Attachment #214381 for bug #246377

View | Details | Raw Unified | Return to bug 246377
Collapse All | Expand All

Lines 1-7 Link Here

(-)Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= rapid-photo-downloader	3	PORTNAME= rapid-photo-downloader
4	DISTVERSION= 0.9.23	4	DISTVERSION= 0.9.24
5	CATEGORIES= graphics	5	CATEGORIES= graphics
6	MASTER_SITES= https://launchpad.net/rapid/pyqt/${PORTVERSION}/+download/	6	MASTER_SITES= https://launchpad.net/rapid/pyqt/${PORTVERSION}/+download/
7		7

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1587355599	1	TIMESTAMP = 1588794721
2	SHA256 (rapid-photo-downloader-0.9.23.tar.gz) = 2bfe30e237803870486ee5e79e482529da4c592930e48d1ba20c03f36f6719f4	2	SHA256 (rapid-photo-downloader-0.9.24.tar.gz) = 66b9482c9212043b519416982dacd734f8d05c285eb8d7e3ee3f0d7a29068590
3	SIZE (rapid-photo-downloader-0.9.23.tar.gz) = 8101336	3	SIZE (rapid-photo-downloader-0.9.24.tar.gz) = 8150727




--- raphodo/rapid.py.orig	2020-05-03 17:31:45 UTC
+++ raphodo/rapid.py
@@ -97,7 +97,7 @@ from PyQt5.QtNetwork import QLocalSocket, QLocalServer
 import sip
 
 from raphodo.storage import (

     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,
@@ -945,18 +945,6 @@ 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:
@@ -624,7 +624,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:
@@ -939,18 +939,6 @@ class RapidWindow(QMainWindow):
             logging.debug("Starting camera hotplug monitor...")
             QTimer.singleShot(0, self.cameraHotplugThread.start)
 

         if self.gvfsControlsMounts:
             # Gio.VolumeMonitor must be in the main thread, according to
             # Gnome documentation
@@ -4748,8 +4736,6 @@ Do you want to proceed with the download?
             select_text=_('Select a destination folder')
         )
         self.photoDestination.addWidget(self.photoDestinationWidget)
-        
+
         self.videoDestinationDisplay = DestinationDisplay(
             menu=True, file_type=FileType.video, parent=self
         )
