This commit is contained in:
User
2025-01-18 19:05:23 -05:00
parent 3f282d6ecd
commit 14938f63df
23 changed files with 652 additions and 177 deletions

View File

@@ -3,11 +3,14 @@
namespace App\Http\Controllers;
use App\Helper\ZhConversion;
use App\Jobs\ComicInsert;
use App\Jobs\ComicUpsert;
use App\Jobs\ImageUpsert;
use App\Jobs\RemotePrefetch;
use App\Models\Author;
use App\Models\Chapter;
use App\Models\Comic;
use App\Models\ReadingHistory;
use App\Remote\CopyManga;
use App\Remote\ImageFetcher;
use GuzzleHttp\Exception\GuzzleException;
@@ -19,6 +22,7 @@ use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response as IlluminateHttpResponse;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use Inertia\Inertia;
use Inertia\Response;
@@ -30,12 +34,15 @@ class ComicController extends Controller
{
/**
* Autoload classes
*
* @param CopyManga $copyManga
* @param ZhConversion $zhConversion
*/
public function __construct(private readonly CopyManga $copyManga, private readonly ZhConversion $zhConversion)
{
}
public function __construct(
private readonly CopyManga $copyManga,
private readonly ZhConversion $zhConversion
) {}
/**
* Convert SC to ZH
@@ -61,10 +68,8 @@ class ComicController extends Controller
*/
public function favourites(Request $request): Response
{
$favourites = $this->scToZh($request->user()->favourites()->with(['authors'])->orderBy('upstream_updated_at', 'desc')->get());
return Inertia::render('Comic/Favourites', [
'favourites' => $favourites,
'favourites' => $this->scToZh($request->user()->favourites()->with(['authors'])->orderBy('upstream_updated_at', 'desc')->get()),
]);
}
@@ -84,16 +89,16 @@ class ComicController extends Controller
// Fetch from remote
$remoteComic = $this->copyManga->comic($request->pathword);
$comic = new Comic;
$comic->pathword = $remoteComic['comic']['path_word'];
$comic->name = $remoteComic['comic']['name'];
$comic->cover = $remoteComic['comic']['cover'];
$comic->upstream_updated_at = $remoteComic['comic']['datetime_updated'];
$comic->uuid = $remoteComic['comic']['uuid'];
$comic->alias = explode(',', $remoteComic['comic']['alias']);
$comic->description = $remoteComic['comic']['brief'];
$comic->metadata = $remoteComic;
$comic->save();
$comic = Comic::create([
'pathword' => $remoteComic['comic']['path_word'],
'name' => $remoteComic['comic']['name'],
'cover' => $remoteComic['comic']['cover'],
'upstream_updated_at' => $remoteComic['comic']['datetime_updated'],
'uuid' => $remoteComic['comic']['uuid'],
'alias' => explode(',', $remoteComic['comic']['alias']),
'description' => $remoteComic['comic']['brief'],
'metadata' => $remoteComic,
]);
}
// Set favourite
@@ -125,47 +130,6 @@ class ComicController extends Controller
]);
}
// Internal function for Upsert comics to db
protected function comicsUpsert($comics): void
{
// Prep the array for upsert
$comicsUpsertArray = [];
$authorsUpsertArray = [];
foreach ($comics['list'] as $comic) {
$comicsUpsertArray[] = [
'pathword' => $comic['path_word'],
'uuid' => '',
'name' => $comic['name'],
'alias' => '{}',
'description' => '',
'cover' => $comic['cover'],
'upstream_updated_at' => $comic['datetime_updated'] ?? null,
];
foreach ($comic['author'] as $author) {
$authorsUpsertArray[] = [
'name' => $author['name']
];
}
}
// Do an upsert for comics
Comic::upsert($comicsUpsertArray, uniqueBy: 'pathword', update: ['upstream_updated_at']);
Author::upsert($authorsUpsertArray, uniqueBy: 'name');
// Had to do a second pass to insert the relationships
foreach ($comics['list'] as $comic) {
// Get the comic id
$comicObj = Comic::where('pathword', $comic['path_word'])->first();
foreach ($comic['author'] as $author) {
$authorObj = Author::where('name', $author['name'])->first();
$comicObj->authors()->sync($authorObj);
}
}
}
/**
* Index / Tags for comic listing
*
@@ -180,12 +144,23 @@ class ComicController extends Controller
$params['theme'] = $request->get('tag');
}
$comics = $this->copyManga->comics(30, $request->header('offset', 0), $request->get('top', 'all'), $params);
$this->comicsUpsert($comics);
$offset = $request->header('offset', 0);
$comics = $this->copyManga->comics(30, $offset, $request->get('top', 'all'), $params);
// Upsert into DB
ComicUpsert::dispatch($comics);
// Prefetch next page
RemotePrefetch::dispatch('comics', [
'limit' => 30,
'offset' => $offset + 30,
'top' => $request->get('top', 'all'),
'params' => $params
])->delay(now()->addSecond());
return Inertia::render('Comic/Index', [
'comics' => $this->scToZh($comics),
'offset' => $request->header('offset', 0)
'offset' => $offset
]);
}
@@ -199,15 +174,15 @@ class ComicController extends Controller
*/
public function author(Request $request, string $author): Response
{
$params = [];
$params['author'] = $author;
$offset = $request->header('offset', 0);
$comics = $this->copyManga->comics(30, $offset, $request->get('top', 'all'), ['author' => $author]);
$comics = $this->copyManga->comics(30, $request->header('offset', 0), $request->get('top', 'all'), $params);
$this->comicsUpsert($comics);
// Upsert into DB
ComicUpsert::dispatch($comics);
return Inertia::render('Comic/Index', [
'comics' => $this->scToZh($comics),
'offset' => $request->header('offset', 0)
'offset' => $offset
]);
}
@@ -221,13 +196,14 @@ class ComicController extends Controller
*/
public function search(Request $request, string $search): Response
{
$comics = $this->copyManga->search($search, 30, $request->header('offset', 0));
$offset = $request->header('offset', 0);
$comics = $this->copyManga->search($search, 30, $offset);
// Search API is limited, no upsert
return Inertia::render('Comic/Index', [
'comics' => $this->scToZh($comics),
'offset' => $request->header('offset', 0)
'offset' => $offset
]);
}
@@ -245,8 +221,10 @@ class ComicController extends Controller
return to_route('comics.index');
}
$offset = $request->header('offset', 0);
$comic = $this->copyManga->comic($pathword);
$chapters = $this->copyManga->chapters($pathword, 200, $request->header('offset', 0), [], $request->get('group', 'default'));
$chapters = $this->copyManga->chapters($pathword, 200, $offset, [], $request->get('group', 'default'));
// Get the comic object and fill other parameters
try {
@@ -297,15 +275,20 @@ class ComicController extends Controller
// Do an upsert
Chapter::upsert($arrayForUpsert, uniqueBy: 'chapter_uuid');
// Get history
// Get user history
$histories = $request->user()->readingHistories()->where('reading_histories.comic_id', $comicObject->id)
->distinct()->select('chapter_uuid')->get()->pluck('chapter_uuid');
// Check if the first chapter is already fetched or not, if not, do a prefetch
if (!$histories->contains($chapters['list'][0]['uuid'])) {
RemotePrefetch::dispatch('chapter', ['pathword' => $pathword, 'uuid' => $chapters['list'][0]['uuid']]);
}
return Inertia::render('Comic/Chapters', [
'comic' => $this->scToZh($comic),
'chapters' => $this->scToZh($chapters),
'histories' => $histories,
'offset' => $request->header('offset', 0)
'offset' => $offset
]);
}
@@ -351,7 +334,7 @@ class ComicController extends Controller
try {
Chapter::where('chapter_uuid', $chapter['chapter']['next'])->firstOrFail()->images()->firstOrFail();
} catch (ModelNotFoundException $e) {
RemotePrefetch::dispatch('chapter', ['pathword' => $pathword, 'uuid' => $chapter['chapter']['next']]);
RemotePrefetch::dispatch('chapter', ['pathword' => $pathword, 'uuid' => $chapter['chapter']['next']]);
}
}
@@ -370,7 +353,48 @@ class ComicController extends Controller
*/
public function histories(Request $request): Response
{
// Get history
// Group by comic
if ($request->get('group', '') === 'comic') {
$readingHistory = ReadingHistory::query()
->join('comics', 'reading_histories.comic_id', '=', 'comics.id')
->join('chapters', 'reading_histories.chapter_id', '=', 'chapters.id')
->select(
'comics.id as comic_id',
'comics.name as comic_name',
'comics.pathword as comic_pathword',
'comics.upstream_updated_at as comic_upstream_updated_at',
'chapters.name as chapter_name',
'chapters.chapter_uuid as chapter_uuid',
'reading_histories.created_at as read_at'
)
->where('reading_histories.user_id', $request->user()->id)
->orderBy('comics.name')->orderByDesc('reading_histories.created_at')->paginate(2000);
// Transform the paginated data into a 2D array grouped by comic_id, including comic data and histories
$groupedData = $readingHistory->getCollection()
->groupBy('comic_id')->map(function (Collection $records, $comicId) {
$firstRecord = $records->first();
return [
'comic' => [
'comic_id' => $comicId,
'comic_name' => $firstRecord->comic_name,
'comic_pathword' => $firstRecord->comic_pathword,
'comic_upstream_updated_at' => $firstRecord->comic_upstream_updated_at,
],
'histories' => $records->map(fn($record) => [
'chapter_name' => $record->chapter_name,
'chapter_uuid' => $record->chapter_uuid,
'read_at' => $record->read_at,
])->toArray(),
];
})->values()->toArray(); // Use values() to reset numeric keys after grouping
return Inertia::render('Comic/HistoriesByComic', [
'histories' => $this->scToZh($groupedData)
]);
}
// Only order by chapter
$histories = $request->user()->readingHistories()->with(['comic:id,name,pathword'])->orderByDesc('reading_histories.created_at')
->select(['reading_histories.id as hid', 'chapters.comic_id', 'chapters.name'])->paginate(50)->toArray();
@@ -425,7 +449,7 @@ class ComicController extends Controller
*/
public function destroyHistories(Request $request): RedirectResponse
{
$result = $request->user()->cleanUpReadingHistories();
$request->user()->cleanUpReadingHistories();
return redirect()->route('comics.histories');
}

71
app/Jobs/ComicUpsert.php Normal file
View File

@@ -0,0 +1,71 @@
<?php
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;
/**
* Create a new job instance.
*/
public function __construct(
public array $comic,
) {}
/**
* Execute the job.
*/
public function handle(): void
{
$this->queueProgress(0);
Log::info("JOB ComicUpsert START");
$comicsUpsertArray = [];
$authorsUpsertArray = [];
foreach ($this->comic['list'] as $comic) {
$comicsUpsertArray[] = [
'pathword' => $comic['path_word'],
'uuid' => '',
'name' => $comic['name'],
'alias' => '{}',
'description' => '',
'cover' => $comic['cover'],
'upstream_updated_at' => $comic['datetime_updated'] ?? null,
];
foreach ($comic['author'] as $author) {
$authorsUpsertArray[] = [
'name' => $author['name']
];
}
}
// Do an upsert for comics
Comic::upsert($comicsUpsertArray, uniqueBy: 'pathword', update: ['upstream_updated_at']);
Author::upsert($authorsUpsertArray, uniqueBy: 'name');
// Had to do a second pass to insert the relationships
foreach ($this->comic['list'] as $comic) {
// Get the comic id
$comicObj = Comic::where('pathword', $comic['path_word'])->first();
foreach ($comic['author'] as $author) {
$authorObj = Author::where('name', $author['name'])->first();
$comicObj->authors()->sync($authorObj);
}
}
Log::info('JOB ComicUpsert END');
$this->queueProgress(100);
}
}

