Cache: show upgrade progress

6 files changed, 115 insertions, 39 deletions

diff --git a/apps/files/ajax/upgrade.php b/apps/files/ajax/upgrade.php
new file mode 100644
index 00000000000..965c0073b8a
--- /dev/null
+++ b/apps/files/ajax/upgrade.php
@@ -0,0 +1,42 @@
+<?php
+set_time_limit(0); //scanning can take ages
+session_write_close();
+
+$user = OC_User::getUser();
+$eventSource = new OC_EventSource();
+$listener = new UpgradeListener($eventSource);
+$legacy = new \OC\Files\Cache\Legacy($user);
+
+if ($legacy->hasItems()) {
+	OC_Hook::connect('\OC\Files\Cache\Upgrade', 'migrate_path', $listener, 'upgradePath');
+
+	$upgrade = new \OC\Files\Cache\Upgrade($legacy);
+	$count = $legacy->getCount();
+	$eventSource->send('total', $count);
+	$upgrade->upgradePath('/' . $user . '/files');
+}
+\OC\Files\Cache\Upgrade::upgradeDone($user);
+$eventSource->send('done', true);
+$eventSource->close();
+
+class UpgradeListener {
+	/**
+	 * @var OC_EventSource $eventSource
+	 */
+	private $eventSource;
+
+	private $count = 0;
+	private $lastSend = 0;
+
+	public function __construct($eventSource) {
+		$this->eventSource = $eventSource;
+	}
+
+	public function upgradePath($path) {
+		$this->count++;
+		if ($this->count > ($this->lastSend + 5)) {
+			$this->lastSend = $this->count;
+			$this->eventSource->send('count', $this->count);
+		}
+	}
+}
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 643d8ed18a2..ab2f3b01a29 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -10,13 +10,3 @@ OCP\App::addNavigationEntry( array( "id" => "files_index",
 									"name" => $l->t("Files") ));
 
 OC_Search::registerProvider('OC_Search_Provider_File');
-
-if (OC_User::isLoggedIn()) {
-	// update OC4.5 filecache to OC5 filecache, can't do this in update.php since it needs to happen for each user individually
-	$cacheVersion = (int)OCP\Config::getUserValue(OC_User::getUser(), 'files', 'cache_version', 4);
-	if ($cacheVersion < 5) {
-		\OC_Log::write('files', 'updating filecache to 5.0 for user ' . OC_User::getUser(), \OC_Log::INFO);
-		\OC\Files\Cache\Upgrade::upgrade();
-		OCP\Config::setUserValue(OC_User::getUser(), 'files', 'cache_version', 5);
-	}
-}
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 36a1e5c954b..0c130efe472 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -122,3 +122,12 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
 
 div.crumb a{ padding:0.9em 0 0.7em 0; }
+
+#upgrade {
+	width: 400px;
+	position: absolute;
+	top: 200px;
+	left: 50%;
+	text-align: center;
+	margin-left: -200px;
+}
diff --git a/apps/files/index.php b/apps/files/index.php
index 993d8b4dcff..0dce7686962 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -28,7 +28,6 @@ OCP\User::checkLoggedIn();
 OCP\Util::addStyle('files', 'files');
 OCP\Util::addscript('files', 'jquery.iframe-transport');
 OCP\Util::addscript('files', 'jquery.fileupload');
-OCP\Util::addscript('files', 'files');
 OCP\Util::addscript('files', 'filelist');
 OCP\Util::addscript('files', 'fileactions');
 OCP\Util::addscript('files', 'keyboardshortcuts');
@@ -37,8 +36,8 @@ OCP\App::setActiveNavigationEntry('files_index');
 // Load the files
 $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
 // Redirect if directory does not exist
