Merge branch 'v1.5.0' into feature/playlists/107

src/renderer/components/maps-playlists-panel/maps/filter-panel.component.tsx

@@ -11,6 +11,7 @@ import { useTranslation } from "renderer/hooks/use-translation.hook";
 import { MAP_SPECIFICITIES } from "renderer/partials/maps/map-general/map-specificity";
 import { MAP_REQUIREMENTS } from "renderer/partials/maps/map-requirements/map-requirements";
 import { MAP_DIFFICULTIES_COLORS } from "renderer/partials/maps/map-difficulties/map-difficulties-colors";
+import { MapExclude, MAP_EXCLUDES } from "renderer/partials/maps/map-excludes/map-excludes";
 import { BsmButton } from "../../shared/bsm-button.component";
 import equal from "fast-deep-equal/es6";
 import clone from "rfdc";
@@ -21,12 +22,13 @@ export type Props = {
     ref?: MutableRefObject<undefined>;
     playlist?: boolean;
     filter: MapFilter;
+    localData?: boolean;
     onChange?: (filter: MapFilter) => void;
     onApply?: (filter: MapFilter) => void;
     onClose?: (filter: MapFilter) => void;
 };
 
-export function FilterPanel({ className, ref, playlist = false, filter, onChange, onApply, onClose }: Props) {
+export function FilterPanel({ className, ref, playlist = false, filter, localData = true, onChange, onApply, onClose }: Props) {
     const t = useTranslation();
 
     const [haveChanged, setHaveChanged] = useState(false);
@@ -147,6 +149,10 @@ export function FilterPanel({ className, ref, playlist = false, filter, onChange
         return t(`maps.map-specificities.${specificity}`);
     };
 
+    const translateMapExclude = (exclude: MapExclude): string => {
+        return t(`maps.map-excludes.${exclude}`);
+    };
+
     type BooleanKeys<T> = { [k in keyof T]: T[k] extends boolean ? k : never }[keyof T];
 
     const handleCheckbox = (key: BooleanKeys<MapFilter>) => {
@@ -189,6 +195,17 @@ export function FilterPanel({ className, ref, playlist = false, filter, onChange
                             <span className="grow capitalize">{requirement}</span>
                         </div>
                     ))}
+                    { !localData && (
+                        <>
+                            <h2 className="my-1 uppercase text-sm">{t("maps.map-filter-panel.exclude")}</h2>
+                            {MAP_EXCLUDES.map(exclude => (
+                                <div key={exclude} className="flex justify-start items-center h-[22px] z-20 relative py-0.5 cursor-pointer" onClick={() => handleCheckbox(exclude)}>
+                                    <BsmCheckbox className="h-full aspect-square relative bg-inherit mr-1" checked={filter?.[exclude]} onChange={() => handleCheckbox(exclude)} />
+                                    <span className="grow capitalize">{translateMapExclude(exclude)}</span>
+                                </div>
+                            ))}
+                        </>
+                    )}
                 </section>
                 <section className="grow capitalize">
                     <h2 className="uppercase text-sm mb-1">{t("maps.map-filter-panel.tags")}</h2>

src/renderer/components/modal/modal-types/download-maps-modal.component.tsx

@@ -77,12 +77,48 @@ export const DownloadMapsModal: ModalComponent<void, { version: BSVersion; owned
         };
     }, []);
 
-    const loadMaps = (params: SearchParams) => {
+    const applyInstalledFilter = (maps: BsvMapDetail[]): BsvMapDetail[] => {
+        return maps.filter(map => {
+            if (!filter.installed) {
+                return true;
+            }
+
+            return !map.versions.some(version => ownedMapHashs.includes(version.hash));
+        });
+    }
+
+    const loadMaps = (params: SearchParams, tryToLoad = 5) => {
         setLoading(() => true);
-        beatSaver
-            .searchMaps(params)
-            .then(maps => setMaps(prev => [...prev, ...maps]))
-            .finally(() => setLoading(() => false));
+
+        const searchResult = beatSaver.searchMaps(params);
+
+        if (!filter.installed) {
+            searchResult
+                .then(maps => setMaps(prev => [...prev, ...maps]))
+                .finally(() => setLoading(() => false));
+
+            return;
+        }
+
+        searchResult
+           .then(maps => {
+                if (!maps.length) {
+                    setLoading(() => false);
+
+                    return;
+                }
+
+                maps = applyInstalledFilter(maps);
+                setMaps(prev => [...prev, ...maps])
+
+                if (maps.length < tryToLoad) {
+                    handleLoadMore();
+
+                    return;
+                }
+
+                setLoading(() => false);
+            })
     };
 
     const renderMap = (map: BsvMapDetail) => {
@@ -155,7 +191,7 @@ export const DownloadMapsModal: ModalComponent<void, { version: BSVersion; owned
         >
             <div className="flex h-9 gap-2 shrink-0">
                 <BsmDropdownButton ref={filterContainerRef} className="shrink-0 h-full relative z-[1] flex justify-start" buttonClassName="flex items-center justify-center h-full rounded-full px-2 py-1 !bg-light-main-color-1 dark:!bg-main-color-1" icon="filter" text="pages.version-viewer.maps.search-bar.filters-btn" withBar={false}>
-                    <FilterPanel className="absolute top-[calc(100%+3px)] origin-top w-[450px] h-fit p-2 rounded-md shadow-md shadow-black" filter={filter} onChange={setFilter} onApply={handleSearch} onClose={() => filterContainerRef.current.close()} />
+                    <FilterPanel className="absolute top-[calc(100%+3px)] origin-top w-[450px] h-fit p-2 rounded-md shadow-md shadow-black" localData={false} filter={filter} onChange={setFilter} onApply={handleSearch} onClose={() => filterContainerRef.current.close()} />
                 </BsmDropdownButton>
                 <input className="h-full bg-light-main-color-1 dark:bg-main-color-1 rounded-full px-2 grow pb-0.5" type="text" name="" id="" placeholder={t("pages.version-viewer.maps.search-bar.search-placeholder")} value={query} onChange={e => setQuery(e.target.value)} />
                 <BsmButton

src/renderer/components/modal/modal-types/original-oculus-version-backup.modal.tsx

@@ -19,11 +19,9 @@ export const OriginalOculusVersionBackupModal: ModalComponent<boolean, void> = (
         <form className="max-w-[450px] text-gray-800 dark:text-gray-200">
             <h1 className="text-3xl uppercase tracking-wide w-full text-center text-gray-800 dark:text-gray-200">{t("modals.original-version-backup-oculus.title")}</h1>
             <BsmImage className="mx-auto h-20" image={BeatConflict} />
-            
+
             <p className="text-sm italic mb-4 font-bold">{t("modals.original-version-backup-oculus.body.must-be-installed-once")}</p>
-            <p className="mb-4">{t("modals.original-version-backup-oculus.body.need-backup")}</p>
-            <p className="mb-4">{t("modals.original-version-backup-oculus.body.can-restore-later")}</p>
-            <p className="text-sm italic mb-4">{t("modals.original-version-backup-oculus.body.tips-launch-oculus")}</p>
+            <p className="mb-4">{t("modals.original-version-backup-oculus.body.will-backup")}</p>
 
             <div className="flex flex-row justify-start items-center gap-1.5 my-4" >
                 <BsmCheckbox className="relative z-[1] w-6 aspect-square" checked={dontShowAgain} onChange={setDontShowAgain} />