update: Dropping redundant url column from database

Author: jstnmthw

app/Console/Commands/ImportBatchMediaCSV.php

@@ -16,7 +16,7 @@ class ImportBatchMediaCSV extends Command
      * @var string
      */
     protected $signature = 'media:csv:batch-import
-                            { --path= : Directory where files are located }';
+                            { path : Directory where files are located }';
 
     /**
      * The console command description.
@@ -42,7 +42,7 @@ public function __construct()
      */
     public function handle(): int
     {
-        $path = $this->option('path');
+        $path = $this->argument('path');
         $fi = new FilesystemIterator($path);
         $fc = iterator_count($fi);
         $this->comment('Importing ' .$fc. ' CSV files into Media database...');

app/Console/Commands/ImportMediaCSV.php

@@ -40,6 +40,7 @@ public function __construct()
      */
     public function handle(): int
     {
+        $pattern = '(.*\/embed\/)([a-zA-Z0-9]*)(.)*';
         $this->comment('Starting CSV import to MySQL...');
         $query =
             'LOAD DATA INFILE "'.$this->argument('file').'" IGNORE
@@ -49,8 +50,7 @@ public function handle(): int
             LINES TERMINATED BY "\n"
             (@url, thumbnail, album, title, @tags, categories, @author, duration, views, @likes, @dislikes, @dummy, @dummy)
             SET author = IF(@author = "", NULL, @author),
-                url = SUBSTRING(@url,14,45),
-                unique_key = SUBSTRING(@url,44,15),
+                unique_key = REGEXP_REPLACE(@url,"'.$pattern.'", "$2"),
                 likes = IF(@likes = "", 0, @likes),
                 dislikes = IF(@dislikes = "", 0, @dislikes),
                 created_at = CURRENT_TIMESTAMP,
@@ -61,4 +61,4 @@ public function handle(): int
         $this->info('Done.');
         return 0;
     }
-}
+}

app/Media.php

@@ -28,7 +28,6 @@ class Media extends Model
      * @var array
      */
     protected $fillable = [
-        'url',
         'unique_key',
         'thumbnail',
         'album',
@@ -59,7 +58,6 @@ public function toSearchableArray(): array
     {
         return $this->only([
             'id',
-            'url',
             'unique_key',
             'thumbnail',
             'album',

config/const.php

@@ -18,4 +18,5 @@
     'media_new_fn' => env('MEDIA_NEW_FILE_NAME', ''),
     'media_new_unzipped' => env('MEDIA_NEW_FILE_UNZIPPED', ''),
     'media_cdn_url' => env('MEDIA_CDN_URL', ''),
+    'media_embed_url' => env('MEDIA_EMBED_URL', ''),
 ];

database/migrations/2020_04_13_073834_media.php

@@ -16,7 +16,6 @@ public function up()
         Schema::create('media', function (Blueprint $table) {
             $table->id();
             $table->text('unique_key');
-            $table->text('url');
             $table->text('thumbnail');
             $table->text('album');
             $table->text('title');

public/vendor/telescope/app-dark.css

@@ -223,8 +223,7 @@ export default {
       // Clear iframe src
       document.getElementById('video').setAttribute('src', '')
 
-      let key = this.$route.params.slug
-      key = key.substring(key.length - 15, key.length)
+      let key = this.$route.params.slug.split('-').pop()
 
       // Make the call
       await axios
@@ -238,7 +237,9 @@ export default {
           this.getRelated(12)
           document
             .querySelector('#video')
-            .contentWindow.location.replace(this.data.url)
+            .contentWindow.location.replace(
+              window.embedUrl + this.data.unique_key
+            )
         })
         .catch((error) => {
           console.log(error)

public/vendor/telescope/app.css

@@ -40,6 +40,9 @@
     <noscript><link rel="stylesheet" href="{{ mix('css/app.css') }}"></noscript>
 
     <!-- Javascript -->
+    <script>
+        window.embedUrl = "{{ config('const.media_embed_url') }}";
+    </script>
     <script src="{{ mix('js/app.js') }}" defer></script>
 </body>
 </html>