Merge branch 'master' into tracklist-update

Author: Myxelium

.github/workflows/build-and-release.yaml

@@ -39,10 +39,15 @@ jobs:
           node-version: v18.19.0
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Install builder dependencies
+      - name: Fix apt and install builder dependencies
         shell: bash
         run: |
+          sudo rm /var/lib/apt/lists/* || true
+          sudo apt update
+          sudo apt install flatpak -y
+          sudo apt install flatpak-builder -y
           sudo apt install elfutils -y
+          flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
           git config --global --add protocol.file.allow always
       - name: Build the app (Linux)
         shell: bash
@@ -54,7 +59,7 @@ jobs:
         shell: bash
         run: |
           cd release
-          find . -type f \( -name "*.AppImage" -o -name "latest-linux.yml" \) -print0 | tar -czvf bridge-linux.tar.gz --null -T -
+          find . -type f \( -name "*.AppImage" -o -name "*.flatpak" -o -name "latest-linux.yml" \) -print0 | tar -czvf bridge-linux.tar.gz --null -T -
       - uses: actions/upload-artifact@v4
         with:
           name: bridge-linux

.github/workflows/build-on-pr.yaml

@@ -27,11 +27,15 @@ jobs:
           node-version: v18.19.0
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Install builder dependencies
+      - name: Fix apt and install builder dependencies
         shell: bash
         run: |
+          sudo rm /var/lib/apt/lists/* || true
+          sudo apt update
+          sudo apt install flatpak -y
+          sudo apt install flatpak-builder -y
           sudo apt install elfutils -y
-          git config --global --add protocol.file.allow always
+          flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
       - name: Build the app
         shell: bash
         run: |

electron-builder.json

@@ -36,7 +36,8 @@
 	"linux": {
 		"compression": "maximum",
 		"target": [
-			"AppImage"
+			"AppImage",
+			"flatpak"
 		],
 		"category": "utility"
 	}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bridge",
-  "version": "3.4.4",
+  "version": "3.4.6",
   "description": "A rhythm game chart searching and downloading tool.",
   "homepage": "https://github.com/Geomitron/Bridge",
   "license": "GPL-3.0",

src-angular/app/core/services/search.service.ts

@@ -70,7 +70,7 @@ export class SearchService {
 			}
 		})
 
-		this.drumsReviewed = new FormControl<boolean>((localStorage.getItem('drumsReviewed') ?? 'true') === 'true', { nonNullable: true })
+		this.drumsReviewed = new FormControl<boolean>((localStorage.getItem('drumsReviewed') ?? 'false') === 'true', { nonNullable: true })
 		this.drumsReviewed.valueChanges.subscribe(drumsReviewed => {
 			localStorage.setItem('drumsReviewed', `${drumsReviewed}`)
 			if (this.songsResponse?.page) {

src-electron/ipc/issue-scan/ExcelBuilder.ts

@@ -171,12 +171,12 @@ export function columnNumberToLetter(column: number) {
 }
 
 /**
- * @returns an string representation of `ms` that looks like HH:MM:SS.mm
+ * @returns a string representation of `ms` that looks like HH:MM:SS.mm
  */
 export function msToExactTime(ms: number) {
 	const seconds = _.round((ms / 1000) % 60, 2)
 	const minutes = Math.floor((ms / 1000 / 60) % 60)
-	const hours = Math.floor((ms / 1000 / 60 / 60) % 24)
+	const hours = Math.floor(ms / 1000 / 60 / 60)
 	return `${hours ? `${hours}:` : ''}${_.padStart(
 		minutes + '',
 		2,

src-shared/UtilFunctions.ts

@@ -140,7 +140,7 @@ export function instrumentToDiff(instrument: Instrument | 'vocals') {
 export function msToRoughTime(ms: number) {
 	const seconds = _.floor((ms / 1000) % 60)
 	const minutes = _.floor((ms / 1000 / 60) % 60)
-	const hours = _.floor((ms / 1000 / 60 / 60) % 24)
+	const hours = _.floor(ms / 1000 / 60 / 60)
 	return `${hours ? `${hours}:` : ''}${minutes}:${_.padStart(String(seconds), 2, '0')}`
 }