From ddd93d0e571edbe1a62f928436ea79818466e940 Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Thu, 17 Dec 2009 17:47:41 +0100
Subject: splited gui file, extended .hgignore

---
 module/gui/connector.py | 146 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 module/gui/connector.py

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
new file mode 100644
index 000000000..e4fd4770c
--- /dev/null
+++ b/module/gui/connector.py
@@ -0,0 +1,146 @@
+# -*- coding: utf-8 -*-
+"""
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License,
+    or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
+    
+    @author: mkaay
+"""
+
+SERVER_VERSION = "0.3"
+
+from time import sleep
+
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+
+from xmlrpclib import ServerProxy
+
+class connector(QThread):
+    def __init__(self):
+        """
+            init thread
+        """
+        QThread.__init__(self)
+        self.mutex = QMutex()
+        self.running = True
+        self.proxy = None
+        self.addr = None
+    
+    def setAddr(self, addr):
+        self.mutex.lock()
+        self.addr = addr
+        self.mutex.unlock()
+    
+    def run(self):
+        """
+            start thread
+            (called from thread.start())
+        """
+        self.connectProxy(self.addr)
+        while self.running:
+            sleep(1)
+    
+    def stop(self):
+        """
+            stop thread
+        """
+        self.running = False
+    
+    def connectProxy(self, addr):
+        """
+            connect to remote server
+        """
+        self.proxy = ServerProxy(addr, allow_none=True)
+        server_version = self.proxy.get_server_version()
+        if not server_version == SERVER_VERSION:
+            self.emit(SIGNAL("error_box"), "server is version %s client accepts version %s" % (server_version, SERVER_VERSION))
+    
+    def getLinkCollector(self):
+        """
+            grab links from collector and return the ids
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.get_collector_files()
+        finally:
+            self.mutex.unlock()
+    
+    def getPackageCollector(self):
+        """
+            grab packages from collector and return the data
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.get_collector_packages()
+        finally:
+            self.mutex.unlock()
+    
+    def getLinkInfo(self, id):
+        """
+            grab file info for the given id and return it
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.get_file_info(id)
+        finally:
+            self.mutex.unlock()
+    
+    def getPackageInfo(self, id):
+        """
+            grab package info for the given id and return it
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.get_package_data(id)
+        finally:
+            self.mutex.unlock()
+    
+    def getPackageQueue(self):
+        """
+            grab queue return the data
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.get_queue()
+        finally:
+            self.mutex.unlock()
+    
+    def getPackageFiles(self, id):
+        """
+            grab package files and return ids
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.get_package_files(id)
+        finally:
+            self.mutex.unlock()
+    
+    def getDownloadQueue(self):
+        """
+            grab files that are currently downloading and return info
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.status_downloads()
+        finally:
+            self.mutex.unlock()
+    
+    def getServerStatus(self):
+        """
+            return server status
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.status_server()
+        finally:
+            self.mutex.unlock()
-- 
cgit v1.2.3


From 20f7c0e65607f2fb8607ed0e5e96181a36be76ca Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Mon, 21 Dec 2009 14:24:51 +0100
Subject: new update threads, link dock works now

---
 module/gui/connector.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index e4fd4770c..3627545ba 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -144,3 +144,13 @@ class connector(QThread):
             return self.proxy.status_server()
         finally:
             self.mutex.unlock()
+    
+    def addURLs(self, links):
+        """
+            add links to collector
+        """
+        self.mutex.lock()
+        try:
+            self.proxy.add_urls(links)
+        finally:
+            self.mutex.unlock()
-- 
cgit v1.2.3


From 4c98db9a0eb0ca1ca70c4886b907e79682bfad82 Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Mon, 21 Dec 2009 14:41:23 +0100
Subject: pause/start button works

---
 module/gui/connector.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index 3627545ba..32da29bba 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -154,3 +154,26 @@ class connector(QThread):
             self.proxy.add_urls(links)
         finally:
             self.mutex.unlock()
