nextcloud / server

lib/private/Repair.php

Indentation +165 added lines, -165 removed lines

@@ -55,169 +55,169 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Repair implements IOutput{
-	/* @var IRepairStep[] */
-	private $repairSteps;
-	/** @var EventDispatcher */
-	private $dispatcher;
-	/** @var string */
-	private $currentStep;
-
-	/**
-	 * Creates a new repair step runner
-	 *
-	 * @param IRepairStep[] $repairSteps array of RepairStep instances
-	 * @param EventDispatcher $dispatcher
-	 */
-	public function __construct($repairSteps = [], EventDispatcher $dispatcher = null) {
-		$this->repairSteps = $repairSteps;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * Run a series of repair steps for common problems
-	 */
-	public function run() {
-		if (count($this->repairSteps) === 0) {
-			$this->emit('\OC\Repair', 'info', array('No repair steps available'));
-			return;
-		}
-		// run each repair step
-		foreach ($this->repairSteps as $step) {
-			$this->currentStep = $step->getName();
-			$this->emit('\OC\Repair', 'step', [$this->currentStep]);
-			$step->run($this);
-		}
-	}
-
-	/**
-	 * Add repair step
-	 *
-	 * @param IRepairStep|string $repairStep repair step
-	 * @throws \Exception
-	 */
-	public function addStep($repairStep) {
-		if (is_string($repairStep)) {
-			try {
-				$s = \OC::$server->query($repairStep);
-			} catch (QueryException $e) {
-				if (class_exists($repairStep)) {
-					$s = new $repairStep();
-				} else {
-					throw new \Exception("Repair step '$repairStep' is unknown");
-				}
-			}
-
-			if ($s instanceof IRepairStep) {
-				$this->repairSteps[] = $s;
-			} else {
-				throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
-			}
-		} else {
-			$this->repairSteps[] = $repairStep;
-		}
-	}
-
-	/**
-	 * Returns the default repair steps to be run on the
-	 * command line or after an upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getRepairSteps() {
-		return [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
-			new RepairMimeTypes(\OC::$server->getConfig()),
-			new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
-			new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new RemoveRootShares(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager(), \OC::$server->getLazyRootFolder()),
-			new MoveUpdaterStepFile(\OC::$server->getConfig()),
-			new FixMountStorages(\OC::$server->getDatabaseConnection()),
-			new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
-			new AddLogRotateJob(\OC::$server->getJobList()),
-			new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
-			new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
-			new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
-		];
-	}
-
-	/**
-	 * Returns expensive repair steps to be run on the
-	 * command line with a special option.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getExpensiveRepairSteps() {
-		return [
-			new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
-		];
-	}
-
-	/**
-	 * Returns the repair steps to be run before an
-	 * upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getBeforeUpgradeRepairSteps() {
-		$connection = \OC::$server->getDatabaseConnection();
-		$config = \OC::$server->getConfig();
-		$steps = [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
-			new SqliteAutoincrement($connection),
-			new SaveAccountsTableData($connection, $config),
-			new DropAccountTermsTable($connection),
-		];
-
-		return $steps;
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments
-	 */
-	public function emit($scope, $method, array $arguments = []) {
-		if (!is_null($this->dispatcher)) {
-			$this->dispatcher->dispatch("$scope::$method",
-				new GenericEvent("$scope::$method", $arguments));
-		}
-	}
-
-	public function info($string) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'info', array($string));
-	}
-
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'warning', [$message]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
-	}
-
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'advance', [$step, $description]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function finishProgress() {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'finishProgress', []);
-	}
+    /* @var IRepairStep[] */
+    private $repairSteps;
+    /** @var EventDispatcher */
+    private $dispatcher;
+    /** @var string */
+    private $currentStep;
+
+    /**
+     * Creates a new repair step runner
+     *
+     * @param IRepairStep[] $repairSteps array of RepairStep instances
+     * @param EventDispatcher $dispatcher
+     */
+    public function __construct($repairSteps = [], EventDispatcher $dispatcher = null) {
+        $this->repairSteps = $repairSteps;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * Run a series of repair steps for common problems
+     */
+    public function run() {
+        if (count($this->repairSteps) === 0) {
+            $this->emit('\OC\Repair', 'info', array('No repair steps available'));
+            return;
+        }
+        // run each repair step
+        foreach ($this->repairSteps as $step) {
+            $this->currentStep = $step->getName();
+            $this->emit('\OC\Repair', 'step', [$this->currentStep]);
+            $step->run($this);
+        }
+    }
+
+    /**
+     * Add repair step
+     *
+     * @param IRepairStep|string $repairStep repair step
+     * @throws \Exception
+     */
+    public function addStep($repairStep) {
+        if (is_string($repairStep)) {
+            try {
+                $s = \OC::$server->query($repairStep);
+            } catch (QueryException $e) {
+                if (class_exists($repairStep)) {
+                    $s = new $repairStep();
+                } else {
+                    throw new \Exception("Repair step '$repairStep' is unknown");
+                }
+            }
+
+            if ($s instanceof IRepairStep) {
+                $this->repairSteps[] = $s;
+            } else {
+                throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
+            }
+        } else {
+            $this->repairSteps[] = $repairStep;
+        }
+    }
+
+    /**
+     * Returns the default repair steps to be run on the
+     * command line or after an upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getRepairSteps() {
+        return [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
+            new RepairMimeTypes(\OC::$server->getConfig()),
+            new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
+            new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new RemoveRootShares(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager(), \OC::$server->getLazyRootFolder()),
+            new MoveUpdaterStepFile(\OC::$server->getConfig()),
+            new FixMountStorages(\OC::$server->getDatabaseConnection()),
+            new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
+            new AddLogRotateJob(\OC::$server->getJobList()),
+            new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
+            new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
+            new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
+        ];
+    }
+
+    /**
+     * Returns expensive repair steps to be run on the
+     * command line with a special option.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getExpensiveRepairSteps() {
+        return [
+            new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
+        ];
+    }
+
+    /**
+     * Returns the repair steps to be run before an
+     * upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getBeforeUpgradeRepairSteps() {
+        $connection = \OC::$server->getDatabaseConnection();
+        $config = \OC::$server->getConfig();
+        $steps = [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
+            new SqliteAutoincrement($connection),
+            new SaveAccountsTableData($connection, $config),
+            new DropAccountTermsTable($connection),
+        ];
+
+        return $steps;
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments
+     */
+    public function emit($scope, $method, array $arguments = []) {
+        if (!is_null($this->dispatcher)) {
+            $this->dispatcher->dispatch("$scope::$method",
+                new GenericEvent("$scope::$method", $arguments));
+        }
+    }
+
+    public function info($string) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'info', array($string));
+    }
+
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'warning', [$message]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
+    }
+
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'advance', [$step, $description]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function finishProgress() {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'finishProgress', []);
+    }
 }

