Finalize the extension parser stuff

_packages/extension-parser/classes/config.php

@@ -101,14 +101,4 @@ $ContainersExtra = [
   'Plain'            => ['csv', 'txt'],
   'Other'            => [],
 ];
-
-$Archives = [
-  '7z'       => ['7z'],
-  'bzip2'    => ['bz2', 'bzip2'],
-  'gzip'     => ['gz', 'gzip', 'tgz', 'tpz'],
-  'Pickle'   => ['pickle', 'pkl'],
-  'RAR'      => ['rar', 'rev'],
-  'ZIP'      => ['zip', 'zipx'],
-  'None'     => [],
-];
-# Line 331
+# Line 321

_packages/extension-parser/classes/torrent_form.class.php

@@ -20,97 +20,113 @@ class TorrentForm
 ?>
 
 <!-- Line 510 -->
-<!-- Multiple container fields -->
-<tr id="container_tr">
-  <td class="label">
-    Format
-    <strong class="important_text">*</strong>
-  </td>
-  <td>
-    <select name="container">
-      <option value="Autofill">Autofill</option>
-      <?php
-        foreach ($this->Containers as $Name => $Container) {
-            echo "<option value='$Name'>$Name</option>\n";
-        } ?>
-    </select><br />
-    Data file format, or detect from file list
-  </td>
-</tr>
+  <!-- Multiple container fields -->
+  <tr id="container_tr">
+    <td class="label">
+      Format
+      <strong class="important_text">*</strong>
+    </td>
+    <td>
+      <select id="container" name="container">
+        <option value="Autofill">Autofill</option>
+        <?php
+            foreach ($this->Containers as $Name => $Container) {
+                echo "\t\t\t\t\t\t<option value=\"$Name\"";
+                if ($Name === ($Torrent['Container'] ?? false)) {
+                    echo " selected";
+                }
+                echo ">$Name</option>\n";
+            } ?>
+      </select><br />
+      Data file format, or detect from file list
+    </td>
+  </tr>
 
-<!-- 2 -->
-<tr id="container_games_tr">
-  <td class="label">
-    Format
-    <strong class="important_text">*</strong>
-  </td>
-  <td>
-    <select id="container" name="container">
-      <option value="Autofill">Autofill</option>
-      <?php
-        foreach ($this->ContainersGames as $Name => $Container) {
-            echo "<option value='$Name'>$Name</option>\n";
-        } ?>
-    </select><br />
-    Data file format, or detect from file list
-  </td>
-</tr>
+  <!-- 2 -->
+  <tr id="container_games_tr">
+    <td class="label">
+      Format
+      <strong class="important_text">*</strong>
+    </td>
+    <td>
+      <select id="container" name="container">
+        <option value="Autofill">Autofill</option>
+        <?php
+            foreach ($this->ContainersGames as $Name => $Container) {
+                echo "\t\t\t\t\t\t<option value=\"$Name\"";
+                if ($Name === ($Torrent['Container'] ?? false)) {
+                    echo " selected";
+                }
+                echo ">$Name</option>\n";
+            } ?>
+      </select><br />
+      Data file format, or detect from file list
+    </td>
+  </tr>
 
-<!-- 3 -->
-<tr id="container_prot_tr">
-  <td class="label">
-    Format
-    <strong class="important_text">*</strong>
-  </td>
-  <td>
-    <select id="container" name="container">
-      <option value="Autofill">Autofill</option>
-      <?php
-        foreach ($this->ContainersProt as $Name => $Container) {
-            echo "<option value='$Name'>$Name</option>\n";
-        } ?>
-    </select><br />
-    Data file format, or detect from file list
-  </td>
-</tr>
+  <!-- 3 -->
+  <tr id="container_prot_tr">
+    <td class="label">
+      Format
+      <strong class="important_text">*</strong>
+    </td>
+    <td>
+      <select id="container" name="container">
+        <option value="Autofill">Autofill</option>
+        <?php
+            foreach ($this->ContainersProt as $Name => $Container) {
+                echo "\t\t\t\t\t\t<option value=\"$Name\"";
+                if ($Name === ($Torrent['Container'] ?? false)) {
+                    echo " selected";
+                }
+                echo ">$Name</option>\n";
+            } ?>
+      </select><br />
+      Data file format, or detect from file list
+    </td>
+  </tr>
 