+    
+    def togglePause(self):
+        """
+            toogle pause
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.toggle_pause()
+        finally:
+            self.mutex.unlock()
+    
+    def setPause(self, pause):
+        """
+            set pause
+        """
+        self.mutex.lock()
+        try:
+            if pause:
+                self.proxy.pause_server()
+            else:
+                self.proxy.unpause_server()
+        finally:
+            self.mutex.unlock()
-- 
cgit v1.2.3


From ff7fa4a0d1aa1c09e563d2086704aa7e2acea716 Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Mon, 21 Dec 2009 17:07:16 +0100
Subject: package creation works

---
 module/gui/connector.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index 32da29bba..e7a151c5e 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -177,3 +177,23 @@ class connector(QThread):
                 self.proxy.unpause_server()
         finally:
             self.mutex.unlock()
+    
+    def newPackage(self, name):
+        """
+            create a new package and return id
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.new_package(name)
+        finally:
+            self.mutex.unlock()
+    
+    def addFileToPackage(self, fileid, packid):
+        """
+            add a file from collector to package
+        """
+        self.mutex.lock()
+        try:
+            self.proxy.move_file_2_package(fileid, packid)
+        finally:
+            self.mutex.unlock()
-- 
cgit v1.2.3


From ed36dd5988907019cc9cc5b98265f00a52462c85 Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Tue, 22 Dec 2009 17:07:35 +0100
Subject: more docstrings, small design changes

---
 module/gui/connector.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index e7a151c5e..2a1ce511e 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -37,6 +37,9 @@ class connector(QThread):
         self.addr = None
     
     def setAddr(self, addr):
+        """
+            set new address
+        """
         self.mutex.lock()
         self.addr = addr
         self.mutex.unlock()
@@ -197,3 +200,13 @@ class connector(QThread):
             self.proxy.move_file_2_package(fileid, packid)
         finally:
             self.mutex.unlock()
+    
+    def pushPackageToQueue(self, packid):
+        """
+            push a package to queue
+        """
+        self.mutex.lock()
+        try:
+            self.proxy.push_package_2_queue(packid)
+        finally:
+            self.mutex.unlock()
-- 
cgit v1.2.3


From a5ff0482ede8bd7bd932482887f2f7cdae5039d9 Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Wed, 23 Dec 2009 00:04:36 +0100
Subject: core: downloadlimit is not far away ;) gui: restart download action

---
 module/gui/connector.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index 2a1ce511e..75781ebb1 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -210,3 +210,23 @@ class connector(QThread):
             self.proxy.push_package_2_queue(packid)
         finally:
             self.mutex.unlock()
+    
+    def restartPackage(self, packid):
+        """
+            restart a package
+        """
+        self.mutex.lock()
+        try:
+            self.proxy.restart_package(packid)
+        finally:
+            self.mutex.unlock()
+    
+    def restartFile(self, fileid):
+        """
+            restart a file
+        """
+        self.mutex.lock()
+        try:
+            self.proxy.restart_file(fileid)
+        finally:
+            self.mutex.unlock()
-- 
cgit v1.2.3


From ea04c11ce1fb52895449a56e862eff5448ea456a Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Thu, 24 Dec 2009 01:28:08 +0100
Subject: downloads are now aborted correctly, gui: remove downloads, new icons

---
 module/gui/connector.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index 75781ebb1..4d3af0d61 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -230,3 +230,23 @@ class connector(QThread):
             self.proxy.restart_file(fileid)
         finally:
             self.mutex.unlock()
+    
+    def removePackage(self, packid):
+        """
+            remove a package
+        """
+        self.mutex.lock()
+        try:
+            self.proxy.del_packages([packid,])
+        finally:
+            self.mutex.unlock()
+    
+    def removeFile(self, fileid):
+        """
+            remove a file
+        """
+        self.mutex.lock()
+        try:
+            self.proxy.del_links([fileid,])
+        finally:
+            self.mutex.unlock()
-- 
cgit v1.2.3


From 504b313112be6a82d6eee418ae059646ecfc4b30 Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Sat, 26 Dec 2009 20:18:11 +0100
Subject: fixed ddl-music, cleaned up, new status (starting), some more fixes

---
 module/gui/connector.py | 54 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index 4d3af0d61..4ac635200 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -35,6 +35,8 @@ class connector(QThread):
         self.running = True
         self.proxy = None
         self.addr = None
