From f12201300aa36e1e46851a69ad3033b1846ccde7 Mon Sep 17 00:00:00 2001
From: RumovZ <gp5glkw78@relay.firefox.com>
Date: Tue, 22 Aug 2023 20:48:10 +0200
Subject: [PATCH 1/5] Catch any errors when fetching browser cookies

---
 src/usdb_syncer/settings.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/usdb_syncer/settings.py b/src/usdb_syncer/settings.py
index cca19d33..8c765a4a 100644
--- a/src/usdb_syncer/settings.py
+++ b/src/usdb_syncer/settings.py
@@ -8,7 +8,6 @@
 from __future__ import annotations
 
 import os
-import sqlite3
 from enum import Enum
 from http.cookiejar import CookieJar
 from pathlib import Path
@@ -222,7 +221,7 @@ def cookies(self) -> CookieJar | None:
                 assert_never(unreachable)
         try:
             return function(domain_name=Usdb.DOMAIN)
-        except (browser_cookie3.BrowserCookieError, sqlite3.Error) as error:
+        except Exception as error:  # pylint: disable=broad-exception-caught
             _logger.debug(error)
         _logger.warning(f"Failed to retrieve {str(self).capitalize()} cookies.")
         return None

From f459942b3c07c2087c663bb3c81426c945049661 Mon Sep 17 00:00:00 2001
From: RumovZ <gp5glkw78@relay.firefox.com>
Date: Tue, 22 Aug 2023 20:48:31 +0200
Subject: [PATCH 2/5] Add CHANGELOG.md

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..84905300
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,26 @@
+<!-- 0.2.1 -->
+
+# Changes
+
+## Fixes
+
+- Fixed another error with fetching browser cookies preventing the app to start.
+
+<!-- 0.2.0 -->
+
+# Changes
+
+## Fixes
+
+- Fixed an error which prevented downloads from finishing successfully ("Only valid ISO 639 language values are supported as arguments.")
+- Fixed an error with the USDB login when downloading multiple songs concurrently without being logged in, yet.
+- Fixed an error which could prevent the app from starting if unable to retrieve browser cookies.
+- Fixed some Linux-specific issues and documented requirements (see [README](https://github.com/bohning/usdb_syncer/blob/main/README.md)).
+- Fixed wrong songs being matched when finding local songs.
+- Fixed downloading from YouTube by updating yt_dlp.
+- Fixed shortening URLs in the meta tags dialog.
+
+## Features
+
+- Implemented importing and exporting a list of USDB song ids from .json, .usdb_ids and hyperlink files.
+- Added actions to show the current song on USDB and on the local file system.

From b60a2cd31722a0337ca3b3e4e8fecc893943dff5 Mon Sep 17 00:00:00 2001
From: RumovZ <gp5glkw78@relay.firefox.com>
Date: Wed, 23 Aug 2023 21:08:54 +0200
Subject: [PATCH 3/5] Pin Qt 6.5

---
 .github/workflows/release.yaml | 2 +-
 setup.cfg                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index bc8bda02..490900a3 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -31,7 +31,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: "6.*"
+          version: "6.5.*"
           setup-python: false
       - name: Set up Python
         uses: actions/setup-python@v4
diff --git a/setup.cfg b/setup.cfg
index f7bbe669..1f81818a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ package_dir =
 install_requires =
     importlib-metadata
     wheel
-    PySide6
+    PySide6==6.5.*
     lxml
     beautifulsoup4
     requests

From c69f92e1bcece6bddbea94210870ff6bbe5eaf3a Mon Sep 17 00:00:00 2001
From: RumovZ <gp5glkw78@relay.firefox.com>
Date: Wed, 23 Aug 2023 21:09:59 +0200
Subject: [PATCH 4/5] Only upload relevant artifacts

---
 .github/workflows/release.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 490900a3..7ed187a0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -75,8 +75,9 @@ jobs:
         with:
           name: artifacts
           path: |
-            dist/*
-            !dist/*.app
+            dist/*Linux
+            dist/*.dmg
+            dist/*.exe
 
   release:
     name: Create release

From 7c8d59eb05aeca04576dbb0043e09c9518cfd863 Mon Sep 17 00:00:00 2001
From: RumovZ <gp5glkw78@relay.firefox.com>
Date: Wed, 23 Aug 2023 21:11:20 +0200
Subject: [PATCH 5/5] Extract release notes from CHANGELOG.md

---
 .github/workflows/release.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7ed187a0..ddc03637 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -78,6 +78,7 @@ jobs:
             dist/*Linux
             dist/*.dmg
             dist/*.exe
+            CHANGELOG.md
 
   release:
     name: Create release
@@ -87,6 +88,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v3
+      - name: Extract Release Notes
+        id: extract_notes
+        run: |
+          awk 'BEGIN { RS="<!-- [0-9]+\\.[0-9]+\\.[0-9]+ -->\\s*"; ORS=""; } NR==2 { print $0; exit; }' artifacts/CHANGELOG.md >CHANGELOG.md
+        shell: bash
       - uses: ncipollo/release-action@v1
         with:
-          artifacts: "artifacts/*"
+          artifacts: "artifacts/dist/*"
+          bodyFile: "CHANGELOG.md"