Fix asset import bug (#227)

Author: ryanmitchell

src/Assets/Asset.php

@@ -6,6 +6,7 @@
 use Illuminate\Support\Facades\Cache;
 use Statamic\Assets\Asset as FileAsset;
 use Statamic\Assets\AssetUploader as Uploader;
+use Statamic\Contracts\Assets\Asset as AssetContract;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Path;
 use Statamic\Support\Arr;
@@ -115,15 +116,26 @@ public function writeMeta($meta)
     {
         $meta['data'] = Arr::removeNullValues($meta['data']);
 
+        self::makeModelFromContract($this, $meta);
+
+        Blink::put('eloquent-asset-meta-exists-'.$this->id(), true);
+    }
+
+    public static function makeModelFromContract(AssetContract $source, $meta = [])
+    {
+        if (! $meta) {
+            $meta = $source->meta();
+        }
+
         $model = app('statamic.eloquent.assets.model')::firstOrNew([
-            'container' => $this->containerHandle(),
-            'folder' => $this->folder(),
-            'basename' => $this->basename(),
+            'container' => $source->containerHandle(),
+            'folder' => $source->folder(),
+            'basename' => $source->basename(),
         ])->fill([
             'meta' => $meta,
-            'filename' => $this->filename(),
-            'extension' => $this->extension(),
-            'path' => $this->path(),
+            'filename' => $source->filename(),
+            'extension' => $source->extension(),
+            'path' => $source->path(),
         ]);
 
         // Set initial timestamps.
@@ -134,7 +146,7 @@ public function writeMeta($meta)
 
         $model->save();
 
-        Blink::put('eloquent-asset-meta-exists-'.$this->id(), true);
+        return $model;
     }
 
     public function metaPath()

src/Commands/ImportAssets.php

@@ -4,17 +4,17 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Facade;
+use Statamic\Assets\AssetContainerContents;
 use Statamic\Assets\AssetRepository;
 use Statamic\Console\RunsInPlease;
-use Statamic\Contracts\Assets\Asset as AssetContract;
+use Statamic\Contracts\Assets\Asset;
 use Statamic\Contracts\Assets\AssetContainer as AssetContainerContract;
 use Statamic\Contracts\Assets\AssetContainerRepository as AssetContainerRepositoryContract;
 use Statamic\Contracts\Assets\AssetRepository as AssetRepositoryContract;
-use Statamic\Eloquent\Assets\Asset;
+use Statamic\Eloquent\Assets\Asset as EloquentAsset;
 use Statamic\Eloquent\Assets\AssetContainer;
 use Statamic\Facades\Asset as AssetFacade;
 use Statamic\Facades\AssetContainer as AssetContainerFacade;
-use Statamic\Facades\YAML;
 use Statamic\Stache\Repositories\AssetContainerRepository;
 use Statamic\Statamic;
 
@@ -61,6 +61,10 @@ private function useDefaultRepositories()
 
         app()->bind(AssetContainerContract::class, AssetContainer::class);
         app()->bind(AssetContract::class, Asset::class);
+
+        app()->bind(AssetContainerContents::class, function ($app) {
+            return new AssetContainerContents();
+        });
     }
 
     private function importAssetContainers()
@@ -89,10 +93,7 @@ private function importAssets()
         $assets = AssetFacade::all();
 
         $this->withProgressBar($assets, function ($asset) {
-            if ($contents = $asset->disk()->get($path = $asset->metaPath())) {
-                $metadata = YAML::file($path)->parse($contents);
-                $asset->writeMeta($metadata);
-            }
+            EloquentAsset::makeModelFromContract($asset);
         });
 
         $this->newLine();