little user wishes

5 files changed, 29 insertions, 30 deletions

diff --git a/Plugins/NetloadIn.py b/Plugins/NetloadIn.py
index a7d6ee4cf..0df1fab8c 100644
--- a/Plugins/NetloadIn.py
+++ b/Plugins/NetloadIn.py
@@ -97,8 +97,6 @@ class NetloadIn(Plugin):
 
         if re.search(r"We had a reqeust with the IP", self.html[2]):
             self.want_reconnect = True
-
-
         
     def get_file_name(self):
         if self.html[0] == None:
diff --git a/config b/config
index 1c3179af4..9adbb708f 100644
--- a/config
+++ b/config
@@ -4,8 +4,8 @@ language: de
 download_folder = Downloads
 link_file = links.txt
 failed_file = failed_links.txt
-use_reconnect = True
-reconnect_method = ./reconnect.sh
+use_reconnect = False
+reconnect_method = reconnect_method 
 max_downloads = 3
 [updates]
 search_updates = True
diff --git a/module/file_list.py b/module/file_list.py
index b96c7a63d..7eaca7c97 100644
--- a/module/file_list.py
+++ b/module/file_list.py
@@ -107,7 +107,6 @@ class File_List(object):
         pyfile = self.data['order'].pop(index)
         self.data['order'].insert(index + offset, pyfile)
 
-
     def save(self):
         self.lock.acquire()
 
diff --git a/pyLoadCore.py b/pyLoadCore.py
index 36e06c1e4..9be5fe2a9 100644
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -18,6 +18,7 @@
 #
 ###
 CURRENT_VERSION = '0.1.0'
+print_test_status = False
 
 import ConfigParser
 import gettext
@@ -26,13 +27,9 @@ import logging.handlers
 import time
 import urllib2
 from glob import glob
-from os import mkdir
-from os import sep
-from os.path import basename
-from os.path import exists
-from sys import exit
-from sys import path
-from sys import stdout
+from os import mkdir, sep
+from os.path import exists, basename
+from sys import exit, path, argv, stdout
 from time import sleep
 
 from module.file_list import File_List
@@ -220,19 +217,6 @@ class Core(object):
                 elif pyfile.status.type == 'waiting':
                     print pyfile.status.filename + ": wait", self.format_time(pyfile.status.waituntil - time.time())
 
-    def start(self):
-        """ starts the machine
-        """
-        self.read_links()
-        while True:
-            #self.thread_list.status()
-            self._test_print_status()
-            self.server_test()
-            sleep(2)
-            if self.do_kill:
-                self.logger.info("pyLoad quits")
-                exit()
-
     def server_test(self):
         obj = RequestObject()
         obj.command = "update"
@@ -302,7 +286,26 @@ class Core(object):
             self.thread_list.pause = True
             return True
 
+    def start(self):
+        """ starts the machine
+        """
+        self.read_links()
+        while True:
+            #self.thread_list.status()
+            if print_test_status:
+                self._test_print_status()
+            self.server_test()
+            sleep(2)
+            if self.do_kill:
+                self.logger.info("pyLoad quits")
+                exit()
+
 if __name__ == "__main__":
+    if len(argv) > 1:
+        if argv[1] == "-v":
+            print "pyLoad", CURRENT_VERSION
+            exit()
+        elif argv[1] == "-p":
+            print_test_status = True
     testLoader = Core()
     testLoader.start()
-
diff --git a/pyLoadGui.py b/pyLoadGui.py
index 5b53788b2..d86ac30f0 100755
--- a/pyLoadGui.py
+++ b/pyLoadGui.py
@@ -21,8 +21,7 @@
 import socket
 import subprocess
 from os import sep
-from os.path import abspath
-from os.path import dirname
+from os.path import abspath, dirname
 from time import sleep
 
 import wxversion
@@ -67,8 +66,8 @@ class Download_Liste(wx.ListCtrl):
         
         self.InsertColumn(0, 'Name', width=300)
         self.InsertColumn(1, 'Status', width=120)
-        self.InsertColumn(2, 'Groesse')
-        self.InsertColumn(3, 'Uebertragen', width=100)
+        self.InsertColumn(2, 'Größe')
+        self.InsertColumn(3, 'Übertragen', width=100)
         self.InsertColumn(4, 'Prozent', width=60)
         self.InsertColumn(5, 'Dauer', width=100)
         self.InsertColumn(7, 'Geschwindigkeit', width=120)