-<!-- 4 -->
-<tr id="container_extra_tr">
-  <td class="label">
-    Format
-    <strong class="important_text">*</strong>
-  </td>
-  <td>
-    <select id="container" name="container">
-      <option value="Autofill">Autofill</option>
-      <?php
-        foreach ($this->ContainersExtra as $Name => $Container) {
-            echo "<option value='$Name'>$Name</option>\n";
-        } ?>
-    </select><br />
-    Data file format, or detect from file list
-  </td>
-</tr>
+  <!-- 4 -->
+  <tr id="container_extra_tr">
+    <td class="label">
+      Format
+      <strong class="important_text">*</strong>
+    </td>
+    <td>
+      <select id="container" name="container">
+        <option value="Autofill">Autofill</option>
+        <?php
+            foreach ($this->ContainersExtra as $Name => $Container) {
+                echo "\t\t\t\t\t\t<option value=\"$Name\"";
+                if ($Name === ($Torrent['Container'] ?? false)) {
+                    echo " selected";
+                }
+                echo ">$Name</option>\n";
+            } ?>
+      </select><br />
+      Data file format, or detect from file list
+    </td>
+  </tr>
 
-<!-- Compression -->
-<tr id="archive_tr">
-  <td class="label">
-    Archive
-    <strong class="important_text">*</strong>
-  </td>
-  <td>
-    <select name='archive'>
-      <option value="Autofill">Autofill</option>
-      <?php
-        foreach ($this->Archives as $Name => $Archive) {
-            echo "\t\t\t\t\t\t<option value=\"$Name\"";
-            if ($Archive === ($Torrent['Archive'] ?? false)) {
-                echo ' selected';
-            }
-            echo ">$Name</option>\n";
-        } ?>
-    </select><br />
-    Compression algorithm, or detect from file list
-  </td>
-</tr>
-<!-- Line 607 -->
+  <!-- Compression -->
+  <tr id="archive_tr">
+    <td class="label">
+      Archive
+      <strong class="important_text">*</strong>
+    </td>
+    <td>
+      <select id="archive" name="archive">
+        <option value="Autofill">Autofill</option>
+        <?php
+            foreach ($this->Archives as $Name => $Archive) {
+                echo "\t\t\t\t\t\t<option value=\"$Name\"";
+                if ($Name === ($Torrent['Archive'] ?? false)) {
+                    echo " selected";
+                }
+                echo ">$Name</option>\n";
+            } ?>
+      </select><br />
+      Compression algorithm, or detect from file list
+    </td>
+  </tr>
+<!-- Line 618 -->

_packages/extension-parser/classes/validate.class.php

@@ -63,4 +63,4 @@ class Validate
             }
         }
     }
-    # Line 227
+    # Line 230

_packages/extension-parser/readme.md

@@ -4,8 +4,37 @@ One of the challenges of tracking biology data is the overwhelming number of fil
 If a user leaves the container or archive dropdown blank, this tool:
   * Adds the file sizes of each extension
   * Sorts the torrent file list by size
-  * Returns the first matching extension value
+  * Returns the first matching extension key
 
 ## In this repo
 Please find all the snippets you need to implement a similar feature on your own tracker.
