From 1ffc3b70cebfb6bcc900517eb00b9471cb1532ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Wed, 5 Sep 2018 17:33:14 +0200
Subject: New upstream version 0.9.11

---
 raphodo/rpdfile.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'raphodo/rpdfile.py')

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(
-- 
cgit v1.2.3