+        self.errorQueue = []
+        self.connect(self, SIGNAL("proxy_error"), self._proxyError)
     
     def setAddr(self, addr):
         """
@@ -52,6 +54,7 @@ class connector(QThread):
         self.connectProxy(self.addr)
         while self.running:
             sleep(1)
+            self.getError()
     
     def stop(self):
         """
@@ -68,6 +71,21 @@ class connector(QThread):
         if not server_version == SERVER_VERSION:
             self.emit(SIGNAL("error_box"), "server is version %s client accepts version %s" % (server_version, SERVER_VERSION))
     
+    def _proxyError(self, func):
+        """
+            formats proxy error msg
+        """
+        msg = "proxy error in '%s'" % (func,)
+        self.errorQueue.append(msg)
+    
+    def getError(self):
+        self.mutex.lock()
+        if len(self.errorQueue) > 0:
+            err = self.errorQueue.pop()
+            print err
+            self.emit(SIGNAL("error_box"), err)
+        self.mutex.unlock()
+    
     def getLinkCollector(self):
         """
             grab links from collector and return the ids
@@ -75,6 +93,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.get_collector_files()
+        except:
+            self.emit(SIGNAL("proxy_error"), "getLinkCollector")
         finally:
             self.mutex.unlock()
     
@@ -85,6 +105,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.get_collector_packages()
+        except:
+            self.emit(SIGNAL("proxy_error"), "getPackageCollector")
         finally:
             self.mutex.unlock()
     
@@ -95,6 +117,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.get_file_info(id)
+        except:
+            self.emit(SIGNAL("proxy_error"), "getLinkInfo")
         finally:
             self.mutex.unlock()
     
@@ -105,6 +129,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.get_package_data(id)
+        except:
+            self.emit(SIGNAL("proxy_error"), "getPackageInfo")
         finally:
             self.mutex.unlock()
     
@@ -115,6 +141,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.get_queue()
+        except:
+            self.emit(SIGNAL("proxy_error"), "getPackageQueue")
         finally:
             self.mutex.unlock()
     
@@ -125,6 +153,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.get_package_files(id)
+        except:
+            self.emit(SIGNAL("proxy_error"), "getPackageFiles")
         finally:
             self.mutex.unlock()
     
@@ -135,6 +165,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.status_downloads()
+        except:
+            self.emit(SIGNAL("proxy_error"), "getDownloadQueue")
         finally:
             self.mutex.unlock()
     
@@ -145,6 +177,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.status_server()
+        except:
+            self.emit(SIGNAL("proxy_error"), "getServerStatus")
         finally:
             self.mutex.unlock()
     
@@ -155,6 +189,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.add_urls(links)
+        except:
+            self.emit(SIGNAL("proxy_error"), "addURLs")
         finally:
             self.mutex.unlock()
     
@@ -165,6 +201,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.toggle_pause()
+        except:
+            self.emit(SIGNAL("proxy_error"), "togglePause")
         finally:
             self.mutex.unlock()
     
@@ -178,6 +216,8 @@ class connector(QThread):
                 self.proxy.pause_server()
             else:
                 self.proxy.unpause_server()
+        except:
+            self.emit(SIGNAL("proxy_error"), "setPause")
         finally:
             self.mutex.unlock()
     
@@ -188,6 +228,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.new_package(name)
+        except:
+            self.emit(SIGNAL("proxy_error"), "newPackage")
         finally:
             self.mutex.unlock()
     
@@ -198,6 +240,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.move_file_2_package(fileid, packid)
+        except:
+            self.emit(SIGNAL("proxy_error"), "addFileToPackage")
         finally:
             self.mutex.unlock()
     
@@ -208,6 +252,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.push_package_2_queue(packid)
+        except:
+            self.emit(SIGNAL("proxy_error"), "pushPackageToQueue")
         finally:
             self.mutex.unlock()
     
@@ -218,6 +264,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.restart_package(packid)
+        except:
+            self.emit(SIGNAL("proxy_error"), "restartPackage")
         finally:
             self.mutex.unlock()
     
@@ -228,6 +276,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.restart_file(fileid)
+        except:
+            self.emit(SIGNAL("proxy_error"), "restartFile")
         finally:
             self.mutex.unlock()
     
@@ -238,6 +288,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.del_packages([packid,])
+        except:
+            self.emit(SIGNAL("proxy_error"), "removePackage")
         finally:
             self.mutex.unlock()
     
@@ -248,5 +300,7 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.del_links([fileid,])
+        except:
+            self.emit(SIGNAL("proxy_error"), "removeFile")
         finally:
             self.mutex.unlock()
-- 
cgit v1.2.3


From b5d1c47ac2590fe4314d7e96d58443c30463746c Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Sat, 26 Dec 2009 22:35:20 +0100
Subject: gui contaoner upload, closes #39

---
 module/gui/connector.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index 4ac635200..e52cf42ff 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -304,3 +304,16 @@ class connector(QThread):
             self.emit(SIGNAL("proxy_error"), "removeFile")
         finally:
             self.mutex.unlock()
+    
+    def uploadContainer(self, filename, type, content):
+        """
+            upload a container
+        """
+        self.mutex.lock()
+        try:
+            self.proxy.upload_container(filename, type, content)
+        except:
+            self.emit(SIGNAL("proxy_error"), "uploadContainer")
+        finally:
+            self.mutex.unlock()
+        
-- 
cgit v1.2.3


From 757f025247d77b085b6168d5f625d2bbfa7c4c0d Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Sun, 27 Dec 2009 14:45:22 +0100
Subject: stop button works, closes #59

---
 module/gui/connector.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index e52cf42ff..64c05ba8c 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -316,4 +316,28 @@ class connector(QThread):
             self.emit(SIGNAL("proxy_error"), "uploadContainer")
         finally:
             self.mutex.unlock()
+    
+    def getLog(self, offset):
+        """
+            get log
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.get_log(offset)
+        except:
+            self.emit(SIGNAL("proxy_error"), "getLog")
+        finally:
+            self.mutex.unlock()
+    
+    def stopAllDownloads(self):
+        """
+            get log
+        """
+        self.mutex.lock()
+        try:
+            self.proxy.stop_downloads()
+        except:
+            self.emit(SIGNAL("proxy_error"), "stopAllDownloads")
+        finally:
+            self.mutex.unlock()
         
