refactoring

Author: miladimos

src/Services/AttachmentService.php

@@ -6,6 +6,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\UploadedFile;
 use Intervention\Image\Facades\Image;
+use Laravelir\Attachmentable\Models\Attachment;
 
 
 final class AttachmentService extends Service
@@ -46,7 +47,6 @@ public function attach($file, $attachmentable)
             'disk' => $this->disk,
         ]);
 
-
     }
 
     public function detach($file)
@@ -138,20 +138,6 @@ function mkdir_if_not_exists($dirPath)
         }
     }
 
-    public function output($disposition = 'inline')
-    {
-
-        header("Content-type: " . $this->filetype);
-        header('Content-Disposition: ' . $disposition . '; filename="' . $this->filename . '"');
-        header('Cache-Control: private');
-        header('Cache-Control: no-store, no-cache, must-revalidate');
-        header('Cache-Control: pre-check=0, post-check=0, max-age=0');
-        header('Accept-Ranges: bytes');
-        header('Content-Length: ' . $this->filesize);
-
-        exit($this->getContents());
-    }
-
     public function isFile($file): bool
     {
         return true;
@@ -162,5 +148,4 @@ public function isImage($file): bool
         return true;
     }
 
-
 }

src/Services/DownloadService.php

@@ -13,20 +13,21 @@ public function __construct()
 
     public function download($id, Request $request)
     {
-        $disposition = ($disposition = $request->input('disposition')) === 'inline' ? $disposition : 'attachment';
-
-        if ($file = $this->model->where('uuid', $id)->first()) {
-            try {
-                if (!$file->output($disposition)) {
-                    abort(403, Lang::get('attachments::messages.errors.access_denied'));
-                }
-            } catch (FileNotFoundException $e) {
-                abort(404, Lang::get('attachments::messages.errors.file_not_found'));
-            }
-        }
-
-        abort(404, Lang::get('attachments::messages.errors.file_not_found'));
+        if ($file = $this->model->where('uuid', $id)->first()) {}
     }
 
+    public function output($disposition = 'inline')
+    {
+
+        header("Content-type: " . $this->filetype);
+        header('Content-Disposition: ' . $disposition . '; filename="' . $this->filename . '"');
+        header('Cache-Control: private');
+        header('Cache-Control: no-store, no-cache, must-revalidate');
+        header('Cache-Control: pre-check=0, post-check=0, max-age=0');
+        header('Accept-Ranges: bytes');
+        header('Content-Length: ' . $this->filesize);
+
+        exit($this->getContents());
+    }
 
 }

src/Services/Service.php

@@ -82,7 +82,6 @@ public function getFileUrl($file)
         }
     }
 
-
     public function setFileMetadata($file)
     {
         $data = [

src/Services/mt.php

@@ -33,4 +33,8 @@
 //    return $this;
 //}
 
-
+//
+//public function attachFromUrl($url, array $options = null)
+//{
+//    # code...
+//}

src/Traits/Attachmentable.php

@@ -3,12 +3,8 @@
 namespace Laravelir\Attachmentable\Traits;
 
 use Illuminate\Database\Eloquent\Relations\MorphMany;
-use Illuminate\Support\Arr;
-use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Facades\Lang;
 use Laravelir\Attachmentable\Models\Attachment;
-use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Laravelir\Attachmentable\Services\AttachmentService;
 
 trait Attachmentable
@@ -40,59 +36,18 @@ public function attach($file, $path = null): bool
         return false;
     }
 
-    public function hasAttachment($key)
+    public function detach(): bool
     {
-        # code...
+        return true;
     }
 
-    public function clearAttachments($group)
+    public function hasAttachment($key): bool
     {
-        # code...
+        return true;
     }
 
-    public function attachFromUrl($url, array $options = null)
+    public function clearAttachments(): bool
     {
-        # code...
+        return true;
     }
-
-    public static function attach3($uuid, $model, $options = [])
-    {
-        /** @var Attachment $attachment */
-        $attachment = self::where('uuid', $uuid)->first();
-
-        if (!$attachment) {
-            return null;
-        }
-
-        // The dz_session_key is set by the build-in DropzoneController for security check
-        if ($attachment->metadata('dz_session_key')) {
-            $meta = $attachment->metadata;
-
-            unset($meta['dz_session_key']);
-
-            $attachment->metadata = $meta;
-        }
-
-        $options = Arr::only($options, config('attachments.attributes'));
-
-        $attachment->fill($options);
-
-        if ($found = $model->attachments()->where('key', '=', $attachment->key)->first()) {
-            $found->delete();
-        }
-
-        return $attachment->model()->associate($model)->save() ? $attachment : null;
-    }
-
-    public function deleteOne()
-    {
-        # code
-    }
-
-    public function delete()
-    {
-        # code
-    }
-
-
 }

src/Traits/Attachmentorable.php

@@ -16,15 +16,6 @@ public function attachments(): MorphMany
 
     public function attach(Model $model, UploadedFile $file, array $option = null): bool
     {
-        if (!$model instanceof Model) {
-            return false;
-        }
-
-        $model->attachments()->create([
-            'attachmentorable_id' => $this->id,
-            'attachmentorable_type' => get_class($this),
-        ]);
-
         return true;
     }