0.1.4

app/Http/Controllers/ComicController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Helper\ZhConversion;
-use App\Jobs\ComicInsert;
 use App\Jobs\ComicUpsert;
 use App\Jobs\ImageUpsert;
 use App\Jobs\RemotePrefetch;
@@ -224,7 +223,7 @@ class ComicController extends Controller
         $offset = $request->header('offset', 0);
 
         $comic = $this->copyManga->comic($pathword);
-        $chapters = $this->copyManga->chapters($pathword, 200, $offset, [], $request->get('group', 'default'));
+        $chapters = $this->copyManga->chapters($pathword, 200, $offset, [], $request->get('group', 'default'), $request->get('reload', false));
 
         // Get the comic object and fill other parameters
         try {

app/Jobs/ComicUpsert.php

@@ -4,15 +4,13 @@ namespace App\Jobs;
 
 use App\Models\Author;
 use App\Models\Comic;
-use App\Models\Image;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Support\Facades\Log;
-use romanzipp\QueueMonitor\Traits\IsMonitored;
 
 class ComicUpsert implements ShouldQueue
 {
-    use IsMonitored, Queueable;
+    use Queueable;
 
     /**
      * Create a new job instance.
@@ -26,7 +24,6 @@ class ComicUpsert implements ShouldQueue
      */
     public function handle(): void
     {
-        $this->queueProgress(0);
         Log::info("JOB ComicUpsert START");
 
         $comicsUpsertArray = [];
@@ -66,6 +63,5 @@ class ComicUpsert implements ShouldQueue
         }
 
         Log::info('JOB ComicUpsert END');
-        $this->queueProgress(100);
     }
 }

app/Jobs/ImageUpsert.php

@@ -6,11 +6,10 @@ use App\Models\Image;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Support\Facades\Log;
-use romanzipp\QueueMonitor\Traits\IsMonitored;
 
 class ImageUpsert implements ShouldQueue
 {
-    use IsMonitored, Queueable;
+    use Queueable;
 
     /**
      * Create a new job instance.
@@ -26,12 +25,7 @@ class ImageUpsert implements ShouldQueue
      */
     public function handle(): void
     {
-        $this->queueProgress(0);
         Log::info("JOB ImageUpsert START, comicId: {$this->comicId}, chapterId: {$this->chapterId}");
-        $this->queueData([
-            'comicId' => $this->comicId,
-            'chapterId' => $this->chapterId,
-        ]);
 
         $arrayForUpsert = [];
 
@@ -53,6 +47,5 @@ class ImageUpsert implements ShouldQueue
         Image::upsert($arrayForUpsert, uniqueBy: 'url');
 
         Log::info('JOB ImageUpsert END');
-        $this->queueProgress(100);
     }
 }

app/Jobs/RemotePrefetch.php

@@ -6,11 +6,10 @@ use App\Remote\CopyManga;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Support\Facades\Log;
-use romanzipp\QueueMonitor\Traits\IsMonitored;
 
 class RemotePrefetch implements ShouldQueue
 {
-    use IsMonitored, Queueable;
+    use Queueable;
 
     /**
      * Create a new job instance.
@@ -25,17 +24,11 @@ class RemotePrefetch implements ShouldQueue
      */
     public function handle(): void
     {
-        $this->queueProgress(0);
         $copyManga = new CopyManga();
 
         switch ($this->action) {
             case 'chapter':
                 Log::info("JOB RemotePrefetch START, action '{$this->action}', Pathword: {$this->parameters['pathword']}, UUID: {$this->parameters['uuid']}");
-                $this->queueData([
-                    'action' => $this->action,
-                    'pathword' => $this->parameters['pathword'],
-                    'uuid' => $this->parameters['uuid']
-                ]);
 
                 $copyManga->chapter($this->parameters['pathword'], $this->parameters['uuid']);
 
@@ -46,13 +39,6 @@ class RemotePrefetch implements ShouldQueue
                 break;
             case 'comics':
                 Log::info("JOB RemotePrefetch START, action '{$this->action}', Offset: {$this->parameters['offset']}");
-                $this->queueData([
-                    'action' => $this->action,
-                    'offset' => $this->parameters['offset'],
-                    'limit' => $this->parameters['limit'],
-                    'top' => $this->parameters['top'],
-                    'params' => $this->parameters['params']
-                ]);
 
                 $copyManga->comics($this->parameters['offset'], $this->parameters['limit'], $this->parameters['top'], $this->parameters['params']);
 
@@ -62,7 +48,5 @@ class RemotePrefetch implements ShouldQueue
                 Log::info("JOB RemotePrefetch Unknown action '{$this->action}'");
                 break;
         }
-
-        $this->queueProgress(100);
     }
 }

app/Remote/CopyManga.php

@@ -123,19 +123,24 @@ class CopyManga
      * @param string $method
      * @param string $userAgent
      * @param int $ttl
+     * @param bool $force
      * @return mixed|string
      * @throws GuzzleException
      */
-    protected function execute(string $url, string $method = 'GET', string $userAgent = "", int $ttl = 0): mixed
+    protected function execute(string $url, string $method = 'GET', string $userAgent = "", int $ttl = 0, bool $force = false): mixed
     {
-        if ($this->options['caching']) {
-            // Check cache exist
-            if (Cache::has("URL_{$url}")) {
-                $cache = Cache::get("URL_{$url}");
-                if (isset($cache['type']) && $cache['type'] == 'HTML') {
-                    return $cache['response'];
-                } else {
-                    return $cache;
+        if ($force) {
+            $this->forget($url);
+        } else {
+            if ($this->options['caching']) {
+                // Check cache exist
+                if (Cache::has("URL_{$url}")) {
+                    $cache = Cache::get("URL_{$url}");
+                    if (isset($cache['type']) && $cache['type'] == 'HTML') {
+                        return $cache['response'];
+                    } else {
+                        return $cache;
+                    }
                 }
             }
         }
@@ -178,6 +183,17 @@ class CopyManga
         }
     }
 
+    /**
+     * Remove a cache with key
+     *
+     * @param string $url
+     * @return void
+     */
+    public function forget(string $url): void
+    {
+        Cache::forget("URL_{$url}");
+    }
+
     /**
      * Get tags available
      *
@@ -256,16 +272,17 @@ class CopyManga
      * @param int $offset
      * @param array $parameters
      * @param string $group
+     * @param bool $force
      * @return mixed|string
      * @throws GuzzleException
      */
-    public function chapters(string $comic, int $limit = 200, int $offset = 0, array $parameters = [], string $group = "default"): mixed
+    public function chapters(string $comic, int $limit = 200, int $offset = 0, array $parameters = [], string $group = "default", bool $force = false): mixed
     {
         $parameters['limit'] = $limit;
         $parameters['offset'] = $offset;
         $options = $this->execute($this->buildUrl("comic/{$comic}/group/{$group}/chapters", $parameters, false), 'OPTIONS');
 
-        return $this->execute($this->buildUrl("comic/{$comic}/group/{$group}/chapters", $parameters), ttl: 24 * 60 * 60);
+        return $this->execute($this->buildUrl("comic/{$comic}/group/{$group}/chapters", $parameters), ttl: 24 * 60 * 60, force: $force);
     }
 
     /**