-- 
cgit v1.2.3


From ff7d4f1a13db0f4a9d6c427dcccbb0d1faf6c577 Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Sun, 27 Dec 2009 15:26:33 +0100
Subject: closes #51

---
 module/gui/connector.py | 100 +++++++++++++++++++++++++++---------------------
 1 file changed, 56 insertions(+), 44 deletions(-)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index 64c05ba8c..8458d74b9 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -71,11 +71,11 @@ class connector(QThread):
         if not server_version == SERVER_VERSION:
             self.emit(SIGNAL("error_box"), "server is version %s client accepts version %s" % (server_version, SERVER_VERSION))
     
-    def _proxyError(self, func):
+    def _proxyError(self, func, e):
         """
             formats proxy error msg
         """
-        msg = "proxy error in '%s'" % (func,)
+        msg = "proxy error in '%s':\n%s" % (func, e)
         self.errorQueue.append(msg)
     
     def getError(self):
@@ -93,8 +93,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.get_collector_files()
-        except:
-            self.emit(SIGNAL("proxy_error"), "getLinkCollector")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "getLinkCollector", e)
         finally:
             self.mutex.unlock()
     
@@ -105,8 +105,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.get_collector_packages()
-        except:
-            self.emit(SIGNAL("proxy_error"), "getPackageCollector")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "getPackageCollector", e)
         finally:
             self.mutex.unlock()
     
@@ -117,8 +117,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.get_file_info(id)
-        except:
-            self.emit(SIGNAL("proxy_error"), "getLinkInfo")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "getLinkInfo", e)
         finally:
             self.mutex.unlock()
     
@@ -129,8 +129,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.get_package_data(id)
-        except:
-            self.emit(SIGNAL("proxy_error"), "getPackageInfo")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "getPackageInfo", e)
         finally:
             self.mutex.unlock()
     
@@ -141,8 +141,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.get_queue()
-        except:
-            self.emit(SIGNAL("proxy_error"), "getPackageQueue")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "getPackageQueue", e)
         finally:
             self.mutex.unlock()
     
@@ -153,8 +153,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.get_package_files(id)
-        except:
-            self.emit(SIGNAL("proxy_error"), "getPackageFiles")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "getPackageFiles", e)
         finally:
             self.mutex.unlock()
     
