Merge pull request #14 from AnotherStranger/feature/smaller-refactorings

Feature/smaller refactorings
AnotherStranger · Feb 29, 2024 · 77045ea · 77045ea
2 parents bd8f2b4 + 420395d
commit 77045ea
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 18 deletions.
diff --git a/renovate.json b/renovate.json
@@ -1,6 +1,16 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
+  "extends": ["config:recommended"],
+  "baseBranches": ["dev"],
+  "lockFileMaintenance": {
+    "enabled": true,
+    "automerge": true
+  },
+  "packageRules": [
+    {
+      "matchUpdateTypes": ["minor", "patch"],
+      "matchCurrentVersion": "!/^0/",
+      "automerge": true
+    }
   ]
 }
diff --git a/rockbox_listenbrainz_scrobbler/model.py b/rockbox_listenbrainz_scrobbler/model.py
@@ -1,15 +1,20 @@
-from datetime import datetime
+from enum import Enum
 
 from pydantic import AliasChoices, BaseModel, Field
 
 
+class SongRatingEnum(str, Enum):
+    LISTENED: str = "L"
+    SKIPPED: str = "S"
+
+
 class ScrobblerEntry(BaseModel):
     artist: str = Field(validation_alias=AliasChoices("artist", "#ARTIST"))
     album: str = Field(validation_alias=AliasChoices("album", "#ALBUM"))
     title: str = Field(validation_alias=AliasChoices("title", "#TITLE"))
     tracknum: int = Field(validation_alias=AliasChoices("tracknum", "#TRACKNUM"))
     length: int = Field(validation_alias=AliasChoices("length", "#LENGTH"))
-    rating: str = Field(validation_alias=AliasChoices("rating", "#RATING"))
+    rating: SongRatingEnum = Field(validation_alias=AliasChoices("rating", "#RATING"))
     timestamp: int = Field(validation_alias=AliasChoices("timestamp", "#TIMESTAMP"))
     musicbrainz_trackid: str = Field(
         validation_alias=AliasChoices("musicbrainz_trackid", "#MUSICBRAINZ_TRACKID")

diff --git a/rockbox_listenbrainz_scrobbler/rockbox_listenbrainz_ui.py b/rockbox_listenbrainz_scrobbler/rockbox_listenbrainz_ui.py
@@ -9,11 +9,11 @@
 from PySide6.QtCore import QSettings
 from PySide6.QtWidgets import (
     QFileDialog,
+    QGroupBox,
     QHBoxLayout,
     QLabel,
     QLineEdit,
     QMessageBox,
-    QProgressBar,
     QPushButton,
     QTextEdit,
     QVBoxLayout,
@@ -49,6 +49,18 @@ def show_error(text: str):
     msg.exec()
 
 
+def show_info(text: str):
+    """
+    Display an error message with the given text
+    """
+    msg = QMessageBox()
+    msg.setIcon(QMessageBox.Information)
+    msg.setText("Success")
+    msg.setInformativeText(text)
+    msg.setWindowTitle("Success")
+    msg.exec()
+
+
 class ListenbrainzWidget(QWidget):
     """
     Main GUI widget for the Rockbox Listenbrainz Scrobbler
@@ -65,8 +77,9 @@ def __init__(self):
         self.setLayout(layout)
 
         # Input field for auth token
+        settings_group = QGroupBox("Settings")
         auth_layout = QHBoxLayout()
-        layout.addLayout(auth_layout)
+        # layout.addLayout(auth_layout)
 
         auth_label = QLabel("Enter User Token:", self)
         auth_layout.addWidget(auth_label)
@@ -76,12 +89,15 @@ def __init__(self):
         self.auth_token_input.setToolTip(
             "Your personal auth token for ListenBrainz. Get it here: https://listenbrainz.org/settings/"
         )
+        self.auth_token_input.setEchoMode(QLineEdit.Password)
         if self.settings.value(LISTENBRAINZ_AUTH_TOKEN_SETTING_KEY):
             self.auth_token_input.setText(
                 self.settings.value(LISTENBRAINZ_AUTH_TOKEN_SETTING_KEY)
             )
 
         auth_layout.addWidget(self.auth_token_input)
+        settings_group.setLayout(auth_layout)
+        layout.addWidget(settings_group)
 
         # Button for selecting log file
         self.file_button = QPushButton("Select Logfile...", self)
@@ -98,10 +114,6 @@ def __init__(self):
         buttons_layout.addWidget(self.submit_button)
         layout.addLayout(buttons_layout)
 
-        # Progress bar
-        self.progress_bar = QProgressBar(self)
-        layout.addWidget(self.progress_bar)
-
         # Read-only text edit area
         self.text_edit = QTextEdit(self)
         self.text_edit.setReadOnly(True)
@@ -112,7 +124,7 @@ def select_file(self):
         Opens a file dialog allowing the user to select a log file and configures the UI accordingly
         """
         file_dialog = QFileDialog(self)
-        file_dialog.setNameFilter("All Files (*);;Rockbox Scrobbler Log (*.log)")
+        file_dialog.setNameFilter("Rockbox Scrobbler Log (*.log);;All Files (*)")
         if file_dialog.exec_():
             selected_file = Path(file_dialog.selectedFiles()[0])
             if selected_file.exists():
@@ -141,13 +153,10 @@ def submit_data(self):
 
         try:
             scrobbles = read_rockbox_log(self.selected_file)
-            total_scrobbles = len(scrobbles)
-            self.progress_bar.setMaximum(total_scrobbles)
             client = ListenBrainzScrobbler(auth_token)
 
-            for i, scrobble in enumerate(scrobbles):
-                self.progress_bar.setValue(i + 1)
-                client.scrobble(scrobble)
+            client.scrobble_multiple(scrobbles)
+            show_info("Successfully uploaded your Listens.")
         except ValidationError:
             show_error(
                 "Could not parse the given File. Did you choose a Rockbox .scrobbler.log?"

diff --git a/rockbox_listenbrainz_scrobbler/scrobbling.py b/rockbox_listenbrainz_scrobbler/scrobbling.py
@@ -5,7 +5,7 @@
 
 from pylistenbrainz import Listen, ListenBrainz
 
-from rockbox_listenbrainz_scrobbler.model import ScrobblerEntry
+from rockbox_listenbrainz_scrobbler.model import ScrobblerEntry, SongRatingEnum
 
 
 class AbstractScrobbler(ABC):
@@ -79,4 +79,4 @@ def read_rockbox_log(
             scrobbles += [
                 ScrobblerEntry(**{**row, **{"listening_from": listening_from}})
             ]
-    return scrobbles
+    return list(filter(lambda x: x.rating == SongRatingEnum.LISTENED, scrobbles))