Fix for transmission bug introduced in last update

headphones/db.py

@@ -28,8 +28,6 @@ import headphones
 
 from headphones import logger
 
-db_lock = threading.Lock()
-
 def dbFilename(filename="headphones.db"):
 
     return os.path.join(headphones.DATA_DIR, filename)
@@ -56,38 +54,36 @@ class DBConnection:
         self.connection.row_factory = sqlite3.Row
         
     def action(self, query, args=None):
-    
-        with db_lock:
 
-            if query == None:
+        if query == None:
-                return
+            return
-                
-            sqlResult = None
-            attempt = 0
             
-            while attempt < 5:
+        sqlResult = None
-                try:
+        attempt = 0
-                    if args == None:
+        
-                        #logger.debug(self.filename+": "+query)
+        while attempt < 5:
-                        sqlResult = self.connection.execute(query)
+            try:
-                    else:
+                if args == None:
-                        #logger.debug(self.filename+": "+query+" with args "+str(args))
+                    #logger.debug(self.filename+": "+query)
-                        sqlResult = self.connection.execute(query, args)
+                    sqlResult = self.connection.execute(query)
-                    self.connection.commit()
+                else:
-                    break
+                    #logger.debug(self.filename+": "+query+" with args "+str(args))
-                except sqlite3.OperationalError, e:
+                    sqlResult = self.connection.execute(query, args)
-                    if "unable to open database file" in e.message or "database is locked" in e.message:
+                self.connection.commit()
-                        logger.warn('Database Error: %s' % e)
+                break
-                        attempt += 1
+            except sqlite3.OperationalError, e:
-                        time.sleep(1)
+                if "unable to open database file" in e.message or "database is locked" in e.message:
-                    else:
+                    logger.warn('Database Error: %s' % e)
-                        logger.error('Database error: %s' % e)
+                    attempt += 1
-                        raise
+                    time.sleep(1)
-                except sqlite3.DatabaseError, e:
+                else:
-                    logger.error('Fatal Error executing %s :: %s' % (query, e))
+                    logger.error('Database error: %s' % e)
                     raise
-            
+            except sqlite3.DatabaseError, e:
-            return sqlResult
+                logger.error('Fatal Error executing %s :: %s' % (query, e))
+                raise
+        
+        return sqlResult
     
     def select(self, query, args=None):
     

headphones/searcher_rutracker.py

@@ -123,8 +123,8 @@ class Rutracker():
                 urls.append(url)
                 
             # Seeders
-             
+
-            for link in soup.find_all('td', attrs={'class' : 'row4 seedmed'}): 
+            for link in soup.find_all('b', attrs={'class' : 'seedmed'}):
                 seeder = link.get_text()
                 seeders.append(seeder)
             

headphones/transmission.py

@@ -85,11 +85,23 @@ def torrentAction(method, arguments):
     if host.endswith('/'):
         host = host[:-1]
 
+    # Either the host ends with a port, or some directory, or rpc
+    # If it ends with /rpc we don't have to do anything
+    # If it ends with a port we add /transmission/rpc
+    # anything else we just add rpc
     if not host.endswith('/rpc'):
-        if host.endswith(':\d{2,6}'):
+        # Check if it ends in a port number
-            host = host + "/transmission/rpc"
+        i = host.rfind(':')
+        if i >= 0:
+            possible_port = host[i+1:]
+            try:
+                port = int(possible_port)
+                host = host + "/transmission/rpc"
+            except ValueError:
+                host = host + "/rpc"
         else:
-            host = host + "/rpc"
+            logger.error('Transmission port missing')
+            return
 
     request = urllib2.Request(host)
     if username and password: