Fixed correct filename of MoveAvatarsBackgroundJob

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 40ea9cca71a39d855cb296fefbb20a1a735f9784..4f0a058e4e505715e726d7925847e41130308bb3 100644 (file)
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -681,7 +681,7 @@ return array(
     'OC\\Repair\\NC11\\CleanPreviews' => $baseDir . '/lib/private/Repair/NC11/CleanPreviews.php',
     'OC\\Repair\\NC11\\CleanPreviewsBackgroundJob' => $baseDir . '/lib/private/Repair/NC11/CleanPreviewsBackgroundJob.php',
     'OC\\Repair\\NC11\\MoveAvatars' => $baseDir . '/lib/private/Repair/NC11/MoveAvatars.php',
-    'OC\\Repair\\NC11\\MoveAvatarsBackgroundJob' => $baseDir . '/lib/private/Repair/NC11/MoveAvatarBackgroundJob.php',
+    'OC\\Repair\\NC11\\MoveAvatarsBackgroundJob' => $baseDir . '/lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php',
     'OC\\Repair\\OldGroupMembershipShares' => $baseDir . '/lib/private/Repair/OldGroupMembershipShares.php',
     'OC\\Repair\\Preview' => $baseDir . '/lib/private/Repair/Preview.php',
     'OC\\Repair\\RemoveGetETagEntries' => $baseDir . '/lib/private/Repair/RemoveGetETagEntries.php',

diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 99fb3679b6e1d508ee1544eadded0c93a52ea8b2..2ab2da2ea578b68a63c057feff33d9ec03ed1561 100644 (file)
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -711,7 +711,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Repair\\NC11\\CleanPreviews' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/CleanPreviews.php',
         'OC\\Repair\\NC11\\CleanPreviewsBackgroundJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/CleanPreviewsBackgroundJob.php',
         'OC\\Repair\\NC11\\MoveAvatars' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/MoveAvatars.php',
-        'OC\\Repair\\NC11\\MoveAvatarsBackgroundJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/MoveAvatarBackgroundJob.php',
+        'OC\\Repair\\NC11\\MoveAvatarsBackgroundJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php',
         'OC\\Repair\\OldGroupMembershipShares' => __DIR__ . '/../../..' . '/lib/private/Repair/OldGroupMembershipShares.php',
         'OC\\Repair\\Preview' => __DIR__ . '/../../..' . '/lib/private/Repair/Preview.php',
         'OC\\Repair\\RemoveGetETagEntries' => __DIR__ . '/../../..' . '/lib/private/Repair/RemoveGetETagEntries.php',

diff --git a/lib/private/Repair/NC11/MoveAvatarBackgroundJob.php b/lib/private/Repair/NC11/MoveAvatarBackgroundJob.php
deleted file mode 100644 (file)
index f8c0d9b..0000000
--- a/lib/private/Repair/NC11/MoveAvatarBackgroundJob.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * @copyright 2016 Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-namespace OC\Repair\NC11;
-
-use OC\BackgroundJob\QueuedJob;
-use OCP\Files\File;
-use OCP\Files\Folder;
-use OCP\Files\IAppData;
-use OCP\Files\IRootFolder;
-use OCP\Files\NotFoundException;
-use OCP\ILogger;
-use OCP\IUser;
-use OCP\IUserManager;
-
-class MoveAvatarsBackgroundJob extends QueuedJob {
-
-       /** @var IUserManager */
-       private $userManager;
-
-       /** @var IRootFolder */
-       private $rootFolder;
-
-       /** @var IAppData */
-       private $appData;
-
-       /** @var ILogger */
-       private $logger;
-
-       /**
-        * MoveAvatars constructor.
-        */
-       public function __construct() {
-               $this->userManager = \OC::$server->getUserManager();
-               $this->rootFolder = \OC::$server->getRootFolder();
-               $this->logger = \OC::$server->getLogger();
-               $this->appData = \OC::$server->getAppDataDir('avatar');
-       }
-
-       public function run($arguments) {
-               $this->logger->info('Started migrating avatars to AppData folder');
-               $this->moveAvatars();
-               $this->logger->info('All avatars migrated to AppData folder');
-       }
-
-       private function moveAvatars() {
-               $counter = 0;
-               $this->userManager->callForSeenUsers(function (IUser $user) use ($counter) {
-                       $uid = $user->getUID();
-
-                       \OC\Files\Filesystem::initMountPoints($uid);
-                       /** @var Folder $userFolder */
-                       $userFolder = $this->rootFolder->get($uid);
-
-                       try {
-                               $userData = $this->appData->getFolder($uid);
-                       } catch (NotFoundException $e) {
-                               $userData = $this->appData->newFolder($uid);
-                       }
-
-
-                       $regex = '/^avatar\.([0-9]+\.)?(jpg|png)$/';
-                       $avatars = $userFolder->getDirectoryListing();
-
-                       foreach ($avatars as $avatar) {
-                               /** @var File $avatar */
-                               if (preg_match($regex, $avatar->getName())) {
-                                       /*
-                                        * This is not the most effective but it is the most abstract way
-                                        * to handle this. Avatars should be small anyways.
-                                        */
-                                       $newAvatar = $userData->newFile($avatar->getName());
-                                       $newAvatar->putContent($avatar->getContent());
-                                       $avatar->delete();
-                               }
-                       }
-                       $counter++;
-                       if ($counter % 100) {
-                               $this->logger->info('{amount} avatars migrated', ['amount' => $counter]);
-                       }
-               });
-       }
-}

diff --git a/lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php b/lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php
new file mode 100644 (file)
index 0000000..f8c0d9b
--- /dev/null
+++ b/lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @copyright 2016 Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OC\Repair\NC11;
+
+use OC\BackgroundJob\QueuedJob;
+use OCP\Files\File;
+use OCP\Files\Folder;
+use OCP\Files\IAppData;
+use OCP\Files\IRootFolder;
+use OCP\Files\NotFoundException;
+use OCP\ILogger;
+use OCP\IUser;
+use OCP\IUserManager;
+
+class MoveAvatarsBackgroundJob extends QueuedJob {
+
+       /** @var IUserManager */
+       private $userManager;
+
+       /** @var IRootFolder */
+       private $rootFolder;
+
+       /** @var IAppData */
+       private $appData;
+
+       /** @var ILogger */
+       private $logger;
+
+       /**
+        * MoveAvatars constructor.
+        */
+       public function __construct() {
+               $this->userManager = \OC::$server->getUserManager();
+               $this->rootFolder = \OC::$server->getRootFolder();
+               $this->logger = \OC::$server->getLogger();
+               $this->appData = \OC::$server->getAppDataDir('avatar');
+       }
+
+       public function run($arguments) {
+               $this->logger->info('Started migrating avatars to AppData folder');
+               $this->moveAvatars();
+               $this->logger->info('All avatars migrated to AppData folder');
+       }
+
+       private function moveAvatars() {
+               $counter = 0;
+               $this->userManager->callForSeenUsers(function (IUser $user) use ($counter) {
+                       $uid = $user->getUID();
+
+                       \OC\Files\Filesystem::initMountPoints($uid);
+                       /** @var Folder $userFolder */
+                       $userFolder = $this->rootFolder->get($uid);
+
+                       try {
+                               $userData = $this->appData->getFolder($uid);
+                       } catch (NotFoundException $e) {
+                               $userData = $this->appData->newFolder($uid);
+                       }
+
+
+                       $regex = '/^avatar\.([0-9]+\.)?(jpg|png)$/';
+                       $avatars = $userFolder->getDirectoryListing();
+
+                       foreach ($avatars as $avatar) {
+                               /** @var File $avatar */
+                               if (preg_match($regex, $avatar->getName())) {
+                                       /*
+                                        * This is not the most effective but it is the most abstract way
+                                        * to handle this. Avatars should be small anyways.
+                                        */
+                                       $newAvatar = $userData->newFile($avatar->getName());
+                                       $newAvatar->putContent($avatar->getContent());
+                                       $avatar->delete();
+                               }
+                       }
+                       $counter++;
+                       if ($counter % 100) {
+                               $this->logger->info('{amount} avatars migrated', ['amount' => $counter]);
+                       }
+               });
+       }
+}