Moving media generation to base class instead of separate class

src/Tasks/Build/Base.php

@@ -314,6 +314,51 @@ public function getDate()
         return date('Y-m-d');
     }
 
+    /**
+     * Copy the media files for an extension to the build folder
+     *
+     * @param   string  $name  The name of the extension to copy media files for
+     *
+     * @return  bool
+     *
+     * @since   1.0
+     */
+    public function buildMediaFiles($name)
+    {
+        $verbosity = $this->verbosityThreshold();
+        $this->setVerbosityThreshold(VerbosityThresholdInterface::VERBOSITY_VERBOSE);
+        $type   = substr($name, 0, 3);
+        $source = $this->getSourceFolder() . '/media/' . $name;
+        $target = $this->getBuildFolder() . '/media/' . $name;
+
+        if ($type == 'lib') {
+            $source = $this->getSourceFolder() . '/media/' . substr($name, 3);
+            $target = $this->getBuildFolder() . '/media/' . substr($name, 3);
+        }
+
+        $this->printTaskInfo("Building media folder " . $source . " for " . $name);
+
+        if (!file_exists($source)) {
+            $this->printTaskInfo("Folder " . $source . " does not exist!");
+
+            return false;
+        }
+
+        $this->taskFilesystemStack()
+            ->setVerbosityThreshold(VerbosityThresholdInterface::VERBOSITY_VERY_VERBOSE)
+            ->mkdir($target)
+            ->run();
+
+        $map = $this->copyTarget($source, $target);
+
+        $this->addFiles('media', $map);
+
+        $this->printTaskSuccess("Finished building media folder " . $source . " for " . $name);
+        $this->setVerbosityThreshold($verbosity);
+
+        return true;
+    }
+
     /**
      * Generate a list of files
      *

src/Tasks/Build/Component.php

@@ -100,11 +100,7 @@ public function run()
         // Build media (relative path)
         if ($this->hasMedia) {
             $this->logger->log(LogLevel::INFO, 'Copy media files', $this->getTaskContext());
-            $media = $this->buildMedia("media/com_" . $this->getExtensionName(), 'com_' . $this->getExtensionName(), $this->params);
-            $media->setVerbosityThreshold(VerbosityThresholdInterface::VERBOSITY_VERBOSE)
-                ->run();
-
-            $this->addFiles('media', $media->getResultFiles());
+            $this->buildMediaFiles('com_' . $this->getExtensionName());
         }
 
         // Build language files for the component

src/Tasks/Build/File.php

@@ -90,12 +90,6 @@ public function run()
             $this->addFiles('frontend', $frontendFiles);
         }
 
-        // Build media (relative path)
-        $media = $this->buildMedia("media/com_" . $this->getExtensionName(), 'com_' . $this->getExtensionName());
-        $media->run();
-
-        $this->addFiles('media', $media->getResultFiles());
-
         // Build language files for the component
         $language = $this->buildLanguage("com_" . $this->getExtensionName());
         $language->run();

src/Tasks/Build/Library.php

@@ -88,11 +88,7 @@ public function run()
         }
 
         // Build media (relative path)
-        $media = $this->buildMedia("media/" . $lib, $lib);
-        $media->setVerbosityThreshold(VerbosityThresholdInterface::VERBOSITY_VERBOSE)
-            ->run();
-
-        $this->addFiles('media', $media->getResultFiles());
+        $this->buildMediaFiles($this->libName);
 
         // Build language files for the component
         $language = $this->buildLanguage($lib)

src/Tasks/Build/Module.php

@@ -67,11 +67,7 @@ public function run()
         $files = $this->copyTarget($this->source, $this->target);
 
         // Build media (relative path)
-        $media = $this->buildMedia("media/" . $this->modName, $this->modName);
-        $media->setVerbosityThreshold(VerbosityThresholdInterface::VERBOSITY_VERBOSE)
-            ->run();
-
-        $this->addFiles('media', $media->getResultFiles());
+        $this->buildMediaFiles($this->modName);
 
         // Build language files for the module
         if (is_dir($this->getSourceFolder() . '/language')) {

src/Tasks/Build/Plugin.php

@@ -71,11 +71,7 @@ public function run()
         $files = $this->copyTarget($this->source, $this->target);
 
         // Build media (relative path)
-        $media = $this->buildMedia("media/plg_" . $this->plgType . "_" . $this->plgName, 'plg_' . $this->plgType . "_" . $this->plgName);
-        $media->setVerbosityThreshold(VerbosityThresholdInterface::VERBOSITY_VERBOSE)
-            ->run();
-
-        $this->addFiles('media', $media->getResultFiles());
+        $this->buildMediaFiles('plg_' . $this->plgType . '_' . $this->plgName);
 
         // Build language files
         if (is_dir($this->getSourceFolder() . '/administrator/language')) {

src/Tasks/Build/Tasks.php

@@ -41,21 +41,6 @@ protected function buildComponent($name, $params = [])
         return $this->task(Component::class, $name, $params);
     }
 
-    /**
-     * Build media folder
-     *
-     * @param   string   $source   The media folder (an extension could have multiple)
-     * @param   string   $extName  The extension name (e.g. mod_xy)
-     *
-     * @return  CollectionBuilder
-     *
-     * @since   1.0
-     */
-    protected function buildMedia($source, $extName, $params = [])
-    {
-        return $this->task(Media::class, $source, $extName, $params);
-    }
-
     /**
      * Build language folder
      *

src/Tasks/Build/Template.php

@@ -67,11 +67,7 @@ public function run()
         $files = $this->copyTarget($this->source, $this->target);
 
         // Build media (relative path)
-        $media = $this->buildMedia("media/" . $this->templateName, $this->templateName);
-        $media->setVerbosityThreshold(VerbosityThresholdInterface::VERBOSITY_VERBOSE)
-            ->run();
-
-        $this->addFiles('media', $media->getResultFiles());
+        $this->buildMediaFiles('tpl_' . $this->templateName);
 
         // Build language files for the component
         if (is_dir($this->getSourceFolder() . '/language')) {