[feature-107] some fixes

This commit is contained in:
MathieuG-P
2024-07-04 21:25:36 +02:00
parent 517db1d056
commit 6d38985581
8 changed files with 19 additions and 23 deletions
+7 -8
View File
@@ -26,14 +26,13 @@ message SongDetails {
bool ranked = 8;
bool qualified = 9;
bool curated = 10;
bool rankedBL = 11;
bool nominatedBL = 12;
bool qualifiedBL = 13;
uint32 upVotes = 14;
uint32 downVotes = 15;
uint32 downloads = 16;
bool automapper = 17;
repeated Difficulty difficulties = 18;
bool blRanked = 11;
bool blQualified = 12;
uint32 upVotes = 13;
uint32 downVotes = 14;
uint32 downloads = 15;
bool automapper = 16;
repeated Difficulty difficulties = 17;
}
message Difficulty {
+2 -1
View File
@@ -38,7 +38,8 @@
"extraResources": [
"./assets/favicon.ico",
"./assets/jsons/bs-versions.json",
"./assets/jsons/patreons.json"
"./assets/jsons/patreons.json",
"./assets/proto/song_details_cache_v1.proto"
],
"productName": "BSManager",
"appId": "org.erb.BSManager",
-1
View File
@@ -1,4 +1,3 @@
import { SongCacheService } from "main/services/additional-content/maps/song-cache.service";
import { LocalMapsManagerService } from "../services/additional-content/maps/local-maps-manager.service";
import { IpcService } from "../services/ipc.service";
import { from, of, throwError } from "rxjs";
@@ -321,7 +321,7 @@ export const isLocalMapFitMapFilter = ({filter, map, search}: { filter: MapFilte
if (!isFitChroma(filter, map.songDetails?.difficulties.some(diff => !!diff.chroma))) { return false; }
if (!isFitFullSpread(filter, map.songDetails?.difficulties.length)) { return false; }
if (!isFitAutomapper(filter, map.songDetails?.automapper)){ return false; }
if (!isFitRanked(filter, map.songDetails?.ranked || map.songDetails?.rankedBL)) { return false; }
if (!isFitRanked(filter, map.songDetails?.ranked || map.songDetails?.blRanked)) { return false; }
if (!isFitCurated(filter, map.songDetails?.curated)) { return false; }
if (!isFitVerified(filter, map.songDetails?.uploader.verified)) { return false; }
if (!isFitSearch(search, {songName: map.rawInfo?._songName, songAuthorName: map.rawInfo?._songAuthorName, levelAuthorName: map.rawInfo?._levelAuthorName})) { return false; }
@@ -364,7 +364,7 @@ export const isSongDetailsFitMapFilter = ({filter, map, search}: { filter: MapFi
if (!isFitChroma(filter, map.difficulties.some(diff => !!diff.chroma))) { return false; }
if (!isFitFullSpread(filter, map.difficulties.length)) { return false; }
if (!isFitAutomapper(filter, map.automapper)){ return false; }
if (!isFitRanked(filter, map.ranked || map.rankedBL)) { return false; }
if (!isFitRanked(filter, map.ranked || map.blRanked)) { return false; }
if (!isFitCurated(filter, map.curated)) { return false; }
if (!isFitVerified(filter, map.uploader.verified)) { return false; }
if (!isFitSearch(search, {songName: map.name, songAuthorName: map.uploader.name, levelAuthorName: map.uploader.name})) { return false; }
@@ -55,7 +55,7 @@ export abstract class MapItemComponentPropsMapper {
diffs: MapItemComponentPropsMapper.extractMapDiffs({ rawMapInfo: map.rawInfo, songDetails: map.songDetails }),
mapId: map.songDetails?.id,
ranked: map.songDetails?.ranked,
blRanked: map.songDetails?.rankedBL,
blRanked: map.songDetails?.blRanked,
autorId: map.songDetails?.uploader.id,
likes: map.songDetails?.upVotes,
createdAt: map.songDetails?.uploadedAt,
@@ -94,7 +94,7 @@ export abstract class MapItemComponentPropsMapper {
likes: song.upVotes,
mapId: song.id,
ranked: song.ranked,
blRanked: song.rankedBL,
blRanked: song.blRanked,
title: song.name,
diffs: MapItemComponentPropsMapper.extractMapDiffs({ songDetails: song }),
callBackParam: song
@@ -25,9 +25,8 @@ export interface RawSongDetails {
ranked: boolean;
qualified: boolean;
curated: boolean;
rankedBL: boolean;
nominatedBL: boolean;
qualifiedBL: boolean;
blRanked: boolean;
blQualified: boolean;
upVotes: number;
downVotes: number;
downloads: number;
@@ -163,9 +163,8 @@ export abstract class RawSongDetailsDeserializer {
ranked: rawSongDetails.ranked,
qualified: rawSongDetails.qualified,
curated: rawSongDetails.curated,
rankedBL: rawSongDetails.rankedBL,
nominatedBL: rawSongDetails.nominatedBL,
qualifiedBL: rawSongDetails.qualifiedBL,
blRanked: rawSongDetails.blRanked,
blQualified: rawSongDetails.blQualified,
upVotes: rawSongDetails.upVotes,
downVotes: rawSongDetails.downVotes,
downloads: rawSongDetails.downloads,
@@ -11,9 +11,8 @@ export interface SongDetails {
ranked: boolean;
qualified: boolean;
curated: boolean;
rankedBL: boolean;
nominatedBL: boolean;
qualifiedBL: boolean;
blRanked: boolean;
blQualified: boolean;
upVotes: number;
downVotes: number;
downloads: number;