-The file and folder structure mirrors what Oppaitime Gazelle uses.
+See `classes/config.php` for an idea of how the each format is associated with an array of file extensions.
+I'll reproduce an example below so you can see how powerful a general extension parser can be.
+
+```php
+$ContainersExtra = [
+  'Docker'           => ['dockerfile'],
+  'Hard Disk'        => ['fvd', 'dmg', 'esd', 'qcow', 'qcow2', 'qcow3', 'smi', 'swm', 'vdi', 'vhd', 'vhdx', 'vmdk', 'wim'],
+  'Optical Disc'     => ['bin', 'ccd', 'cso', 'cue', 'daa', 'isz', 'mdf', 'mds', 'mdx', 'nrg', 'uif'],
+  'Python'           => ['pxd', 'py', 'py3', 'pyc', 'pyd', 'pyde', 'pyi', 'pyo', 'pyp', 'pyt', 'pyw', 'pywz', 'pyx', 'pyz', 'rpy', 'xpy'],
+  'Jupyter Notebook' => ['ipynb'],
+  'Ontology'         => ['cgif', 'cl', 'clif', 'csv', 'htm', 'html', 'kif', 'obo', 'owl', 'rdf', 'rdfa', 'rdfs', 'rif', 'tsv', 'xcl', 'xht', 'xhtml', 'xml'],
+  'OpenDocument'     => ['odt', 'fodt', 'ods', 'fods', 'odp', 'fodp', 'odg', 'fodg', 'odf'],
+  'Word'             => ['doc', 'dot', 'wbk', 'docx', 'docm', 'dotx', 'dotm', 'docb'],
+  'Excel'            => ['xls', 'xlt', 'xlm', 'xlsx', 'xlsm', 'xltx', 'xltm', 'xlsb', 'xla', 'xlam', 'xll', 'xlw'],
+  'PowerPoint'       => ['ppt', 'pot', 'pps', 'pptx', 'pptm', 'potx', 'potm', 'ppam', 'ppsx', 'ppsm', 'sldx', 'sldm'],
+  'PDF'              => ['pdf', 'fdf', 'xfdf'],
+  'Plain'            => ['csv', 'txt'],
+  'Other'            => [],
+];
+```
+
+## Caveats and todos
+Test thoroughly before implementing to ensure the behavior is what you expect!
+You don't want to ruin the database with unextected "Autofill" formats.
+
+For this reason, extension parsing is disabled on the torrent edit handler for now.
+The FileList stored in the database, available to the edit form, is a bencoded string instead of a nested array.
+$Validate->ParseExtensions currently only works with the $Tor->FileList object before its bencoded.
+
+That's all for now.

_packages/extension-parser/sections/torrents/edit.php

@@ -0,0 +1,3 @@
+<?php
+
+# todo

_packages/extension-parser/sections/torrents/takeedit.php

@@ -1,64 +1,23 @@
 <?php
 
-# Line 28
-# todo: Associate containers with categories beforehand
-# It may have to happen structurally in config.php, e.g.,
-# $Categories = [
-#   'GazelleName' => [$Name, $Icon, $Description, $Containers],
-#    ...
-#  ];
-$Properties['CategoryID'] = $TypeID;
-$Properties['CategoryName'] = $Type;
-$Properties['FileTypes'] = [
-  'DNA'      => $Containers,
-  'RNA'      => $Containers,
-  'Proteins' => $ContainersProt,
-  'Imaging'  => $ContainersGames,
-  'Extras'   => $ContainersExtra
-];
-$Properties['ArchiveTypes'] = [
-  'DNA'      => $Archives,
-  'RNA'      => $Archives,
-  'Proteins' => $Archives,
-  'Imaging'  => $Archives,
-  'Extras'   => $Archives
-];
-# Line 49
-
-# Line 313
-$T['FileTypes'] = $Properties['FileTypes'];
-$T['ArchiveTypes'] = $Properties['FileTypes'];
+# Line 58
+$Properties['Container'] = (isset($_POST['container']) && $_POST['container'] !== '---') ? $_POST['container'] : 'Other';
+$Properties['Archive'] = (isset($_POST['archive']) && $_POST['archive'] !== '---') ? $_POST['archive'] : 'None';
+# Line 59
 
