summaryrefslogtreecommitdiff
path: root/raphodo/rpdfile.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-09-05 17:33:14 +0200
committerJörg Frings-Fürst <debian@jff.email>2018-09-05 17:33:14 +0200
commit1ffc3b70cebfb6bcc900517eb00b9471cb1532ce (patch)
tree6d555d44687d0f4605a3d6ea34f8b546eae2ec0e /raphodo/rpdfile.py
parent8b136df8c340d1e1ee1874ef60850aa9bd153d49 (diff)
New upstream version 0.9.11upstream/0.9.11upstream
Diffstat (limited to 'raphodo/rpdfile.py')
-rw-r--r--raphodo/rpdfile.py25
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(