-if(!\OC\Files\Filesystem::is_dir($dir . '/')) {
-	header('Location: '.$_SERVER['SCRIPT_NAME'].'');
+if (!\OC\Files\Filesystem::is_dir($dir . '/')) {
+	header('Location: ' . $_SERVER['SCRIPT_NAME'] . '');
 	exit();
 }
 
@@ -53,16 +52,25 @@ function fileCmp($a, $b) {
 }
 
 $files = array();
-foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $i ) {
-	$i['date'] = OCP\Util::formatDate($i['mtime'] );
-	if($i['type'] == 'file') {
+$user = OC_User::getUser();
+if (\OC\Files\Cache\Upgrade::needUpgrade($user)) { //dont load anything if we need to upgrade the cache
+	$content = array();
+	$needUpgrade = true;
+	$freeSpace = 0;
+} else {
+	$content = \OC\Files\Filesystem::getDirectoryContent($dir);
+	$freeSpace = \OC\Files\Filesystem::free_space($dir);
+	$needUpgrade = false;
+}
+foreach ($content as $i) {
+	$i['date'] = OCP\Util::formatDate($i['mtime']);
+	if ($i['type'] == 'file') {
 		$fileinfo = pathinfo($i['name']);
 		$i['basename'] = $fileinfo['filename'];
 		if (!empty($fileinfo['extension'])) {
-			$i['extension']='.' . $fileinfo['extension'];
-		}
-		else {
-			$i['extension']='';
+			$i['extension'] = '.' . $fileinfo['extension'];
+		} else {
+			$i['extension'] = '';
 		}
 	}
 	$i['directory'] = $dir;
@@ -74,10 +82,10 @@ usort($files, "fileCmp");
 // Make breadcrumb
 $breadcrumb = array();
 $pathtohere = '';
-foreach( explode( '/', $dir ) as $i ) {
-	if( $i != '' ) {
+foreach (explode('/', $dir) as $i) {
+	if ($i != '') {
 		$pathtohere .= '/' . $i;
-		$breadcrumb[] = array( 'dir' => $pathtohere, 'name' => $i );
+		$breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
 	}
 }
 
@@ -94,29 +102,35 @@ $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')
 $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
 $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 
-$freeSpace = \OC\Files\Filesystem::free_space($dir);
-$freeSpace = max($freeSpace,0);
+$freeSpace = max($freeSpace, 0);
 $maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
 
 $permissions = OCP\PERMISSION_READ;
 if (\OC\Files\Filesystem::isUpdatable($dir . '/')) {
-    $permissions |= OCP\PERMISSION_UPDATE;
+	$permissions |= OCP\PERMISSION_UPDATE;
 }
 if (\OC\Files\Filesystem::isDeletable($dir . '/')) {
-    $permissions |= OCP\PERMISSION_DELETE;
+	$permissions |= OCP\PERMISSION_DELETE;
 }
 if (\OC\Files\Filesystem::isSharable($dir . '/')) {
-    $permissions |= OCP\PERMISSION_SHARE;
+	$permissions |= OCP\PERMISSION_SHARE;
 }
 
-$tmpl = new OCP\Template( 'files', 'index', 'user' );
-$tmpl->assign( 'fileList', $list->fetchPage(), false );
-$tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage(), false );
-$tmpl->assign( 'dir', \OC\Files\Filesystem::normalizePath($dir));
-$tmpl->assign( 'isCreatable', \OC\Files\Filesystem::isCreatable($dir . '/'));
-$tmpl->assign('permissions', $permissions);
-$tmpl->assign('files', $files);
-$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
-$tmpl->printPage();
+if ($needUpgrade) {
+	OCP\Util::addscript('files', 'upgrade');
+	$tmpl = new OCP\Template('files', 'upgrade', 'user');
+	$tmpl->printPage();
+} else {
+	OCP\Util::addscript('files', 'files');
+	$tmpl = new OCP\Template('files', 'index', 'user');
+	$tmpl->assign('fileList', $list->fetchPage(), false);
+	$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
+	$tmpl->assign('dir', \OC\Files\Filesystem::normalizePath($dir));
+	$tmpl->assign('isCreatable', \OC\Files\Filesystem::isCreatable($dir . '/'));
+	$tmpl->assign('permissions', $permissions);
+	$tmpl->assign('files', $files);
+	$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+	$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+	$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+	$tmpl->printPage();
+}
diff --git a/apps/files/js/upgrade.js b/apps/files/js/upgrade.js
new file mode 100644
index 00000000000..02d57fc9e6c
--- /dev/null
+++ b/apps/files/js/upgrade.js
@@ -0,0 +1,17 @@
+$(document).ready(function () {
+	var eventSource, total, bar = $('#progressbar');
+	console.log('start');
+	bar.progressbar({value: 0});
+	eventSource = new OC.EventSource(OC.filePath('files', 'ajax', 'upgrade.php'));
+	eventSource.listen('total', function (count) {
+		total = count;
+		console.log(count + ' files needed to be migrated');
+	});
+	eventSource.listen('count', function (count) {
+		bar.progressbar({value: (count / total) * 100});
+		console.log(count);
+	});
+	eventSource.listen('done', function () {
+		document.location.reload();
+	});
+});
diff --git a/apps/files/templates/upgrade.php b/apps/files/templates/upgrade.php
new file mode 100644
index 00000000000..de6cc713028
--- /dev/null
+++ b/apps/files/templates/upgrade.php
@@ -0,0 +1,4 @@
+<div id="upgrade">
+	<?php echo $l->t('Upgrading filesystem cache...');?>
+	<div id="progressbar" />
+</div>