@@ -165,8 +165,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.status_downloads()
-        except:
-            self.emit(SIGNAL("proxy_error"), "getDownloadQueue")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "getDownloadQueue", e)
         finally:
             self.mutex.unlock()
     
@@ -177,8 +177,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.status_server()
-        except:
-            self.emit(SIGNAL("proxy_error"), "getServerStatus")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "getServerStatus", e)
         finally:
             self.mutex.unlock()
     
@@ -189,8 +189,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.add_urls(links)
-        except:
-            self.emit(SIGNAL("proxy_error"), "addURLs")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "addURLs", e)
         finally:
             self.mutex.unlock()
     
@@ -201,8 +201,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.toggle_pause()
-        except:
-            self.emit(SIGNAL("proxy_error"), "togglePause")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "togglePause", e)
         finally:
             self.mutex.unlock()
     
@@ -216,8 +216,8 @@ class connector(QThread):
                 self.proxy.pause_server()
             else:
                 self.proxy.unpause_server()
-        except:
-            self.emit(SIGNAL("proxy_error"), "setPause")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "setPause", e)
         finally:
             self.mutex.unlock()
     
@@ -228,8 +228,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.new_package(name)
-        except:
-            self.emit(SIGNAL("proxy_error"), "newPackage")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "newPackage", e)
         finally:
             self.mutex.unlock()
     
@@ -240,8 +240,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.move_file_2_package(fileid, packid)
-        except:
-            self.emit(SIGNAL("proxy_error"), "addFileToPackage")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "addFileToPackage", e)
         finally:
             self.mutex.unlock()
     
@@ -252,8 +252,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.push_package_2_queue(packid)
-        except:
-            self.emit(SIGNAL("proxy_error"), "pushPackageToQueue")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "pushPackageToQueue", e)
         finally:
             self.mutex.unlock()
     
@@ -264,8 +264,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.restart_package(packid)
-        except:
-            self.emit(SIGNAL("proxy_error"), "restartPackage")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "restartPackage", e)
         finally:
             self.mutex.unlock()
     
@@ -276,8 +276,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.restart_file(fileid)
-        except:
-            self.emit(SIGNAL("proxy_error"), "restartFile")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "restartFile", e)
         finally:
             self.mutex.unlock()
     
@@ -288,8 +288,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.del_packages([packid,])
-        except:
-            self.emit(SIGNAL("proxy_error"), "removePackage")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "removePackage", e)
         finally:
             self.mutex.unlock()
     
@@ -300,8 +300,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.del_links([fileid,])
-        except:
-            self.emit(SIGNAL("proxy_error"), "removeFile")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "removeFile", e)
         finally:
             self.mutex.unlock()
     
@@ -312,8 +312,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.upload_container(filename, type, content)
-        except:
-            self.emit(SIGNAL("proxy_error"), "uploadContainer")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "uploadContainer", e)
         finally:
             self.mutex.unlock()
     
@@ -324,8 +324,8 @@ class connector(QThread):
         self.mutex.lock()
         try:
             return self.proxy.get_log(offset)
-        except:
-            self.emit(SIGNAL("proxy_error"), "getLog")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "getLog", e)
         finally:
             self.mutex.unlock()
     
@@ -336,8 +336,20 @@ class connector(QThread):
         self.mutex.lock()
         try:
             self.proxy.stop_downloads()
-        except:
-            self.emit(SIGNAL("proxy_error"), "stopAllDownloads")
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "stopAllDownloads", e)
+        finally:
+            self.mutex.unlock()
+    
+    def updateAvailable(self):
+        """
+            update available
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.update_available()
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "updateAvailable", e)
         finally:
             self.mutex.unlock()
         
-- 
cgit v1.2.3


From 090c9d2abdac07025fe6d7351e376e85aabc0891 Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Sun, 27 Dec 2009 22:16:51 +0100
Subject: fixed uploaded.to and netload.in, gui clipboard check

---
 module/gui/connector.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index 8458d74b9..3f594d68e 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -335,6 +335,7 @@ class connector(QThread):
         """
         self.mutex.lock()
         try:
