Inspection of "check if the user still exists before we try to cl..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#7172)

by Björn

created 2017-11-14 19:27 UTC

Status

Indentation +96 added lines, -96 removed lines patch added patch discarded remove patch

@@ -33,100 +33,100 @@
 block discarded – undo
 use OCP\IUserManager;
 
 class CleanPreviewsBackgroundJob extends QueuedJob {
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/**
-	 * CleanPreviewsBackgroundJob constructor.
-	 *
-	 * @param IRootFolder $rootFolder
-	 * @param ILogger $logger
-	 * @param IJobList $jobList
-	 * @param ITimeFactory $timeFactory
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IRootFolder $rootFolder,
-								ILogger $logger,
-								IJobList $jobList,
-								ITimeFactory $timeFactory,
-								IUserManager $userManager) {
-		$this->rootFolder = $rootFolder;
-		$this->logger = $logger;
-		$this->jobList = $jobList;
-		$this->timeFactory = $timeFactory;
-		$this->userManager = $userManager;
-	}
-
-	public function run($arguments) {
-		$uid = $arguments['uid'];
-		if (!$this->userManager->userExists($uid)) {
-			$this->logger->info('User no longer exists, skip user ' . $uid);
-			return;
-		}
-		$this->logger->info('Started preview cleanup for ' . $uid);
-		$empty = $this->cleanupPreviews($uid);
-
-		if (!$empty) {
-			$this->jobList->add(self::class, ['uid' => $uid]);
-			$this->logger->info('New preview cleanup scheduled for ' . $uid);
-		} else {
-			$this->logger->info('Preview cleanup done for ' . $uid);
-		}
-	}
-
-	/**
-	 * @param $uid
-	 * @return bool
-	 */
-	private function cleanupPreviews($uid) {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($uid);
-		} catch (NotFoundException $e) {
-			return true;
-		}
-
-		$userRoot = $userFolder->getParent();
-
-		try {
-			/** @var Folder $thumbnailFolder */
-			$thumbnailFolder = $userRoot->get('thumbnails');
-		} catch (NotFoundException $e) {
-			return true;
-		}
-
-		$thumbnails = $thumbnailFolder->getDirectoryListing();
-
-		$start = $this->timeFactory->getTime();
-		foreach ($thumbnails as $thumbnail) {
-			try {
-				$thumbnail->delete();
-			} catch (NotPermittedException $e) {
-				// Ignore
-			}
-
-			if (($this->timeFactory->getTime() - $start) > 15) {
-				return false;
-			}
-		}
-
-		try {
-			$thumbnailFolder->delete();
-		} catch (NotPermittedException $e) {
-			// Ignore
-		}
-
-		return true;
-	}
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /**
+     * CleanPreviewsBackgroundJob constructor.
+     *
+     * @param IRootFolder $rootFolder
+     * @param ILogger $logger
+     * @param IJobList $jobList
+     * @param ITimeFactory $timeFactory
+     * @param IUserManager $userManager
+     */
+    public function __construct(IRootFolder $rootFolder,
+                                ILogger $logger,
+                                IJobList $jobList,
+                                ITimeFactory $timeFactory,
+                                IUserManager $userManager) {
+        $this->rootFolder = $rootFolder;
+        $this->logger = $logger;
+        $this->jobList = $jobList;
+        $this->timeFactory = $timeFactory;
+        $this->userManager = $userManager;
+    }
+
+    public function run($arguments) {
+        $uid = $arguments['uid'];
+        if (!$this->userManager->userExists($uid)) {
+            $this->logger->info('User no longer exists, skip user ' . $uid);
+            return;
+        }
+        $this->logger->info('Started preview cleanup for ' . $uid);
+        $empty = $this->cleanupPreviews($uid);
+
+        if (!$empty) {
+            $this->jobList->add(self::class, ['uid' => $uid]);
+            $this->logger->info('New preview cleanup scheduled for ' . $uid);
+        } else {
+            $this->logger->info('Preview cleanup done for ' . $uid);
+        }
+    }
+
+    /**
+     * @param $uid
+     * @return bool
+     */
+    private function cleanupPreviews($uid) {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($uid);
+        } catch (NotFoundException $e) {
+            return true;
+        }
+
+        $userRoot = $userFolder->getParent();
+
+        try {
+            /** @var Folder $thumbnailFolder */
+            $thumbnailFolder = $userRoot->get('thumbnails');
+        } catch (NotFoundException $e) {
+            return true;
+        }
+
+        $thumbnails = $thumbnailFolder->getDirectoryListing();
+
+        $start = $this->timeFactory->getTime();
+        foreach ($thumbnails as $thumbnail) {
+            try {
+                $thumbnail->delete();
+            } catch (NotPermittedException $e) {
+                // Ignore
+            }
+
+            if (($this->timeFactory->getTime() - $start) > 15) {
+                return false;
+            }
+        }
+
+        try {
+            $thumbnailFolder->delete();
+        } catch (NotPermittedException $e) {
+            // Ignore
+        }
+
+        return true;
+    }
 }

