Changeset 51

Timestamp:

05/03/08 10:32:31 (2 years ago)

Author:

royger

Message:

* New xmlrpc factory, 2 classes added:

• torrent.cls.php
  
• multicall.cls.php
  

Every torrent creates a torrent object, which contains the functions for calling all the necessary methods. Also a transparent cache was added.

* Cleaned most of the classes of unnecessary php code.
* Command interface finished, most actions are done through AJAX calls using the Commands.cls.php class. Fixes #16.
* This build is tested to work with Mozilla Firefox 2.0.0.14 and Safari 3.1.1 (5525.18) using Mac OS X. Same results expected (although not tested) under Windows.

Files:

• trunk/wtorrent/cls/multicall.cls.php (added)
• trunk/wtorrent/cls/rtorrent.cls.php (modified) (5 diffs)
• trunk/wtorrent/cls/torrent.cls.php (added)
• trunk/wtorrent/home/cls/Commands.cls.php (modified) (1 diff)
• trunk/wtorrent/home/cls/Feeds.cls.php (modified) (3 diffs)
• trunk/wtorrent/home/cls/Files.cls.php (modified) (4 diffs)
• trunk/wtorrent/home/cls/General.cls.php (modified) (3 diffs)
• trunk/wtorrent/home/cls/ListT.cls.php (modified) (8 diffs)
• trunk/wtorrent/home/cls/Tracker.cls.php (modified) (3 diffs)
• trunk/wtorrent/home/css/estil.css (modified) (1 diff)
• trunk/wtorrent/home/js/javasc.js (modified) (1 diff)
• trunk/wtorrent/lib/inc/includes.inc.php (modified) (1 diff)

trunk/wtorrent/cls/rtorrent.cls.php

