From 0a297829eaf3912c939e1b43a3ef6ddeb7607b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Wed, 14 Mar 2018 12:24:17 -0400 Subject: New upstream version 0.9.9 --- raphodo/scan.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'raphodo/scan.py') diff --git a/raphodo/scan.py b/raphodo/scan.py index abad59e..7b98941 100755 --- a/raphodo/scan.py +++ b/raphodo/scan.py @@ -90,7 +90,7 @@ from raphodo.problemnotification import ( CameraFileReadProblem, FileMetadataLoadProblem, FileWriteProblem, FsMetadataReadProblem, FileZeroLengthProblem ) -from raphodo.storage import get_uri, CameraDetails +from raphodo.storage import get_uri, CameraDetails, gvfs_gphoto2_path FileInfo = namedtuple('FileInfo', 'path modification_time size ext_lower base_name file_type') CameraFile = namedtuple('CameraFile', 'name size') @@ -393,6 +393,9 @@ class ScanWorker(WorkerInPublishPullPipeline): for dir_name, dir_list, file_list in walk(path_to_walk): if len(dir_list) > 0: + # Do not scan gvfs gphoto2 mount + dir_list[:] = (d for d in dir_list if not gvfs_gphoto2_path(dir_name + d)) + if self.scan_preferences.ignored_paths: # Don't inspect paths the user wants ignored # Altering subdirs in place controls the looping -- cgit v1.2.3