add download statistics and donate button to the about tab

Author: justin025

src/onthespot/api/youtube_music.py

@@ -21,7 +21,7 @@ def youtube_music_login_user(account):
                 "service": "youtube_music",
                 "status": "active",
                 "account_type": "public",
-                "bitrate": "256k",
+                "bitrate": "128k",
             })
             return True
     except Exception as e:
@@ -66,7 +66,7 @@ def youtube_music_get_search_results(_, search_term, content_types):
                     'item_by': result['channel'],
                     'item_type': "track",
                     'item_service': "youtube_music",
-                    'item_url': result['url'],
+                    'item_url': f"https://music.youtube.com/watch?v={result['id']}",
                     'item_thumbnail_url': f'https://i.ytimg.com/vi/{result["id"]}/hqdefault.jpg'
                 })
 

src/onthespot/downloader.py

@@ -388,7 +388,7 @@ def run(self):
                                 ydl_opts['format'] = 'bestaudio[ext=mp3]'
                         elif item_service == "youtube_music":
                             default_format = '.m4a'
-                            bitrate = "256k"
+                            bitrate = "128k"
                             ydl_opts['format'] = 'bestaudio[ext=m4a]'
                         ydl_opts['quiet'] = True
                         ydl_opts['no_warnings'] = True
@@ -738,7 +738,12 @@ def run(self):
                 logger.info("Item Successfully Downloaded")
                 if self.gui:
                     self.progress.emit(item, self.tr("Downloaded"), 100)
-
+                try:
+                    config.set('total_downloaded_data', config.get('total_downloaded_data') + os.path.getsize(item['file_path']))
+                    config.set('total_downloaded_items', config.get('total_downloaded_items') + 1)
+                    config.save()
+                except Exception:
+                    pass
                 time.sleep(config.get("download_delay"))
                 self.readd_item_to_download_queue(item)
                 continue

src/onthespot/gui/mainui.py

@@ -25,7 +25,7 @@
 from .dl_progressbtn import DownloadActionsButtons
 from .settings import load_config, save_config
 from .thumb_listitem import LabelWithThumb
-from ..utils import is_latest_release, open_item
+from ..utils import is_latest_release, open_item, format_bytes
 from ..search import get_search_results
 
 logger = get_logger('gui.main_ui')
@@ -81,13 +81,6 @@ def closeEvent(self, event):
             self.hide()
 
 
-    # Remove Later
-    def contribute(self):
-        if self.language.currentIndex() == self.language.count() - 1:
-            url = "https://github.com/justin025/OnTheSpot/tree/main#contributing"
-            open_item(url)
-
-
     def __init__(self, _dialog, start_url=''):
         super(MainWindow, self).__init__()
         self.path = os.path.dirname(os.path.realpath(__file__))
@@ -98,8 +91,6 @@ def __init__(self, _dialog, start_url=''):
         self.centralwidget.setStyleSheet(config.get('theme'))
 
         self.start_url = start_url
-        self.version.setText(config.get("version"))
-        self.session_uuid.setText(config.session_uuid)
         logger.info(f"Initialising main window, logging session : {config.session_uuid}")
 
         # Fill the value from configs
@@ -215,15 +206,16 @@ def bind_button_inputs(self):
 
         self.settings_bookmark_accounts.clicked.connect(lambda: self.settings_scroll_area.verticalScrollBar().setValue(0))
         self.settings_bookmark_general.clicked.connect(lambda: self.settings_scroll_area.verticalScrollBar().setValue(328))
-        self.settings_bookmark_audio_downloads.clicked.connect(lambda: self.settings_scroll_area.verticalScrollBar().setValue(1160))
-        self.settings_bookmark_audio_metadata.clicked.connect(lambda: self.settings_scroll_area.verticalScrollBar().setValue(2000))
+        self.settings_bookmark_audio_downloads.clicked.connect(lambda: self.settings_scroll_area.verticalScrollBar().setValue(1176))
+        self.settings_bookmark_audio_metadata.clicked.connect(lambda: self.settings_scroll_area.verticalScrollBar().setValue(2016))
         self.settings_bookmark_video_downloads.clicked.connect(lambda: self.settings_scroll_area.verticalScrollBar().setValue(9999))
 
         self.export_logs.clicked.connect(lambda: shutil.copy(
             os.path.join(cache_dir(), "logs", config.session_uuid, "onthespot.log"),
             os.path.join(os.path.expanduser("~"), "Downloads", "onthespot.log")) and
             self.show_popup_dialog(self.tr("Logs exported to '{0}'").format(os.path.join(os.path.expanduser("~"), "Downloads", "onthespot.log") or True))
             )
+        self.donate.clicked.connect(lambda: open_item('https://justin025.github.io/about.html'))
 
 
     def set_table_props(self):
@@ -480,6 +472,7 @@ def add_item_to_download_list(self, item, item_metadata):
 
 
     def update_item_in_download_list(self, item, status, progress):
+        self.statistics.setText(self.tr("{0} / {1}").format(config.get('total_downloaded_items'), format_bytes(config.get('total_downloaded_data'))))
         with download_queue_lock:
             item['gui']['status_label'].setText(status)
             item['gui']['progress_bar'].setValue(progress)

src/onthespot/gui/qtui/main.ui

