github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-21 22:03:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Flatten file list for hybrid files (#1350)

Browse source 
By Anton's advice:
https://gitlab.com/sandfox/torrent-file/-/issues/6#note_1746451068
This commit is contained in:
Cønstantine Kovalensky 2024-01-27 15:28:15 +04:00 • committed by GitHub
commit 15080b054d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
filelist.php
View file

@ -31,14 +31,16 @@ $sql = 'SELECT t.attach_id, t.info_hash, t.info_hash_v2, t.size, ad.physical_fil
$row = DB()->fetch_row($sql); $row = DB()->fetch_row($sql);
if (empty($row) || empty($row['physical_filename'])) { if (empty($row['physical_filename'])) {
bb_simple_die($lang['INVALID_TOPIC_ID_DB'], 404); bb_simple_die($lang['INVALID_TOPIC_ID_DB'], 404);
} }
// Method fields // Method fields
$t_version_field = !empty($row['info_hash_v2']) ? 'v2' : 'v1'; $meta_v1 = !empty($row['info_hash']);
$t_files_field = ($t_version_field === 'v2') ? 'getFileTree' : 'getFiles'; $meta_v2 = !empty($row['info_hash_v2']);
$t_hash_field = ($t_version_field === 'v2') ? 'piecesRoot' : 'sha1'; $t_version_field = $meta_v2 ? 'v2' : 'v1';
$t_files_field = $meta_v2 ? 'getFileTree' : 'getFiles';
$t_hash_field = $meta_v2 ? 'piecesRoot' : 'sha1';
$file_path = get_attachments_dir() . '/' . $row['physical_filename']; $file_path = get_attachments_dir() . '/' . $row['physical_filename'];
@ -76,6 +78,10 @@ if (IS_GUEST && $torrent->isPrivate()) {
$files = $torrent->$t_version_field()->$t_files_field(); $files = $torrent->$t_version_field()->$t_files_field();
if ($meta_v1 && $meta_v2) {
$files = new \RecursiveIteratorIterator($files); // Flatten the list
}
$allFiles = ''; $allFiles = '';
foreach ($files as $file) { foreach ($files as $file) {
$allFiles .= '<tr><td>' . clean_tor_dirname(implode('/', $file->path)) . '</td><td>' . humn_size($file->length, 2) . '</td><td>' . $file->$t_hash_field . '</td></tr>'; $allFiles .= '<tr><td>' . clean_tor_dirname(implode('/', $file->path)) . '</td><td>' . humn_size($file->length, 2) . '</td><td>' . $file->$t_hash_field . '</td></tr>';
@ -84,9 +90,9 @@ foreach ($files as $file) {
$data = [ $data = [
'name' => !empty($t_name = $torrent->getName()) ? htmlCHR(substr($t_name, 0, 255)) : 'undefined', 'name' => !empty($t_name = $torrent->getName()) ? htmlCHR(substr($t_name, 0, 255)) : 'undefined',
'client' => !empty($creator = $torrent->getCreatedBy()) ? htmlCHR(substr($creator, 0, 20)) : 'unknown client', 'client' => !empty($creator = $torrent->getCreatedBy()) ? htmlCHR(substr($creator, 0, 20)) : 'unknown client',
'date' => (!empty($creation_date = $torrent->getCreationDate()->getTimestamp()) && is_numeric($creation_date)) ? date('d-M-Y H:i (e)', $creation_date) : 'unknown', 'date' => (!empty($dt = $torrent->getCreationDate()) && is_numeric($creation_date = $dt->getTimestamp())) ? date('d-M-Y H:i (e)', $creation_date) : 'unknown',
'size' => humn_size($row['size'], 2), 'size' => humn_size($row['size'], 2),
'file_count' => count($files), 'file_count' => $files->count(),
'site_url' => FULL_URL, 'site_url' => FULL_URL,
'topic_url' => TOPIC_URL . $topic_id, 'topic_url' => TOPIC_URL . $topic_id,
]; ];
@ -206,5 +212,3 @@ sup {
</body> </body>
</html> </html>
EOF; EOF;
die();