View File

@@ -6,10 +6,11 @@ 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 Queueable;
use IsMonitored, Queueable;
/**
* Create a new job instance.
@@ -25,7 +26,12 @@ 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 = [];
@@ -47,5 +53,6 @@ class ImageUpsert implements ShouldQueue
Image::upsert($arrayForUpsert, uniqueBy: 'url');
Log::info('JOB ImageUpsert END');
$this->queueProgress(100);
}
}

View File

@@ -6,10 +6,11 @@ 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 Queueable;
use IsMonitored, Queueable;
/**
* Create a new job instance.
@@ -24,11 +25,17 @@ 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']);
@@ -37,15 +44,25 @@ class RemotePrefetch implements ShouldQueue
case 'chapters':
// TODO:
break;
case 'index':
// TODO
break;
case 'tags':
// TODO
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']);
Log::info("JOB RemotePrefetch END, action '{$this->action}'");
break;
default:
Log::info("JOB RemotePrefetch Unknown action '{$this->action}'");
break;
}
$this->queueProgress(100);
}
}

View File

@@ -296,7 +296,7 @@ class CopyManga
public function legacyChapter(string $comic, string $chapter): array
{
$userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36";
$responses = $this->execute($this->legacyBuildUrl("comic/{$comic}/chapter/{$chapter}"), "GET", $userAgent, ttl: 24 * 60 * 60);
$responses = $this->execute($this->legacyBuildUrl("comic/{$comic}/chapter/{$chapter}"), "GET", $userAgent, ttl: 24 * 60 * 60 * 30);
// Get Content Key
$dom = new DOMDocument();
@@ -346,7 +346,7 @@ class CopyManga
*/
public function chapter(string $comic, string $chapter, array $parameters = []): array
{
$responses = $this->execute($this->buildUrl("comic/{$comic}/chapter2/{$chapter}", $parameters), ttl: 24 * 60 * 60);
$responses = $this->execute($this->buildUrl("comic/{$comic}/chapter2/{$chapter}", $parameters), ttl: 24 * 60 * 60 * 30);
if ($this->legacyImagesFetch) {
$responses['sorted'] = $this->legacyChapter($comic, $chapter);

View File

@@ -14,7 +14,7 @@ class ImageFetcher
'cache' => [
'enabled' => true,
'prefix' => 'image_fetcher_',
'ttl' => 3600,
'ttl' => 60 * 60 * 24 * 30,
],
'http' => [
'timeout' => 60,

View File

@@ -1,6 +1,7 @@
<?php
use App\Http\Middleware\HandleInertiaRequests;
use GuzzleHttp\Exception\ServerException;
use Illuminate\Foundation\Application;
use Illuminate\Foundation\Configuration\Exceptions;
use Illuminate\Foundation\Configuration\Middleware;
@@ -23,5 +24,9 @@ return Application::configure(basePath: dirname(__DIR__))
//
})
->withExceptions(function (Exceptions $exceptions) {
$exceptions->render(function (ServerException $e, Request $request) {
return response()->view('errors', status: 500);
});
Integration::handles($exceptions);
})->create();

BIN
bun.lockb

Binary file not shown.

View File

@@ -15,6 +15,7 @@
"laravel/tinker": "^2.9",
"plesk/ext-laravel-integration": "^7.0",
"predis/predis": "^2.0",
"romanzipp/laravel-queue-monitor": "^5.3",
"sentry/sentry-laravel": "^4.10",
"tightenco/ziggy": "^2.0"
},