@@ -21 +21 @@
-{
-        protected $client;
+        protected $multicall;
+        protected $torrents;
+        protected $data;
+        
-        private $menu = array('Main' => 'ListT',
-                                                'Add Torrent' => 'AddT',
@@ -36 +40 @@
-    /////////////////////////////////// C O N S T R U C T O R A S  Y  D E S T R U C T O R A ///////////////////////////////////
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        public function registrado( )
-        {
-
+       
-        }
-        public function compLogin($user, $passwd)
-    
+       
-                $passwd = md5($passwd);
-                $sql = "select id from tor_passwd where user = '$user' and passwd = '$passwd'";
@@ -59 +67 @@
-                {
-                        $num = $result->numRows();
-
+
-                        if($num > 0)
-                                $return = $result->current();
-                        else
-                                $return = false;
-
-
-
-
-
-
+
+
+
+
+
-        public function getUser( )
-        {
-                return $this->_sesion->user;
-        }
-
-        public function getIdUser( )
-        {
@@ -108 +114 @@
-                return $return;
-        }
-        
-
-        public function login( $user, $password )
-        {       
@@ -137 +141 @@
-                }
-        }
+        private function getPrivate()
+        {
+                $tt = array();
+                $sql = "select hash, user from torrents";
+                $result = $this->_db->query($sql);
+                $torr = $result->fetchAll();
+                foreach($torr as $torrent)
+                        $tt[$torrent['hash']] = $torrent['user'];
+                        
+                return $tt;
+        }
-        public function setClient()
-        {
-                $this->client = new xmlrpc_client(RT_DIR, RT_HOST, RT_PORT);
-
+
+
-                if(RT_AUTH)
-                        $this->client->setCredentials(RT_USER, RT_PASSWD);
-
-
+
+
+
-        
-   
-
-
+
+
+
-                if($result->errno != 0)
-                {
-                        $this->addMessage($this->_str['err_conn']);
-                        return false;
-
+
+
-                        return true;
+                }
+        }
+        /* Initializes torrent objects */
+        protected function setTorrents() {
+                $message = new xmlrpcmsg("d.multicall", array(new xmlrpcval('default', 'string'),new xmlrpcval('d.get_hash=', 'string')));
+                $result = $this->client->send($message);
+                if(is_array($result->val))
+                {
+                        foreach($result->val as $hash)
+                        {
+                                $this->torrents[$hash[0]] = new torrent($hash[0], $this->client, $this->multicall, $this->data[$hash[0]]);
+                        }
+                        /* Mark torrents as public/private and assign owners */
+                        $private_torrents = $this->getPrivate();
+                        $hashes = $this->getHashes();
+                        foreach($hashes as $hash)
+                        {
+                                if(array_key_exists($hash, $private_torrents))
+                                {
+                                        $this->data[$hash]['private'] = true;
+                                        $this->data[$hash]['owner'] = $private_torrents[$hash];
+                                } else {
+                                        $this->data[$hash]['private'] = false;
+                                        $this->data[$hash]['owner'] = 0;
+                                }
+                        }
+                }
+        }
+        protected function getHashes()
+        {
+                return array_keys($this->torrents);
+        }
+        protected function erase_db($hash)
+        {
+                $sql = "delete from torrents where hash = '" . $hash . "'";
+                $this->_db->query($sql);
-        }
-        protected function setPerm()
-        {
-                $this->admin = false;
+        }
+        /* xmlrpc rtorrent admin functions (not torrent related ) */
+        protected function set_download_rate($limit)
+        {
+                $message = new xmlrpcmsg("set_download_rate", array(new xmlrpcval($limit, 'int')));
+                $result = $this->client->send($message);
+                
+                if($this->checkError($result))
+                {
+                        $return = true;
+                } else {
+                        $return = false;
+                }
+                return $return;
+        }
+        protected function set_upload_rate($limit)
+        {
+                $message = new xmlrpcmsg("set_download_rate", array(new xmlrpcval($limit, 'int')));
+                $result = $this->client->send($message);
+                
+                if($this->checkError($result))
+                {
+                        $return = true;
+                } else {
+                        $return = false;
+                }
+                return $return;
-        }
-}

trunk/wtorrent/home/cls/Commands.cls.php

@@ -18 +18 @@
-class Commands extends rtorrent
-{
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        private function stop($hashes)
+        {
+                $hashes = explode('~', $hashes);
+                if(!is_array($hashes))
+                        $hashes = array($hashes);
+
+                foreach($hashes as $hash)
+                {
+                        $this->torrents[$hash]->stop(true);
+                }
+                $this->multicall->call();
+
+                $this->addMessage($this->_str['info_tor_stop']);
+        }
+        private function close($hashes)
+        {
+                $hashes = explode('~', $hashes);
+                if(!is_array($hashes))
+                        $hashes = array($hashes);
+
+                foreach($hashes as $hash)
+                {
+                        $this->torrents[$hash]->close(true);
+                }
+                $this->multicall->call();
+
+                $this->addMessage($this->_str['info_tor_close']);
+        }
+        private function chash($hashes)
+        {
+                $hashes = explode('~', $hashes);
+        if(!is_array($hashes))
+                $hashes = array($hashes);
+        
+        foreach($hashes as $hash)
+        {
+                $this->torrents[$hash]->check_hash(true);
+        }
+                $this->multicall->call();
+        
+        $this->addMessage($this->_str['info_tor_chash']);
+        }
+        private function start($hashes)
+        {
+                $hashes = explode('~', $hashes);
+        if(!is_array($hashes))
+                $hashes = array($hashes);
+        
+        foreach($hashes as $hash)
+        {
+                $this->torrents[$hash]->start(true);
+        }
+                $this->multicall->call();
+        
+        $this->addMessage($this->_str['info_tor_start']);
+        }
+  private function erase($hashes)
+        {
+        $hashes = explode('~', $hashes);
+    if(!is_array($hashes))
+        $hashes = array($hashes);
+        
+    foreach($hashes as $hash)
-    {
-hashes = explode('~', $hashes
-
-           $hashes = array($hashes);
+this->torrents[$hash]->erase(
+
+}
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                        $this->addMessage($this->_str['info_down_limit']);
-                else
-                        $this->addMessage($this->_str['err_down_limit']);       
-
-
-
-
-
-
-
+
+
+
+
+
+
-                else
-up_limit']);        
-    
-  
-    
-    
+down_limit']);
+       
+
+       
+       
-        
-    
-array_post[] = new xmlrpcmsg('f.set_priority', array(new xmlrpcval($hash, 'string'), new xmlrpcval($param, 'int'), new xmlrpcval($priority, 'int'))
+       
+this->torrents[$hash]->f_set_priority($param, $priority, true
-                
-client->multicall($array_post
+multicall->call(
-                
-->errno == 0
+
-                        $this->addMessage($this->_str['info_ch_files']);
-                else
-                        $this->addMessage($this->_str['err_ch_files']);
-                         
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                        $this->addMessage($this->_str['info_pr']);
-
-
-
-
-
-
-
+
+
+
+
+
+
-        
-       foreach($t_index
-array_post[] = new xmlrpcmsg('t.set_enabled', array(new xmlrpcval($hash, 'string'), new xmlrpcval($param, 'int'), new xmlrpcval($enabled, 'int'))
+               foreach($trackers
+this->torrents[$hash]->t_set_enabled($param, $enabled, true
-                
-//print_r($array_post);        
-$responses = $this->client->multicall($array_post);
+$this->multicall->call();
+
-                $this->addMessage($this->_str['info_ch_trackers']);
-    
+       
-}
-?>

trunk/wtorrent/home/cls/Feeds.cls.php

@@ -18 +18 @@
-class Feeds extends rtorrent
-{
-        /*private  $torrents;
-    private  $info_dowload = array('default', 
-                                                        'd.get_hash=', 
-                                                        'd.get_name=',
-                                                                'd.get_down_rate=',
-                                                                'd.get_up_rate=',
-                                                                'd.get_chunk_size=',
-                                                                'd.get_completed_chunks=',
-                                                                'd.get_size_chunks=',
-                                                                'd.get_state=',
-                                                                'd.get_peers_accounted=',
-                                                                'd.get_peers_complete=',
-                                                                'd.is_hash_checking=',
-                                                                'd.get_ratio=',
-                                                                'd.get_tracker_size=');
-        private $info_tracker = array('',
-                                                                "",
-                                                                't.get_scrape_complete=',
-                                                                't.get_scrape_incomplete=');*/
-        private $info = array();
-        private $feeds = array();
-        private $view_feed = false;
-
-    
+       
-        {
-                if(!$this->setClient())
@@ -91 +72 @@
-                        $this->feeds[$i]['feed'] = new SimplePie();
-                        $this->feeds[$i]['feed']->set_feed_url($result[$i]['url']);
-DIR_TPL_COMPILE
+rtrim(DIR_TPL_COMPILE, '/')
-                        $this->feeds[$i]['feed']->init();
-                        $this->feeds[$i]['feed']->handle_content_type();
@@ -141 +122 @@
-                return $this->info[$index]['title'];
-        }
-        public function getUpLimit()
-        {
-                $message = new xmlrpcmsg("get_upload_rate");
-                $result = $this->client->send($message);
-                return round($result->val/1024, 1);
-        }
-        public function getDownLimit()
-        {
-                $message = new xmlrpcmsg("get_download_rate");
-                $result = $this->client->send($message);
-                return round($result->val/1024, 1);
-        }
-        public function getName($hash)
-        {
-                return $this->torrents[$hash]['name'];
-        }
-        public function getDownRate($hash)
-        {
-                return $this->torrents[$hash]['down_rate'];
-        }
-        public function getUpRate($hash)
-        {
-                return $this->torrents[$hash]['up_rate'];
-        }
-        public function getState($hash)
-        {
-                return $this->torrents[$hash]['state'];
-        }
-        public function getConnPeers($hash)
-        {
-                return $this->torrents[$hash]['peers'];
-        }
-        public function getConnSeeds($hash)
-        {
-                return $this->torrents[$hash]['seeds'];
-        }
-        public function getTotalPeers($hash)
-        {
-                return $this->torrents[$hash]['peers_scrape'];
-        }
-        public function getTotalSeeds($hash)
-        {
-                return $this->torrents[$hash]['seeds_scrape'];
-        }
-        public function getPercent($hash)
-        {
-                return $this->torrents[$hash]['percent'];
-        }
-        public function getRatio($hash)
-        {
-                return $this->torrents[$hash]['ratio'];
-        }
-        public function isHashChecking($hash)
-        {
-                return $this->torrents[$hash]['is_hash_checking'];
-        }
-        public function getETA($hash)
-        {
-                return $this->torrents[$hash]['ETA'];
-        }
-        public function getSize($hash)
-        {
-                return $this->getCorrectUnits($this->torrents[$hash]['size_in_chunks'] * $this->torrents[$hash]['chunk_size']);
-        }
-        public function getDone($hash)
-        {
-                return $this->getCorrectUnits($this->torrents[$hash]['completed_chunks'] * $this->torrents[$hash]['chunk_size']);
-        }
-        private function getCorrectUnits($size)
-    {
-                $size_units = 'bytes';
-                if($size >= 1024)
-                {
-                $size /= 1024;
-                $size_units = 'Kb';
-                }
-                if($size >= 1024)
-                {
-            $size /= 1024;
-            $size_units = 'Mb';
-        }
-                if($size >= 1024)
-        {
-            $size /= 1024;
-            $size_units = 'Gb';
-        }
-        return round($size, 2) .  $size_units;
-
-    }
-        private function getPrivate()
-        {
-                $tt = array();
-                $sql = "select hash, user from torrents";
-                $result = $this->_db->query($sql);
-                $torr = $result->fetchAll();
-                foreach($torr as $torrent)
-                        $tt[$torrent['hash']] = $torrent['user'];
-                        
-                return $tt;
-        }
-    
-        private function fetchFeeds()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-?>

trunk/wtorrent/home/cls/Files.cls.php

@@ -18 +18 @@
-class Files extends rtorrent
-{
-
-
-
-
-
-
-
-
+
-
-   
+      
-        {
-                $this->hash = $this->_request['hash'];
@@ -34 +27 @@
-                        return false;
-                        
-if(isset($this->_request['ch_pr']) && count($this->_request['files']) > 0) $this->changePriorities($this->_request['files'], $this->_request['priority'], $this->hash
-getTorrents($this->_request['hash']
+$array_f = array('f.get_path', 'f.get_completed_chunks', 'f.get_size_chunks','f.get_priority'
+multicall->f_multicall($this->hash, $array_f
-        }
-        
-        
-        public function getHash()
-        {
@@ -45 +36 @@
-        public function getFiles()
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        public function getSize($key)
-        {
-files[$key]['size']
+torrents[$this->hash]->f_get_size_chunks($key) * $this->torrents[$this->hash]->get_chunk_size()
-        }
-        public function getDone($key)
-        {
-
-
-
-
-
+
-        }
-        public function getPriorityStr($key)
-        {
-files[$key]['priority']
+torrents[$this->hash]->f_get_priority($key)
-                {
-                        case 0:
@@ -99 +77 @@
-        }
-        private function getCorrectUnits($size)
-   
+      
-                $size_units = 'bytes';
-                if($size >= 1024)
-                {
-           
-           
+       
+       
-                }
-                if($size >= 1024)
-                {
-        
-      
-        
+   
+
+               
-                if($size >= 1024)
-        {
-            $size /= 1024;
-            $size_units = 'Gb';
-        }
-        return round($size, 2) .  $size_units;
-
-    }
-
-        private function getTorrents($hash)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-?>

trunk/wtorrent/home/cls/General.cls.php

@@ -18 +18 @@
-class General extends rtorrent
-{
-        private  $details;
-        private  $hash;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                $this->hash = $this->_request['hash'];
-        
-                if(!$this->setClient())
-                        return false;
-                
-                if(isset($this->_request['ch_pr'])) $this->changePriority($this->hash, $this->_request['priority']);
-                
-        $this->getTorrents($this->hash);
-        }
-
-        ////////////////////////////////////////////////// C O N S U L T O R A S //////////////////////////////////////////////////
-        public function getHash()
@@ -54 +34 @@
-        public function getName()
-        {
-details['name']
+torrents[$hash]->get_name()
-        }
-        public function getTorrent()
-        {
-$this->details['torrent_file']
+'/' . ltrim($this->torrents[$this->hash]->get_tied_to_file(), '/')
-        }
-        public function getDataPath()
-        {
-details['data_path']
+torrents[$this->hash]->get_base_path()
-        }
-        public function getPercent()
-        {
-$this->details['percent']
+floor(($this->torrents[$this->hash]->get_completed_chunks() / $this->torrents[$this->hash]->get_size_chunks())*100)
-        }
-        public function getRatio()
-        {
-$this->details['ratio']
+round($this->torrents[$this->hash]->get_ratio()/1000,2)
-        }
-        public function getSize()
-        {
-details['size_in_chunks'] * $this->details['chunk_size']
+torrents[$this->hash]->get_size_chunks() * $this->torrents[$this->hash]->get_chunk_size()
-        }
-        public function getDone()
-        {
-details['completed_chunks'] * $this->details['chunk_size']
+torrents[$this->hash]->get_completed_chunks() * $this->torrents[$this->hash]->get_chunk_size()
-        }
-        public function getUp()
-        {
-details['bytes_up']
+torrents[$this->hash]->get_completed_chunks() * $this->torrents[$this->hash]->get_chunk_size() * $this->getRatio()
-        }
-        public function getMaxPeers()
-        {
-details['peers_max']
+torrents[$this->hash]->get_peers_max()
-        }
-        public function getMinPeers()
-        {
-details['peers_min']
+torrents[$this->hash]->get_peers_min()
-        }
-        public function getPriorityStr()
-        {
-details['priority']
+torrents[$this->hash]->d_get_priority()
-                {
-                        case 1:
@@ -116 +96 @@
-        public function getPriority()
-        {
-details['priority']
+torrents[$this->hash]->d_get_priority()
-        }
-        public function getMessage()
-        {
-details['message']
+torrents[$this->hash]->get_message()
-        }
-        private function getCorrectUnits($size)
-   
+      
-                $size_units = 'bytes';
-                if($size >= 1024)
-                {
-           
-           
+       
+       
-                }
-                if($size >= 1024)
-                {
-        
-      
-        
+   
+
+               
-                if($size >= 1024)
-        {
-            $size /= 1024;
-            $size_units = 'Gb';
-        }
-        return round($size, 2) .  $size_units;
-
-    }
-        //////////////////////////////////////////////// M O D I F I C A D O R A S ////////////////////////////////////////////////
-        private function getTorrents($hash)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-?>

trunk/wtorrent/home/cls/ListT.cls.php

@@ -19 +19 @@
-{
-        private  $view;
-        private  $torrents = array();
-        private  $MAX_LENGTH_NAME = 55;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        {
-                if($this->_request['view'] == 'public') $this->view = 'public';
@@ -54 +30 @@
-                        return false;
-                
+                /* d multicall with all the necessary info to generate the torrent list */
+                $array_d = array('d.get_name', 'd.get_down_rate', 'd.get_up_rate', 'd.get_chunk_size','d.get_completed_chunks','d.get_size_chunks','d.get_state','d.get_peers_accounted','d.get_peers_complete','d.is_hash_checking','d.get_ratio','d.get_tracker_size','d.is_active','d.is_open','d.get_message','d.get_creation_date');
+                $this->multicall->d_multicall($array_d);
+                // t multicall
+                $array_t = array('t.get_scrape_complete', 't.get_scrape_incomplete');
+                $hashes = $this->getHashes(); // Retrieve hashes
+                foreach($hashes as $hash)
+                        $this->multicall->t_multicall($hash, $array_t);
+                
-                if(isset($this->_request['start'])) $this->start($this->_request['start']);
-                if(isset($this->_request['stop'])) $this->stop($this->_request['stop']);
-                if(isset($this->_request['erase'])) $this->erase($this->_request['erase']);
-                
-                $this->getTorrents();
-        }
-
@@ -67 +50 @@
-        public function getPublicHashes()
-        {
-tor_hashes = array_keys($this->torrents
-tor_
-['private']
+hashes = $this->getHashes(
+
+->get_private()
-                                $return[] = $hash;
-                                
@@ -76 +59 @@
-        public function getPublicHashesNum()
-        {
-tor_hashes = array_keys($this->torrents
+hashes = $this->getHashes(
-                $i = 0;
-tor_
-['private']
+
+->get_private()
-                                $i++;
-                                
@@ -86 +69 @@
-        public function getPrivateHashes()
-        {
-tor_hashes = array_keys($this->torrents
-tor_
-$this->torrents[$hash]['private'] === true
+hashes = $this->getHashes(
+
+($this->torrents[$hash]->get_private() === true) && ($this->torrents[$hash]->get_owner() == $this->getIdUser())
-                                $return[] = $hash;
-                                
@@ -95 +78 @@
-        public function getPrivateHashesNum()
-        {
-tor_hashes = array_keys($this->torrents
+hashes = $this->getHashes(
-                $i = 0;
-tor_
-       if($this->torrents[$hash]['private'] === true
-       
+
+if(($this->torrents[$hash]->get_private() === false) && ($this->torrents[$hash]->get_owner() == $this->getIdUser())
+
-                                
-                return $i;
@@ -105 +88 @@
-        public function getName($hash)
-        {
-
-['name']
+ (THIS SHOULD BE DONE IN THE TEMPLATE WITH SMARTY TRUNCATE)
+->get_name()
-                if(strlen($name) > $this->MAX_LENGTH_NAME){
-                        $name = substr($name, 0, $this->MAX_LENGTH_NAME) . ' ...';
@@ -112 +95 @@
-                return $name;
-        }
-        // public function getTags($hash)
-        // {
-        //      return $this->torrents[$hash]['tags'];
-        // }
-        public function getState($hash)
-        {
-['state']
+->get_state()
-        }
-        public function getOpen($hash)
-        {
-
-
-
-
-
+
-        }
-        public function getConnPeers($hash)
-        {
-['peers']
+->get_peers_accounted()
-        }
-        public function getConnSeeds($hash)
-        {
-['seeds']
+->get_peers_complete()
-        }
-        public function getTotalPeers($hash)
-        {
-
+
+
+
+
+
+
+
+
+
+
-        }
-        public function getTotalSeeds($hash)
-        {
-
+
+
+
+
+
+
+
+
+
+
-        }
-        public function getDownRate($hash)
-        {
-$this->torrents[$hash]['down_rate']
+round($this->torrents[$hash]->get_down_rate()/1024,2)
-        }
-        public function getUpRate($hash)
-        {
-$this->torrents[$hash]['up_rate']
+round($this->torrents[$hash]->get_up_rate()/1024,2)
-        }
-        public function getPercent($hash)
-        {
-$this->torrents[$hash]['percent']
+floor(($this->torrents[$hash]->get_completed_chunks()/$this->torrents[$hash]->get_size_chunks())*100)
-        }
-        public function getRatio($hash)
-        {
-$this->torrents[$hash]['ratio']
+round($this->torrents[$hash]->get_ratio()/1000,2)
-        }
-        public function isHashChecking($hash)
-        {
-['is_hash_checking']
+->is_hash_checking()
-        }
-        public function getETA($hash)
-        {
-
+
+
+
+
+
-        }
-        public function getSize($hash)
-        {
-['size_in_chunks'] * $this->torrents[$hash]['chunk_size']
+->get_size_chunks() * $this->torrents[$hash]->get_chunk_size()
-        }
-        public function getDone($hash)
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        private function getCorrectUnits($size)
-   
+      
-                $size_units = 'bytes';
-                if($size >= 1024)
-                {
-           
-           
+       
+       
-                }
-                if($size >= 1024)
-                {
-        
-      
-        
+   
+
+               
-                if($size >= 1024)
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      
-return $str
+$array[] = $segment
-    }
+     // If ETA is more then 30 weeks away, display "inf" instead of precise ETA: 
+    if ($values["weeks"] > 30)
+      $str = "inf";
+    else
+      $str = implode('', $array);
+     
+    return $str;
+  }
-}
-?>

trunk/wtorrent/home/cls/Tracker.cls.php

@@ -18 +18 @@
-class Tracker extends rtorrent
-{
-
-
-
-
-
-
-
-
-
+
-
-    
+       
-        {
-                $this->hash = $this->_request['hash'];
@@ -35 +27 @@
-                        return false;
-                        
-
-
-
+
+
-        }
-
-        public function getHash()
-        {
@@ -46 +36 @@
-        public function getTrackers()
-        {
-
+
+
+
+
+
+
+
+
+
-        }
-        public function getName()
-        {
-                return $this->details['name'];
-        }
-        public function getTorrent()
-        {
-                return $this->details['torrent_file'];
-        }
-        public function getDataPath()
-        {
-                return $this->details['data_path'];
-        }
-        public function getPercent()
-        {
-                return $this->details['percent'];
-        }
-        public function getRatio()
-        {
-                return $this->details['ratio'];
-        }
-        public function getSize()
-        {
-                return $this->getCorrectUnits($this->details['size_in_chunks'] * $this->details['chunk_size']);
-        }
-        public function getDone()
-        {
-                return $this->getCorrectUnits($this->details['completed_chunks'] * $this->details['chunk_size']);
-        }
-        public function getUp()
-        {
-                return $this->getCorrectUnits($this->details['bytes_up']);
-        }
-        private function getCorrectUnits($size)
-    {
-                $size_units = 'bytes';
-                if($size >= 1024)
-                {
-                $size /= 1024;
-                $size_units = 'Kb';
-                }
-                if($size >= 1024)
-                {
-            $size /= 1024;
-            $size_units = 'Mb';
-        }
-                if($size >= 1024)
-        {
-            $size /= 1024;
-            $size_units = 'Gb';
-        }
-        return round($size, 2) .  $size_units;
-
-    }
-        
-        private function getTorrents($hash)
-    {
-        //define("XMLRPC_DEBUG", 1);
-        
-        $this->info_trackers[0] = $hash;
-        
-                foreach($this->info_trackers as $param)
-                        $array_post[] = new xmlrpcval($param, 'string');
-                
-                $message = new xmlrpcmsg("t.multicall", $array_post);
-                $result = $this->client->send($message);
-        //print_r($result);
-        foreach($result->val as $key => $tracker)
-        {
-                if(SCRAMBLE === true)
-                        $tracker[0] = $this->scramble($tracker[0]);
-                
-                $sc_time = time() - $tracker[2];
-                //echo $sc_time . " " . $tracker[1] . " " . time() . " " . $tracker[2];
-                if($sc_time > $tracker[1])
-                        $enabled = 0;
-                else
-                        $enabled = 1;
-                        
-                $this->trackers[$key]['url'] = $tracker[0];
-                $this->trackers[$key]['scrape_completed'] = $tracker[3];
-                $this->trackers[$key]['scrape_incomplete'] = $tracker[4];
-                $this->trackers[$key]['enabled'] = $tracker[5];
-        }
-        //print_r($this->files);
-        //XMLRPC_debug_print();
-    }
-    private function changeEnabled($trackers, $enabled, $hash)
-    {
-        $t_index = array_keys($trackers);
-        //print_r($f_index);
-        
-        foreach($t_index as $param)
-                        $array_post[] = new xmlrpcmsg('t.set_enabled', array(new xmlrpcval($hash, 'string'), new xmlrpcval($param, 'int'), new xmlrpcval($enabled, 'int')));
-                
-                //print_r($array_post); 
-                $responses = $this->client->multicall($array_post);
-    }
-}
-?>

trunk/wtorrent/home/css/estil.css

@@ -68 +68 @@
-        cursor: default;
-        display: none;
+        height: 12px;
-}
-.messages:hover {

trunk/wtorrent/home/js/javasc.js

@@ -177 +177 @@
-        ajaxCall(frame, call[0]);
-        // Update the page (after 500ms to give rtorrent time to process the command (also set the frame to loading)
-
-5
+//
+1
-}
-

trunk/wtorrent/lib/inc/includes.inc.php

@@ -22 +22 @@
-require_once( 'lib/cls/Web.cls.php');
-require_once( 'cls/rtorrent.cls.php' );
+require_once( 'cls/torrent.cls.php' );
+require_once( 'cls/multicall.cls.php' );
-require_once( 'lib/xmlrpc/xmlrpc.inc.php' );
-require_once( 'lib/inc/utils.inc.php' );