+# Line 294
 //******************************************************************************//
 //--------------- Autofill format and archive ----------------------------------//
 
-if ($T['Container'] === 'Autofill') {
-    # torrents.Container
-    $T['Container'] = $Validate->ParseExtensions(
-
-        # $FileList
-        $Tor->file_list(),
-
-        # $Category
-        $T['CategoryName'],
-
-        # $FileTypes
-        $T['FileTypes'],
-    );
-}
-
-if ($T['Archive'] === 'Autofill') {
-    # torrents.Archive
-    $T['Archive'] = $Validate->ParseExtensions(
-
-        # $FileList
-        $Tor->file_list(),
-
-        # $Category
-        $T['CategoryName'],
+# Load FileList in lieu of $Tor object
+# todo: Format the output for  $Validate->ParseExtensions()
+#var_dump($T['FileList']);
 
-        # $FileTypes
-        $T['ArchiveTypes'],
-    );
+# Disable the extension parser for edits
+# todo: Make this work with $T['FileList']
+if ($T['Container'] === 'Autofill'
+|| $T['Archive'] === 'Autofill') {
+    $Err = "Extension parsing is only possible for new uploads";
+    error($Err);
 }
-# Line 347
+# Line 307

_packages/extension-parser/sections/upload/upload_handle.php

@@ -7,24 +7,30 @@
 #   'GazelleName' => [$Name, $Icon, $Description, $Containers],
 #    ...
 #  ];
-$Properties['Archives'] = $Archives;
-$Properties['Containers'] = [
+$Properties['FileTypes'] = [
     'DNA'      => $Containers,
     'RNA'      => $Containers,
     'Proteins' => $ContainersProt,
     'Imaging'  => $ContainersGames,
     'Extras'   => $ContainersExtra
 ];
-# Line 57
+$Properties['ArchiveTypes'] = [
+    'DNA'      => $Archives,
+    'RNA'      => $Archives,
+    'Proteins' => $Archives,
+    'Imaging'  => $Archives,
+    'Extras'   => $Archives
+];
+# Line 63
 
-# Line 421
+# Line 427
 //******************************************************************************//
 //--------------- Autofill format and archive ----------------------------------//
 
 if ($T['Container'] === 'Autofill') {
-
     # torrents.Container
-    $Validate->ParseExtensions(
+    $T['Container'] = $Validate->ParseExtensions(
+
         # $FileList
         $Tor->file_list(),
 
@@ -37,9 +43,9 @@ if ($T['Container'] === 'Autofill') {
 }
 
 if ($T['Archive'] === 'Autofill') {
-
     # torrents.Archive
-    $Validate->ParseExtensions(
+    $T['Archive'] = $Validate->ParseExtensions(
+
         # $FileList
         $Tor->file_list(),
 
@@ -47,7 +53,7 @@ if ($T['Archive'] === 'Autofill') {
         $T['CategoryName'],
 
         # $FileTypes
-        $T['FileTypes'],
+        $T['ArchiveTypes'],
     );
 }
-# Line 452
+# Line 458

classes/torrent_form.class.php

@@ -471,7 +471,7 @@ class TorrentForm
     </td>
     <td>
       <select name="media">
-        <option value="">---</option>
+        <option>---</option>
         <?php
           foreach ($this->Media as $Media) {
               echo "\t\t\t\t\t\t<option value=\"$Media\"";
@@ -514,12 +514,16 @@ class TorrentForm
       <strong class="important_text">*</strong>
     </td>
     <td>
-      <select name="container">
+      <select id="container" name="container">
         <option value="Autofill">Autofill</option>
         <?php
-          foreach ($this->Containers as $Name => $Container) {
-              echo "<option value='$Name'>$Name</option>\n";
-          } ?>
+            foreach ($this->Containers as $Name => $Container) {
+                echo "\t\t\t\t\t\t<option value=\"$Name\"";
+                if ($Name === ($Torrent['Container'] ?? false)) {
+                    echo " selected";
+                }
+                echo ">$Name</option>\n";
+            } ?>
       </select><br />
       Data file format, or detect from file list
     </td>
@@ -535,9 +539,13 @@ class TorrentForm
       <select id="container" name="container">
         <option value="Autofill">Autofill</option>
         <?php
-          foreach ($this->ContainersGames as $Name => $Container) {
-              echo "<option value='$Name'>$Name</option>\n";
-          } ?>
+            foreach ($this->ContainersGames as $Name => $Container) {
+                echo "\t\t\t\t\t\t<option value=\"$Name\"";
+                if ($Name === ($Torrent['Container'] ?? false)) {
+                    echo " selected";
+                }
+                echo ">$Name</option>\n";
+            } ?>
       </select><br />
       Data file format, or detect from file list
     </td>
@@ -553,9 +561,13 @@ class TorrentForm
       <select id="container" name="container">
         <option value="Autofill">Autofill</option>
         <?php
-          foreach ($this->ContainersProt as $Name => $Container) {
-              echo "<option value='$Name'>$Name</option>\n";
-          } ?>
+            foreach ($this->ContainersProt as $Name => $Container) {
+                echo "\t\t\t\t\t\t<option value=\"$Name\"";
+                if ($Name === ($Torrent['Container'] ?? false)) {
+                    echo " selected";
+                }
+                echo ">$Name</option>\n";
+            } ?>
       </select><br />
       Data file format, or detect from file list
     </td>
@@ -571,9 +583,13 @@ class TorrentForm
       <select id="container" name="container">
         <option value="Autofill">Autofill</option>
         <?php
-          foreach ($this->ContainersExtra as $Name => $Container) {
-              echo "<option value='$Name'>$Name</option>\n";
-          } ?>
+            foreach ($this->ContainersExtra as $Name => $Container) {
+                echo "\t\t\t\t\t\t<option value=\"$Name\"";
+                if ($Name === ($Torrent['Container'] ?? false)) {
+                    echo " selected";
+                }
+                echo ">$Name</option>\n";
+            } ?>
       </select><br />
       Data file format, or detect from file list
     </td>
@@ -586,16 +602,16 @@ class TorrentForm
       <strong class="important_text">*</strong>
     </td>
     <td>
-      <select name='archive'>
+      <select id="archive" name="archive">
         <option value="Autofill">Autofill</option>
         <?php
-          foreach ($this->Archives as $Name => $Archive) {
-              echo "\t\t\t\t\t\t<option value=\"$Name\"";
-              if ($Archive === ($Torrent['Archive'] ?? false)) {
-                  echo ' selected';
-              }
-              echo ">$Name</option>\n";
-          } ?>
+            foreach ($this->Archives as $Name => $Archive) {
+                echo "\t\t\t\t\t\t<option value=\"$Name\"";
+                if ($Name === ($Torrent['Archive'] ?? false)) {
+                    echo " selected";
+                }
+                echo ">$Name</option>\n";
+            } ?>
       </select><br />
       Compression algorithm, or detect from file list
     </td>
@@ -609,7 +625,7 @@ class TorrentForm
     </td>
     <td>
       <select id="ressel" name="ressel" onchange="SetResolution()">
-        <option value="">---</option>
+        <option>---</option>
         <?php
           foreach ($this->Resolutions as $Res) {
               echo "\t\t\t\t\t\t<option value=\"$Res\"";

sections/torrents/edit.php

@@ -193,7 +193,7 @@ if (check_perms('torrents_edit') || check_perms('users_mod')) {
               <?php    } ?>
             </select>
           </td>
-          </tr>
+        </tr>
         <tr id="split_artist">
           <td class="label">Artist</td>
           <td>

sections/torrents/takeedit.php

@@ -45,7 +45,6 @@ $Properties['Encoding'] = $_POST['bitrate'];
 $Properties['TorrentDescription'] = $_POST['release_desc'];
 $Properties['MediaInfo'] = $_POST['mediainfo'];
 $Properties['Name'] = $_POST['title'];
-$Properties['Container'] = $_POST['container'];
 $Properties['Codec'] = $_POST['codec'];
 $Properties['Resolution'] = $_POST['resolution'];
 $Properties['AudioFormat'] = $_POST['audioformat'];
@@ -55,7 +54,9 @@ $Properties['Subber']= $_POST['subber'];
 
 $Properties['Censored'] = (isset($_POST['censored'])) ? '1' : '0';
 $Properties['Anonymous'] = (isset($_POST['anonymous'])) ? '1' : '0';
-$Properties['Archive'] = (isset($_POST['archive']) && $_POST['archive'] !== '---') ? $_POST['archive'] : '';
+
+$Properties['Container'] = (isset($_POST['container']) && $_POST['container'] !== '---') ? $_POST['container'] : 'Other';
+$Properties['Archive'] = (isset($_POST['archive']) && $_POST['archive'] !== '---') ? $_POST['archive'] : 'None';
 
 if ($_POST['album_desc']) {
     $Properties['GroupDescription'] = $_POST['album_desc'];
@@ -294,52 +295,17 @@ $T['Anonymous'] = $Properties['Anonymous'];
 //--------------- Autofill format and archive ----------------------------------//
 
 # Load FileList in lieu of $Tor object
-$T['FileList'] = $DB->query("
-  SELECT FileList
-  FROM torrents
-  WHERE ID = $TorrentID");
-
-if (!$DB->has_results()) {
-    error(404);
-}
-
-# Call the extension parser
-if ($T['Container'] === 'Autofill') {
-    # torrents.Container
-    $T['Container'] = $Validate->ParseExtensions(
-
-        # $FileList
-        $T['FileList'],
-
-        # $Category
-        $T['CategoryName'],
-
-        # $FileTypes
-        $T['FileTypes'],
-    );
-}
-
-if ($T['Archive'] === 'Autofill') {
-    # torrents.Archive
-    $T['Archive'] = $Validate->ParseExtensions(
-
-        # $FileList
-        $Tor->file_list(),
-
-        # $Category
-        $T['CategoryName'],
-
-        # $FileTypes
-        $T['ArchiveTypes'],
-    );
+# todo: Format the output for  $Validate->ParseExtensions()
+#var_dump($T['FileList']);
+
+# Disable the extension parser for edits
+# todo: Make this work with $T['FileList']
+if ($T['Container'] === 'Autofill'
+|| $T['Archive'] === 'Autofill') {
+    $Err = "Extension parsing is only possible for new uploads";
+    error($Err);
 }
-
-print_r('<pre>');
-var_dump($T['FileList']);
-var_dump($T['CategoryName'], );
-var_dump($T['FileTypes'], );
-var_dump($T['ArchiveTypes'], );
-
+    
 //******************************************************************************//
 //--------------- Start database stuff -----------------------------------------//
 
@@ -408,7 +374,8 @@ if (check_perms('torrents_freeleech')) {
 }
 
 if (check_perms('users_mod')) {
-    /*  if ($T[Format] != "'FLAC'") {
+    /*
+    if ($T[Format] !== "'FLAC'") {
         $SQL .= "
           HasLog = '0',
           HasCue = '0',";
@@ -508,7 +475,7 @@ list($GroupID, $Time) = $DB->next_record();
 
 // Competition
 if (strtotime($Time) > 1241352173) {
-    if ($_POST['log_score'] == '100') {
+    if ($_POST['log_score'] === '100') {
         $DB->query("
       INSERT IGNORE into users_points (GroupID, UserID, Points)
       VALUES ('$GroupID', '$UserID', '1')");