Merge branch 'cache-hash'

1 files changed, 13 insertions, 8 deletions

diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index c42312ce..d7ead160 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -1019,11 +1019,12 @@ class Actions(  # pylint: disable=too-many-instance-attributes,too-many-public-m
         return True
 
     @staticmethod
-    def sha512_encode(path):
-        stat_ = stat(path)
-        sha = sha512(stat_.st_dev)
-        sha.update(stat_.st_ino)
-        sha.update(stat_.st_mtime)
+    def sha512_encode(path, inode=None):
+        if inode is None:
+            inode = stat(path).st_ino
+        sha = sha512(
+            "{0}{1}".format(path, str(inode)).encode('utf-8', 'backslashescape')
+        )
         return '{0}.jpg'.format(sha.hexdigest())
 
     def get_preview(self, fobj, width, height):
@@ -1093,9 +1094,13 @@ class Actions(  # pylint: disable=too-many-instance-attributes,too-many-public-m
 
         if not os.path.exists(ranger.args.cachedir):
             os.makedirs(ranger.args.cachedir)
-        cacheimg = os.path.join(ranger.args.cachedir, self.sha512_encode(path))
-        if self.settings.preview_images and \
-                os.path.isfile(cacheimg):
+        fobj.load_if_outdated()
+        cacheimg = os.path.join(
+            ranger.args.cachedir,
+            self.sha512_encode(path, inode=fobj.stat.st_ino)
+        )
+        if (self.settings.preview_images and os.path.isfile(cacheimg)
+                and fobj.stat.st_mtime <= os.path.getmtime(cacheimg)):
             data['foundpreview'] = True
             data['imagepreview'] = True
             pager.set_image(cacheimg)