Changeset 47 for trunk

Timestamp:

19.10.2005 18:38:25 (3 years ago)

Author:

m

Message:

Closes #6. Enhances File_Bittorrent_Decode::decodeFile() filename handling

Location:

trunk

Files:

• File/Bittorrent/Decode.php (modified) (2 diffs)
• torrentinfo.php (modified) (2 diffs)

trunk/File/Bittorrent/Decode.php

@@ -189 +189 @@
         $this->_source_length = strlen($this->_source);
         $decoded = $this->_bdecode();
+        if (!is_array($decoded)) {
+            PEAR::raiseError('File_Bittorrent_Decode::decode() - Corrupted bencoded data.', null, null, "Failed to decode data from file '$file'.");
+            return false;
+        }
 
         // Compute info_hash
@@ -224 +228 @@
                 );
             }
+        // In case the torrent contains only on file
+        } elseif(isset($decoded['info']['name']))  {
+                $this->files[] = array(
+                   'filename' => $decoded['info']['name'],
+                   'size'     => $decoded['info']['length'],
+                );
         }
         // If the the info->length field is present we are dealing with

trunk/torrentinfo.php

@@ -37 +37 @@
     require_once 'Console/Getargs.php';
 
+    // Set error handling
+    PEAR::setErrorHandling(PEAR_ERROR_PRINT);
+
     // Get filename from command line
     $args_config = array(
@@ -64 +67 @@
         switch($key) {
         case 'files':
-            echo "\n";
+            $n = 1;
+            $files_n = count($val);
+            $n_length = strlen($files_n);
+            echo '(' . $files_n . ")\n";
             foreach ($val as $file) {
-                echo str_repeat(' ', 20) . '- ' . $file['filename'] . "\n";
+                echo str_repeat(' ', 20) . '' . str_pad($n, $n_length, ' ', PAD_LEFT) . ': ' . $file['filename'] . "\n";
+                $n++;
             }
             break;