Fix asset uploading bug (#252)

* Fix asset uploading bug

* Switcheroo

Author: ryanmitchell

src/Assets/Asset.php

@@ -8,10 +8,12 @@
 use Statamic\Assets\AssetUploader as Uploader;
 use Statamic\Contracts\Assets\Asset as AssetContract;
 use Statamic\Data\HasDirtyState;
+use Statamic\Events\AssetUploaded;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Path;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class Asset extends FileAsset
 {
@@ -146,15 +148,19 @@ public static function makeModelFromContract(AssetContract $source, $meta = [])
             return null;
         }
 
+        $original = $source->getOriginal();
+
         $model = app('statamic.eloquent.assets.model')::firstOrNew([
             'container' => $source->containerHandle(),
-            'folder' => $source->folder(),
-            'basename' => $source->basename(),
+            'folder' => Arr::get($original, 'folder', $source->folder()),
+            'basename' => Arr::get($original, 'basename', $source->basename()),
         ])->fill([
             'meta' => $meta,
             'filename' => $source->filename(),
             'extension' => $extension,
             'path' => $source->path(),
+            'folder' => $source->folder(),
+            'basename' => $source->basename(),
         ]);
 
         // Set initial timestamps.
@@ -211,4 +217,32 @@ public function move($folder, $filename = null)
 
         return $this;
     }
+
+    /**
+     * Upload a file.
+     *
+     * @return $this
+     */
+    public function upload(UploadedFile $file)
+    {
+        $path = Uploader::asset($this)->upload($file);
+
+        $this
+            ->path($path)
+            ->save();
+
+        AssetUploaded::dispatch($this);
+
+        return $this;
+    }
+
+    public function getCurrentDirtyStateAttributes(): array
+    {
+        return array_merge([
+            'path' => $this->path(),
+            'folder' => $this->folder(),
+            'basename' => $this->basename(),
+            'data' => $this->data()->toArray(),
+        ]);
+    }
 }