124
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "641b7b21cd3231c89ab305cd615eeb6f",
"content-hash": "6f784bba21b3b875b87a164afa37ff36",
"packages": [
{
"name": "brick/math",
@@ -1189,16 +1189,16 @@
},
{
"name": "laravel/framework",
"version": "v11.37.0",
"version": "v11.38.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "6cb103d2024b087eae207654b3f4b26646119ba5"
"reference": "9d290aa90fcad44048bedca5219d2b872e98772a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/6cb103d2024b087eae207654b3f4b26646119ba5",
"reference": "6cb103d2024b087eae207654b3f4b26646119ba5",
"url": "https://api.github.com/repos/laravel/framework/zipball/9d290aa90fcad44048bedca5219d2b872e98772a",
"reference": "9d290aa90fcad44048bedca5219d2b872e98772a",
"shasum": ""
},
"require": {
@@ -1399,20 +1399,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2025-01-02T20:10:21+00:00"
"time": "2025-01-15T00:06:46+00:00"
},
{
"name": "laravel/prompts",
"version": "v0.3.2",
"version": "v0.3.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/prompts.git",
"reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f"
"reference": "749395fcd5f8f7530fe1f00dfa84eb22c83d94ea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/prompts/zipball/0e0535747c6b8d6d10adca8b68293cf4517abb0f",
"reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f",
"url": "https://api.github.com/repos/laravel/prompts/zipball/749395fcd5f8f7530fe1f00dfa84eb22c83d94ea",
"reference": "749395fcd5f8f7530fe1f00dfa84eb22c83d94ea",
"shasum": ""
},
"require": {
@@ -1456,9 +1456,9 @@
"description": "Add beautiful and user-friendly forms to your command-line applications.",
"support": {
"issues": "https://github.com/laravel/prompts/issues",
"source": "https://github.com/laravel/prompts/tree/v0.3.2"
"source": "https://github.com/laravel/prompts/tree/v0.3.3"
},
"time": "2024-11-12T14:59:47+00:00"
"time": "2024-12-30T15:53:31+00:00"
},
{
"name": "laravel/sanctum",
@@ -3681,6 +3681,76 @@
],
"time": "2024-04-27T21:32:50+00:00"
},
{
"name": "romanzipp/laravel-queue-monitor",
"version": "5.3.7",
"source": {
"type": "git",
"url": "https://github.com/romanzipp/Laravel-Queue-Monitor.git",
"reference": "7412f5315bbb2fa5ea4a05743d615e56b397a96e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/romanzipp/Laravel-Queue-Monitor/zipball/7412f5315bbb2fa5ea4a05743d615e56b397a96e",
"reference": "7412f5315bbb2fa5ea4a05743d615e56b397a96e",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-mbstring": "*",
"illuminate/database": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"illuminate/queue": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"illuminate/support": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"nesbot/carbon": "^2.0|^3.0",
"php": "^8.0"
},
"require-dev": {
"doctrine/dbal": "^3.1",
"friendsofphp/php-cs-fixer": "^3.0",
"laravel/framework": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"mockery/mockery": "^1.3.2",
"orchestra/testbench": ">=3.8",
"phpstan/phpstan": "^0.12.99|^1.0",
"phpunit/phpunit": "^8.5.23|^9.0|^10.5",
"romanzipp/php-cs-fixer-config": "^3.0"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"romanzipp\\QueueMonitor\\Providers\\QueueMonitorProvider"
]
}
},
"autoload": {
"psr-4": {
"romanzipp\\QueueMonitor\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "romanzipp",
"email": "ich@ich.wtf",
"homepage": "https://ich.wtf"
}
],
"description": "Queue Monitoring for Laravel Database Job Queue",
"support": {
"issues": "https://github.com/romanzipp/Laravel-Queue-Monitor/issues",
"source": "https://github.com/romanzipp/Laravel-Queue-Monitor/tree/5.3.7"
},
"funding": [
{
"url": "https://github.com/romanzipp",
"type": "github"
}
],
"time": "2024-12-05T14:46:27+00:00"
},
{
"name": "sentry/sentry",
"version": "4.10.0",
@@ -6966,16 +7036,16 @@
},
{
"name": "laravel/breeze",
"version": "v2.3.0",
"version": "v2.3.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/breeze.git",
"reference": "d59702967b9ae21879df905d691a50132966c4ff"
"reference": "60ac80abfa08c3c2dbc61e4b16f02230b843cfd3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/breeze/zipball/d59702967b9ae21879df905d691a50132966c4ff",
"reference": "d59702967b9ae21879df905d691a50132966c4ff",
"url": "https://api.github.com/repos/laravel/breeze/zipball/60ac80abfa08c3c2dbc61e4b16f02230b843cfd3",
"reference": "60ac80abfa08c3c2dbc61e4b16f02230b843cfd3",
"shasum": ""
},
"require": {
@@ -7023,7 +7093,7 @@
"issues": "https://github.com/laravel/breeze/issues",
"source": "https://github.com/laravel/breeze"
},
"time": "2024-12-14T21:21:42+00:00"
"time": "2025-01-13T16:52:29+00:00"
},
{
"name": "laravel/pail",
@@ -7105,16 +7175,16 @@
},
{
"name": "laravel/pint",
"version": "v1.19.0",
"version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/pint.git",
"reference": "8169513746e1bac70c85d6ea1524d9225d4886f0"
"reference": "53072e8ea22213a7ed168a8a15b96fbb8b82d44b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/pint/zipball/8169513746e1bac70c85d6ea1524d9225d4886f0",
"reference": "8169513746e1bac70c85d6ea1524d9225d4886f0",
"url": "https://api.github.com/repos/laravel/pint/zipball/53072e8ea22213a7ed168a8a15b96fbb8b82d44b",
"reference": "53072e8ea22213a7ed168a8a15b96fbb8b82d44b",
"shasum": ""
},
"require": {
@@ -7167,20 +7237,20 @@
"issues": "https://github.com/laravel/pint/issues",
"source": "https://github.com/laravel/pint"
},
"time": "2024-12-30T16:20:10+00:00"
"time": "2025-01-14T16:20:53+00:00"
},
{
"name": "laravel/sail",
"version": "v1.39.1",
"version": "v1.40.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/sail.git",
"reference": "1a3c7291bc88de983b66688919a4d298d68ddec7"
"reference": "237e70656d8eface4839de51d101284bd5d0cf71"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/sail/zipball/1a3c7291bc88de983b66688919a4d298d68ddec7",
"reference": "1a3c7291bc88de983b66688919a4d298d68ddec7",
"url": "https://api.github.com/repos/laravel/sail/zipball/237e70656d8eface4839de51d101284bd5d0cf71",
"reference": "237e70656d8eface4839de51d101284bd5d0cf71",
"shasum": ""
},
"require": {
@@ -7230,7 +7300,7 @@
"issues": "https://github.com/laravel/sail/issues",
"source": "https://github.com/laravel/sail"
},
"time": "2024-11-27T15:42:28+00:00"
"time": "2025-01-13T16:57:11+00:00"
},
{
"name": "mockery/mockery",

60
config/queue-monitor.php Normal file
View File

@@ -0,0 +1,60 @@
<?php
return [
// Set the table to be used for monitoring data.
'table' => 'queue_monitor',
'connection' => null,
/*
* Set the model used for monitoring.
* If using a custom model, be sure to implement the
* romanzipp\QueueMonitor\Models\Contracts\MonitorContract
* interface or extend the base model.
*/
'model' => \romanzipp\QueueMonitor\Models\Monitor::class,
// Determined if the queued jobs should be monitored
'monitor_queued_jobs' => true,
// Specify the max character length to use for storing exception backtraces.
'db_max_length_exception' => 4294967295,
'db_max_length_exception_message' => 65535,
// The optional UI settings.
'ui' => [
// Enable the UI
'enabled' => true,
// Accepts route group configuration
'route' => [
'prefix' => 'queues',
'middleware' => [],
],
// Set the monitored jobs count to be displayed per page.
'per_page' => 50,
// Show custom data stored on model
'show_custom_data' => true,
// Allow the deletion of single monitor items.
'allow_deletion' => true,
// Allow retry for a single failed monitor item.
'allow_retry' => true,
// Allow purging all monitor entries.
'allow_purge' => true,
'show_metrics' => true,
// Time frame used to calculate metrics values (in days).
'metrics_time_frame' => 14,
// The interval before refreshing the dashboard (in seconds).
'refresh_interval' => 5,
// Order the queued but not started jobs first
'order_queued_first' => false,
],
];

View File

@@ -0,0 +1,55 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use romanzipp\QueueMonitor\Enums\MonitorStatus;
class CreateQueueMonitorTable extends Migration
{
/**
* Get the customized connection name.
*
* @return string|null
*/
public function getConnection()
{
return config('queue-monitor.connection');
}
public function up()
{
Schema::create(config('queue-monitor.table'), function (Blueprint $table) {
$table->increments('id');
$table->uuid('job_uuid')->nullable();
$table->string('job_id')->index();
$table->string('name')->nullable();
$table->string('queue')->nullable();
$table->unsignedInteger('status')->default(MonitorStatus::RUNNING);
$table->dateTime('queued_at')->nullable();
$table->timestamp('started_at')->nullable()->index();
$table->string('started_at_exact')->nullable();
$table->timestamp('finished_at')->nullable();
$table->string('finished_at_exact')->nullable();
$table->integer('attempt')->default(0);
$table->boolean('retried')->default(false);
$table->integer('progress')->nullable();
$table->longText('exception')->nullable();
$table->text('exception_message')->nullable();
$table->text('exception_class')->nullable();
$table->longText('data')->nullable();
});
}
public function down()
{
Schema::drop(config('queue-monitor.table'));
}
}

View File

@@ -7,14 +7,14 @@
},
"devDependencies": {
"@headlessui/react": "^2.2.0",
"@inertiajs/react": "^2.0.0",
"@inertiajs/react": "^2.0.2",
"@tailwindcss/forms": "^0.5.10",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20",
"axios": "^1.7.9",
"concurrently": "^9.1.2",
"laravel-vite-plugin": "^1.1.1",
"postcss": "^8.4.49",
"postcss": "^8.5.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss": "^3.4.17",
@@ -35,7 +35,7 @@
"@radix-ui/react-tabs": "^1.1.2",
"@radix-ui/react-toast": "^1.2.4",
"@radix-ui/react-tooltip": "^1.1.6",
"@sentry/react": "^8.48.0",
"@sentry/react": "^8.50.0",
"@sentry/vite-plugin": "^2.23.0",
"@tanstack/react-table": "^8.20.6",
"class-variance-authority": "^0.7.1",

1
public/vendor/queue-monitor/app.css vendored Normal file

File diff suppressed because one or more lines are too long

View File

@@ -1,43 +1,13 @@
import { useEffect, useState } from 'react';
import { Link } from '@inertiajs/react';
import { Moon, Sun } from 'lucide-react';
import { Separator } from '@radix-ui/react-separator';
import { Tooltip, TooltipProvider, TooltipTrigger } from '@radix-ui/react-tooltip';
import { AppSidebar } from '@/components/ui/app-sidebar';
import { Breadcrumb, BreadcrumbItem, BreadcrumbLink, BreadcrumbList } from '@/components/ui/breadcrumb';
import { Button } from '@/components/ui/button';
import { SidebarInset, SidebarProvider, SidebarTrigger } from '@/components/ui/sidebar';
import { TooltipContent } from '@/components/ui/tooltip';
import { Toaster } from '@/components/ui/toaster';
export default function AppLayout({ auth, header, children, toolbar }) {
const getTheme = () => {
if (localStorage.getItem('theme')) {
return localStorage.getItem('theme');
}
return 'light';
}
const themeButtonOnclickHandler = (theme) => {
// Set local storage
localStorage.setItem('theme', theme);
setTheme(theme);
const root = window.document.documentElement;
root.classList.remove("light", "dark");
root.classList.add(theme);
}
const [theme, setTheme] = useState(getTheme());
useEffect(() => {
setTheme(getTheme());
}, []);
return (
<SidebarProvider>
<AppSidebar auth={ auth } />
@@ -56,20 +26,6 @@ export default function AppLayout({ auth, header, children, toolbar }) {
</BreadcrumbList>
</Breadcrumb>
<span className="flex gap-1 ml-auto justify-center content-center">
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
{ theme === 'dark' ? (<Button variant="link" size="icon" onClick={ () => themeButtonOnclickHandler('light') }>
<Sun />
</Button>) : (<Button variant="link" size="icon" onClick={ () => themeButtonOnclickHandler('dark') }>
<Moon />
</Button>) }
</TooltipTrigger>
<TooltipContent>
<p>Toggle day / night mode</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
{ toolbar }
</span>
</header>

View File

@@ -79,6 +79,12 @@ export default function Histories({ auth, histories }) {
<Button size="sm" variant="destructive" onClick={ () => removeDuplicatedButtonOnClickHandler() }>
Remove duplicates
</Button>
<Button size="sm" asChild>
<Link href="?group=comic">
Group by Comics
</Link>
</Button>
</div>
<Table>
<TableHeader>
@@ -135,5 +141,5 @@ export default function Histories({ auth, histories }) {
</div>
</div>
</AppLayout>
);
);
}

View File

@@ -0,0 +1,92 @@
import { useState } from 'react';
import { Head, Link, router } from '@inertiajs/react';
import AppLayout from '@/Layouts/AppLayout.jsx';
import { DateTime } from "luxon";
import { BreadcrumbItem, BreadcrumbPage, BreadcrumbSeparator } from "@/components/ui/breadcrumb";
import { Table, TableBody, TableCaption, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
import { Button } from "@/components/ui/button.jsx";
export default function Histories({ auth, histories }) {
const deleteButtonOnClickHandler = () => {
router.visit(route('comics.patchHistories'), {
data: (ids.length > 0) ? { ids: ids } : { ids: 'all' },
method: "PATCH",
only: ['histories'],
onSuccess: data => {
toast({
title: "All set",
description: `The histories has been deleted.`,
});
}
});
}
const removeDuplicatedButtonOnClickHandler = () => {
router.visit(route('comics.destroyHistories'), {
data: (ids.length > 0) ? { ids: ids } : { ids: 'all' },
method: "DELETE",
only: ['histories'],
onSuccess: data => {
toast({
title: "All set",
description: `The duplicated records has been deleted.`,
});
}
});
}
return (
<AppLayout auth={ auth } header={
<>
<BreadcrumbSeparator className="hidden lg:block" />
<BreadcrumbItem>
<BreadcrumbPage>Histories</BreadcrumbPage>
</BreadcrumbItem>
</>
}>
<Head>
<title>Histories</title>
</Head>
<div className="p-3 pt-1 w-[90%] mx-auto">
<div className="flex justify-end gap-2">
<Button size="sm" asChild>
<Link href="?group=">
Group by Chapter
</Link>
</Button>
</div>
<Table>
<TableHeader>
<TableRow>
<TableHead>Comic</TableHead>
<TableHead>Chapter</TableHead>
<TableHead>Read at</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{ histories.map((comic, i) =>
comic.histories.map((record, j) => (
<TableRow key={ j }>
{ (j === 0) ? <TableCell className="w-[40%]" rowspan={ comic.histories.length }>
<Link href={ route('comics.chapters', comic.comic.comic_pathword) }>
{ comic.comic.comic_name }
</Link>
</TableCell> : null }
<TableCell>
<Link href={ route('comics.read', [comic.comic.comic_pathword, record.chapter_uuid]) }>
{ record.chapter_name }
</Link>
</TableCell>
<TableCell>{ record.read_at }</TableCell>
</TableRow>
) )
) }
</TableBody>
</Table>
</div>
</AppLayout>
);
}

View File

@@ -12,11 +12,17 @@ import { useToast } from '@/hooks/use-toast.js';
export default function Index({ comics, offset, auth }) {
const url = new URL(window.location); //searchParams
const url = new URL(window.location); // searchParams
const [favourites, setFavourites] = useState(auth.user?.favourites ?? []);
const { toast } = useToast();
/**
* On click handler for the star
* Do posting and make a toast
*
* @param pathword
*/
const favouriteOnClickHandler = (pathword) => {
axios.post(route('comics.postFavourite'), { pathword: pathword }).then(res => {
setFavourites(res.data);
@@ -28,6 +34,12 @@ export default function Index({ comics, offset, auth }) {
});
}
/**
* Generate info card for comics
* @param props
* @returns {JSX.Element}
* @constructor
*/
const ComicCard = (props) => (
<Card>
<CardHeader>
@@ -41,7 +53,9 @@ export default function Index({ comics, offset, auth }) {
</div>
</CardHeader>
<CardContent>
<CardTitle><Link href={ `/comic/${ props.path_word }` }>{ props.name }</Link></CardTitle>
<CardTitle>
<Link href={ `/comic/${ props.path_word }` }>{ props.name }</Link>
</CardTitle>
<CardDescription className="pt-2">
{ props.author && props.author.map(a => (
<Badge className="m-1" key={ a.path_word } variant="outline">
@@ -53,6 +67,12 @@ export default function Index({ comics, offset, auth }) {
</Card>
);
/**
* Loop and return all info cards
* @param comics
* @returns {*}
* @constructor
*/
const ComicCards = (comics) => {
return comics.list.map((comic, i) => <ComicCard key={ i } { ...comic } />);
}

View File

@@ -1,6 +1,6 @@
import React, { useEffect, useLayoutEffect, useRef, useState } from 'react';
import { Head, Link, router } from '@inertiajs/react';
import AppLayout from '@/Layouts/AppLayout.jsx';
import React, { useEffect, useLayoutEffect, useRef, useState } from 'react';
import { ChevronFirst, ChevronLast, Rows3 } from 'lucide-react';
import { Tooltip, TooltipProvider, TooltipTrigger } from '@radix-ui/react-tooltip';
@@ -19,6 +19,7 @@ export default function Read({ auth, comic, chapter, chapters }) {
const validReadingModes = ['rtl', 'utd'];
const [readingMode, setReadingMode] = useState('rtl'); // rtl, utd
const [isInvertClickingZone, setIsInvertClickingZone] = useState(false);
const [isTwoPagesPerScreen, setIsTwoPagePerScreen] = useState(false); // TODO
const [currentImage, setCurrentImage] = useState(1);
@@ -35,9 +36,17 @@ export default function Read({ auth, comic, chapter, chapters }) {
return "rtl";
}
const getLocalStorageIsInvertClickingZone = () => {
if (window.localStorage.getItem('invertClickingZone') !== null && window.localStorage.getItem('invertClickingZone')) {
return window.localStorage.getItem('invertClickingZone') === 'true';
}
return false;
}
const getLocalStorageIsTwoPagePerScreen = () => {
if (window.localStorage.getItem('twoPagesPerScreen') !== null && validReadingModes.includes(window.localStorage.getItem('twoPagesPerScreen'))) {
return window.localStorage.getItem('twoPagesPerScreen');
if (window.localStorage.getItem('twoPagesPerScreen') !== null && window.localStorage.getItem('twoPagesPerScreen')) {
return window.localStorage.getItem('twoPagesPerScreen') === 'true';
}
return false;
@@ -68,6 +77,16 @@ export default function Read({ auth, comic, chapter, chapters }) {
}
}
const toggleInvertClickingZone = (e) => {
if (e) {
window.localStorage.setItem('invertClickingZone', true);
setIsInvertClickingZone(true);
} else {
window.localStorage.setItem('invertClickingZone', false);
setIsInvertClickingZone(false);
}
}
const toggleTwoPagesPerScreen = (e) => {
if (e) {
window.localStorage.setItem('twoPagesPerScreen', true);
@@ -114,24 +133,32 @@ export default function Read({ auth, comic, chapter, chapters }) {
const bounds = imgRef.current.getBoundingClientRect();
const percentage = (e.pageX - bounds.left) / imgRef.current.offsetWidth;
if (percentage < 0.45) {
const prevHandler = () => {
if (img.innerKey === 0 && chapter.chapter.prev) {
router.visit(route('comics.read', [comic.comic.path_word, chapter.chapter.prev]));
} else {
document.getElementById(`image-${img.innerKey - 1}`)?.scrollIntoView();
}
} else if (percentage > 0.55) {
}
const nextHandler = () => {
if (img.innerKey >= chapter.sorted.length - 1 && chapter.chapter.next) {
router.visit(route('comics.read', [comic.comic.path_word, chapter.chapter.next]));
} else {
document.getElementById(`image-${img.innerKey + 1}`)?.scrollIntoView();
}
}
// InvertClickingZone
if (percentage < 0.45 || percentage > 0.55) {
(percentage < 0.45) ^ isInvertClickingZone ? prevHandler() : nextHandler();
}
};
return (
<div className="basis-full">
<img alt={ comic.comic.name } className={` m-auto comic-img `} id={ `image-${ img.innerKey }` } ref={ imgRef }
<img alt={ comic.comic.name } className={` m-auto comic-img `} id={ `image-${ img.innerKey }` }
loading={ (img.innerKey < 5) ? "eager" : "lazy" } ref={ imgRef }
onClick={ handleImageClick } src={ `/image/${ btoa(img.url) }` } style={ imgStyles } />
</div>
);
@@ -166,7 +193,17 @@ export default function Read({ auth, comic, chapter, chapters }) {
<div className="space-y-4">
<div className="flex flex-row items-center justify-between rounded-lg border p-3 shadow-sm">
<div className="space-y-0.5">
<label>Two images per screen</label>
<label>Flip clicking zone</label>
<p>Turn on for clicking image on right side to previous one</p>
</div>
<Switch defaultChecked={ (isInvertClickingZone) }
onCheckedChange={ (e) => toggleInvertClickingZone(!isInvertClickingZone) } />
</div>
</div>
<div className="space-y-4">
<div className="flex flex-row items-center justify-between rounded-lg border p-3 shadow-sm">
<div className="space-y-0.5">
<label>Two images per screen TODO</label>
<p>Only applicable to RTL mode</p>
</div>
<Switch defaultChecked={ (isTwoPagesPerScreen) }
@@ -277,6 +314,7 @@ export default function Read({ auth, comic, chapter, chapters }) {
useEffect(() => {
setReadingMode(getLocalStorageReadingMode());
setIsInvertClickingZone(getLocalStorageIsInvertClickingZone());
setIsTwoPagePerScreen(getLocalStorageIsTwoPagePerScreen());
if (!ref.current) return;
@@ -333,7 +371,7 @@ export default function Read({ auth, comic, chapter, chapters }) {
<title>{ chapter.chapter.name.concat(" - ", comic.comic.name) }</title>
</Head>
<div className="p-3 pt-1 pb-1 flex flex-wrap justify-center" id="mvp" ref={ ref }
style={ { overflowAnchor: "none", height: "calc(100dvh - 90px)", overflowY: "scroll" } }>
style={{ overflowAnchor: "none", height: "calc(100dvh - 90px)", overflowY: "scroll" }}>
{ chapter.sorted.map((img, j) => <ImageForComic key={ j } innerKey={ j } { ...img } />) }
</div>
</AppLayout>

View File

@@ -38,6 +38,7 @@ export default function Installation({ auth }) {
<li>Generate Database tables <span className="rounded-md border m-1 p-1 font-mono text-sm shadow-sm">php artisan migrate</span></li>
<li>Install JS dependencies <span className="rounded-md border m-1 p-1 font-mono text-sm shadow-sm">bun install</span></li>
<li>Build frontend JS files <span className="rounded-md border m-1 p-1 font-mono text-sm shadow-sm">bun run build</span></li>
<li>Run background queue process <span className="rounded-md border m-1 p-1 font-mono text-sm shadow-sm">php artisan queue:listen</span></li>
<li>Visit <span className="rounded-md border m-1 p-1 font-mono text-sm shadow-sm">http://[url]/tags</span> to fetch initial dataset</li>
<li>It should be running?</li>
</ol>

View File

@@ -11,6 +11,22 @@ export default function Updates({ auth }) {
<title>Updates</title>
</Head>
<div className="p-3 pt-1">
<Card className="w-[90%] m-3 mx-auto">
<CardHeader>
<CardTitle>0.1.3</CardTitle>
<CardDescription>Release: 18 Jan 2025</CardDescription>
</CardHeader>
<CardContent>
<ul>
<li>Fixed: Theme initialization</li>
<li>Toggle clicking spot invert in reading page</li>
<li>Beta: Histories group by comics</li>
<li>Beta: Prefetch first chapter if unread comic clicked</li>
<li>Updated cache TTL</li>
<li>Moved theme toggle to sidebar</li>
</ul>
</CardContent>
</Card>
<Card className="w-[90%] m-3 mx-auto">
<CardHeader>
<CardTitle>0.1.2</CardTitle>

View File

@@ -1,7 +1,7 @@
import { useState } from 'react';
import { useEffect, useState } from 'react';
import { Link, router, usePage } from '@inertiajs/react';
import { BadgeCheck, ChevronsUpDown, Star, History, ChevronDown, LogOut, Search, Book, TableOfContents, House, HardDriveDownload } from 'lucide-react';
import { BadgeCheck, ChevronsUpDown, Star, History, ChevronDown, LogOut, Search, Book, TableOfContents, House, HardDriveDownload, Moon, Sun, Layers, SquarePower } from 'lucide-react';
import { Avatar, AvatarFallback } from '@/components/ui/avatar';
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible';
@@ -9,16 +9,15 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuItem,
import { Sidebar, SidebarContent, SidebarFooter, SidebarGroup, SidebarGroupContent, SidebarGroupLabel, SidebarHeader, SidebarInput, SidebarMenu, SidebarMenuBadge, SidebarMenuButton, SidebarMenuItem } from '@/components/ui/sidebar';
export function AppSidebar({ auth }) {
const { tags } = usePage().props;
const { tags } = usePage().props;
const [search, setSearch] = useState('');
const searchOnSubmitHandler = (e) => {
e.preventDefault();
// Visit the search page
router.get(route('comics.search', [search]), {}, {
});
// Visit the search page
router.get(route('comics.search', [search]));
}
const SidebarItem = (props) => {
@@ -44,6 +43,36 @@ export function AppSidebar({ auth }) {
);
};
const getTheme = () => {
if (localStorage.getItem('theme')) {
return localStorage.getItem('theme');
}
return 'light';
}
const themeButtonOnclickHandler = () => {
const t = (theme === 'light') ? 'dark' : 'light';
// Set local storage
localStorage.setItem('theme', t);
setTheme(t);
setThemeInHtml(t);
}
const setThemeInHtml = (theme) => {
const root = window.document.documentElement;
root.classList.remove("light", "dark");
root.classList.add(theme);
}
const [theme, setTheme] = useState(getTheme());
useEffect(() => {
setTheme(getTheme());
setThemeInHtml(getTheme());
}, []);
return (
<Sidebar>
<SidebarContent>
@@ -57,7 +86,7 @@ export function AppSidebar({ auth }) {
</div>
<div className="flex flex-col gap-0.5 leading-none">
<span className="font-semibold">Comic</span>
<span>0.1.2</span>
<span>0.1.3</span>
</div>
</Link>
</SidebarMenuButton>
@@ -147,8 +176,7 @@ export function AppSidebar({ auth }) {
<SidebarMenuItem>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<SidebarMenuButton
size="lg"
<SidebarMenuButton size="lg"
className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
>
<Avatar className="h-8 w-8 rounded-lg">
@@ -186,6 +214,13 @@ export function AppSidebar({ auth }) {
</DropdownMenuLabel>
<DropdownMenuSeparator />
<DropdownMenuGroup>
<DropdownMenuItem>
<SquarePower /> History On
</DropdownMenuItem>
<DropdownMenuItem onClick={ () => themeButtonOnclickHandler() }>
<>{ theme === 'dark' ? (<Sun />) : (<Moon />) } Toggle theme</>
</DropdownMenuItem>
<DropdownMenuItem asChild><a href="/queues" target="_blank"><Layers /> Queues</a></DropdownMenuItem>
<DropdownMenuItem asChild><Link href={ route('profile.edit') }><BadgeCheck /> Profile</Link></DropdownMenuItem>
<DropdownMenuItem asChild><Link href={ route('comics.favourites') }><Star /> Favourites</Link></DropdownMenuItem>
<DropdownMenuItem asChild><Link href={ route('comics.histories') }><History /> History</Link></DropdownMenuItem>

View File