Merge pull request #10 from Thomasedv/master

Release v0.3.2

Author: Thomasedv

Modules/download_element.py

@@ -1,7 +1,5 @@
 from PyQt5.QtCore import QProcess
 
-from utils.utilities import ArgumentError
-
 
 class Download(QProcess):
     def __init__(self, working_dir: str, program_path: str, commands: list, parent=None):
@@ -18,7 +16,10 @@ def __init__(self, working_dir: str, program_path: str, commands: list, parent=N
 
     def start_dl(self):
         if self.program_path is None:
-            raise ArgumentError()
+            raise TypeError('Missing youtube-dl path.')
+        # TODO: Handler errors with starting youtube-dl
+
+        self.errorOccurred.connect(lambda: print('error', self.error()))
 
         self.start(self.program_path, self.commands)
 

Modules/parameterTree.py

@@ -38,6 +38,7 @@ def __init__(self, profile: dict):
         # self.setHeaderHidden(True)
         self.setRootIsDecorated(False)
         self.setHeaderHidden(True)
+        # self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         self.setContextMenuPolicy(Qt.CustomContextMenu)
         self.customContextMenuRequested.connect(self.contextMenu)
 
@@ -119,7 +120,9 @@ def del_option(self, parent: QTreeWidgetItem, child: QTreeWidgetItem):
         self.update_size()
 
     def move_widget(self, item: QTreeWidgetItem):
+        self.blockSignals(True)
         taken_item = self.takeTopLevelItem(self.indexOfTopLevelItem(item))
+        self.blockSignals(False)
         self.move_request.emit(taken_item, self.favorite)
 
     def load_profile(self, profile: dict):
@@ -146,12 +149,15 @@ def load_profile(self, profile: dict):
 
     def hock_dependency(self):
         top_level_names = []
+
         for item in self.topLevelItems():
+
             # Create a list if top level items, their dependent and the QModelIndex of said item.
+
             top_level_names.append([item.data(0, 32), item.data(0, 34), self.indexFromItem(item)])
 
         # Locate matches, and store in dict
-
+        # TODO: Make readable
         indices = {t[0]: i for i, t in enumerate(top_level_names)}
         for index, (first, second, third) in enumerate(top_level_names):
             if second in indices:
@@ -178,6 +184,7 @@ def check_dependency(self, item: QTreeWidgetItem):
         :param item: changed item from QTreeWidget (paramTree)
         :type item: QTreeWidget
         """
+
         if item.data(0, 33) == 0 and item.data(0, 37):
             for i in item.data(0, 37):
                 if item.checkState(0) == Qt.Unchecked:
@@ -335,9 +342,9 @@ def make_exclusive(self, item: QTreeWidgetItem):
                 "command": "-o {}",
                 "dependency": None,
                 "options": [
-                    "D:/Music/DL/%(title)s.%(ext)s",
-                    "C:/Users/Clint Oris/Downloads/%(title)s.%(ext)s",
-                    "D:/Music/%(title)s.%(ext)s"
+                    "D:/Music/DL/",
+                    "C:/Users/Clint Oris/Downloads/",
+                    "D:/Music/"
                 ],
                 "state": True,
                 "tooltip": "Select download location."

README.md

@@ -1,11 +1,11 @@
 # Grabber
 A wrapper for Youtube-dl for Windows. 
 
-![Main](https://i.imgur.com/g5ddMdu.png) ![param](https://i.imgur.com/2vArT7R.png) ![List](https://i.imgur.com/hTRe9f7.png) ![About](https://i.imgur.com/bTuJHDr.png)
+![Main](https://i.imgur.com/fKopNX6.png)
 
 **Requires you to have youtube-dl.exe in the same folder as this program(Grabber), or in PATH. 
 If you want to convert the videos, or otherwise use features of youtube-dl that require ffmpeg,
-that also has to be in the same folder as Grabber.** 
+that also has to be in the same folder (or path) as Grabber.** 
 
 You can get those programs here:
 * Youtube-dl: https://rg3.github.io/youtube-dl/
@@ -19,6 +19,12 @@ Requirements to use source:
 Made with PyQt5 https://www.riverbankcomputing.com/software/pyqt/intro
 
 
+![param](https://i.imgur.com/4jFwhFe.png) ![About](https://i.imgur.com/52Fy75J.png) 
+![Option](https://i.imgur.com/ceYwgyS.png) ![List](https://i.imgur.com/L0PL5OH.png)
+
+
+Images from version 0.3.1.
+
 Current to do list: 
 
 * Make code consistent in style. (Mostly completed...)
@@ -30,5 +36,5 @@ Current to do list:
 * Add general error handling when stuff goes wrong, especially read/write errors if there are some. 
 * ~~Upload first release executable. (Built with PyInstaller)~~ Done!
 * Learn to do testing...
-* Add hide fram taskbar. (So only a icon in bottom right corner, potentially pop-up when done downloading.) 
+* Add hide from taskbar. (So only a icon in bottom right corner, potentially pop-up when done downloading.)
 * Add custom profiles. 

main.py __main__.pymain.py renamed to __main__.py

@@ -1,41 +1,42 @@
-import json
-import sys
-
-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QApplication, QMessageBox
-
-from core import GUI
-from utils.utilities import SettingsError
-
-
-def main():
-    while True:
-        try:
-            app = QApplication(sys.argv)
-            program = GUI()
-
-            EXIT_CODE = app.exec_()
-            app = None
-
-            if EXIT_CODE == GUI.EXIT_CODE_REBOOT:
-                continue
-
-        except (SettingsError, json.decoder.JSONDecodeError) as e:
-            warning = QMessageBox.warning(None,
-                                          'Corrupt settings',
-                                          ''.join([str(e), '\nRestore default settings?']),
-                                          buttons=QMessageBox.Yes | QMessageBox.No)
-            if warning == QMessageBox.Yes:
-                GUI.get_settings(True)
-                app = None
-                continue
-
-        break
-
-
-if __name__ == '__main__':
-    # TODO: Test on high DPI screen.
-    # TODO: Get a high DPI screen...
-    QApplication.setAttribute(Qt.AA_EnableHighDpiScaling, True)
-    QApplication.setAttribute(Qt.AA_UseHighDpiPixmaps, True)
-    main()
+import json
+import sys
+
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QApplication, QMessageBox
+
+from core import GUI
+from utils.utilities import SettingsError
+from utils.filehandler import FileHandler
+
+
+def main():
+    while True:
+        try:
+            app = QApplication(sys.argv)
+            program = GUI()
+
+            EXIT_CODE = app.exec_()
+            app = None
+
+            if EXIT_CODE == GUI.EXIT_CODE_REBOOT:
+                continue
+
+        except (SettingsError, json.decoder.JSONDecodeError) as e:
+            warning = QMessageBox.warning(None,
+                                          'Corrupt settings',
+                                          ''.join([str(e), '\nRestore default settings?']),
+                                          buttons=QMessageBox.Yes | QMessageBox.No)
+            if warning == QMessageBox.Yes:
+                FileHandler().load_settings(True)
+                app = None  # Ensures the app instance is properly removed!
+                continue
+
+        break
+
+
+if __name__ == '__main__':
+    # TODO: Test on high DPI screen.
+    # TODO: Get a high DPI screen...
+    QApplication.setAttribute(Qt.AA_EnableHighDpiScaling, True)
+    QApplication.setAttribute(Qt.AA_UseHighDpiPixmaps, True)
+    main()