makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17361] Add method to track multiple files in a single query

Browse source 
PHPBB-17361
This commit is contained in:
Ruben Calvo 2025-01-18 23:08:52 +01:00
parent b33f17e7ce
commit 90bd9d006e
No known key found for this signature in database
2 changed files with 76 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
phpBB/phpbb/db/migration/data/v400/storage_track.php
View file

@ -19,6 +19,8 @@ use phpbb\storage\file_tracker;
class storage_track extends container_aware_migration
{
private const BATCH_SIZE = 100;
public function effectively_installed()
{
return $this->db_tools->sql_table_exists($this->tables['storage']);
@ -77,9 +79,9 @@ class storage_track extends container_aware_migration
$sql = 'SELECT user_avatar
FROM ' . USERS_TABLE . "
WHERE user_avatar_type = 'avatar.driver.upload'";
$result = $this->db->sql_query($sql);
$files = [];
while ($row = $this->db->sql_fetchrow($result))
{
$avatar_group = false;
@ -94,16 +96,24 @@ class storage_track extends container_aware_migration
$ext = substr(strrchr($filename, '.'), 1);
$filename = (int) $filename;
try
$filename = $this->config['avatar_salt'] . '_' . ($avatar_group ? 'g' : '') . $filename . '.' . $ext;
$files[] = [
'file_path' => $filename,
'filesize' => filesize($this->phpbb_root_path . $this->config['storage\\avatar\\config\\path'] . '/' . $filename),
];
if (count($files) >= self::BATCH_SIZE)
{
$filename = $this->config['avatar_salt'] . '_' . ($avatar_group ? 'g' : '') . $filename . '.' . $ext;
$file_tracker->track_file('avatar', $filename, filesize($this->phpbb_root_path . $this->config['storage\\avatar\\config\\path'] . '/' . $filename));
}
catch (storage_exception $e)
{
// If file doesn't exist, don't track it
$file_tracker->track_files('avatar', $files);
$files = [];
}
}
if (!empty($files))
{
$file_tracker->track_files('avatar', $files);
}
$this->db->sql_freeresult($result);
}
@ -114,32 +124,36 @@ class storage_track extends container_aware_migration
$sql = 'SELECT physical_filename, thumbnail
FROM ' . ATTACHMENTS_TABLE;
$result = $this->db->sql_query($sql);
$files = [];
while ($row = $this->db->sql_fetchrow($result))
{
try
{
$file_tracker->track_file('attachment', $row['physical_filename'], filesize($this->phpbb_root_path . $this->config['storage\\attachment\\config\\path'] . '/' . $row['physical_filename']));
}
catch (storage_exception $e)
{
// If file doesn't exist, don't track it
}
$files[] = [
'file_path' => $row['physical_filename'],
'filesize' => filesize($this->phpbb_root_path . $this->config['storage\\attachment\\config\\path'] . '/' . $row['physical_filename']),
];
if ($row['thumbnail'] == 1)
{
try
{
$file_tracker->track_file('attachment', 'thumb_' . $row['physical_filename'], filesize($this->phpbb_root_path . $this->config['storage\\attachment\\config\\path'] . '/thumb_' . $row['physical_filename']));
}
catch (storage_exception $e)
{
// If file doesn't exist, don't track it
}
$files[] = [
'file_path' => 'thumb_' . $row['physical_filename'],
'filesize' => filesize($this->phpbb_root_path . $this->config['storage\\attachment\\config\\path'] . '/thumb_' . $row['physical_filename']),
];
}
if (count($files) >= self::BATCH_SIZE)
{
$file_tracker->track_files('attachment', $files);
$files = [];
}
}
if (!empty($files))
{
$file_tracker->track_files('attachment', $files);
}
$this->db->sql_freeresult($result);
}
@ -150,21 +164,28 @@ class storage_track extends container_aware_migration
$sql = 'SELECT filename
FROM ' . BACKUPS_TABLE;
$result = $this->db->sql_query($sql);
$files = [];
while ($row = $this->db->sql_fetchrow($result))
{
try
$files[] = [
'file_path' => $row['filename'],
'filesize' => filesize($this->phpbb_root_path . $this->config['storage\\backup\\config\\path'] . '/' . $row['filename']),
];
if (count($files) >= self::BATCH_SIZE)
{
$file_tracker->track_file('backup', $row['filename'], filesize($this->phpbb_root_path . $this->config['storage\\backup\\config\\path'] . '/' . $row['filename']));
}
catch (storage_exception $e)
{
// If file doesn't exist, don't track it
$file_tracker->track_files('backup', $files);
$files = [];
}
}
if (!empty($files))
{
$file_tracker->track_files('backup', $files);
}
$this->db->sql_freeresult($result);
}
}

27
phpBB/phpbb/storage/file_tracker.php
View file

@ -58,14 +58,33 @@ class file_tracker
*/
public function track_file(string $storage, string $path, int $size): void
{
$sql_ary = [
$file = [
'file_path' => $path,
'storage' => $storage,
'filesize' => $size,
];
$sql = 'INSERT INTO ' . $this->storage_table . $this->db->sql_build_array('INSERT', $sql_ary);
$this->db->sql_query($sql);
$this->track_files($storage, [$file]);
}
/**
* Track files in database
*
* @param string $storage Storage name
* @param array $files Array of files to track
*/
public function track_files(string $storage, array $files): void
{
$sql_ary = [];
foreach ($files as $file)
{
$sql_ary[] = [
'storage' => $storage,
'file_path' => $file['file_path'],
'filesize' => $file['filesize'],
];
}
$this->db->sql_multi_insert($this->storage_table, $sql_ary);
$this->cache->destroy('_storage_' . $storage . '_totalsize');
$this->cache->destroy('_storage_' . $storage . '_numfiles');