Append file etag to preview URLs

Fixes #5534

diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index eed0047fc8197e5a8362a49826a1e1a1446d6bc6..9d9a81ae3dcaccf48c3d445b0a0e2f9b3d9cf23b 100644 (file)
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -89,7 +89,7 @@ if($source) {
                $meta = \OC\Files\Filesystem::getFileInfo($target);
                $mime=$meta['mimetype'];
                $id = $meta['fileid'];
-               $eventSource->send('success', array('mime'=>$mime, 'size'=>\OC\Files\Filesystem::filesize($target), 'id' => $id));
+               $eventSource->send('success', array('mime'=>$mime, 'size'=>\OC\Files\Filesystem::filesize($target), 'id' => $id, 'etag' => $meta['etag']));
        } else {
                $eventSource->send('error', $l10n->t('Error while downloading %s to %s', array($source, $target)));
        }
@@ -119,6 +119,7 @@ if($source) {
                        'mime' => $mime,
                        'size' => $size,
                        'content' => $content,
+                       'etag' => $meta['etag']
                )));
                exit();
        }

diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 38c2a053a9eb575d90f09a5da8b7c5a011a09304..0e905f993ac0a8f721d91ad8f8835d2f34e5b3f7 100644 (file)
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -132,6 +132,7 @@ if (strpos($dir, '..') === false) {
                                                        'size' => $meta['size'],
                                                        'id' => $meta['fileid'],
                                                        'name' => basename($target),
+                                                       'etag' => $meta['etag'],
                                                        'originalname' => $files['tmp_name'][$i],
                                                        'uploadMaxFilesize' => $maxUploadFileSize,
                                                        'maxHumanFilesize' => $maxHumanFileSize,
@@ -158,6 +159,7 @@ if (strpos($dir, '..') === false) {
                                        'size' => $meta['size'],
                                        'id' => $meta['fileid'],
                                        'name' => basename($target),
+                                       'etag' => $meta['etag'],
                                        'originalname' => $files['tmp_name'][$i],
                                        'uploadMaxFilesize' => $maxUploadFileSize,
                                        'maxHumanFilesize' => $maxHumanFileSize,

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 5bf4f5c09819b601eae9f5e2178b266c28dc730a..af67a0e2002bf6a6aa871cb40c2c673dc0d96f35 100644 (file)
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -566,11 +566,12 @@ $(document).ready(function() {
                                                                        tr.attr('data-size', result.data.size);
                                                                        tr.attr('data-mime', result.data.mime);
                                                                        tr.attr('data-id', result.data.id);
+                                                                       tr.attr('data-etag', result.data.etag);
                                                                        tr.find('.filesize').text(humanFileSize(result.data.size));
                                                                        var path = getPathForPreview(name);
-                                                                       lazyLoadPreview(path, result.data.mime, function(previewpath) {
+                                                                       Files.lazyLoadPreview(path, result.data.mime, function(previewpath) {
                                                                                tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
-                                                                       });
+                                                                       }, null, null, result.data.etag);
                                                                        FileActions.display(tr.find('td.filename'), true);
                                                                } else {
                                                                        OC.dialogs.alert(result.data.message, t('core', 'Could not create file'));
@@ -632,9 +633,9 @@ $(document).ready(function() {
                                                        tr.data('mime', mime).data('id', id);
                                                        tr.attr('data-id', id);
                                                        var path = $('#dir').val()+'/'+localName;
-                                                       lazyLoadPreview(path, mime, function(previewpath) {
+                                                       Files.lazyLoadPreview(path, mime, function(previewpath) {
                                                                tr.find('td.filename').attr('style', 'background-image:url('+previewpath+')');
-                                                       });
+                                                       }, null, null, data.etag);
                                                        FileActions.display(tr.find('td.filename'), true);
                                                });
                                                eventSource.listen('error',function(error) {

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index c33a06bbdc3d2d20db942ee3e1527a20e7f6dd9f..b05f42a79a83532731ce9c80c810a2b66afddc3a 100644 (file)
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -326,9 +326,9 @@ var FileList={
                        tr.attr('data-id', id);
                }
                var path = getPathForPreview(name);
-               lazyLoadPreview(path, mime, function(previewpath) {
+               Files.lazyLoadPreview(path, mime, function(previewpath) {
                        tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
-               });
+               }, null, null, tr.attr('data-etag'));
                tr.find('td.filename').draggable(dragOptions);
        },
        isLoading:function(name) {
@@ -863,7 +863,7 @@ $(document).ready(function() {
                                data.context = FileList.addFile(file.name, file.size, date, false, false, param);
 
                                // update file data
-                               data.context.attr('data-mime',file.mime).attr('data-id',file.id);
+                               data.context.attr('data-mime',file.mime).attr('data-id',file.id).attr('data-etag', file.etag);
 
                                var permissions = data.context.data('permissions');
                                if (permissions !== file.permissions) {
@@ -873,9 +873,9 @@ $(document).ready(function() {
                                FileActions.display(data.context.find('td.filename'), true);
 
                                var path = getPathForPreview(file.name);
-                               lazyLoadPreview(path, file.mime, function(previewpath) {
+                               Files.lazyLoadPreview(path, file.mime, function(previewpath) {
                                        data.context.find('td.filename').attr('style','background-image:url('+previewpath+')');
-                               });
+                               }, null, null, file.etag);
                        }
                }
        });

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 389bf1bf197a8d2ff79a3d228bc5c96e29e33cb1..ee0fdcb43a9c4443149127abc8b3839dcd1e549c 100644 (file)
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -20,6 +20,17 @@ Files={
                }
 
        },
+
+       /**
+        * Fix path name by removing double slash at the beginning, if any
+        */
+       fixPath: function(fileName) {
+               if (fileName.substr(0, 2) == '//') {
+                       return fileName.substr(1);
+               }
+               return fileName;
+       },
+
        isFileNameValid:function (name) {
                if (name === '.') {
                        throw t('files', '\'.\' is an invalid file name.');
@@ -457,9 +468,9 @@ var createDragShadow = function(event) {
                        newtr.find('td.filename').attr('style','background-image:url('+OC.imagePath('core', 'filetypes/folder.png')+')');
                } else {
                        var path = getPathForPreview(elem.name);
-                       lazyLoadPreview(path, elem.mime, function(previewpath) {
+                       Files.lazyLoadPreview(path, elem.mime, function(previewpath) {
                                newtr.find('td.filename').attr('style','background-image:url('+previewpath+')');
-                       });
+                       }, null, null, elem.etag);
                }
        });
 
@@ -626,26 +637,28 @@ function getSelectedFilesTrash(property) {
        return files;
 }
 
-function getMimeIcon(mime, ready) {
-       if (getMimeIcon.cache[mime]) {
-               ready(getMimeIcon.cache[mime]);
+Files.getMimeIcon = function(mime, ready) {
+       if (Files.getMimeIcon.cache[mime]) {
+               ready(Files.getMimeIcon.cache[mime]);
        } else {
                $.get( OC.filePath('files','ajax','mimeicon.php'), {mime: mime}, function(path) {
-                       getMimeIcon.cache[mime]=path;
-                       ready(getMimeIcon.cache[mime]);
+                       Files.getMimeIcon.cache[mime]=path;
+                       ready(Files.getMimeIcon.cache[mime]);
                });
        }
 }
-getMimeIcon.cache={};
+Files.getMimeIcon.cache={};
 
 function getPathForPreview(name) {
        var path = $('#dir').val() + '/' + name;
        return path;
 }
 
-function lazyLoadPreview(path, mime, ready, width, height) {
+Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
        // get mime icon url
-       getMimeIcon(mime, function(iconURL) {
+       Files.getMimeIcon(mime, function(iconURL) {
+               var urlSpec = {};
+               var previewURL;
                ready(iconURL); // set mimeicon URL
 
                // now try getting a preview thumbnail URL
@@ -655,25 +668,38 @@ function lazyLoadPreview(path, mime, ready, width, height) {
                if ( ! height ) {
                        height = $('#filestable').data('preview-y');
                }
+               // note: the order of arguments must match the one
+               // from the server's template so that the browser
+               // knows it's the same file for caching
+               urlSpec.x = width;
+               urlSpec.y = height;
+               urlSpec.file = Files.fixPath(path);
+
+               if (etag){
+                       // use etag as cache buster
+                       urlSpec.c = etag;
+               }
+               else {
+                       console.warn('Files.lazyLoadPreview(): missing etag argument');
+               }
+
                if ( $('#publicUploadButtonMock').length ) {
-                       var previewURL = OC.Router.generate('core_ajax_public_preview', {file: path, x:width, y:height, t:$('#dirToken').val()});
+                       urlSpec.t = $('#dirToken').val();
+                       previewURL = OC.Router.generate('core_ajax_public_preview', urlSpec);
                } else {
-                       var previewURL = OC.Router.generate('core_ajax_preview', {file: path, x:width, y:height});
-               }
-               $.get(previewURL, function() {
-                       previewURL = previewURL.replace('(', '%28');
-                       previewURL = previewURL.replace(')', '%29');
-                       previewURL += '&reload=true';
-
-                       // preload image to prevent delay
-                       // this will make the browser cache the image
-                       var img = new Image();
-                       img.onload = function(){
-                               //set preview thumbnail URL
-                               ready(previewURL);
-                       }
-                       img.src = previewURL;
-               });
+                       previewURL = OC.Router.generate('core_ajax_preview', urlSpec);
+               }
+               previewURL = previewURL.replace('(', '%28');
+               previewURL = previewURL.replace(')', '%29');
+
+               // preload image to prevent delay
+               // this will make the browser cache the image
+               var img = new Image();
+               img.onload = function(){
+                       //set preview thumbnail URL
+                       ready(previewURL);
+               }
+               img.src = previewURL;
        });
 }
 

diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index 709d78a4d45cb65aab21c3f8f00613e141337055..7692dd67574fb5f4ae7704043516f69e447ef02b 100644 (file)
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -40,7 +40,7 @@ class Helper
 
                if($file['isPreviewAvailable']) {
                        $pathForPreview = $file['directory'] . '/' . $file['name'];
-                       return \OC_Helper::previewIcon($pathForPreview);
+                       return \OC_Helper::previewIcon($pathForPreview) . '&c=' . $file['etag'];
                }
                return \OC_Helper::mimetypeIcon($file['mimetype']);
        }

diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index a6d2e44f34fa4766893a6bb0310f384fafc219b3..2f630e1f014d7ab06f2f22661f478b59f05a4533 100644 (file)
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -16,6 +16,7 @@ $totalsize = 0; ?>
                data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>"
                data-mime="<?php p($file['mimetype'])?>"
                data-size="<?php p($file['size']);?>"
+               data-etag="<?php p($file['etag']);?>"
                data-permissions="<?php p($file['permissions']); ?>">
                <?php if($file['isPreviewAvailable']): ?>
                <td class="filename svg preview-icon"

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 3d02227cb08a4e7b2cf54e19406dd10d6c04947f..6504de8438695c5cb2aaffbf9b590f2cf5f81ac6 100644 (file)
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -28,7 +28,7 @@ function determineIcon($file, $sharingRoot, $sharingToken) {
        $relativePath = substr($file['path'], 6);
        $relativePath = substr($relativePath, strlen($sharingRoot));
        if($file['isPreviewAvailable']) {
-               return OCP\publicPreview_icon($relativePath, $sharingToken);
+               return OCP\publicPreview_icon($relativePath, $sharingToken) . '&c=' . $file['etag'];
        }
        return OCP\mimetype_icon($file['mimetype']);
 }

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index a9b40918ca7835b6c1f8a75c6d903c32d437c26d..f4e3ec014479a9fea10f28bc0ac7df884449b45d 100644 (file)
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -294,14 +294,14 @@ var OCdialogs = {
                                conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate));
                        }
                        var path = getPathForPreview(original.name);
-                       lazyLoadPreview(path, original.mime, function(previewpath){
+                       Files.lazyLoadPreview(path, original.mime, function(previewpath){
                                conflict.find('.original .icon').css('background-image','url('+previewpath+')');
-                       }, 96, 96);
+                       }, 96, 96, original.etag);
                        getCroppedPreview(replacement).then(
                                function(path){
                                        conflict.find('.replacement .icon').css('background-image','url(' + path + ')');
                                }, function(){
-                                       getMimeIcon(replacement.type,function(path){
+                                       Files.getMimeIcon(replacement.type,function(path){
                                                conflict.find('.replacement .icon').css('background-image','url(' + path + ')');
                                        });
                                }

diff --git a/lib/private/helper.php b/lib/private/helper.php
index fca08adca8bcc33faf04a853731b26ab54eb20e1..4bb07ac534daa0bad6ed9a34eabe91bce64140c9 100644 (file)
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -231,11 +231,11 @@ class OC_Helper {
         * Returns the path to the preview of the file.
         */
        public static function previewIcon($path) {
-               return self::linkToRoute( 'core_ajax_preview', array('x' => 36, 'y' => 36, 'file' => urlencode($path) ));
+               return self::linkToRoute( 'core_ajax_preview', array('x' => 36, 'y' => 36, 'file' => $path ));
        }
 
        public static function publicPreviewIcon( $path, $token ) {
-               return self::linkToRoute( 'core_ajax_public_preview', array('x' => 36, 'y' => 36, 'file' => urlencode($path), 't' => $token));
+               return self::linkToRoute( 'core_ajax_public_preview', array('x' => 36, 'y' => 36, 'file' => $path, 't' => $token));
        }
 
        /**