nextcloud / server

lib/private/Repair.php

Indentation +174 added lines, -174 removed lines

@@ -52,178 +52,178 @@
 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 MoveAvatars(
-				\OC::$server->getJobList(),
-				\OC::$server->getConfig()
-			),
-			new CleanPreviews(
-				\OC::$server->getJobList(),
-				\OC::$server->getUserManager(),
-				\OC::$server->getConfig()
-			),
-			new FixMountStorages(\OC::$server->getDatabaseConnection()),
-			new UpdateLanguageCodes(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
-			new InstallCoreBundle(
-				\OC::$server->query(BundleFetcher::class),
-				\OC::$server->getConfig(),
-				\OC::$server->query(Installer::class)
-			)
-		];
-	}
-
-	/**
-	 * 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),
-		];
-
-		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 MoveAvatars(
+                \OC::$server->getJobList(),
+                \OC::$server->getConfig()
+            ),
+            new CleanPreviews(
+                \OC::$server->getJobList(),
+                \OC::$server->getUserManager(),
+                \OC::$server->getConfig()
+            ),
+            new FixMountStorages(\OC::$server->getDatabaseConnection()),
+            new UpdateLanguageCodes(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
+            new InstallCoreBundle(
+                \OC::$server->query(BundleFetcher::class),
+                \OC::$server->getConfig(),
+                \OC::$server->query(Installer::class)
+            )
+        ];
+    }
+
+    /**
+     * 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),
+        ];
+
+        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/Owncloud/SaveAccountsTableData.php

Indentation +135 added lines, -135 removed lines

@@ -37,140 +37,140 @@
  */
 class SaveAccountsTableData implements IRepairStep {
 
-	const BATCH_SIZE = 75;
-
-	/** @var IDBConnection */
-	protected $db;
-
-	/** @var IConfig */
-	protected $config;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param IConfig $config
-	 */
-	public function __construct(IDBConnection $db, IConfig $config) {
-		$this->db = $db;
-		$this->config = $config;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Copy data from accounts table when migrating from ownCloud';
-	}
-
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if (!$this->shouldRun()) {
-			return;
-		}
-
-		$offset = 0;
-		$numUsers = $this->runStep($offset);
-
-		while ($numUsers === self::BATCH_SIZE) {
-			$offset += $numUsers;
-			$numUsers = $this->runStep($offset);
-		}
-
-		// Remove the table
-		$this->db->dropTable('accounts');
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function shouldRun() {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('accounts')
-			->where($query->expr()->isNotNull('user_id'))
-			->setMaxResults(1);
-
-		try {
-			$query->execute();
-			return true;
-		} catch (InvalidFieldNameException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param int $offset
-	 * @return int Number of copied users
-	 */
-	protected function runStep($offset) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('accounts')
-			->orderBy('id')
-			->setMaxResults(self::BATCH_SIZE);
-
-		if ($offset > 0) {
-			$query->setFirstResult($offset);
-		}
-
-		$result = $query->execute();
-
-		$update = $this->db->getQueryBuilder();
-		$update->update('users')
-			->set('displayname', $update->createParameter('displayname'))
-			->where($update->expr()->eq('uid', $update->createParameter('userid')));
-
-		$updatedUsers = 0;
-		while ($row = $result->fetch()) {
-			try {
-				$this->migrateUserInfo($update, $row);
-			} catch (PreConditionNotMetException $e) {
-				// Ignore and continue
-			} catch (\UnexpectedValueException $e) {
-				// Ignore and continue
-			}
-			$updatedUsers++;
-		}
-		$result->closeCursor();
-
-		return $updatedUsers;
-	}
-
-	/**
-	 * @param IQueryBuilder $update
-	 * @param array $userdata
-	 * @throws PreConditionNotMetException
-	 * @throws \UnexpectedValueException
-	 */
-	protected function migrateUserInfo(IQueryBuilder $update, $userdata) {
-		if ($userdata['state'] === '3') {
-			// Deleted user, ignore
-			return;
-		}
-
-		if ($userdata['email'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'settings', 'email', $userdata['email']);
-		}
-		if ($userdata['quota'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'files', 'quota', $userdata['quota']);
-		}
-		if ($userdata['last_login'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'login', 'lastLogin', $userdata['last_login']);
-		}
-		if ($userdata['state'] === '1') {
-			$this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'true');
-		}
-		if ($userdata['state'] === '2') {
-			$this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'false');
-		}
-
-		if ($userdata['display_name'] !== null) {
-			$update->setParameter('displayname', $userdata['display_name'])
-				->setParameter('userid', $userdata['user_id']);
-			$update->execute();
-		}
-
-	}
+    const BATCH_SIZE = 75;
+
+    /** @var IDBConnection */
+    protected $db;
+
+    /** @var IConfig */
+    protected $config;
+
+    /**
+     * @param IDBConnection $db
+     * @param IConfig $config
+     */
+    public function __construct(IDBConnection $db, IConfig $config) {
+        $this->db = $db;
+        $this->config = $config;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Copy data from accounts table when migrating from ownCloud';
+    }
+
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if (!$this->shouldRun()) {
+            return;
+        }
+
+        $offset = 0;
+        $numUsers = $this->runStep($offset);
+
+        while ($numUsers === self::BATCH_SIZE) {
+            $offset += $numUsers;
+            $numUsers = $this->runStep($offset);
+        }
+
+        // Remove the table
+        $this->db->dropTable('accounts');
+    }
+
+    /**
+     * @return bool
+     */
+    protected function shouldRun() {
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')
+            ->from('accounts')
+            ->where($query->expr()->isNotNull('user_id'))
+            ->setMaxResults(1);
+
+        try {
+            $query->execute();
+            return true;
+        } catch (InvalidFieldNameException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param int $offset
+     * @return int Number of copied users
+     */
+    protected function runStep($offset) {
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')
+            ->from('accounts')
+            ->orderBy('id')
+            ->setMaxResults(self::BATCH_SIZE);
+
+        if ($offset > 0) {
+            $query->setFirstResult($offset);
+        }
+
+        $result = $query->execute();
+
+        $update = $this->db->getQueryBuilder();
+        $update->update('users')
+            ->set('displayname', $update->createParameter('displayname'))
+            ->where($update->expr()->eq('uid', $update->createParameter('userid')));
+
+        $updatedUsers = 0;
+        while ($row = $result->fetch()) {
+            try {
+                $this->migrateUserInfo($update, $row);
+            } catch (PreConditionNotMetException $e) {
+                // Ignore and continue
+            } catch (\UnexpectedValueException $e) {
+                // Ignore and continue
+            }
+            $updatedUsers++;
+        }
+        $result->closeCursor();
+
+        return $updatedUsers;
+    }
+
+    /**
+     * @param IQueryBuilder $update
+     * @param array $userdata
+     * @throws PreConditionNotMetException
+     * @throws \UnexpectedValueException
+     */
+    protected function migrateUserInfo(IQueryBuilder $update, $userdata) {
+        if ($userdata['state'] === '3') {
+            // Deleted user, ignore
+            return;
+        }
+
+        if ($userdata['email'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'settings', 'email', $userdata['email']);
+        }
+        if ($userdata['quota'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'files', 'quota', $userdata['quota']);
+        }
+        if ($userdata['last_login'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'login', 'lastLogin', $userdata['last_login']);
+        }
+        if ($userdata['state'] === '1') {
+            $this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'true');
+        }
+        if ($userdata['state'] === '2') {
+            $this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'false');
+        }
+
+        if ($userdata['display_name'] !== null) {
+            $update->setParameter('displayname', $userdata['display_name'])
+                ->setParameter('userid', $userdata['user_id']);
+            $update->execute();
+        }
+
+    }
 }