diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-01-03 18:32:15 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-01-03 18:32:15 +0100 |
commit | b71beaf0d22f182ab0b95b1b35da7e786585c4e7 (patch) | |
tree | 1e95d573c09bee1dec63d909cc59ef57222a7710 /raphodo/scan.py | |
parent | deb736d38beac3863c04d4c0f285c28557fe07c6 (diff) | |
parent | 8351a36cbcbe8529ec1c0bb60d77bf65fb59fe12 (diff) |
Update upstream source from tag 'upstream/0.9.7'
Update to upstream version '0.9.7'
with Debian dir 9c39d3b734403d3ae14a7bfdb1f76e371acb4e78
Diffstat (limited to 'raphodo/scan.py')
-rwxr-xr-x | raphodo/scan.py | 5 |
1 files changed, 4 insertions, 1 deletions
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 |