Full Config File

4 files changed, 49 insertions, 49 deletions

diff --git a/module/XMLConfigParser.py b/module/XMLConfigParser.py
index 444d45928..0d2094dae 100644
--- a/module/XMLConfigParser.py
+++ b/module/XMLConfigParser.py
@@ -85,6 +85,9 @@ class XMLConfigParser():
     
     def getConfig(self):
         return self.config
+
+    def getData(self):
+        return self.data
     
     def set(self, section, option, value):
         root = self.root
diff --git a/module/config/core_default.xml b/module/config/core_default.xml
index 58e5d1be2..4c95d5386 100644
--- a/module/config/core_default.xml
+++ b/module/config/core_default.xml
@@ -1,60 +1,60 @@
-<config>
+<config name="Configuration">
     <remote name="Remote">
         <port type="int" name="Port">7227</port>
         <listenaddr type="ip" name="Adress">0.0.0.0</listenaddr>
         <username type="str" name="Username">admin</username>
         <password type="str" name="Password">pwhere</password>
     </remote>
-    <ssl>
-        <activated type="bool" name="">False</activated>
+    <ssl name="SSL">
+        <activated type="bool" name="Activated">False</activated>
         <cert type="str" name="Remote Port">ssl.srt</cert>
         <key type="str" name="Remote Port">ssl.key</key>
     </ssl>
-    <webinterface>
-        <activated type="bool">True</activated>
-        <host type="ip">0.0.0.0</host>
-        <port type="int">8000</port>
-        <template type="str">default</template>
-        <local type="bool">True</local>
-        <ssl type="bool">False</ssl>
-        <username type="str">None</username>
-        <adress type="ip">None</adress>
-        <extport type="int">None</extport>
-        <pw type="str">None</pw>
+    <webinterface name="Webinterface">
+        <activated type="bool" name="Activated">True</activated>
+        <host type="ip" name="IP">0.0.0.0</host>
+        <port type="int" name="Port">8000</port>
+        <template type="str" name="Template">default</template>
+        <local type="bool" name="Local">True</local>
+        <ssl type="bool" name="SSL">False</ssl>
+        <username type="str" name="Username">None</username>
+        <adress type="ip" name="Adress">None</adress>
+        <extport type="int" name="Extern Port">None</extport>
+        <pw type="str" name="Password">None</pw>
     </webinterface>
-    <log>
-        <file_log type="bool">True</file_log>
-        <log_folder type="str">Logs</log_folder>
-        <log_count type="int">5</log_count>
+    <log name="Log">
+        <file_log type="bool" name="File Log">True</file_log>
+        <log_folder type="str" name="Folder">Logs</log_folder>
+        <log_count type="int" name="Count">5</log_count>
     </log>
-    <general>
-        <language type="str" input="en;de;fr">de</language>
-        <download_folder type="str">Downloads</download_folder>
-        <max_downloads type="int">3</max_downloads>
-        <use_reconnect type="bool">False</use_reconnect>
-        <link_file type="str">links.txt</link_file>
-        <failed_file type="str">failed_links.txt</failed_file>
-        <reconnect_method type="str">None</reconnect_method>
-        <debug_mode type="bool">False</debug_mode>
-        <max_download_time type="int">5</max_download_time>
-        <download_speed_limit type="int">0</download_speed_limit>
-        <checksum type="bool">True</checksum>
+    <general name="General">
+        <language type="str" input="en;de;fr" name="Language">de</language>
+        <download_folder type="str" name="Download Folder">Downloads</download_folder>
+        <max_downloads type="int" name="Max Parallel Downloads">3</max_downloads>
+        <use_reconnect type="bool" name="Use Reconnect">False</use_reconnect>
+        <link_file type="str" name="File For Links">links.txt</link_file>
+        <failed_file type="str" name="File For Failed Links">failed_links.txt</failed_file>
+        <reconnect_method type="str" name="Reconnect Method">None</reconnect_method>
+        <debug_mode type="bool" name="Debug Mode">False</debug_mode>
+        <max_download_time type="int" name="Max Download Time">5</max_download_time>
+        <download_speed_limit type="int" name="Download Speed Limit">0</download_speed_limit>
+        <checksum type="bool" name="Use Checksum">True</checksum>
     </general>
-    <updates>
-        <search_updates type="bool">True</search_updates>
-        <install_updates type="bool">False</install_updates>
+    <updates name="Updates">
+        <search_updates type="bool" name="Search">True</search_updates>
+        <install_updates type="bool" name="Install">False</install_updates>
     </updates>
-    <reconnectTime>
-        <start type="time">0:00</start>
-        <end type="time">0:00</end>
+    <reconnectTime name="Reconnect Time">
+        <start type="time" name="Start">0:00</start>
+        <end type="time" name="End">0:00</end>
     </reconnectTime>
-    <downloadTime>
-        <start type="time">0:00</start>
-        <end type="time">0:00</end>
+    <downloadTime name="Download Time">
+        <start type="time" name="Start">0:00</start>
+        <end type="time" name="End">0:00</end>
     </downloadTime>
-    <proxy>
-        <activated type="bool">False</activated>
-        <adress type="str">http://localhost:8080</adress>
-        <protocol type="str">http</protocol>
+    <proxy name="Proxy">
+        <activated type="bool" name="Activated">False</activated>
+        <adress type="str" name="Adress">http://localhost:8080</adress>
+        <protocol type="str" name="Protocol">http</protocol>
     </proxy>
 </config>
diff --git a/module/config/plugin_default.xml b/module/config/plugin_default.xml
index 88628cb5e..76a873048 100644
--- a/module/config/plugin_default.xml
+++ b/module/config/plugin_default.xml
@@ -9,7 +9,7 @@
             TeliaSonera #3, TeliaSonera
         -->
         <!-- leave empty for autmomatic selection -->
-        <server></server>
+        <server input=";Cogent;Deutsche Telekom;Level(3);Level(3) #2;GlobalCrossing;Level(3) #3;Teleglobe;GlobalCrossing #2;TeliaSonera #2;Teleglobe #2;TeliaSonera #3;TeliaSonera"></server>
         <premium>False</premium>
         <username></username>
         <password></password>
diff --git a/pyLoadCore.py b/pyLoadCore.py
index bdf4e1e40..6eafee4ac 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -138,14 +138,11 @@ class Core(object):
         self.update_available = self.check_update()

 

         self.init_server()

-        self.init_webserver() # start webinterface like cli, gui etc

+        self.init_webserver()

 

 

-        self.logger.info(_("Downloadtime: %s") % self.server_methods.is_time_download()) # debug only

+        self.logger.info(_("Downloadtime: %s") % self.server_methods.is_time_download())

         

-        #read url list @mkaay: pid, lid?

-        # pid = package id

-        # lid = link/file id

         linkFile = self.config['general']['link_file']

         packs = self.server_methods.get_queue()

         found = False