refactor for readability

spatie · May 15, 2018 · c51be87 · c51be87
1 parent 2896e1d
commit c51be87
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/src/Commands/RegenerateCommand.php b/src/Commands/RegenerateCommand.php
@@ -40,7 +40,7 @@ public function __construct(MediaRepository $mediaRepository, FileManipulator $f
 
     public function handle()
     {
-        if (! $this->confirmToProceed()) {
+        if (!$this->confirmToProceed()) {
             return;
         }
 
@@ -80,22 +80,31 @@ public function handle()
     public function getMediaToBeRegenerated(): Collection
     {
         $modelType = $this->argument('modelType') ?? '';
-        $mediaIds = $this->option('ids');
+        $mediaIds = $this->getMediaIds();
 
-        if ($modelType === '' && ! $mediaIds) {
+        if ($modelType === '' && count($mediaIds) === 0) {
             return $this->mediaRepository->all();
         }
 
-        if ($mediaIds) {
-            if (! is_array($mediaIds)) {
-                $mediaIds = explode(',', $mediaIds);
-            } elseif (count($mediaIds) === 1 && str_contains($mediaIds[0], ',')) {
-                $mediaIds = explode(',', $mediaIds[0]);
-            }
+        if (!count($mediaIds)) {
+            return $this->mediaRepository->getByModelType($modelType);
+        }
+
+        return $this->mediaRepository->getByIds($mediaIds);
+    }
+
+    protected function getMediaIds(): array
+    {
+        $mediaIds = $this->option('ids');
+
+        if (!is_array($mediaIds)) {
+            $mediaIds = explode(',', $mediaIds);
+        }
 
-            return $this->mediaRepository->getByIds($mediaIds);
+        if (count($mediaIds) === 1 && str_contains($mediaIds[0], ',')) {
+            $mediaIds = explode(',', $mediaIds[0]);
         }
 
-        return $this->mediaRepository->getByModelType($modelType);
+        return $mediaIds;
     }
 }