+            self.proxy.pause_server()
             self.proxy.stop_downloads()
         except Exception, e:
             self.emit(SIGNAL("proxy_error"), "stopAllDownloads", e)
-- 
cgit v1.2.3


From 86949a6240bc6d5a5fd5e5677925e0d945686d3e Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Mon, 28 Dec 2009 22:21:35 +0100
Subject: package renaming in collector works

---
 module/gui/connector.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index 3f594d68e..8a2909c5e 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -353,4 +353,16 @@ class connector(QThread):
             self.emit(SIGNAL("proxy_error"), "updateAvailable", e)
         finally:
             self.mutex.unlock()
+    
+    def setPackageName(self, pid, name):
+        """
+            set new package name
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.set_package_name(pid, name)
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "setPackageName", e)
+        finally:
+            self.mutex.unlock()
         
-- 
cgit v1.2.3


From fa9cce4987da585f5bf21274cfbe5f046f46f703 Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Tue, 29 Dec 2009 16:50:13 +0100
Subject: : Bitte gib eine Versions-Meldung ein. Zeilen beginnend mit 'HG:'
 werden entfernt.

---
 module/gui/connector.py | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index 8a2909c5e..2915cf568 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -51,11 +51,14 @@ class connector(QThread):
             start thread
             (called from thread.start())
         """
-        self.connectProxy(self.addr)
+        self.canConnect()
         while self.running:
             sleep(1)
             self.getError()
     
+    def canConnect(self):
+        return self.connectProxy(self.addr)
+    
     def stop(self):
         """
             stop thread
@@ -67,9 +70,14 @@ class connector(QThread):
             connect to remote server
         """
         self.proxy = ServerProxy(addr, allow_none=True)
-        server_version = self.proxy.get_server_version()
+        try:
+            server_version = self.proxy.get_server_version()
+        except:
+            return False
         if not server_version == SERVER_VERSION:
             self.emit(SIGNAL("error_box"), "server is version %s client accepts version %s" % (server_version, SERVER_VERSION))
+            return False
+        return True
     
     def _proxyError(self, func, e):
         """
@@ -365,4 +373,16 @@ class connector(QThread):
             self.emit(SIGNAL("proxy_error"), "setPackageName", e)
         finally:
             self.mutex.unlock()
+    
+    def slotPullOutPackage(self, pid):
+        """
+            pull out package
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.pull_out_package(pid)
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "slotPullOutPackage", e)
+        finally:
+            self.mutex.unlock()
         
-- 
cgit v1.2.3


From c1516088e4e7f76dddd68ef71f58c6413862e31c Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Wed, 30 Dec 2009 12:35:03 +0100
Subject: show captchas in gui, SerienjunkiesOrg plugin

---
 module/gui/connector.py | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

(limited to 'module/gui/connector.py')

diff --git a/module/gui/connector.py b/module/gui/connector.py
index 2915cf568..432999161 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -374,7 +374,7 @@ class connector(QThread):
         finally:
             self.mutex.unlock()
     
-    def slotPullOutPackage(self, pid):
+    def pullOutPackage(self, pid):
         """
             pull out package
         """
@@ -382,7 +382,43 @@ class connector(QThread):
         try:
             return self.proxy.pull_out_package(pid)
         except Exception, e:
-            self.emit(SIGNAL("proxy_error"), "slotPullOutPackage", e)
+            self.emit(SIGNAL("proxy_error"), "pullOutPackage", e)
+        finally:
+            self.mutex.unlock()
+    
+    def captchaWaiting(self):
+        """
+            is the a captcha waiting?
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.is_captcha_waiting()
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "captchaWaiting", e)
+        finally:
+            self.mutex.unlock()
+    
+    def getCaptcha(self):
+        """
+            get captcha
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.get_captcha_task()
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "getCaptcha", e)
+        finally:
+            self.mutex.unlock()
+    
+    def setCaptchaResult(self, cid, result):
+        """
+            get captcha
+        """
+        self.mutex.lock()
+        try:
+            return self.proxy.set_captcha_result(cid, result)
+        except Exception, e:
+            self.emit(SIGNAL("proxy_error"), "setCaptchaResult", e)
         finally:
             self.mutex.unlock()
         
-- 
cgit v1.2.3