lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-24 03:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

announce log add more field

Browse Source
This commit is contained in:
xiaomlove
2025-07-13 22:17:29 +07:00
parent b3b11f418c
commit b81cf0c1c6
10 changed files with 255 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Filament/Resources/Torrent/AnnounceLogResource.php
+74 -41
View File
@@ -5,6 +5,7 @@ namespace App\Filament\Resources\Torrent;
use App\Filament\Resources\Torrent\AnnounceLogResource\Pages;
use App\Filament\Resources\Torrent\AnnounceLogResource\RelationManagers;
use App\Models\AnnounceLog;
use App\Models\Torrent;
use Filament\Forms;
use Filament\Forms\Form;
use Filament\Resources\Resource;
@@ -14,6 +15,9 @@ use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope;
use Filament\Infolists;
use Filament\Infolists\Infolist;
use Filament\Infolists\Components\Tabs;
use Filament\Infolists\Components\Fieldset;
class AnnounceLogResource extends Resource
{
@@ -39,50 +43,79 @@ class AnnounceLogResource extends Resource
{
return $infolist
->schema([
Infolists\Components\TextEntry::make('timestamp')->label(__('announce-log.timestamp')),
Infolists\Components\TextEntry::make('request_id')->label(__('announce-log.request_id'))->copyable(),
Infolists\Components\TextEntry::make('user_id')->label(__('announce-log.user_id'))->copyable(),
Tabs::make('Tabs')
->tabs([
Tabs\Tab::make(__('announce-log.tab_primary'))
->schema([
Fieldset::make(__('announce-log.fieldset_basic'))
->schema([
Infolists\Components\TextEntry::make('timestamp')->label(__('announce-log.timestamp')),
Infolists\Components\TextEntry::make('user_id')->label(__('announce-log.user_id'))->copyable(),
Infolists\Components\TextEntry::make('torrent_id')->label(__('announce-log.torrent_id'))->copyable(),
Infolists\Components\TextEntry::make('torrent_size')->label(__('announce-log.torrent_size'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('seeder_count')->label(__('announce-log.seeder_count')),
Infolists\Components\TextEntry::make('leecher_count')->label(__('announce-log.leecher_count')),
Infolists\Components\TextEntry::make('promotion_state')->label(__('announce-log.promotion_state'))->formatStateUsing(fn($state) => Torrent::$promotionTypes[$state]['text'] ?? ''),
Infolists\Components\TextEntry::make('promotion_state_desc')->label(__('announce-log.promotion_state_desc')),
Infolists\Components\TextEntry::make('event')->label(__('announce-log.event')),
Infolists\Components\TextEntry::make('left')->label(__('announce-log.left'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('announce_time')->label(__('announce-log.announce_time')),
Infolists\Components\TextEntry::make('speed')->label(__('announce-log.speed'))->formatStateUsing(fn($state) => mksize($state) . "/s"),
])->columns(4),
Fieldset::make(__('announce-log.fieldset_uploaded'))
->schema([
Infolists\Components\TextEntry::make('uploaded_offset')->label(__('announce-log.uploaded_offset'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('uploaded_total_last')->label(__('announce-log.uploaded_total_last'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('uploaded_total')->label(__('announce-log.uploaded_total'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('uploaded_increment')->label(__('announce-log.uploaded_increment'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('up_factor')->label(__('announce-log.up_factor')),
Infolists\Components\TextEntry::make('up_factor_desc')->label(__('announce-log.up_factor_desc')),
Infolists\Components\TextEntry::make('uploaded_increment_for_user')->label(__('announce-log.uploaded_increment_for_user'))->formatStateUsing(fn($state) => mksize($state)),
])->columns(4),
Infolists\Components\TextEntry::make('torrent_id')->label(__('announce-log.torrent_id'))->copyable(),
Infolists\Components\TextEntry::make('torrent_size')->label(__('announce-log.torrent_size'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('peer_id')->label(__('announce-log.peer_id'))->copyable(),
Fieldset::make(__('announce-log.fieldset_downloaded'))
->schema([
Infolists\Components\TextEntry::make('downloaded_offset')->label(__('announce-log.downloaded_offset'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('downloaded_total_last')->label(__('announce-log.downloaded_total_last'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('downloaded_total')->label(__('announce-log.downloaded_total'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('downloaded_increment')->label(__('announce-log.downloaded_increment'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('down_factor')->label(__('announce-log.down_factor')),
Infolists\Components\TextEntry::make('down_factor_desc')->label(__('announce-log.down_factor_desc')),
Infolists\Components\TextEntry::make('downloaded_increment_for_user')->label(__('announce-log.downloaded_increment_for_user'))->formatStateUsing(fn($state) => mksize($state)),
])->columns(4),
]),
Tabs\Tab::make(__('announce-log.tab_secondary'))
->schema([
Fieldset::make(__('announce-log.fieldset_client'))
->schema([
Infolists\Components\TextEntry::make('port')->label(__('announce-log.port')),
Infolists\Components\TextEntry::make('agent')->label(__('announce-log.agent')),
Infolists\Components\TextEntry::make('peer_id')->label(__('announce-log.peer_id'))->copyable(),
Infolists\Components\TextEntry::make('client_select')->label(__('announce-log.client_select')),
])->columns(4),
Fieldset::make(__('announce-log.fieldset_location'))
->schema([
Infolists\Components\TextEntry::make('ip')->label(__('announce-log.ip'))->copyable()->limit(25),
Infolists\Components\TextEntry::make('ipv4')->label(__('announce-log.ipv4'))->copyable(),
Infolists\Components\TextEntry::make('ipv6')->label(__('announce-log.ipv6'))->copyable()->limit(25),
Infolists\Components\TextEntry::make('continent')->label(__('announce-log.continent')),
Infolists\Components\TextEntry::make('country')->label(__('announce-log.country')),
Infolists\Components\TextEntry::make('city')->label(__('announce-log.city')),
Infolists\Components\TextEntry::make('announce_time')->label(__('announce-log.announce_time'))->copyable(),
Infolists\Components\TextEntry::make('seeder_count')->label(__('announce-log.seeder_count')),
Infolists\Components\TextEntry::make('leecher_count')->label(__('announce-log.leecher_count')),
])->columns(4),
Fieldset::make(__('announce-log.fieldset_request'))
->schema([
Infolists\Components\TextEntry::make('scheme')->label(__('announce-log.scheme')),
Infolists\Components\TextEntry::make('host')->label(__('announce-log.host')),
Infolists\Components\TextEntry::make('path')->label(__('announce-log.path')),
Infolists\Components\TextEntry::make('request_id')->label(__('announce-log.request_id'))->copyable()->limit(25),
Infolists\Components\TextEntry::make('batch_no')->label(__('announce-log.batch_no'))->copyable(),
Infolists\Components\TextEntry::make('uploaded_offset')->label(__('announce-log.uploaded_offset'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('uploaded_total')->label(__('announce-log.uploaded_total'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('uploaded_increment')->label(__('announce-log.uploaded_increment'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('downloaded_offset')->label(__('announce-log.downloaded_offset'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('downloaded_total')->label(__('announce-log.downloaded_total'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('downloaded_increment')->label(__('announce-log.downloaded_increment'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('left')->label(__('announce-log.left'))->formatStateUsing(fn($state) => mksize($state)),
Infolists\Components\TextEntry::make('port')->label(__('announce-log.port')),
Infolists\Components\TextEntry::make('agent')->label(__('announce-log.agent')),
Infolists\Components\TextEntry::make('started')->label(__('announce-log.started')),
Infolists\Components\TextEntry::make('last_action')->label(__('announce-log.last_action')),
Infolists\Components\TextEntry::make('prev_action')->label(__('announce-log.prev_action')),
Infolists\Components\TextEntry::make('scheme')->label(__('announce-log.scheme')),
Infolists\Components\TextEntry::make('host')->label(__('announce-log.host')),
Infolists\Components\TextEntry::make('path')->label(__('announce-log.path')),
Infolists\Components\TextEntry::make('ip')->label(__('announce-log.ip'))->copyable(),
Infolists\Components\TextEntry::make('ipv4')->label(__('announce-log.ipv4'))->copyable(),
Infolists\Components\TextEntry::make('ipv6')->label(__('announce-log.ipv6'))->copyable(),
Infolists\Components\TextEntry::make('continent')->label(__('announce-log.continent')),
Infolists\Components\TextEntry::make('country')->label(__('announce-log.country')),
Infolists\Components\TextEntry::make('city')->label(__('announce-log.city')),
Infolists\Components\TextEntry::make('event')->label(__('announce-log.event')),
Infolists\Components\TextEntry::make('passkey')->label(__('announce-log.passkey'))->copyable(),
Infolists\Components\TextEntry::make('client_select')->label(__('announce-log.client_select')),
])->columns(3);
])->columns(4),
]),
])->columnSpanFull()
]);
}
public static function table(Table $table): Table
@@ -171,7 +204,7 @@ class AnnounceLogResource extends Resource
,
])
->actions([
Tables\Actions\ViewAction::make(),
Tables\Actions\ViewAction::make()->modalWidth('5xl'),
])
->bulkActions([
// Tables\Actions\BulkActionGroup::make([
app/Filament/Resources/Torrent/AnnounceLogResource/Pages/ListAnnounceLogs.php
+16 -6
View File
@@ -21,18 +21,24 @@ class ListAnnounceLogs extends PageListSingle
public function getTableRecords(): Collection|Paginator|CursorPaginator
{
$filterableColumns = ['user_id', 'torrent_id', 'peer_id', 'ip', 'event'];
$filterableColumns = [
'user_id' => 'is_numeric',
'torrent_id'=> 'is_numeric',
'peer_id' => 'is_string',
'ip' => 'is_string',
'event' => 'is_string',
];
$sortableColumns = ['timestamp', 'uploaded_total', 'uploaded_increment', 'downloaded_total', 'downloaded_increment', 'left', 'announce_time'];
$sortableDirections = ['asc', 'desc'];
$request = request();
// dd($request->all());
$filters = [];
foreach ($request->get('tableFilters', []) as $field => $values) {
if (!in_array($field, $filterableColumns)) {
if (!isset($filterableColumns[$field])) {
continue;
}
foreach ($values as $k => $v) {
if (in_array($k, $filterableColumns)) {
if (isset($filterableColumns[$k])) {
$filters[$field] = $v;
}
}
@@ -77,7 +83,7 @@ class ListAnnounceLogs extends PageListSingle
// dd($snapshot['data']['tableFilters']);
foreach ($snapshot['data']['tableFilters'] as $filterItems) {
foreach ($filterItems as $field => $items) {
if (!in_array($field, $filterableColumns) || !is_array($items)) {
if (!isset($filterableColumns[$field]) || !is_array($items)) {
continue;
}
foreach ($items as $values) {
@@ -121,12 +127,16 @@ class ListAnnounceLogs extends PageListSingle
}
}
}
foreach ($filterableColumns as $field) {
foreach ($filterableColumns as $field => $filterFunc) {
if (isset($component['updates']["tableFilters.$field.$field"])) {
$filters[$field] = $component['updates']["tableFilters.$field.$field"];
}
}
}
foreach ($filters as $field => $value) {
if (!isset($filterableColumns[$field]) || !call_user_func($filterableColumns[$field], $value)) {
unset($filters[$field]);
}
}
$rep = new AnnounceLogRepository();
$result = $rep->listAll($filters, $page, $perPage, $sortColumn, $sortDirection);
app/Models/AnnounceLog.php
+7 -5
View File
@@ -10,12 +10,14 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
class AnnounceLog extends NexusModel
{
protected $fillable = [
'timestamp', 'user_id', 'passkey', 'torrent_id', 'info_hash', 'torrent_size', 'event', 'peer_id',
'uploaded_total', 'uploaded_increment', 'uploaded_offset',
'downloaded_total', 'downloaded_increment', 'downloaded_offset',
'announce_time', 'ip', 'ipv4', 'ipv6', 'port', 'agent', 'left', 'started', 'prev_action', 'last_action',
'timestamp', 'user_id', 'passkey', 'torrent_id', 'info_hash', 'torrent_size',
'promotion_state', 'promotion_state_desc', 'up_factor', 'up_factor_desc', 'down_factor', 'down_factor_desc',
'event', 'peer_id',
'uploaded_total_last', 'uploaded_total', 'uploaded_increment', 'uploaded_increment_for_user','uploaded_offset',
'downloaded_total_last', 'downloaded_total', 'downloaded_increment', 'downloaded_increment_for_user', 'downloaded_offset',
'announce_time', 'speed', 'ip', 'ipv4', 'ipv6', 'port', 'agent', 'left', 'started', 'prev_action', 'last_action',
'client_select', 'seeder_count', 'leecher_count', 'scheme', 'host', 'path',
'continent', 'country', 'city', 'request_id'
'continent', 'country', 'city', 'request_id', 'batch_no'
];
protected $table = null;
app/Repositories/AnnounceLogRepository.php
+6 -2
View File
@@ -12,6 +12,10 @@ class AnnounceLogRepository extends BaseRepository
public function listAll(array $filters, int $page, int $perPage, ?string $sortColumn, ?string $sortDirection)
{
$beginTimestamp = microtime(true);
do_log(sprintf(
"[REQUEST_CLICKHOUSE] [BEGIN], filters: %s, page: %s, perPage: %s, sortColumn: %s, sortDirection: %s",
json_encode($filters), $page, $perPage, $sortColumn, $sortDirection
));
$totalAlias = "total";
$offset = ($page - 1) * $perPage;
$client = $this->getClient();
@@ -37,8 +41,8 @@ class AnnounceLogRepository extends BaseRepository
$data = $client->select($selectSql, $bindValues);
$total = $client->select($countSql, $bindValues)->rows()[0][$totalAlias] ?? 0;
do_log(sprintf(
"[REQUEST_CLICKHOUSE], filters: %s, page: %s, perPage: %s, sortColumn: %s, sortDirection: %s, selectSql: %s, binds: %s, costTime: %.3f sec.",
json_encode($filters), $page, $perPage, $sortColumn, $sortDirection, $selectSql, json_encode($bindValues), microtime(true) - $beginTimestamp
"[REQUEST_CLICKHOUSE] [END], selectSql: %s, binds: %s, costTime: %.3f sec.",
$selectSql, json_encode($bindValues), microtime(true) - $beginTimestamp
));
return [
'data' => $data->rows(),
app/Repositories/UploadRepository.php
+1
View File
@@ -126,6 +126,7 @@ class UploadRepository extends BaseRepository
'media_info' => $request->technical_info ?? '',
'nfo' => $this->getNfoContent($request),
'created_at' => $nowStr,
'pt_gen' => $request->pt_gen ?? '',
];
$newTorrent = DB::transaction(function () use ($torrentInsert, $extraInsert, $fileListInfo, $subCategoriesAngTags, $dict, $torrentSavePath) {
$newTorrent = Torrent::query()->create($torrentInsert);