Please login to merge, or discard this patch.

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -72,17 +72,17 @@
 block discarded – undo
 	public function run($arguments) {
 		$uid = $arguments['uid'];
 		if (!$this->userManager->userExists($uid)) {
-			$this->logger->info('User no longer exists, skip user ' . $uid);
+			$this->logger->info('User no longer exists, skip user '.$uid);
 			return;
 		}
-		$this->logger->info('Started preview cleanup for ' . $uid);
+		$this->logger->info('Started preview cleanup for '.$uid);
 		$empty = $this->cleanupPreviews($uid);
 
 		if (!$empty) {
 			$this->jobList->add(self::class, ['uid' => $uid]);
-			$this->logger->info('New preview cleanup scheduled for ' . $uid);
+			$this->logger->info('New preview cleanup scheduled for '.$uid);
 		} else {
-			$this->logger->info('Preview cleanup done for ' . $uid);
+			$this->logger->info('Preview cleanup done for '.$uid);
 		}
 	}
 

Please login to merge, or discard this patch.

		@@ -33,100 +33,100 @@
		block discarded – undo
33	33	use OCP\IUserManager;
34	34
35	35	class CleanPreviewsBackgroundJob extends QueuedJob {
36		- /** @var IRootFolder */
37		- private $rootFolder;
38		-
39		- /** @var ILogger */
40		- private $logger;
41		-
42		- /** @var IJobList */
43		- private $jobList;
44		-
45		- /** @var ITimeFactory */
46		- private $timeFactory;
47		-
48		- /** @var IUserManager */
49		- private $userManager;
50		-
51		- /**
52		- * CleanPreviewsBackgroundJob constructor.
53		- *
54		- * @param IRootFolder $rootFolder
55		- * @param ILogger $logger
56		- * @param IJobList $jobList
57		- * @param ITimeFactory $timeFactory
58		- * @param IUserManager $userManager
59		- */
60		- public function __construct(IRootFolder $rootFolder,
61		- ILogger $logger,
62		- IJobList $jobList,
63		- ITimeFactory $timeFactory,
64		- IUserManager $userManager) {
65		- $this->rootFolder = $rootFolder;
66		- $this->logger = $logger;
67		- $this->jobList = $jobList;
68		- $this->timeFactory = $timeFactory;
69		- $this->userManager = $userManager;
70		- }
71		-
72		- public function run($arguments) {
73		- $uid = $arguments['uid'];
74		- if (!$this->userManager->userExists($uid)) {
75		- $this->logger->info('User no longer exists, skip user ' . $uid);
76		- return;
77		- }
78		- $this->logger->info('Started preview cleanup for ' . $uid);
79		- $empty = $this->cleanupPreviews($uid);
80		-
81		- if (!$empty) {
82		- $this->jobList->add(self::class, ['uid' => $uid]);
83		- $this->logger->info('New preview cleanup scheduled for ' . $uid);
84		- } else {
85		- $this->logger->info('Preview cleanup done for ' . $uid);
86		- }
87		- }
88		-
89		- /**
90		- * @param $uid
91		- * @return bool
92		- */
93		- private function cleanupPreviews($uid) {
94		- try {
95		- $userFolder = $this->rootFolder->getUserFolder($uid);
96		- } catch (NotFoundException $e) {
97		- return true;
98		- }
99		-
100		- $userRoot = $userFolder->getParent();
101		-
102		- try {
103		- /** @var Folder $thumbnailFolder */
104		- $thumbnailFolder = $userRoot->get('thumbnails');
105		- } catch (NotFoundException $e) {
106		- return true;
107		- }
108		-
109		- $thumbnails = $thumbnailFolder->getDirectoryListing();
110		-
111		- $start = $this->timeFactory->getTime();
112		- foreach ($thumbnails as $thumbnail) {
113		- try {
114		- $thumbnail->delete();
115		- } catch (NotPermittedException $e) {
116		- // Ignore
117		- }
118		-
119		- if (($this->timeFactory->getTime() - $start) > 15) {
120		- return false;
121		- }
122		- }
123		-
124		- try {
125		- $thumbnailFolder->delete();
126		- } catch (NotPermittedException $e) {
127		- // Ignore
128		- }
129		-
130		- return true;
131		- }
	36	+ /** @var IRootFolder */
	37	+ private $rootFolder;
	38	+
	39	+ /** @var ILogger */
	40	+ private $logger;
	41	+
	42	+ /** @var IJobList */
	43	+ private $jobList;
	44	+
	45	+ /** @var ITimeFactory */
	46	+ private $timeFactory;
	47	+
	48	+ /** @var IUserManager */
	49	+ private $userManager;
	50	+
	51	+ /**
	52	+ * CleanPreviewsBackgroundJob constructor.
	53	+ *
	54	+ * @param IRootFolder $rootFolder
	55	+ * @param ILogger $logger
	56	+ * @param IJobList $jobList
	57	+ * @param ITimeFactory $timeFactory
	58	+ * @param IUserManager $userManager
	59	+ */
	60	+ public function __construct(IRootFolder $rootFolder,
	61	+ ILogger $logger,
	62	+ IJobList $jobList,
	63	+ ITimeFactory $timeFactory,
	64	+ IUserManager $userManager) {
	65	+ $this->rootFolder = $rootFolder;
	66	+ $this->logger = $logger;
	67	+ $this->jobList = $jobList;
	68	+ $this->timeFactory = $timeFactory;
	69	+ $this->userManager = $userManager;
	70	+ }
	71	+
	72	+ public function run($arguments) {
	73	+ $uid = $arguments['uid'];
	74	+ if (!$this->userManager->userExists($uid)) {
	75	+ $this->logger->info('User no longer exists, skip user ' . $uid);
	76	+ return;
	77	+ }
	78	+ $this->logger->info('Started preview cleanup for ' . $uid);
	79	+ $empty = $this->cleanupPreviews($uid);
	80	+
	81	+ if (!$empty) {
	82	+ $this->jobList->add(self::class, ['uid' => $uid]);
	83	+ $this->logger->info('New preview cleanup scheduled for ' . $uid);
	84	+ } else {
	85	+ $this->logger->info('Preview cleanup done for ' . $uid);
	86	+ }
	87	+ }
	88	+
	89	+ /**
	90	+ * @param $uid
	91	+ * @return bool
	92	+ */
	93	+ private function cleanupPreviews($uid) {
	94	+ try {
	95	+ $userFolder = $this->rootFolder->getUserFolder($uid);
	96	+ } catch (NotFoundException $e) {
	97	+ return true;
	98	+ }
	99	+
	100	+ $userRoot = $userFolder->getParent();
	101	+
	102	+ try {
	103	+ /** @var Folder $thumbnailFolder */
	104	+ $thumbnailFolder = $userRoot->get('thumbnails');
	105	+ } catch (NotFoundException $e) {
	106	+ return true;
	107	+ }
	108	+
	109	+ $thumbnails = $thumbnailFolder->getDirectoryListing();
	110	+
	111	+ $start = $this->timeFactory->getTime();
	112	+ foreach ($thumbnails as $thumbnail) {
	113	+ try {
	114	+ $thumbnail->delete();
	115	+ } catch (NotPermittedException $e) {
	116	+ // Ignore
	117	+ }
	118	+
	119	+ if (($this->timeFactory->getTime() - $start) > 15) {
	120	+ return false;
	121	+ }
	122	+ }
	123	+
	124	+ try {
	125	+ $thumbnailFolder->delete();
	126	+ } catch (NotPermittedException $e) {
	127	+ // Ignore
	128	+ }
	129	+
	130	+ return true;
	131	+ }
132	132	}

		@@ -72,17 +72,17 @@
		block discarded – undo
72	72	public function run($arguments) {
73	73	$uid = $arguments['uid'];
74	74	if (!$this->userManager->userExists($uid)) {
75		- $this->logger->info('User no longer exists, skip user ' . $uid);
	75	+ $this->logger->info('User no longer exists, skip user '.$uid);
76	76	return;
77	77	}
78		- $this->logger->info('Started preview cleanup for ' . $uid);
	78	+ $this->logger->info('Started preview cleanup for '.$uid);
79	79	$empty = $this->cleanupPreviews($uid);
80	80
81	81	if (!$empty) {
82	82	$this->jobList->add(self::class, ['uid' => $uid]);
83		- $this->logger->info('New preview cleanup scheduled for ' . $uid);
	83	+ $this->logger->info('New preview cleanup scheduled for '.$uid);
84	84	} else {
85		- $this->logger->info('Preview cleanup done for ' . $uid);
	85	+ $this->logger->info('Preview cleanup done for '.$uid);
86	86	}
87	87	}
88	88

nextcloud / server

Pull Request — master (#7172)

Status

Category

Indentation +96 added lines, -96 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch