summaryrefslogtreecommitdiff
path: root/graphics/rapid-photo-downloader/files/patch-raphodo_rapid.py
diff options
context:
space:
mode:
authorKurt Jaeger <pi@FreeBSD.org>2019-09-21 18:45:22 +0000
committerKurt Jaeger <pi@FreeBSD.org>2019-09-21 18:45:22 +0000
commitafc03086202ce696e54c801d26c215310f4e2e31 (patch)
tree499d2ee3d97c9fc488cdeeaf3faf719b839a252f /graphics/rapid-photo-downloader/files/patch-raphodo_rapid.py
parentNew port: sysutils/p5-File-Rename (diff)
New port: graphics/rapid-photo-downloader
Rapid Photo Downloader imports photos and videos from cameras, phones, memory cards and other devices at high speed. It can be configured to rename photos and videos with meaningful filenames you specify. It can also back up photos and videos as they are downloaded. It downloads from and backs up to multiple devices simultaneously. WWW: http://www.damonlynch.net/rapid/ PR: 240601 Submitted by: m.ne@gmx.net Reviewed by: koobs
Notes
Notes: svn path=/head/; revision=512533
Diffstat (limited to 'graphics/rapid-photo-downloader/files/patch-raphodo_rapid.py')
-rw-r--r--graphics/rapid-photo-downloader/files/patch-raphodo_rapid.py140
1 files changed, 140 insertions, 0 deletions
diff --git a/graphics/rapid-photo-downloader/files/patch-raphodo_rapid.py b/graphics/rapid-photo-downloader/files/patch-raphodo_rapid.py
new file mode 100644
index 000000000000..26fc07391c24
--- /dev/null
+++ b/graphics/rapid-photo-downloader/files/patch-raphodo_rapid.py
@@ -0,0 +1,140 @@
+--- raphodo/rapid.py.orig 2019-08-18 03:58:11 UTC
++++ raphodo/rapid.py
+@@ -98,7 +98,7 @@ from PyQt5.QtNetwork import QLocalSocket, QLocalServer
+ import sip
+
+ from raphodo.storage import (
+- ValidMounts, CameraHotplug, UDisks2Monitor, GVolumeMonitor, have_gio,
++ ValidMounts, CameraHotplug, GVolumeMonitor, have_gio,
+ has_one_or_more_folders, mountPaths, get_desktop_environment, get_desktop,
+ gvfs_controls_mounts, get_default_file_manager, validate_download_folder,
+ validate_source_folder, get_fdo_cache_thumb_base_directory, WatchDownloadDirs, get_media_dir,
+@@ -584,12 +584,12 @@ class RapidWindow(QMainWindow):
+ self.prefs.backup_files = backup
+ else:
+ logging.info("Backing up files: %s", self.prefs.backup_files)
+-
++
+ if backup_auto_detect is not None:
+ self.prefs.backup_device_autodetection = backup_auto_detect
+ elif self.prefs.backup_files:
+ logging.info("Backup device auto detection: %s", self.prefs.backup_device_autodetection)
+-
++
+ if photo_backup_identifier is not None:
+ self.prefs.photo_backup_identifier = photo_backup_identifier
+ elif self.prefs.backup_files and self.prefs.backup_device_autodetection:
+@@ -599,7 +599,7 @@ class RapidWindow(QMainWindow):
+ self.prefs.video_backup_identifier = video_backup_identifier
+ elif self.prefs.backup_files and self.prefs.backup_device_autodetection:
+ logging.info("video backup identifier: %s", self.prefs.video_backup_identifier)
+-
++
+ if photo_backup_location is not None:
+ self.prefs.backup_photo_location = photo_backup_location
+ elif self.prefs.backup_files and not self.prefs.backup_device_autodetection:
+@@ -934,18 +934,6 @@ class RapidWindow(QMainWindow):
+ logging.debug("Starting camera hotplug monitor...")
+ QTimer.singleShot(0, self.cameraHotplugThread.start)
+
+- # Monitor when the user adds or removes a partition
+- self.udisks2Monitor = UDisks2Monitor(self.validMounts)
+- self.udisks2MonitorThread = QThread()
+- self.udisks2MonitorThread.started.connect(self.udisks2Monitor.startMonitor)
+- self.udisks2Unmount.connect(self.udisks2Monitor.unmount_volume)
+- self.udisks2Monitor.moveToThread(self.udisks2MonitorThread)
+- self.udisks2Monitor.partitionMounted.connect(self.partitionMounted)
+- self.udisks2Monitor.partitionUnmounted.connect(self.partitionUmounted)
+- # Start the monitor only on the thread it will be running on
+- logging.debug("Starting UDisks2 monitor...")
+- QTimer.singleShot(0, self.udisks2MonitorThread.start)
+-
+ if self.gvfsControlsMounts:
+ # Gio.VolumeMonitor must be in the main thread, according to
+ # Gnome documentation
+@@ -2119,7 +2107,7 @@ class RapidWindow(QMainWindow):
+ select_text=_('Select a destination folder')
+ )
+ self.photoDestination.addWidget(self.photoDestinationWidget)
+-
++
+ self.videoDestinationDisplay = DestinationDisplay(
+ menu=True, file_type=FileType.video, parent=self
+ )
+@@ -2582,11 +2570,11 @@ class RapidWindow(QMainWindow):
+
+ body = _(
+ r"""Please report the problem at <a href="{website}">{website}</a>.<br><br>
+- Include in your bug report the program's log files. The bug report must include
+- <i>{log_file}</i>, but attaching the other log files is often helpful.<br><br>
++ Include in your bug report the program's log files. The bug report must include
++ <i>{log_file}</i>, but attaching the other log files is often helpful.<br><br>
+ If possible, please also include the program's configuration file
+- <i>{config_file}</i>.<br><br>
+- Click <a href="{log_path}">here</a> to open the log directory, and
++ <i>{config_file}</i>.<br><br>
++ Click <a href="{log_path}">here</a> to open the log directory, and
+ <a href="{config_path}">here</a> to open the configuration directory.
+ """
+ ).format(
+@@ -2622,7 +2610,7 @@ class RapidWindow(QMainWindow):
+
+ :param message: the text to display
+ :param rich_text: whether it text to display is in HTML format
+- :param title: optional title for message box, else defaults to
++ :param title: optional title for message box, else defaults to
+ localized 'Rapid Photo Downloader'
+ :return: the message box
+ """
+@@ -4652,8 +4640,6 @@ Do you want to proceed with the download?
+ self.sendTerminateToThread(self.backup_controller)
+
+ if not self.gvfsControlsMounts:
+- self.udisks2MonitorThread.quit()
+- self.udisks2MonitorThread.wait()
+ self.cameraHotplugThread.quit()
+ self.cameraHotplugThread.wait()
+ else:
+@@ -5254,7 +5240,7 @@ Do you want to proceed with the download?
+ After a preference change, rescan already scanned devices
+ :param ignore_cameras: if True, don't rescan cameras
+ :param rescan_path: if True, include manually specified paths
+- (i.e. This Computer)
++ (i.e. This Computer)
+ """
+
+ if rescan_path:
+@@ -6243,7 +6229,7 @@ def main():
+ logger = iplogging.setup_main_process_logging(logging_level=logging_level)
+
+ logging.info("Rapid Photo Downloader is starting")
+-
++
+ if args.photo_renaming:
+ photo_rename = args.photo_renaming == 'on'
+ if photo_rename:
+@@ -6252,7 +6238,7 @@ def main():
+ logging.info("Photo renaming turned off from command line")
+ else:
+ photo_rename = None
+-
++
+ if args.video_renaming:
+ video_rename = args.video_renaming == 'on'
+ if video_rename:
+@@ -6313,13 +6299,13 @@ def main():
+ logging.info("This Computer path set from command line: %s", this_computer_location)
+ else:
+ this_computer_location=None
+-
++
+ if args.photo_location:
+ photo_location = os.path.abspath(args.photo_location)
+ logging.info("Photo location set from command line: %s", photo_location)
+ else:
+ photo_location=None
+-
++
+ if args.video_location:
+ video_location = os.path.abspath(args.video_location)
+ logging.info("video location set from command line: %s", video_location)