diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-09-05 17:34:36 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-09-05 17:34:36 +0200 |
| commit | 7a69f337bc541ed3b9b5abd8ab817c14575c0156 (patch) | |
| tree | 8d84c6bb855dd70b687626a32b0430841a8ea996 /raphodo/rpdfile.py | |
| parent | dbcbf91736c8d62a4c62e4aa38db068906774dfc (diff) | |
| parent | 1ffc3b70cebfb6bcc900517eb00b9471cb1532ce (diff) | |
Update upstream source from tag 'upstream/0.9.11'
Update to upstream version '0.9.11'
with Debian dir 5d2c404987947d3d87ce14c73ceb6bafa6e0e99d
Diffstat (limited to 'raphodo/rpdfile.py')
| -rw-r--r-- | raphodo/rpdfile.py | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/raphodo/rpdfile.py b/raphodo/rpdfile.py index 1703e51..eac310b 100644 --- a/raphodo/rpdfile.py +++ b/raphodo/rpdfile.py @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2017 Damon Lynch <damonlynch@gmail.com> +# Copyright (C) 2011-2018 Damon Lynch <damonlynch@gmail.com> # This file is part of Rapid Photo Downloader. # @@ -17,7 +17,7 @@ # see <http://www.gnu.org/licenses/>. __author__ = 'Damon Lynch' -__copyright__ = "Copyright 2011-2017, Damon Lynch" +__copyright__ = "Copyright 2011-2018, Damon Lynch" import os import time @@ -37,9 +37,11 @@ gi.require_version('GLib', '2.0') from gi.repository import GLib import raphodo.exiftool as exiftool -from raphodo.constants import (DownloadStatus, FileType, FileExtension, FileSortPriority, - ThumbnailCacheStatus, Downloaded, Desktop, thumbnail_offset, - DeviceTimestampTZ, ThumbnailCacheDiskStatus, ExifSource) +from raphodo.constants import ( + DownloadStatus, FileType, FileExtension, FileSortPriority, ThumbnailCacheStatus, Downloaded, + Desktop, thumbnail_offset, DeviceTimestampTZ, ThumbnailCacheDiskStatus, ExifSource, + FileManagerType, +) from raphodo.storage import get_uri, CameraDetails import raphodo.metadataphoto as metadataphoto @@ -797,12 +799,15 @@ class RPDFile: """ if self.status in Downloaded: - return 'file://{}'.format(pathname2url(self.download_full_file_name)) + path = self.download_full_file_name + camera_details = None else: - return get_uri( - full_file_name = self.full_file_name, camera_details=self.camera_details, - desktop_environment=desktop_environment - ) + path = self.full_file_name + camera_details = self.camera_details + return get_uri( + full_file_name = path, camera_details=camera_details, + desktop_environment=desktop_environment + ) def get_souce_href(self) -> str: return make_href( |