From 8f28621bb0bf622b4ec3b3fcb37e48a09fe2b395 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 11 Jun 2018 11:23:11 +0200 Subject: [PATCH] Remove unnecessary logs when logging in --- www/common/mergeDrive.js | 2 +- www/common/outer/userObject.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/www/common/mergeDrive.js b/www/common/mergeDrive.js index f491643f9..ea4c6edc7 100644 --- a/www/common/mergeDrive.js +++ b/www/common/mergeDrive.js @@ -109,7 +109,7 @@ define([ pinPads: function () {} // without pinPads /outer/userObject.js won't be loaded }); var onMigrated = function () { - oldFo.fixFiles(); + oldFo.fixFiles(true); var newFo = proxyData.userObject; var oldRecentPads = parsed.drive[newFo.FILES_DATA]; var newRecentPads = proxy.drive[newFo.FILES_DATA]; diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js index d43375ef2..31e70a3bb 100644 --- a/www/common/outer/userObject.js +++ b/www/common/outer/userObject.js @@ -426,7 +426,7 @@ define([ migrateToNewFormat(cb); }; - exp.fixFiles = function () { + exp.fixFiles = function (silent) { // Explore the tree and check that everything is correct: // * 'root', 'trash', 'unsorted' and 'filesData' exist and are objects // * ROOT: Folders are objects, files are href @@ -435,6 +435,9 @@ define([ // - Dates (adate, cdate) can be parsed/formatted // - All files in filesData should be either in 'root', 'trash' or 'unsorted'. If that's not the case, copy the fily to 'unsorted' // * TEMPLATE: Contains only files (href), and does not contains files that are in ROOT + + if (silent) { debug = function () {}; } + debug("Cleaning file system..."); var before = JSON.stringify(files);