Compare commits

..

3 Commits

Author SHA1 Message Date
c0a22e875c Fix duplicate download entries and add constraint 2025-09-22 00:18:22 +02:00
4697073e9f Replace old download search with new patreon file search 2025-09-21 23:49:58 +02:00
9be33db14f Improve patreon filebrowser 2025-09-21 23:10:53 +02:00
8 changed files with 101 additions and 239 deletions

View File

@@ -1,60 +0,0 @@
<?php
namespace App\Livewire;
use App\Models\Hentai;
use Livewire\Component;
use Livewire\WithPagination;
class Downloads extends Component
{
use WithPagination;
public $search;
public $order = 'az';
public $withTorrents;
protected $queryString = [
'search' => ['except' => '', 'as' => 's'],
'withTorrents' => ['withTorrents' => '', 'as' => 'withTorrents'],
'order' => ['except' => '', 'as' => 'order'],
];
public function updatingSearch()
{
$this->resetPage();
}
public function render()
{
$orderby = 'slug';
$orderdirection = 'desc';
switch ($this->order) {
case 'az':
$orderby = 'slug';
$orderdirection = 'asc';
break;
case 'za':
$orderby = 'slug';
$orderdirection = 'desc';
break;
default:
$orderby = 'created_at';
$orderdirection = 'desc';
}
$hentai = Hentai::with('episodes')
->when($this->search != '', fn ($query) => $query->whereHas('episodes', fn ($q) => $q->where('title', 'like', '%'.$this->search.'%')->orWhere('title_jpn', 'like', '%'.$this->search.'%')))
->when($this->withTorrents != '', fn ($query) => $query->whereHas('torrents'))
->orderBy($orderby, $orderdirection)
->paginate(10);
return view('livewire.downloads', [
'hentai' => $hentai,
'query' => $this->search,
]);
}
}

View File

