Changeset 49 for trunk

Timestamp:

19.10.2005 19:06:23 (3 years ago)

Author:

m

Message:

Closes #4. Raise an error in File_Bittorrent_MakeTorrent if no file is given. Save last PEAR_Error object in public property.

Location:

trunk

Files:

• File/Bittorrent/Decode.php (modified) (5 diffs)
• File/Bittorrent/MakeTorrent.php (modified) (8 diffs)
• example_mktorrent.php (modified) (1 diff)

trunk/File/Bittorrent/Decode.php

@@ -145 +145 @@
 
     /**
+    * @var mixed    The last error object or null if no error has occurred.
+    */
+    var $last_error;
+
+    /**
     * Decode a Bencoded string
     *
@@ -168 +173 @@
         // Check file
         if (!is_file($file)) {
-            PEAR::raiseError('File_Bittorrent_Decode::decode() - Not a file.', null, null, "Given filename '$file' is not a valid file.");
+            $this->last_error = PEAR::raiseError('File_Bittorrent_Decode::decode() - Not a file.', null, null, "Given filename '$file' is not a valid file.");
             return false;
         }
@@ -190 +195 @@
         $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'.");
+            $this->last_error = PEAR::raiseError('File_Bittorrent_Decode::decode() - Corrupted bencoded data.', null, null, "Failed to decode data from file '$file'.");
             return false;
         }
@@ -409 +414 @@
         // Check if we can access remote data
         if (!ini_get('allow_url_fopen')) {
-            PEAR::raiseError('File_Bittorrent_Decode::getStats() - "allow_url_fopen" must be enabled.');
+            $this->last_error = PEAR::raiseError('File_Bittorrent_Decode::getStats() - "allow_url_fopen" must be enabled.');
             return false;
         }
@@ -418 +423 @@
         $stats = $this->decode($scrape_data);
         if (!isset($stats['files'][$packed_hash])) {
-            PEAR::raiseError('File_Bittorrent_Decode::getStats() - Invalid scrape data: "' . $scrape_data . '"');
+            $this->last_error = PEAR::raiseError('File_Bittorrent_Decode::getStats() - Invalid scrape data: "' . $scrape_data . '"');
             return false;
         }

trunk/File/Bittorrent/MakeTorrent.php

@@ -134 +134 @@
 
     /**
+    * @var mixed    The last error object or null if no error has occurred.
+    */
+    var $last_error;
+
+    /**
      * Constructor
      *
@@ -169 +174 @@
     {
         if (!is_array($announce_list)) {
-            PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - No array given.');
+            $this->last_error = PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - No array given.');
             return false;
         }
@@ -223 +228 @@
     {
         if ($piece_length < 32 or $piece_length > 4096) {
-            PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - Invalid piece lenth: "' . $piece_length . '"');
+            $this->last_error = PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - Invalid piece lenth: "' . $piece_length . '"');
             return false;
         }
@@ -251 +256 @@
             }
             $metainfo = $this->_encodeTorrent();
+        } else {
+            $this->last_error = PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - You must provide a file or directory.');
+            return false;
         }
         return $metainfo;
@@ -277 +285 @@
             $bencdata['info']['files'] = $this->_files;
         } else {
-            PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - Use ' .  __CLASS__ . '::setPath() to define a file or directory.');
+            $this->last_error = PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - Use ' .  __CLASS__ . '::setPath() to define a file or directory.');
             return false;
         }
@@ -303 +311 @@
     function _addFile($file)
     {
-        if (!$this->_openFile($file)) return false;
+        if (!$this->_openFile($file)) {
+            $this->last_error = PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . "() - Failed to open file '$file'.");
+            return false;
+        }
 
         $filelength = 0;
@@ -452 +463 @@
         if ($fsize <= 2*1024*1024*1024) {
             if (!$this->_fp = fopen($file, 'r')) {
-                PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - Failed to open "' . $file . '"');
+                $this->last_error = PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - Failed to open "' . $file . '"');
                 return false;
             }
@@ -458 +469 @@
         } else {
             if (PHP_OS != 'Linux') {
-                PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - File size is greater than 2GB. This is only supported under Linux.');
+                $this->last_error = PEAR::raiseError(__CLASS__ . '::'. __FUNCTION__ . '() - File size is greater than 2GB. This is only supported under Linux.');
                 return false;
             }

trunk/example_mktorrent.php

@@ -4 +4 @@
 
 require_once 'File/Bittorrent/MakeTorrent.php';
+
+// Set error handling
+PEAR::setErrorHandling(PEAR_ERROR_PRINT);
+
 $MakeTorrent = new File_Bittorrent_MakeTorrent('example.php');