fix torrentrss descr

This commit is contained in:
xiaomlove
2025-01-20 12:02:59 +08:00
parent a74a2c3c2a
commit a197cade6d
2 changed files with 9 additions and 9 deletions
+6 -5
View File
@@ -74,13 +74,14 @@ class Torrent
if (is_null($ptGen)) { if (is_null($ptGen)) {
$ptGen = new PTGen(); $ptGen = new PTGen();
} }
$ptGenInfo = $torrentInfo['pt_gen']; // $ptGenInfo = $torrentInfo['pt_gen'];
if (!is_array($torrentInfo['pt_gen']) && is_string($torrentInfo['pt_gen'])) { // if (!is_array($torrentInfo['pt_gen']) && is_string($torrentInfo['pt_gen'])) {
$ptGenInfo = json_decode($ptGenInfo, true); // $ptGenInfo = json_decode($ptGenInfo, true);
} // }
$log = "torrent: " . $torrentInfo['id']; $log = "torrent: " . $torrentInfo['id'];
$siteIdAndRating = $ptGen->listRatings($ptGenInfo ?? [], $torrentInfo['url']); // $siteIdAndRating = $ptGen->listRatings($ptGenInfo ?? [], $torrentInfo['url']);
$siteIdAndRating = $ptGen->listRatings([], $torrentInfo['url']);
$log .= "siteIdAndRating: " . json_encode($siteIdAndRating); $log .= "siteIdAndRating: " . json_encode($siteIdAndRating);
do_log($log); do_log($log);
return $ptGen->buildRatingSpan($siteIdAndRating); return $ptGen->buildRatingSpan($siteIdAndRating);
+3 -4
View File
@@ -171,15 +171,14 @@ if ($where) {
} }
} }
$sort = "id desc"; $sort = "id desc";
$fieldStr = "torrents.id, torrents.category, torrents.name, torrents.small_descr, torrents.descr, torrents.info_hash, torrents.size, torrents.added, torrents.anonymous, torrents.owner, categories.name AS category_name"; $fieldStr = "torrents.id, torrents.category, torrents.name, torrents.small_descr, torrent_extras.descr, torrents.info_hash, torrents.size, torrents.added, torrents.anonymous, torrents.owner, categories.name AS category_name";
//$query = "SELECT torrents.id, torrents.category, torrents.name, torrents.small_descr, torrents.descr, torrents.info_hash, torrents.size, torrents.added, torrents.anonymous, users.username AS username, categories.id AS cat_id, categories.name AS cat_name FROM torrents LEFT JOIN categories ON category = categories.id LEFT JOIN users ON torrents.owner = users.id $where ORDER BY $sort LIMIT $limit";
if (!$noNormalResults) { if (!$noNormalResults) {
$query = "SELECT $fieldStr FROM torrents LEFT JOIN categories ON category = categories.id $normalWhere ORDER BY $sort LIMIT $limit"; $query = "SELECT $fieldStr FROM torrents LEFT JOIN categories ON category = categories.id left join torrent_extras on torrent_extras.torrent_id = torrents.id $normalWhere ORDER BY $sort LIMIT $limit";
$normalRows = \Nexus\Database\NexusDB::select($query); $normalRows = \Nexus\Database\NexusDB::select($query);
} }
if (!empty($prependIdArr) && $startindex == 0) { if (!empty($prependIdArr) && $startindex == 0) {
$prependIdStr = implode(',', $prependIdArr); $prependIdStr = implode(',', $prependIdArr);
$prependRows = \Nexus\Database\NexusDB::select("SELECT $fieldStr FROM torrents LEFT JOIN categories ON category = categories.id where torrents.id in ($prependIdStr) and $where ORDER BY field(torrents.id, $prependIdStr)"); $prependRows = \Nexus\Database\NexusDB::select("SELECT $fieldStr FROM torrents LEFT JOIN categories ON category = categories.id left join torrent_extras on torrent_extras.torrent_id = torrents.id where torrents.id in ($prependIdStr) and $where ORDER BY field(torrents.id, $prependIdStr)");
} }
$list = []; $list = [];
foreach ($prependRows as $row) { foreach ($prependRows as $row) {