@@ -6,7 +6,7 @@ use App\Models\Downloads;
use Livewire\Component;
use Livewire\WithPagination;
class DownloadsPatreon extends Component
class DownloadsSearch extends Component
{
use WithPagination;
@@ -24,6 +24,18 @@ class DownloadsPatreon extends Component
$this->resetPage();
}
public function clicked($downloadId)
{
$download = Downloads::find($downloadId);
if (!$download) {
return;
}
$download->count++;
$download->save();
cache()->forget("episode_{$download->episode->id}_download_{$download->type}");
}
public function render()
{
$orderby = 'created_at';
@@ -60,12 +72,12 @@ class DownloadsPatreon extends Component
}
$downloads = Downloads::when($this->fileSearch != '', fn ($query) => $query->where('url', 'like', '%'.$this->fileSearch.'%'))
->where('size', '>', 0)
->where(fn ($q) => $q->where('type', '=', 'UHD')->orWhere('type', '=', 'UHDi'))
->when(!auth()->user()->is_patreon, fn ($query) => $query->whereIn('type', ['FHD', 'FHDi']))
->whereNotNull('size')
->orderBy($orderby, $orderdirection)
->paginate(20);
return view('livewire.downloads-patreon', [
return view('livewire.downloads-search', [
'downloads' => $downloads,
'query' => $this->fileSearch,
]);

View File

@@ -0,0 +1,54 @@
<?php
use App\Models\Downloads;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
# Delete entries with "#" as URL
Downloads::where('url', '#')->forceDelete();
# Remove duplicate entries
$duplicates = DB::table('downloads')
->select('episode_id', 'type', DB::raw('COUNT(*) as count'))
->groupBy('episode_id', 'type')
->having('count', '>', 1)
->get();
foreach ($duplicates as $duplicate) {
// Find all rows for this episode_id and type
$rows = DB::table('downloads')
->where('episode_id', $duplicate->episode_id)
->where('type', $duplicate->type)
->orderBy('count', 'desc') // Order by count to delete the ones with the lower count
->get();
// Delete the rows with lower counts, keeping the one with the highest count
$rows->skip(1)->each(function ($row) {
DB::table('downloads')->where('id', $row->id)->delete();
});
}
Schema::table('downloads', function (Blueprint $table) {
$table->unique(['episode_id', 'type']);
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('downloads', function (Blueprint $table) {
$table->dropUnique(['episode_id', 'type']);
});
}
};

View File

@@ -67,53 +67,61 @@
<!-- Header -->
<div
class="flex bg-white/30 dark:bg-neutral-950/40 backdrop-blur font-medium dark:border-neutral-500 border-b rounded-tl-lg rounded-tr-lg">
<div class="flex-1 px-6 py-4">Title</div>
<div class="w-28 px-6 py-4">Size</div>
<div class="w-32 px-6 py-4">Date</div>
<div class="flex-1 px-6 py-4 hidden sm:block">Title</div>
<div class="w-28 px-6 py-4 hidden sm:block">Size</div>
<div class="w-32 px-6 py-4 hidden sm:block">Date</div>
<div class="w-32 px-6 py-4">Download</div>
</div>
@php
$dldomains = config('hstream.download_domain');
$dlpdomains = config('hstream.download_domain_4k');
@endphp
<!-- Rows -->
@foreach ($downloads as $download)
@php
$title = explode('/', $download->url)[2];
$bytes = $download->size;
$units = ['B', 'KB', 'MB', 'GB', 'TB'];
$power = $bytes > 0 ? floor(log($bytes, 1024)) : 0;
$fileSize = round($bytes / pow(1024, $power), 2) . ' ' . $units[$power];
@endphp
<div
class="flex items-center border-b bg-white/70 dark:bg-neutral-950/80 dark:border-zinc-700 hover:bg-white/80 dark:hover:bg-neutral-950/90">
class="flex flex-col sm:flex-row items-center border-b bg-white dark:bg-neutral-950 dark:border-zinc-700 hover:bg-zinc-100 dark:hover:bg-neutral-800">
<!-- Title -->
<div class="flex flex-1 items-center space-x-2 px-3 py-2">
<span class="cursor-default">
{{ $title }}
</span>
{{ $title }}
</div>
<!-- Size -->
<div class="w-28 whitespace-nowrap">
{{ $fileSize }}
<div class="w-28 whitespace-nowrap flex">
<span class="block sm:hidden">
Size:
</span>
{{ $download->getFileSize() }}
</div>
<!-- Date -->
<div class="w-32 whitespace-nowrap">
<div class="w-32 whitespace-nowrap flex">
<span class="block sm:hidden">
Date:
</span>
{{ $download->created_at->format('Y-m-d') }}
</div>
<!-- Download -->
<div class="w-32 whitespace-nowrap">
@php
$dlpdomains = config('hstream.download_domain_4k');
$now = \Illuminate\Support\Carbon::now();
$expire = \Illuminate\Support\Facades\Crypt::encryptString($now->addHours(6));
$file = \Illuminate\Support\Facades\Crypt::encryptString('hentai/'.$download->url);
$downloadURL = $dlpdomains[array_rand($dlpdomains)].'/download/'.$file.'/'.$expire;
if (in_array($download->type, ['FHD', 'FHDi'])) {
$downloadURL = $dldomains[array_rand($dldomains)].'/'.$download->url;
} else {
$now = \Illuminate\Support\Carbon::now();
$expire = \Illuminate\Support\Facades\Crypt::encryptString($now->addHours(6));
$file = \Illuminate\Support\Facades\Crypt::encryptString('hentai/'.$download->url);
$downloadURL = $dlpdomains[array_rand($dlpdomains)].'/download/'.$file.'/'.$expire;
}
@endphp
<a href="{{ $downloadURL }}" download>
<a href="{{ $downloadURL }}" wire:click="clicked({{ $download->id }})" download>
<button id="dl-{{ $download->id }}"
class="group rounded-md bg-transparent border-[1px] border-white/20 shadow dark:text-white text-blac cursor-pointer flex justify-between items-center overflow-hidden transition-all w-[110px] h-[35px]">
class="group rounded-md bg-transparent border-[1px] border-white/20 shadow dark:text-white text-blac cursor-pointer flex justify-between items-center overflow-hidden transition-all w-[110px] h-[32px] mt-1 mb-1">
<div
class="relative w-12 h-[40px] bg-transparent dark:text-white text-black flex justify-center items-center transition-all">
<svg class="w-4 h-4 transition-all group-hover:-translate-y-1"

View File

@@ -1,146 +0,0 @@
<div class="py-3">
<div class="mx-auto sm:px-6 lg:px-8 space-y-6 max-w-[100%] xl:max-w-[80%] 2xl:max-w-[50%]">
<!-- Search Filter -->
<div class="p-4 sm:p-8 bg-white dark:bg-neutral-800 shadow sm:rounded-lg">
<div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
<!-- Title -->
<div>
<label for="live-search"
class="mb-2 text-sm font-medium text-gray-900 sr-only dark:text-white">Search</label>
<div class="relative right-2 left-0 sm:left-2 transition-all">
<div class="absolute inset-y-0 left-2 flex items-center pl-3 pointer-events-none">
<svg class="w-4 h-4 text-gray-500 dark:text-gray-400" aria-hidden="true"
xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
stroke-width="2" d="m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z" />
</svg>
</div>
<input wire:model.live.debounce.600ms="search" type="search" id="live-search"
class="block w-full p-4 pl-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-rose-800 focus:border-rose-900 dark:bg-neutral-900 dark:border-neutral-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-rose-800 dark:focus:border-rose-900"
placeholder="{{ __('search.search-hentai') }}" required>
<div class="absolute right-0 top-[11px]" wire:loading>
<svg aria-hidden="true"
class="inline w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-pink-600"
viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor" />
<path
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill" />
</svg>
</div>
</div>
</div>
<!-- Ordering -->
<div>
<div class="relative right-2 left-0 sm:left-2 transition-all">
<div class="absolute inset-y-0 left-2 flex items-center pl-3 pointer-events-none">
<i class="fa-solid fa-sort text-gray-500 dark:text-gray-400"></i>
</div>
<select wire:model.live="order"
class="block w-full p-4 pl-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-rose-800 focus:border-rose-900 dark:bg-neutral-900 dark:border-neutral-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-rose-800 dark:focus:border-rose-900">
<option value="az">A-Z</option>
<option value="za">Z-A</option>
</select>
</div>
</div>
</div>
<div class="float-right text-gray-900 dark:text-white">
<input type="checkbox" wire:model.live="withTorrents">
Show only with Torrent
</div>
</div>
</div>
@php $dldomains = config('hstream.download_domain'); @endphp
<div class="relative pt-5 mx-auto sm:px-6 lg:px-8 space-y-6 text-gray-900 dark:text-white xl:max-w-[95%] 2xl:max-w-[60%]" wire:keydown.right.window="nextPage" wire:keydown.left.window="previousPage">
<div class="flex flex-col">
<div class="overflow-x-auto sm:-mx-6 lg:-mx-8">
<div class="inline-block min-w-full py-2 sm:px-6 lg:px-8">
<div class="overflow-hidden">
<!-- Desktop -->
<table class="min-w-full text-left text-sm font-light collapse md:visible">
<thead class="border-b font-medium dark:border-neutral-500 bg-white dark:bg-neutral-800 shadow sm:rounded-lg">
<tr>
<th scope="col" class="px-6 py-4">Title</th>
<th scope="col" class="px-6 py-4">Download</th>
<th scope="col" class="px-6 py-4">Torrent</th>
</tr>
</thead>
<tbody>
@foreach($hentai as $h)
@php $episode = $h->episodes->first(); @endphp
<tr class="border-b dark:border-neutral-500">
<td class="whitespace-nowrap px-6 py-4">
{{ $episode->title }}
@if ($episode->title != $episode->title_jpn)
<br>
{{ $episode->title_jpn }}
@endif
@auth
@if(Auth::user()->is_admin)
<br>
<a href="{{ route('admin.add.torrentpage', ['hentai_id' => $h->id]) }}" target="_blank">Add Torrent</a>
@endif
@endauth
</td>
<td class="whitespace-nowrap px-6 py-4">
@foreach($h->episodes as $episode)
@include('livewire.partials.download-button', ['hdl' => $episode])
@endforeach
</td>
<td class="whitespace-nowrap px-6 py-4">
@include('livewire.partials.torrent-button', ['hentai' => $h])
</td>
</tr>
@endforeach
</tbody>
</table>
<!-- Mobile -->
<table class="min-w-full text-left text-sm font-light visible md:collapse">
<thead class="font-medium">
<tr>
<th scope="col" class="px-6 py-4"></th>
</tr>
</thead>
<tbody>
@foreach($hentai as $h)
@php $episode = $h->episodes->first(); @endphp
<tr class="border-b dark:border-neutral-500">
<td class="px-2 py-4 grid grid-flow-row">
{{ $episode->title }}
@if ($episode->title != $episode->title_jpn)
<br>
{{ $episode->title_jpn }}
@endif
<br>
<div class="flex flex-row flex-wrap">
@foreach($h->episodes as $episode)
@include('livewire.partials.download-button', ['hdl' => $episode])
@endforeach
@include('livewire.partials.torrent-button', ['hentai' => $h])
</div>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
{{ $hentai->links('pagination::tailwind') }}
</div>
</div>

View File

@@ -1,4 +0,0 @@
<x-app-layout>
@include('user.partials.background')
@livewire('downloads-patreon')
</x-app-layout>

View File

@@ -1,3 +1,4 @@
<x-app-layout>
@livewire('downloads')
@include('user.partials.background')
@livewire('downloads-search')
</x-app-layout>

View File

@@ -78,9 +78,6 @@ Route::middleware('auth')->group(function () {
// Download Page
Route::get('/download-search', [HomeController::class, 'downloadSearch'])->name('download.search');
// Download Page for Patreon Subscribers
Route::get('/files', [DownloadsController::class, 'index'])->name('files.index');
});
Route::get('/user/{username}', [UserController::class, 'index'])->name('user.index');