@@ -2655,11 +2643,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(
@@ -2695,7 +2683,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
         """
@@ -4766,8 +4754,6 @@ Do you want to proceed with the download?
             self.sendTerminateToThread(self.backup_controller)
 
         if not self.gvfsControlsMounts:

             self.cameraHotplugThread.quit()
             self.cameraHotplugThread.wait()
         else:
@@ -5384,7 +5370,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:
@@ -6499,7 +6485,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:
@@ -6508,7 +6494,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:
@@ -6569,13 +6555,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)




--- raphodo/storage.py.orig	2020-05-03 17:31:45 UTC
+++ raphodo/storage.py
@@ -69,10 +69,9 @@ import xdg
 import gi
 
 gi.require_version('GUdev', '1.0')

 
 
 
@@ -181,7 +180,7 @@ def get_media_dir() -> str:
 
     """
 

         media_dir = '/media/{}'.format(get_user_name())
         run_media_dir = '/run/media'
         distro = get_distro()
@@ -289,7 +288,7 @@ class ValidMounts():
         self.validMountFolders, e.g. /media/<USER>, etc.
         """
 

             raise ("Mounts.setValidMountPoints() not implemented on %s", sys.platform())
         else:
             try:
@@ -660,7 +659,7 @@ def get_default_file_manager() -> Tuple[Optional[str],
 
     _default_file_manager_probed = True
 

     cmd = shlex.split('xdg-mime query default inode/directory')
     try:
         desktop_file = subprocess.check_output(cmd, universal_newlines=True)  # type: str
@@ -1064,259 +1063,6 @@ class CameraHotplug(QObject):
             if emit_remove:
                 logging.info("Hotplug: %s has been removed", name)
     :param write_on_waccesss_failure: if os.access reports path is not writable, test
-     nonetheless to see if it's writable by writing and deleting a test file 
+     nonetheless to see if it's writable by writing and deleting a test file
     :return: Tuple indicating validity and path made absolute
 
     >>> validate_download_folder('/some/bogus/and/ridiculous/path')
@@ -1041,259 +1040,6 @@ class CameraHotplug(QObject):
                 self.cameraRemoved.emit()
-
-
-class UDisks2Monitor(QObject):
-    # Most of this class is Copyright 2008-2015 Canonical
-

-            logging.exception('Traceback:')
-
-        self.partitionUnmounted.emit(mount_point)
 
 
 if have_gio:
     class GVolumeMonitor(QObject):
         r"""
@@ -1692,7 +1438,7 @@ def get_mount_size(mount: QStorageInfo) -> Tuple[int, 
     """
     Uses GIO to get bytes total and bytes free (available) for the mount that a
     path is in.
-    
+
     :param path: path located anywhere in the mount
     :return: bytes_total, bytes_free
     """




--- raphodo/utilities.py.orig	2020-05-03 17:31:45 UTC
+++ raphodo/utilities.py
@@ -83,10 +83,11 @@ if arrow_version >= parse_version('0.14.3') and arrow_
 # Linux specific code to ensure child processes exit when parent dies
 # See http://stackoverflow.com/questions/19447603/
 # how-to-kill-a-python-child-process-created-with-subprocess-check-output-when-t/

     return callable
 
 
@@ -201,8 +202,8 @@ def show_errors():
 # kilobytes, etc.
 suffixes = [_('B'), _('KB'), _('MB'), _('GB'), _('TB'), _('PB'), _('EB'), _('ZB'), _('YB')]
 
-def format_size_for_user(size_in_bytes: int, 
-                         zero_string: str='', 
+def format_size_for_user(size_in_bytes: int,
+                         zero_string: str='',
                          no_decimals: int=2) -> str:
     r"""
     Humanize display of bytes.
@@ -388,12 +389,12 @@ def find_mount_point(path: str) -> str:
     Find the mount point of a path
     See:
     http://stackoverflow.com/questions/4453602/how-to-find-the-mountpoint-a-file-resides-on
-    
+
     >>> print(find_mount_point('/crazy/path'))
     /
-    
-    :param path: 
-    :return: 
+
+    :param path:
+    :return:
     """
     path = os.path.realpath(path)
     while not os.path.ismount(path):
@@ -743,13 +744,13 @@ def _collect_duplicates(basenames, paths):
 
 def make_path_end_snippets_unique(*paths) -> List[str]:
     r"""
-    Make list of path ends unique given possible common path endings.  
-    
-    A snippet starts from the end of the path, in extreme cases possibly up the path start. 
+    Make list of path ends unique given possible common path endings.
 
+    A snippet starts from the end of the path, in extreme cases possibly up the path start.
+
     :param paths: sequence of paths to generate unique end snippets for
     :return: list of unique snippets
-    
+
     >>> p0 = '/home/damon/photos'
     >>> p1 = '/media/damon/backup1/photos'
     >>> p2 = '/media/damon/backup2/photos'

Lines 1-4 Link Here

(-)files/patch-setup.py (-1 / +1 lines)
1	--- setup.py.orig 2020-04-17 01:22:23 UTC	1	--- setup.py.orig 2020-05-03 17:31:45 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -271,7 +271,6 @@ setup(	3	@@ -271,7 +271,6 @@ setup(
4	'scandir;python_version<"3.5"',	4	'scandir;python_version<"3.5"',

Return to bug 246377

Lines 1-6 Link Here

(-)files/patch-raphodo_rapid.py (-105 / +4 lines)
1	--- raphodo/rapid.py.orig 2020-04-17 01:22:23 UTC	1	--- raphodo/rapid.py.orig 2020-05-03 17:31:45 UTC
2	+++ raphodo/rapid.py	2	+++ raphodo/rapid.py
3	@@ -96,7 +96,7 @@ from PyQt5.QtNetwork import QLocalSocket, QLocalServer	3	@@ -97,7 +97,7 @@ from PyQt5.QtNetwork import QLocalSocket, QLocalServer
4	import sip	4	import sip
5		5
6	from raphodo.storage import (	6	from raphodo.storage import (
Lines 9-39 Link Here
9	has_one_or_more_folders, mountPaths, get_desktop_environment, get_desktop,	9	has_one_or_more_folders, mountPaths, get_desktop_environment, get_desktop,
10	gvfs_controls_mounts, get_default_file_manager, validate_download_folder,	10	gvfs_controls_mounts, get_default_file_manager, validate_download_folder,
11	validate_source_folder, get_fdo_cache_thumb_base_directory, WatchDownloadDirs, get_media_dir,	11	validate_source_folder, get_fdo_cache_thumb_base_directory, WatchDownloadDirs, get_media_dir,
12	@@ -609,12 +609,12 @@ class RapidWindow(QMainWindow):	12	@@ -945,18 +945,6 @@ class RapidWindow(QMainWindow):
13	self.prefs.backup_files = backup
14	else:
15	logging.info("Backing up files: %s", self.prefs.backup_files)
16	-
17	+
18	if backup_auto_detect is not None:
19	self.prefs.backup_device_autodetection = backup_auto_detect
20	elif self.prefs.backup_files:
21	logging.info("Backup device auto detection: %s", self.prefs.backup_device_autodetection)
22	-
23	+
24	if photo_backup_identifier is not None:
25	self.prefs.photo_backup_identifier = photo_backup_identifier
26	elif self.prefs.backup_files and self.prefs.backup_device_autodetection:
27	@@ -624,7 +624,7 @@ class RapidWindow(QMainWindow):
28	self.prefs.video_backup_identifier = video_backup_identifier
29	elif self.prefs.backup_files and self.prefs.backup_device_autodetection:
30	logging.info("video backup identifier: %s", self.prefs.video_backup_identifier)
31	-
32	+
33	if photo_backup_location is not None:
34	self.prefs.backup_photo_location = photo_backup_location
35	elif self.prefs.backup_files and not self.prefs.backup_device_autodetection:
36	@@ -939,18 +939,6 @@ class RapidWindow(QMainWindow):
37	logging.debug("Starting camera hotplug monitor...")	13	logging.debug("Starting camera hotplug monitor...")
38	QTimer.singleShot(0, self.cameraHotplugThread.start)	14	QTimer.singleShot(0, self.cameraHotplugThread.start)
39		15
Lines 52-92 Link Here
52	if self.gvfsControlsMounts:	28	if self.gvfsControlsMounts:
53	# Gio.VolumeMonitor must be in the main thread, according to	29	# Gio.VolumeMonitor must be in the main thread, according to
54	# Gnome documentation	30	# Gnome documentation
55	@@ -2189,7 +2177,7 @@ class RapidWindow(QMainWindow):	31	@@ -4748,8 +4736,6 @@ Do you want to proceed with the download?
56	select_text=_('Select a destination folder')
57	)
58	self.photoDestination.addWidget(self.photoDestinationWidget)
59	-
60	+
61	self.videoDestinationDisplay = DestinationDisplay(
62	menu=True, file_type=FileType.video, parent=self
63	)
64	@@ -2655,11 +2643,11 @@ class RapidWindow(QMainWindow):
65
66	body = _(
67	r"""Please report the problem at <a href="{website}">{website}</a>.<br><br>
68	- Include in your bug report the program's log files. The bug report must include
69	- <i>{log_file}</i>, but attaching the other log files is often helpful.<br><br>
70	+ Include in your bug report the program's log files. The bug report must include
71	+ <i>{log_file}</i>, but attaching the other log files is often helpful.<br><br>
72	If possible, please also include the program's configuration file
73	- <i>{config_file}</i>.<br><br>
74	- Click <a href="{log_path}">here</a> to open the log directory, and
75	+ <i>{config_file}</i>.<br><br>
76	+ Click <a href="{log_path}">here</a> to open the log directory, and
77	<a href="{config_path}">here</a> to open the configuration directory.
78	"""
79	).format(
80	@@ -2695,7 +2683,7 @@ class RapidWindow(QMainWindow):
81
82	:param message: the text to display
83	:param rich_text: whether it text to display is in HTML format
84	- :param title: optional title for message box, else defaults to
85	+ :param title: optional title for message box, else defaults to
86	localized 'Rapid Photo Downloader'
87	:return: the message box
88	"""
89	@@ -4766,8 +4754,6 @@ Do you want to proceed with the download?
90	self.sendTerminateToThread(self.backup_controller)	32	self.sendTerminateToThread(self.backup_controller)
91		33
92	if not self.gvfsControlsMounts:	34	if not self.gvfsControlsMounts:
Lines 95-140 Link Here
95	self.cameraHotplugThread.quit()	37	self.cameraHotplugThread.quit()
96	self.cameraHotplugThread.wait()	38	self.cameraHotplugThread.wait()
97	else:	39	else:
98	@@ -5384,7 +5370,7 @@ Do you want to proceed with the download?
99	After a preference change, rescan already scanned devices
100	:param ignore_cameras: if True, don't rescan cameras
101	:param rescan_path: if True, include manually specified paths
102	- (i.e. This Computer)
103	+ (i.e. This Computer)
104	"""
105
106	if rescan_path:
107	@@ -6499,7 +6485,7 @@ def main():
108	logger = iplogging.setup_main_process_logging(logging_level=logging_level)
109
110	logging.info("Rapid Photo Downloader is starting")
111	-
112	+
113	if args.photo_renaming:
114	photo_rename = args.photo_renaming == 'on'
115	if photo_rename:
116	@@ -6508,7 +6494,7 @@ def main():
117	logging.info("Photo renaming turned off from command line")
118	else:
119	photo_rename = None
120	-
121	+
122	if args.video_renaming:
123	video_rename = args.video_renaming == 'on'
124	if video_rename:
125	@@ -6569,13 +6555,13 @@ def main():
126	logging.info("This Computer path set from command line: %s", this_computer_location)
127	else:
128	this_computer_location=None
129	-
130	+
131	if args.photo_location:
132	photo_location = os.path.abspath(args.photo_location)
133	logging.info("Photo location set from command line: %s", photo_location)
134	else:
135	photo_location=None
136	-
137	+
138	if args.video_location:
139	video_location = os.path.abspath(args.video_location)
140	logging.info("video location set from command line: %s", video_location)

Lines 1-6 Link Here

(-)files/patch-raphodo_storage.py (-30 / +12 lines)
1	--- raphodo/storage.py.orig 2020-04-17 01:22:23 UTC	1	--- raphodo/storage.py.orig 2020-05-03 17:31:45 UTC
2	+++ raphodo/storage.py	2	+++ raphodo/storage.py
3	@@ -68,10 +68,9 @@ import xdg	3	@@ -69,10 +69,9 @@ import xdg
4	import gi	4	import gi
5		5
6	gi.require_version('GUdev', '1.0')	6	gi.require_version('GUdev', '1.0')
Lines 12-18 Link Here
12		12
13		13
14		14
15	@@ -170,7 +169,7 @@ def get_media_dir() -> str:	15	@@ -181,7 +180,7 @@ def get_media_dir() -> str:
16		16
17	"""	17	"""
18		18
Lines 21-27 Link Here
21	media_dir = '/media/{}'.format(get_user_name())	21	media_dir = '/media/{}'.format(get_user_name())
22	run_media_dir = '/run/media'	22	run_media_dir = '/run/media'
23	distro = get_distro()	23	distro = get_distro()
24	@@ -278,7 +277,7 @@ class ValidMounts():	24	@@ -289,7 +288,7 @@ class ValidMounts():
25	self.validMountFolders, e.g. /media/<USER>, etc.	25	self.validMountFolders, e.g. /media/<USER>, etc.
26	"""	26	"""
27		27
Lines 30-36 Link Here
30	raise ("Mounts.setValidMountPoints() not implemented on %s", sys.platform())	30	raise ("Mounts.setValidMountPoints() not implemented on %s", sys.platform())
31	else:	31	else:
32	try:	32	try:
33	@@ -649,7 +648,7 @@ def get_default_file_manager() -> Tuple[Optional[str],	33	@@ -660,7 +659,7 @@ def get_default_file_manager() -> Tuple[Optional[str],
34		34
35	_default_file_manager_probed = True	35	_default_file_manager_probed = True
36		36
Lines 39-57 Link Here
39	cmd = shlex.split('xdg-mime query default inode/directory')	39	cmd = shlex.split('xdg-mime query default inode/directory')
40	try:	40	try:
41	desktop_file = subprocess.check_output(cmd, universal_newlines=True) # type: str	41	desktop_file = subprocess.check_output(cmd, universal_newlines=True) # type: str
42	@@ -794,7 +793,7 @@ def validate_download_folder(path: Optional[str],	42	@@ -1064,259 +1063,6 @@ class CameraHotplug(QObject):
43		43	if emit_remove:
44	:param path: path to analyze	44	logging.info("Hotplug: %s has been removed", name)
45	:param write_on_waccesss_failure: if os.access reports path is not writable, test
46	- nonetheless to see if it's writable by writing and deleting a test file
47	+ nonetheless to see if it's writable by writing and deleting a test file
48	:return: Tuple indicating validity and path made absolute
49
50	>>> validate_download_folder('/some/bogus/and/ridiculous/path')
51	@@ -1041,259 +1040,6 @@ class CameraHotplug(QObject):
52	self.cameraRemoved.emit()	45	self.cameraRemoved.emit()
53		46	-
54		47	-
55	-class UDisks2Monitor(QObject):	48	-class UDisks2Monitor(QObject):
56	- # Most of this class is Copyright 2008-2015 Canonical	49	- # Most of this class is Copyright 2008-2015 Canonical
57	-	50	-
Lines 303-319 Link Here
303	- logging.exception('Traceback:')	296	- logging.exception('Traceback:')
304	-	297	-
305	- self.partitionUnmounted.emit(mount_point)	298	- self.partitionUnmounted.emit(mount_point)
306	-	299
307	-	300
308	if have_gio:	301	if have_gio:
309	class GVolumeMonitor(QObject):
310	r"""
311	@@ -1692,7 +1438,7 @@ def get_mount_size(mount: QStorageInfo) -> Tuple[int,
312	"""
313	Uses GIO to get bytes total and bytes free (available) for the mount that a
314	path is in.
315	-
316	+
317	:param path: path located anywhere in the mount
318	:return: bytes_total, bytes_free
319	"""

Lines 1-6 Link Here

(-)files/patch-raphodo_utilities.py (-48 / +2 lines)
1	--- raphodo/utilities.py.orig 2020-04-17 01:22:23 UTC	1	--- raphodo/utilities.py.orig 2020-05-03 17:31:45 UTC
2	+++ raphodo/utilities.py	2	+++ raphodo/utilities.py
3	@@ -82,10 +82,11 @@ if arrow_version >= parse_version('0.14.3') and arrow_	3	@@ -83,10 +83,11 @@ if arrow_version >= parse_version('0.14.3') and arrow_
4	# Linux specific code to ensure child processes exit when parent dies	4	# Linux specific code to ensure child processes exit when parent dies
5	# See http://stackoverflow.com/questions/19447603/	5	# See http://stackoverflow.com/questions/19447603/
6	# how-to-kill-a-python-child-process-created-with-subprocess-check-output-when-t/	6	# how-to-kill-a-python-child-process-created-with-subprocess-check-output-when-t/
Lines 14-62 Link Here
14	return callable	14	return callable
15		15
16		16
17	@@ -201,8 +202,8 @@ def show_errors():
18	# kilobytes, etc.
19	suffixes = [_('B'), _('KB'), _('MB'), _('GB'), _('TB'), _('PB'), _('EB'), _('ZB'), _('YB')]
20
21	-def format_size_for_user(size_in_bytes: int,
22	- zero_string: str='',
23	+def format_size_for_user(size_in_bytes: int,
24	+ zero_string: str='',
25	no_decimals: int=2) -> str:
26	r"""
27	Humanize display of bytes.
28	@@ -388,12 +389,12 @@ def find_mount_point(path: str) -> str:
29	Find the mount point of a path
30	See:
31	http://stackoverflow.com/questions/4453602/how-to-find-the-mountpoint-a-file-resides-on
32	-
33	+
34	>>> print(find_mount_point('/crazy/path'))
35	/
36	-
37	- :param path:
38	- :return:
39	+
40	+ :param path:
41	+ :return:
42	"""
43	path = os.path.realpath(path)
44	while not os.path.ismount(path):
45	@@ -743,13 +744,13 @@ def _collect_duplicates(basenames, paths):
46
47	def make_path_end_snippets_unique(*paths) -> List[str]:
48	r"""
49	- Make list of path ends unique given possible common path endings.
50	-
51	- A snippet starts from the end of the path, in extreme cases possibly up the path start.
52	+ Make list of path ends unique given possible common path endings.
53
54	+ A snippet starts from the end of the path, in extreme cases possibly up the path start.
55	+
56	:param paths: sequence of paths to generate unique end snippets for
57	:return: list of unique snippets
58	-
59	+
60	>>> p0 = '/home/damon/photos'
61	>>> p1 = '/media/damon/backup1/photos'
62	>>> p2 = '/media/damon/backup2/photos'