Can now copy past urls from GUI

Author: Thomasedv

Modules/download_element.py

@@ -7,7 +7,7 @@
 from PyQt5.QtGui import QCursor
 from PyQt5.QtWidgets import QWidget, QHBoxLayout, QLabel, QVBoxLayout, QSizePolicy, QMenu, QTextBrowser
 
-from utils.utilities import FONT_CONSOLAS, color_text
+from utils.utilities import FONT_CONSOLAS, color_text, to_clipboard
 
 
 # TODO: Enum with states (because keeping track of strings is messy + possiblity a define a broad "error" states
@@ -247,10 +247,12 @@ def process_output(self):
 
 class ProcessListItem(QWidget):
     """ ListItem that shows attached process state"""
-    def __init__(self, process: Download, slot, debug=False, parent=None, tooltip=''):
+
+    def __init__(self, process: Download, slot, debug=False, parent=None, url=None):
         super(ProcessListItem, self).__init__(parent=parent)
         self.process = process
         self.slot = slot
+        self.url = url
         self.process.getOutput.connect(self.stat_update)
         self.line = QHBoxLayout()
         self.setFocusPolicy(Qt.NoFocus)
@@ -294,7 +296,7 @@ def __init__(self, process: Download, slot, debug=False, parent=None, tooltip=''
 
         self.info_label_in_layout = False
         self.info_label = QLabel('', parent=self)
-        self.info_label.setToolTip(tooltip)
+        self.info_label.setToolTip(f'URL: {url} (Right-click to copy)')
         self.info_label.setWordWrap(True)
         self.info_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
         self.info_label.hide()
@@ -332,15 +334,21 @@ def open_file(self):
             # Print failed to open file to user!
 
     def open_file_menu(self, event):
-        if self.process.status in ('ERROR', 'Aborted', 'Filesize Error'):
-            return
         menu = QMenu(self.sender())
-        menu.addAction('Open folder', self.open_file)
+
+        if self.process.status not in ('ERROR', 'Aborted', 'Filesize Error'):
+            menu.addAction('Open folder', self.open_file)
+        if self.url is not None:
+            menu.addAction('Copy URL', lambda: to_clipboard(self.url))
+        if not menu.actions():
+            return
         menu.exec(QCursor.pos())
 
     def open_info_menu(self, event):
         menu = QMenu(self.sender())
         menu.addAction('Show complete log', self.open_log)
+        if self.url is not None:
+            menu.addAction('Copy URL', lambda: to_clipboard(self.url))
         menu.exec(QCursor.pos())
 
     def open_log(self):

core.py

@@ -2,16 +2,16 @@
 import os
 import sys
 
-from PyQt5.QtCore import QProcess, pyqtSignal, Qt, QMimeData
-from PyQt5.QtGui import QIcon, QClipboard, QGuiApplication
+from PyQt5.QtCore import QProcess, pyqtSignal, Qt
+from PyQt5.QtGui import QIcon
 from PyQt5.QtWidgets import QFileDialog, QTreeWidgetItem, qApp, QDialog, QApplication, QMessageBox, \
     QTabWidget, QListWidgetItem
 
 from Modules import Dialog, Download, MainTab, ParameterTree, MainWindow, AboutTab, Downloader, ParameterTab, TextTab
 from Modules.download_element import ProcessListItem, MockDownload
 from utils.filehandler import FileHandler
 from utils.utilities import path_shortener, color_text, format_in_list, SettingsError, get_stylesheet, \
-    get_win_accent_color, ProfileLoadError, LessNiceDict
+    get_win_accent_color, ProfileLoadError, LessNiceDict, to_clipboard
 
 
 class GUI(MainWindow):
@@ -546,10 +546,8 @@ def window_focus_event(self):
 
     def copy_to_cliboard(self):
         """ Adds text to clipboard. """
-        mime = QMimeData()
-        mime.setText(self.tab2.download_lineedit.text())
-        board = QGuiApplication.clipboard()
-        board.setMimeData(mime, mode=QClipboard.Clipboard)
+        text = self.tab2.download_lineedit.text()
+        to_clipboard(text)
 
     def open_folder(self):
         """ Opens a folder at specified location. """
@@ -785,14 +783,15 @@ def queue_download(self):
 
         if self.tab1.checkbox.isChecked():
             txt = self.settings.user_options['multidl_txt']
-
+            url = None
             if not txt:
                 self.alert_message('Error!', 'No textfile selected!', '')
                 return
 
             command += ['-a', f'{txt}']
         else:
             txt = self.tab1.url_input.text()
+            url = txt
             command.append(f'{txt}')
 
         # for i in range(len(command)):
@@ -855,16 +854,16 @@ def queue_download(self):
 
         download = Download(self.program_workdir, self.youtube_dl_path, command, parent=self)
 
-        self.add_download_to_gui(download, tooltip=f'URL: {txt}')
+        self.add_download_to_gui(download, url=url)
         self.downloader.queue_dl(download)
 
-    def add_download_to_gui(self, download, tooltip=''):
+    def add_download_to_gui(self, download, url=None):
         scrollbar = self.tab1.process_list.verticalScrollBar()
         place = scrollbar.sliderPosition()
         go_bottom = (place == scrollbar.maximum())
 
         slot = QListWidgetItem(parent=self.tab1.process_list)
-        gui_progress = ProcessListItem(download, slot, debug=self._debug, tooltip=tooltip)
+        gui_progress = ProcessListItem(download, slot, debug=self._debug, url=url)
 
         self.tab1.process_list.addItem(slot)
         self.tab1.process_list.setItemWidget(slot, gui_progress)

utils/filehandler.py

@@ -5,8 +5,8 @@
 
 from PyQt5.QtCore import QThreadPool, QTimer, Qt
 
-from .task import Task
-from .utilities import get_base_settings, SettingsClass, ProfileLoadError
+from utils.task import Task
+from utils.utilities import get_base_settings, SettingsClass, ProfileLoadError
 
 
 def threaded_cooldown(func):
@@ -87,17 +87,20 @@ class FileHandler:
     # TODO: Implement logging, since returned values from threaded functions are discarded.
     # Need to know if errors hanppen!
 
-    def __init__(self, settings='settings.json', profiles='profiles.json'):
+    def __init__(self, settings_path='settings.json', profiles_path='profiles.json'):
 
-        self.profile_path = profiles
-        self.settings_path = settings
+        self.profile_path = profiles_path
+        self.settings_path = settings_path
         self.work_dir = os.getcwd().replace('\\', '/')
 
         self.force_save = False
 
         self.threadpool = QThreadPool()
         self.threadpool.setMaxThreadCount(1)
 
+    def __repr__(self):
+        return f'{__name__}(settings_path={self.settings_path}, profile_path={self.profile_path})'
+
     @staticmethod
     def find_file(relative_path, exist=True):
         """ Get absolute path to resource, works for dev and for PyInstaller """

utils/utilities.py

@@ -9,6 +9,7 @@
 from traceback import format_exception
 from winreg import ConnectRegistry, OpenKey, QueryValueEx, HKEY_CURRENT_USER
 
+
 LOG_FILE = 'Grabber_error.log'
 
 log = logging.getLogger('Grabber')
@@ -45,7 +46,8 @@ def except_hook(cls, exception, traceback):
 # Override PyQt exception handling
 sys.excepthook = except_hook
 
-from PyQt5.QtGui import QFont, QColor
+from PyQt5.QtCore import QMimeData
+from PyQt5.QtGui import QFont, QColor, QGuiApplication, QClipboard
 from PyQt5.QtWidgets import QApplication, QMessageBox
 
 FONT_CONSOLAS = QFont()
@@ -64,6 +66,13 @@ def warn_user(error):
     QApplication.exit(1)
 
 
+def to_clipboard(text):
+    mime = QMimeData()
+    mime.setText(text)
+    board = QGuiApplication.clipboard()
+    board.setMimeData(mime, mode=QClipboard.Clipboard)
+
+
 def path_shortener(full_path: str):
     """ Formats a path to a shorter version, for cleaner UI."""