lib/private/Repair/AddCleanupUpdaterBackupsJob.php

Indentation +11 added lines, -11 removed lines

@@ -30,19 +30,19 @@
 
 class AddCleanupUpdaterBackupsJob implements IRepairStep {
 
-	/** @var IJobList */
-	protected $jobList;
+    /** @var IJobList */
+    protected $jobList;
 
-	public function __construct(IJobList $jobList) {
-		$this->jobList = $jobList;
-	}
+    public function __construct(IJobList $jobList) {
+        $this->jobList = $jobList;
+    }
 
-	public function getName() {
-		return 'Queue a one-time job to cleanup old backups of the updater';
-	}
+    public function getName() {
+        return 'Queue a one-time job to cleanup old backups of the updater';
+    }
 
-	public function run(IOutput $output) {
-		$this->jobList->add(BackgroundCleanupUpdaterBackupsJob::class);
-	}
+    public function run(IOutput $output) {
+        $this->jobList->add(BackgroundCleanupUpdaterBackupsJob::class);
+    }
 }
 

core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php

Indentation +49 added lines, -49 removed lines

@@ -28,63 +28,63 @@
 
 class BackgroundCleanupUpdaterBackupsJob extends QueuedJob {
 
-	/** @var IConfig */
-	protected $config;
-	/** @var ILogger */
-	protected $log;
+    /** @var IConfig */
+    protected $config;
+    /** @var ILogger */
+    protected $log;
 
-	public function __construct(IConfig $config, ILogger $log) {
-		$this->config = $config;
-		$this->log = $log;
-	}
+    public function __construct(IConfig $config, ILogger $log) {
+        $this->config = $config;
+        $this->log = $log;
+    }
 
-	/**
-	 * This job cleans up all backups except the latest 3 from the updaters backup directory
-	 *
-	 */
-	public function run($arguments) {
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
-		$instanceId = $this->config->getSystemValue('instanceid', null);
+    /**
+     * This job cleans up all backups except the latest 3 from the updaters backup directory
+     *
+     */
+    public function run($arguments) {
+        $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+        $instanceId = $this->config->getSystemValue('instanceid', null);
 
-		if(!is_string($instanceId) || empty($instanceId)) {
-			return;
-		}
+        if(!is_string($instanceId) || empty($instanceId)) {
+            return;
+        }
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
-		$backupFolderPath = $updaterFolderPath . '/backups';
-		if(file_exists($backupFolderPath)) {
-			$this->log->info("$backupFolderPath exists - start to clean it up");
+        $updaterFolderPath = $dataDir . '/updater-' . $instanceId;
+        $backupFolderPath = $updaterFolderPath . '/backups';
+        if(file_exists($backupFolderPath)) {
+            $this->log->info("$backupFolderPath exists - start to clean it up");
 
-			$dirList = [];
-			$dirs = new \DirectoryIterator($backupFolderPath);
-			foreach($dirs as $dir) {
-				// skip files and dot dirs
-				if ($dir->isFile() || $dir->isDot()) {
-					continue;
-				}
+            $dirList = [];
+            $dirs = new \DirectoryIterator($backupFolderPath);
+            foreach($dirs as $dir) {
+                // skip files and dot dirs
+                if ($dir->isFile() || $dir->isDot()) {
+                    continue;
+                }
 
-				$mtime = $dir->getMTime();
-				$realPath = $dir->getRealPath();
+                $mtime = $dir->getMTime();
+                $realPath = $dir->getRealPath();
 
-				if ($realPath === false) {
-					continue;
-				}
+                if ($realPath === false) {
+                    continue;
+                }
 
-				$dirList[$mtime] = $realPath;
-			}
+                $dirList[$mtime] = $realPath;
+            }
 
-			ksort($dirList);
-			// drop the newest 3 directories
-			$dirList = array_slice($dirList, 0, -3);
-			$this->log->info("List of all directories that will be deleted: " . json_encode($dirList));
+            ksort($dirList);
+            // drop the newest 3 directories
+            $dirList = array_slice($dirList, 0, -3);
+            $this->log->info("List of all directories that will be deleted: " . json_encode($dirList));
 
-			foreach($dirList as $dir) {
-				$this->log->info("Removing $dir ...");
-				\OC_Helper::rmdirr($dir);
-			}
-			$this->log->info("Cleanup finished");
-		} else {
-			$this->log->info("Could not find updater directory $backupFolderPath - cleanup step not needed");
-		}
-	}
+            foreach($dirList as $dir) {
+                $this->log->info("Removing $dir ...");
+                \OC_Helper::rmdirr($dir);
+            }
+            $this->log->info("Cleanup finished");
+        } else {
+            $this->log->info("Could not find updater directory $backupFolderPath - cleanup step not needed");
+        }
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -43,21 +43,21 @@ 
 	 *
 	 */
 	public function run($arguments) {
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
 		$instanceId = $this->config->getSystemValue('instanceid', null);
 
-		if(!is_string($instanceId) || empty($instanceId)) {
+		if (!is_string($instanceId) || empty($instanceId)) {
 			return;
 		}
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
-		$backupFolderPath = $updaterFolderPath . '/backups';
-		if(file_exists($backupFolderPath)) {
+		$updaterFolderPath = $dataDir.'/updater-'.$instanceId;
+		$backupFolderPath = $updaterFolderPath.'/backups';
+		if (file_exists($backupFolderPath)) {
 			$this->log->info("$backupFolderPath exists - start to clean it up");
 
 			$dirList = [];
 			$dirs = new \DirectoryIterator($backupFolderPath);
-			foreach($dirs as $dir) {
+			foreach ($dirs as $dir) {
 				// skip files and dot dirs
 				if ($dir->isFile() || $dir->isDot()) {
 					continue;
@@ -76,9 +76,9 @@ 
 			ksort($dirList);
 			// drop the newest 3 directories
 			$dirList = array_slice($dirList, 0, -3);
-			$this->log->info("List of all directories that will be deleted: " . json_encode($dirList));
+			$this->log->info("List of all directories that will be deleted: ".json_encode($dirList));
 
-			foreach($dirList as $dir) {
+			foreach ($dirList as $dir) {
 				$this->log->info("Removing $dir ...");
 				\OC_Helper::rmdirr($dir);
 			}