Migrate to storing torrent files on the filesystem rather than the DB

classes/config.template

@@ -5,9 +5,10 @@ if (version_compare(PHP_VERSION, '7.0.0', '<')) {
 //date_default_timezone_set('EST');
 
 // Main settings
-define('SITE_NAME',   'Oppaitime'); //The name of your site
-define('SITE_DOMAIN', 'oppaiti.me'); //The FQDN of your site
-define('SERVER_ROOT', '/var/www'); //The root of the server, used for includes, purpose is to shorten the path string
+define('SITE_NAME',     'Oppaitime'); //The name of your site
+define('SITE_DOMAIN',   'oppaiti.me'); //The FQDN of your site
+define('SERVER_ROOT',   '/var/www'); //The root of the server, used for includes
+define('TORRENT_STORE', '/var/torrents/'); //Where torrent files are stored
 
 // Tracker urls to be added to torrent files ala bittorrent.org/beps/bep_0012.html
 define('ANNOUNCE_URLS', [[

classes/torrents.class.php

@@ -324,9 +324,7 @@ class Torrents {
       G::$Cache->decrement('num_torrent_reportsv2', $Reports);
     }
 
-    G::$DB->query("
-      DELETE FROM torrents_files
-      WHERE TorrentID = '$ID'");
+    unlink(TORRENT_STORE.$ID.'.torrent');
     G::$DB->query("
       DELETE FROM torrents_bad_tags
       WHERE TorrentID = $ID");
@@ -567,14 +565,12 @@ class Torrents {
     $QueryID = G::$DB->get_query_id();
 
     G::$DB->query("
-      SELECT tg.ID,
-        tf.File
-      FROM torrents_files AS tf
-        JOIN torrents AS t ON t.ID = tf.TorrentID
-        JOIN torrents_group AS tg ON tg.ID = t.GroupID
-      WHERE tf.TorrentID = $TorrentID");
+      SELECT GroupID
+      FROM torrents
+      WHERE ID = $TorrentID");
     if (G::$DB->has_results()) {
-      list($GroupID, $Contents) = G::$DB->next_record(MYSQLI_NUM, false);
+      list($GroupID) = G::$DB->next_record(MYSQLI_NUM, false);
+      $Contents = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
       if (Misc::is_new_torrent($Contents)) {
         $Tor = new BencodeTorrent($Contents);
         $FilePath = (isset($Tor->Dec['info']['files']) ? Format::make_utf8($Tor->get_name()) : '');

gazelle.sql

@@ -1181,12 +1181,6 @@ CREATE TABLE `torrents_bad_tags` (
   KEY `TimeAdded` (`TimeAdded`)
 ) ENGINE=InnoDB CHARSET=utf8;
 
-CREATE TABLE `torrents_files` (
-  `TorrentID` int(10) NOT NULL,
-  `File` mediumblob NOT NULL,
-  PRIMARY KEY (`TorrentID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
 CREATE TABLE `torrents_group` (
   `ID` int(10) NOT NULL AUTO_INCREMENT,
   `CategoryID` int(10) DEFAULT NULL,

sections/artist/download.php

@@ -44,7 +44,6 @@ SELECT
 FROM torrents AS t
   INNER JOIN torrents_group AS tg ON tg.ID = t.GroupID AND tg.CategoryID = '1'
   INNER JOIN artists_group AS a ON a.ArtistID = tg.ArtistID AND a.ArtistID = '59721'
-  LEFT JOIN torrents_files AS f ON t.ID = f.TorrentID
 ORDER BY t.GroupID ASC, Rank DESC, t.Seeders ASC
 */
 
@@ -142,20 +141,9 @@ $DownloadsQ = $DB->query($SQL);
 $Collector = new TorrentsDL($DownloadsQ, $ArtistName);
 while (list($Downloads, $GroupIDs) = $Collector->get_downloads('GroupID')) {
   $Artists = Artists::get_artists($GroupIDs);
-  $TorrentFilesQ = $DB->query("
-    SELECT TorrentID, File
-    FROM torrents_files
-    WHERE TorrentID IN (".implode(',', array_keys($GroupIDs)).')', false);
-  if (is_int($TorrentFilesQ)) {
-    // Query failed. Let's not create a broken zip archive
-    foreach ($GroupIDs as $GroupID) {
-      $Download =& $Downloads[$GroupID];
-      $Download['Artist'] = Artists::display_artists($Artists[$GroupID], false, true, false);
-      $Collector->fail_file($Download);
-    }
-    continue;
-  }
-  while (list($TorrentID, $TorrentFile) = $DB->next_record(MYSQLI_NUM, false)) {
+  $TorrentIDs = array_keys($GroupIDs);
+  foreach ($TorrentIDs as $TorrentID) {
+    $TorrentFile = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
     $GroupID = $GroupIDs[$TorrentID];
     $Download =& $Downloads[$GroupID];
     $Download['Artist'] = Artists::display_artists($Artists[$Download['GroupID']], false, true, false);

sections/collages/download.php

@@ -44,7 +44,6 @@ FROM torrents AS t
   INNER JOIN collages_torrents AS c ON t.GroupID = c.GroupID AND c.CollageID = '8'
   INNER JOIN torrents_group AS tg ON tg.ID = t.GroupID AND tg.CategoryID = '1'
   LEFT JOIN artists_group AS a ON a.ArtistID = tg.ArtistID
-  LEFT JOIN torrents_files AS f ON t.ID = f.TorrentID
 ORDER BY t.GroupID ASC, Rank DESC, t.Seeders ASC
 */
 
@@ -133,20 +132,9 @@ $Collector = new TorrentsDL($DownloadsQ, $CollageName);
 
 while (list($Downloads, $GroupIDs) = $Collector->get_downloads('GroupID')) {
   $Artists = Artists::get_artists($GroupIDs);
-  $TorrentFilesQ = $DB->query("
-    SELECT TorrentID, File
-    FROM torrents_files
-    WHERE TorrentID IN (".implode(',', array_keys($GroupIDs)).')', false);
-  if (is_int($TorrentFilesQ)) {
-    // Query failed. Let's not create a broken zip archive
-    foreach ($GroupIDs as $GroupID) {
-      $Download =& $Downloads[$GroupID];
-      $Download['Artist'] = Artists::display_artists($Artists[$GroupID], false, true, false);
-      $Collector->fail_file($Download);
-    }
-    continue;
-  }
-  while (list($TorrentID, $TorrentFile) = $DB->next_record(MYSQLI_NUM, false)) {
+  $TorrentIDs = array_keys($GroupIDs);
+  foreach ($TorrentIDs as $TorrentID) {
+    file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
     $GroupID = $GroupIDs[$TorrentID];
     $Download =& $Downloads[$GroupID];
     $Download['Artist'] = Artists::display_artists($Artists[$Download['GroupID']], false, true, false);

sections/torrents/browse.php

@@ -582,8 +582,7 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
       $SnatchedTorrentClass = $Data['IsSnatched'] ? ' snatched_torrent' : '';
       $TorrentDL = "torrents.php?action=download&id=".$TorrentID."&authkey=".$LoggedUser['AuthKey']."&torrent_pass=".$LoggedUser['torrent_pass'];
       if (!($TorrentFileName = $Cache->get_value('torrent_file_name_'.$TorrentID))) {
-        $DB->query("SELECT File FROM torrents_files WHERE TorrentID=".$TorrentID);
-        list($TorrentFile) = $DB->next_record(MYSQLI_NUM, false);
+        $TorrentFile = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
         $Tor = new BencodeTorrent($TorrentFile);
         $TorrentFileName = $Tor->Dec['info']['name'];
         $Cache->cache_value('torrent_file_name_'.$TorrentID, $TorrentFileName);
@@ -655,8 +654,7 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
     $SnatchedTorrentClass = $Data['IsSnatched'] ? ' snatched_torrent' : '';
     $TorrentDL = "torrents.php?action=download&id=".$TorrentID."&authkey=".$LoggedUser['AuthKey']."&torrent_pass=".$LoggedUser['torrent_pass'];
     if (!($TorrentFileName = $Cache->get_value('torrent_file_name_'.$TorrentID))) {
-      $DB->query("SELECT File FROM torrents_files WHERE TorrentID=".$TorrentID);
-      list($TorrentFile) = $DB->next_record(MYSQLI_NUM, false);
+      $TorrentFile = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
       $Tor = new BencodeTorrent($TorrentFile);
       $TorrentFileName = $Tor->Dec['info']['name'];
       $Cache->cache_value('torrent_file_name_'.$TorrentID, $TorrentFileName);

sections/torrents/details.php

@@ -516,8 +516,7 @@ foreach ($TorrentList as $Torrent) {
 
   $TorrentDL = "torrents.php?action=download&id=".$TorrentID."&authkey=".$LoggedUser['AuthKey']."&torrent_pass=".$LoggedUser['torrent_pass'];
   if (!($TorrentFileName = $Cache->get_value('torrent_file_name_'.$TorrentID))) {
-    $DB->query("SELECT File FROM torrents_files WHERE TorrentID=".$TorrentID);
-    list($TorrentFile) = $DB->next_record(MYSQLI_NUM, false);
+    $TorrentFile = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
     $Tor = new BencodeTorrent($TorrentFile);
     $TorrentFileName = $Tor->Dec['info']['name'];
     $Cache->cache_value('torrent_file_name_'.$TorrentID, $TorrentFileName);

sections/torrents/download.php

@@ -177,13 +177,8 @@ $DB->query("
   INSERT IGNORE INTO users_downloads (UserID, TorrentID, Time)
   VALUES ('$UserID', '$TorrentID', '".sqltime()."')");
 
-$DB->query("
-  SELECT File
-  FROM torrents_files
-  WHERE TorrentID = '$TorrentID'");
-
 Torrents::set_snatch_update_time($UserID, Torrents::SNATCHED_UPDATE_AFTERDL);
-list($Contents) = $DB->next_record(MYSQLI_NUM, false);
+$Contents = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
 $FileName = TorrentsDL::construct_file_name($Info['PlainArtists'], $Name, $Year, $Media, $Format, $Encoding, $TorrentID, $DownloadAlt);
 
 if ($DownloadAlt) {

sections/torrents/redownload.php

@@ -76,20 +76,8 @@ $Collector = new TorrentsDL($DownloadsQ, "$Username's ".ucfirst($_GET['type']));
 while (list($Downloads, $GroupIDs) = $Collector->get_downloads('TorrentID')) {
   $Artists = Artists::get_artists($GroupIDs);
   $TorrentIDs = array_keys($GroupIDs);
-  $TorrentFilesQ = $DB->query('
-    SELECT TorrentID, File
-    FROM torrents_files
-    WHERE TorrentID IN ('.implode(',', $TorrentIDs).')', false);
-  if (is_int($TorrentFilesQ)) {
-    // Query failed. Let's not create a broken zip archive
-    foreach ($TorrentIDs as $TorrentID) {
-      $Download =& $Downloads[$TorrentID];
-      $Download['Artist'] = str_replace('–','-',Artists::display_artists($Artists[$Download['GroupID']], false, true, false));
-      $Collector->fail_file($Download);
-    }
-    continue;
-  }
-  while (list($TorrentID, $TorrentFile) = $DB->next_record(MYSQLI_NUM, false)) {
+  foreach ($TorrentIDs as $TorrentID) {
+    $TorrentFile = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
     $Download =& $Downloads[$TorrentID];
     // unzip(1) corrupts files if an emdash is present. Replace them.
     $Download['Artist'] = str_replace('–','-',Artists::display_artists($Artists[$Download['GroupID']], false, true, false));

sections/upload/generate_extra_torrents.php

@@ -48,17 +48,11 @@ foreach ($ExtraTorrents as $ExtraTorrent) {
     WHERE info_hash = '" . db_string($ThisInsert['InfoHash']) . "'");
   if ($DB->has_results()) {
     list($ExtraID) = $DB->next_record();
-    $DB->query("
-      SELECT TorrentID
-      FROM torrents_files
-      WHERE TorrentID = $ExtraID");
-    if ($DB->has_results()) {
+    if (file_exists(TORRENT_STORE.$ExtraID.'.torrent')) {
       $Err = "<a href=\"torrents.php?torrentid=$ExtraID\">The exact same torrent file already exists on the site!</a>";
     } else {
       //One of the lost torrents.
-      $DB->query("
-        INSERT INTO torrents_files (TorrentID, File)
-        VALUES ($ExtraID, '$ThisInsert[TorEnc]')");
+      file_put_contents(TORRENT_STORE.$ExtraID.'.torrent', $ThisInsert['TorEnc']);
       $Err = "<a href=\"torrents.php?torrentid=$ExtraID\">Thank you for fixing this torrent.</a>";
     }
   }

sections/upload/insert_extra_torrents.php

@@ -27,11 +27,7 @@ foreach ($ExtraTorrentsInsert as $ExtraTorrent) {
   //******************************************************************************//
   //--------------- Write torrent file -------------------------------------------//
 
-  $DB->query("
-    INSERT INTO torrents_files
-      (TorrentID, File)
-    VALUES
-      ($ExtraTorrentID, '$ExtraTorrent[TorEnc]')");
+  file_put_contents(TORRENT_STORE.$ExtraTorrentID.'torrent', $ExtraTorrent['TorEnc']);
 
   Misc::write_log("Torrent $ExtraTorrentID ($LogName) (" . number_format($ExtraTorrent['TotalSize'] / (1024 * 1024), 2) . ' MB) was uploaded by ' . $LoggedUser['Username']);
   Torrents::write_group_log($GroupID, $ExtraTorrentID, $LoggedUser['ID'], 'uploaded (' . number_format($ExtraTorrent['TotalSize'] / (1024 * 1024), 2) . ' MB)', 0);

sections/upload/upload_handle.php

@@ -254,7 +254,7 @@ $T['Censored'] = $Properties['Censored'];
 
 $Tor = new BencodeTorrent($TorrentName, true);
 $PublicTorrent = $Tor->make_private(); // The torrent is now private.
-$TorEnc = db_string($Tor->encode());
+$TorEnc = $Tor->encode();
 $InfoHash = pack('H*', $Tor->info_hash());
 
 $DB->query("
@@ -263,17 +263,11 @@ $DB->query("
   WHERE info_hash = '".db_string($InfoHash)."'");
 if ($DB->has_results()) {
   list($ID) = $DB->next_record();
-  $DB->query("
-    SELECT TorrentID
-    FROM torrents_files
-    WHERE TorrentID = $ID");
-  if ($DB->has_results()) {
+  if (file_exists(TORRENT_STORE.$ID.'.torrent')) {
     $Err = '<a href="torrents.php?torrentid='.$ID.'">The exact same torrent file already exists on the site!</a>';
   } else {
     // A lost torrent
-    $DB->query("
-      INSERT INTO torrents_files (TorrentID, File)
-      VALUES ($ID, '$TorEnc')");
+    file_put_contents(TORRENT_STORE.$ID.'.torrent', $TorEnc);
     $Err = '<a href="torrents.php?torrentid='.$ID.'">Thank you for fixing this torrent</a>';
   }
 }
@@ -605,9 +599,7 @@ if ($T['FreeLeechType'] == 3) {
 //******************************************************************************//
 //--------------- Write torrent file -------------------------------------------//
 
-$DB->query("
-  INSERT INTO torrents_files (TorrentID, File)
-  VALUES ($TorrentID, '$TorEnc')");
+file_put_contents(TORRENT_STORE.$TorrentID.'.torrent', $TorEnc);
 Misc::write_log("Torrent $TorrentID ($LogName) (".number_format($TotalSize / (1024 * 1024), 2).' MB) was uploaded by ' . $LoggedUser['Username']);
 Torrents::write_group_log($GroupID, $TorrentID, $LoggedUser['ID'], 'uploaded ('.number_format($TotalSize / (1024 * 1024), 2).' MB)', 0);