@@ -4674,14 +4674,14 @@
             </widget>
            </item>
            <item>
-            <widget class="QLabel" name="lb_session_uuid">
+            <widget class="QLabel" name="lb_statistics">
              <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Log UUID : &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Total Downloads : &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QLineEdit" name="session_uuid">
+            <widget class="QLineEdit" name="statistics">
              <property name="enabled">
               <bool>false</bool>
              </property>
@@ -4696,13 +4696,6 @@
              </property>
             </widget>
            </item>
-           <item>
-            <widget class="QPushButton" name="export_logs">
-             <property name="text">
-              <string>Export Logs</string>
-             </property>
-            </widget>
-           </item>
            <item>
             <spacer name="horizontalSpacer_25">
              <property name="orientation">
@@ -4716,6 +4709,20 @@
              </property>
             </spacer>
            </item>
+           <item>
+            <widget class="QPushButton" name="export_logs">
+             <property name="text">
+              <string>Export Logs</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="donate">
+             <property name="text">
+              <string>Donate</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>
@@ -4729,8 +4736,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>140</width>
-             <height>1309</height>
+             <width>641</width>
+             <height>405</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -4755,12 +4762,9 @@
     program or source code.  Users are solely responsible for ensuring that their use of
     OnTheSpot complies with all relevant/applicable laws in their country.The creators
     and contributors of OnTheSpot assume no liability for any misuse of legal terms
-    associated with the application or its source code.
+    associated with the application or its source code. Licensed under GPL-2.0.
     &lt;br&gt;
     &lt;br&gt;
-    &lt;a href=&quot;https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html#SEC1&quot; style=&quot;text-decoration: underline; color:#64B5F6;&quot;&gt;
-        GPL-2.0 License
-    &lt;/a&gt;
 &lt;/p&gt;</string>
               </property>
               <property name="scaledContents">

src/onthespot/gui/settings.py

@@ -2,6 +2,7 @@
 from PyQt6.QtGui import QIcon
 from PyQt6.QtWidgets import QSpinBox, QComboBox, QWidget
 from ..otsconfig import config
+from ..utils import format_bytes
 
 
 class NonScrollableSpinBox(QSpinBox):
@@ -15,6 +16,9 @@ def wheelEvent(self, event):
 
 
 def load_config(self):
+    self.version.setText(config.get("version"))
+    self.statistics.setText(self.tr("{0} / {1}").format(config.get('total_downloaded_items'), format_bytes(config.get('total_downloaded_data'))))
+
     # Dev Tools
     self.settings_scrollarea_value.valueChanged.connect(self.settings_scroll_area.verticalScrollBar().setValue)
     if not config.get('debug_mode'):
@@ -27,12 +31,11 @@ def load_config(self):
     # Icons
     self.toggle_theme_button.setIcon(self.get_icon('light'))
     self.export_logs.setIcon(self.get_icon('export_file'))
+    self.donate.setIcon(self.get_icon('filled_heart'))
 
     self.language.insertItem(0, self.get_icon('en_US'), "English")
     self.language.insertItem(1, self.get_icon('de_DE'), "Deutsch")
     self.language.insertItem(2, self.get_icon('pt_PT'), "Português")
-    self.language.insertItem(999, self.get_icon('pirate_flag'), "Contribute")
-    self.language.currentIndexChanged.connect(self.contribute)
 
     self.login_service.insertItem(0, "Audio")
     self.login_service.insertItem(1, self.get_icon('apple_music'), "Apple Music")

src/onthespot/otsconfig.py

@@ -38,8 +38,10 @@ def __init__(self, cfg_path=None):
         self.__template_data = {
             # System Variables
             "version": "v1.0.7", # Application version
-            "debug_mode": False, # Application version
+            "debug_mode": False, # Enable debug mode
             "language_index": 0, # Language Index
+            "total_downloaded_items": 0, # Total downloaded items
+            "total_downloaded_data": 0, # Total downloaded data in bytes
             "m3u_format": "m3u8", # M3U file format
             "use_double_digit_path_numbers": False, # Append a 0 to single digit path numbers, for instance 1 -> 01
             "ffmpeg_args": [], # Extra arguments for ffmpeg

src/onthespot/resources/web/about.html

@@ -32,11 +32,11 @@ <h1 align="center">Disclaimer</h1>
             program or source code.  Users are solely responsible for ensuring that their use of
             OnTheSpot complies with all relevant/applicable laws in their country.The creators
             and contributors of OnTheSpot assume no liability for any misuse of legal terms
-            associated with the application or its source code.
+            associated with the application or its source code. Licensed under GPL-2.0.
             <br>
             <br>
-            <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html#SEC1" style="text-decoration: underline; color:#64B5F6;">
-                GPL-2.0 License
+            <a href="https://justin025.github.io/about.html" style="text-decoration: underline; color:#64B5F6;">
+                <strong>Donate <3</strong>
             </a>
         </p>
     </body>

src/onthespot/utils.py

@@ -722,3 +722,12 @@ def strip_metadata(item):
         else:
             subprocess.check_call(command, shell=False)
         os.remove(temp_name)
+
+
+def format_bytes(size):
+    units = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB']
+    index = 0
+    while size >= 1024 and index < len(units) - 1:
+        size /= 1024
+        index += 1
+    return f"{size:.2f} {units[index]}"