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

[API] torrent list add active_status

Browse Source
This commit is contained in:
xiaomlove
2025-10-29 17:02:00 +07:00
parent 907cca7a40
commit f1cbb5c3da
4 changed files with 46 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/TorrentResource.php
+1 -8
View File
@@ -70,6 +70,7 @@ class TorrentResource extends BaseResource
'description' => $this->whenHas('description'),
'images' => $this->whenHas('images'),
'download_url' => $this->whenHas('download_url'),
'active_status' => $this->whenHas('active_status'),
'user' => new UserResource($this->whenLoaded('user')),
'extra' => new TorrentExtraResource($this->whenLoaded('extra')),
'tags' => TagResource::collection($this->whenLoaded('tags')),
@@ -97,14 +98,6 @@ class TorrentResource extends BaseResource
return self::NAME;
}
private function getTorrentRep(): TorrentRepository
{
if (!isset(self::$torrentRep)) {
self::$torrentRep = new TorrentRepository();
}
return self::$torrentRep;
}
protected function hex_esc($matches) {
return sprintf("%02x", ord($matches[0]));
}
app/Repositories/TorrentRepository.php
+39 -37
View File
@@ -62,7 +62,28 @@ class TorrentRepository extends BaseRepository
const BUY_STATUS_NOT_YET = -1;
const BUY_STATUS_UNKNOWN = -2;
private static array $defaultLoadRelationships = [
'basic_category', 'basic_category.search_box',
'basic_audiocodec', 'basic_codec', 'basic_medium',
'basic_source', 'basic_processing', 'basic_standard', 'basic_team',
];
private static array $allowIncludes = ['user', 'extra', 'tags'];
private static array $allowIncludeCounts = ['thank_users', 'reward_logs', 'claims'];
private static array $allowIncludeFields = [
'has_bookmarked', 'has_claimed', 'has_thanked', 'has_rewarded',
'description', 'download_url', 'active_status'
];
private static array $allowFilters = [
'title', 'category', 'source', 'medium', 'codec', 'audiocodec', 'standard', 'processing', 'team',
'owner', 'visible', 'added', 'size', 'sp_state', 'leechers', 'seeders', 'times_completed',
'bookmark',
];
private static array $allowSorts = ['id', 'comments', 'size', 'seeders', 'leechers', 'times_completed'];
/**
* fetch torrent list
@@ -83,31 +104,15 @@ class TorrentRepository extends BaseRepository
}
$categoryIdList = $searchBox->categories()->pluck('id')->toArray();
//query this info default
$query = Torrent::query()->with([
'basic_category', 'basic_category.search_box',
'basic_audiocodec', 'basic_codec', 'basic_medium',
'basic_source', 'basic_processing', 'basic_standard', 'basic_team',
])
$query = Torrent::query()->with(self::$defaultLoadRelationships)
->whereIn('category', $categoryIdList)
->orderBy("pos_state", "DESC");
$allowIncludes = ['user', 'extra', 'tags'];
$allowIncludeCounts = ['thank_users', 'reward_logs', 'claims'];
$allowIncludeFields = [
'has_bookmarked', 'has_claimed', 'has_thanked', 'has_rewarded',
'description', 'download_url'
];
$allowFilters = [
'title', 'category', 'source', 'medium', 'codec', 'audiocodec', 'standard', 'processing', 'team',
'owner', 'visible', 'added', 'size', 'sp_state', 'leechers', 'seeders', 'times_completed',
'bookmark',
];
$allowSorts = ['id', 'comments', 'size', 'seeders', 'leechers', 'times_completed'];
$apiQueryBuilder = ApiQueryBuilder::for(TorrentResource::NAME, $query, $request)
->allowIncludes($allowIncludes)
->allowIncludeCounts($allowIncludeCounts)
->allowIncludeFields($allowIncludeFields)
->allowFilters($allowFilters)
->allowSorts($allowSorts)
->allowIncludes(self::$allowIncludes)
->allowIncludeCounts(self::$allowIncludeCounts)
->allowIncludeFields(self::$allowIncludeFields)
->allowFilters(self::$allowFilters)
->allowSorts(self::$allowSorts)
->registerCustomFilter('title', function (Builder $query, Request $request) {
$title = $request->input(ApiQueryBuilder::PARAM_NAME_FILTER.".title");
$title = trim(str_replace('.', '', $title));
@@ -161,21 +166,11 @@ class TorrentRepository extends BaseRepository
public function getDetail($id, Authenticatable $user)
{
//query this info default
$query = Torrent::query()->with([
'basic_category', 'basic_category.search_box',
'basic_audiocodec', 'basic_codec', 'basic_medium',
'basic_source', 'basic_processing', 'basic_standard', 'basic_team',
]);
$allowIncludes = ['user', 'extra', 'tags'];
$allowIncludeCounts = ['thank_users', 'reward_logs', 'claims'];
$allowIncludeFields = [
'has_bookmarked', 'has_claimed', 'has_thanked', 'has_rewarded',
'description', 'download_url'
];
$query = Torrent::query()->with(self::$defaultLoadRelationships);
$apiQueryBuilder = ApiQueryBuilder::for(TorrentResource::NAME, $query)
->allowIncludes($allowIncludes)
->allowIncludeCounts($allowIncludeCounts)
->allowIncludeFields($allowIncludeFields)
->allowIncludes(self::$allowIncludes)
->allowIncludeCounts(self::$allowIncludeCounts)
->allowIncludeFields(self::$allowIncludeFields)
;
do_log("before query torrent detail");
$torrent = $apiQueryBuilder->build()->findOrFail($id);
@@ -186,7 +181,7 @@ class TorrentRepository extends BaseRepository
private function appendIncludeFields(ApiQueryBuilder $apiQueryBuilder, Authenticatable $user, $torrentList)
{
$torrentIdArr = $bookmarkData = $claimData = $thankData = $rewardData =[];
$torrentIdArr = $bookmarkData = $claimData = $thankData = $rewardData = $activeData = [];
foreach ($torrentList as $torrent) {
$torrentIdArr[] = $torrent->id;
}
@@ -203,6 +198,10 @@ class TorrentRepository extends BaseRepository
if ($hasFieldHasRewarded = $apiQueryBuilder->hasIncludeField('has_rewarded')) {
$rewardData = $user->reward_torrent_logs()->whereIn('torrentid', $torrentIdArr)->get()->keyBy('torrentid');
}
if ($hasFieldActiveStatus = $apiQueryBuilder->hasIncludeField('active_status')) {
$torrentModule = new \Nexus\Torrent\Torrent();
$activeData = $torrentModule->listLeechingSeedingStatus($user->id, $torrentIdArr);
}
do_log("after prepare has data");
foreach ($torrentList as $torrent) {
@@ -219,6 +218,9 @@ class TorrentRepository extends BaseRepository
if ($hasFieldHasRewarded) {
$torrent->has_rewarded = $rewardData->has($id);
}
if ($hasFieldActiveStatus) {
$torrent->active_status = $activeData[$id] ?? null;
}
if ($apiQueryBuilder->hasIncludeField('description') && $apiQueryBuilder->hasInclude('extra')) {
do_log("before format_description of torrent: {$torrent->id}");
include/constants.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.9.10');
defined('RELEASE_DATE') || define('RELEASE_DATE', '2025-10-28');
defined('RELEASE_DATE') || define('RELEASE_DATE', '2025-10-29');
defined('IN_TRACKER') || define('IN_TRACKER', false);
defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
nexus/Torrent/Torrent.php
+5 -5
View File
@@ -25,17 +25,17 @@ class Torrent
}
$torrentIdStr = implode(',', $torrentIdArr);
//seeding or leeching, from peers
$whereStr = sprintf("userid = %s and torrent in (%s)", sqlesc($uid), $torrentIdStr);
$whereStr = sprintf("userid = %s and torrent in (%s)", $uid, $torrentIdStr);
$peerList = NexusDB::getAll('peers', $whereStr, 'torrent, to_go');
$peerList = array_column($peerList,'to_go', 'torrent');
//download progress, from snatched
$sql = sprintf(
"select snatched.to_go, snatched.torrentid, torrents.size from snatched inner join torrents on snatched.torrentid = torrents.id where snatched.userid = %s and snatched.torrentid in (%s)",
sqlesc($uid), $torrentIdStr
$uid, $torrentIdStr
);
$snatchedList = [];
$res = sql_query($sql);
while ($row = mysql_fetch_assoc($res)) {
$res = NexusDB::select($sql);
foreach ($res as $row) {
$id = $row['torrentid'];
$activeStatus = 'inactivity';
if (isset($peerList[$id])) {
@@ -49,7 +49,7 @@ class Torrent
$progress = sprintf('%.4f', $realDownloaded / $row['size']);
$snatchedList[$id] = [
'finished' => $row['to_go'] == 0 ? 'yes' : 'no',
'progress' => $progress,
'progress' => floatval($progress),
'active_status' => $activeStatus,
];
}