many new stuff, some things already working

4 files changed, 66 insertions, 173 deletions

diff --git a/module/config/core_default.xml b/module/config/core_default.xml
deleted file mode 100644
index 4d2e59aad..000000000
--- a/module/config/core_default.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" ?>
-<config name="Configuration" version="0.1">
-    <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 name="SSL">
-        <activated type="bool" name="Activated">False</activated>
-        <cert type="str" name="SSL Certificate">ssl.crt</cert>
-        <key type="str" name="SSL Key">ssl.key</key>
-    </ssl>
-    <webinterface name="Webinterface">
-        <activated type="bool" name="Activated">True</activated>
-        <server type="str" input="builtin;lighttpd;nginx;fastcgi" name="Server">builtin</server>
-        <https type="bool" name="Use HTTPS">False</https>
-        <host type="ip" name="IP">0.0.0.0</host>
-        <port type="int" name="Port">8001</port>
-        <template type="str" name="Template">default</template>
-    </webinterface>
-    <xdcc>
-        <nick name="Nickname" type="str">pyload</nick> 
-        <ident name="Ident" type="str">pyloadident</ident> 
-        <realname name="Realname" type="str">pyloadreal</realname> 
-    </xdcc>
-    <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 name="General">
-        <language type="str" input="en;de;fr;nl;pl" 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>
-        <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>
-        <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>
-        <min_free_space type="int" name="Min Free Space (MB)">200</min_free_space>
-        <folder_per_package type="bool" name="Create folder for each package">False</folder_per_package>
-        <download_interface type="ip" name="Outgoing IP address for downloads"></download_interface>
-    </general>
-    <updates name="Updates">
-        <search_updates type="bool" name="Search">True</search_updates>
-        <install_updates type="bool" name="Install">False</install_updates>
-    </updates>
-    <reconnect name="Reconnect">
-        <activated type="bool" name="Use Reconnect">False</activated>
-        <method type="str" name="Method">None</method>
-        <startTime type="time" name="Start">0:00</startTime>
-        <endTime type="time" name="End">0:00</endTime>
-    </reconnect>
-    <downloadTime name="Download Time">
-        <start type="time" name="Start">0:00</start>
-        <end type="time" name="End">0:00</end>
-    </downloadTime>
-    <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>
-    <plugins> <!-- python import style, separated with comma -->
-        <load_hook_plugins>
-        module.plugins.hooks.ClickAndLoad,
-        module.plugins.hooks.ContainerDownload,
-        module.plugins.hooks.ExternalScripts,
-        </load_hook_plugins>
-        <load_captcha_plugins>
-        module.plugins.captcha.GigasizeCom,
-        module.plugins.captcha.LinksaveIn,
-        module.plugins.captcha.MegauploadCom,
-        module.plugins.captcha.NetloadIn,
-        module.plugins.captcha.ShareonlineBiz,
-        </load_captcha_plugins>
-        <load_container_plugins>
-        module.plugins.container.CCF,
-        module.plugins.container.DLC_25,
-        module.plugins.container.DLC_26,
-        module.plugins.container.RSDF,
-        module.plugins.container.LinkList,
-        </load_container_plugins>
-        <load_crypter_plugins>
-        module.plugins.crypter.DDLMusicOrg,
-        module.plugins.crypter.FourChanOrg,
-        module.plugins.crypter.HoerbuchIn,
-        module.plugins.crypter.LixIn,
-        module.plugins.crypter.OneKhDe,
-        module.plugins.crypter.RelinkUs,
-        module.plugins.crypter.RSLayerCom,
-        module.plugins.crypter.SecuredIn,
-        module.plugins.crypter.SerienjunkiesOrg,
-        module.plugins.crypter.StealthTo,
-        module.plugins.crypter.YoutubeChannel,
-        </load_crypter_plugins>
-        <load_hoster_plugins>
-        module.plugins.hoster.DepositfilesCom,
-        module.plugins.hoster.DuckloadCom,
-        module.plugins.hoster.FilefactoryCom,
-        module.plugins.hoster.FilesmonsterCom,
-        module.plugins.hoster.FreakshareNet,
-        module.plugins.hoster.GigasizeCom,
-        module.plugins.hoster.HotfileCom,
-        module.plugins.hoster.MegauploadCom,
-        module.plugins.hoster.MegavideoCom,
-        module.plugins.hoster.MyvideoDe,
-        module.plugins.hoster.NetloadIn,
-        module.plugins.hoster.PornhostCom,
-        module.plugins.hoster.PornhubCom,
-        module.plugins.hoster.RapidshareCom,
-        module.plugins.hoster.RedtubeCom,
-        module.plugins.hoster.ShareonlineBiz,
-        module.plugins.hoster.ShragleCom,
-        module.plugins.hoster.StorageTo,
-        module.plugins.hoster.UploadedTo,
-        module.plugins.hoster.XupIn,
-        module.plugins.hoster.YoupornCom,
-        module.plugins.hoster.YoutubeCom,
-        module.plugins.hoster.ZippyshareCom,
-        module.plugins.hoster.ZshareNet,
-        module.plugins.hoster.SharenowNet,
-        module.plugins.hoster.YourfilesTo,
-        module.plugins.hoster.Xdcc,
-        module.plugins.hoster.Ftp,
-        </load_hoster_plugins>
-        <load_account_plugins>
-        module.plugins.accounts.RapidshareCom,
-        module.plugins.accounts.UploadedTo,
-        </load_account_plugins>
-    </plugins>
-</config>
diff --git a/module/config/default.config b/module/config/default.config
new file mode 100644
index 000000000..7a9b7a93c
--- /dev/null
+++ b/module/config/default.config
@@ -0,0 +1,52 @@
+remote - "Remote":

+	int port : "Port" = 7227

+	ip listenaddr : "Adress" = 0.0.0.0

+	str username : "Username" = admin

+	str password : "Password" = pwhere

+ssl - "SSL":

+	bool activated : "Activated"= False

+	str cert : "SSL Certificate" = ssl.crt

+	str key : "SSL Key" = ssl.key

+webinterface - "Webinterface":

+	bool activated : "Activated" = True

+	str server : "Server" = builtin #builtin;lighttpd;nginx;fastcgi

+	bool https : "Use HTTPS" = False

+	ip host : "IP" = 0.0.0.0

+	int port : "Port" = 8001

+	str template : "Template" = default

+xdcc - "xdcc":

+	str nick : "Nickname" = pyload

+	str ident : "Ident" = pyloadident

+	str realname : "Realname" = pyloadreal

+log - "Log":

+	bool file_log : "File Log" = True

+	str log_folder : "Folder" = Logs

+	int log_count : "Count" = 5

+general - "General":

+	str language : "Language" = de #input="en;de;fr;nl;pl"

+	str download_folder : "Download Folder" = Downloads

+	int max_downloads : "Max Parallel Downloads" = 3

+	str link_file : "File For Links" = links.txt

+	str failed_file : "File For Failed Links" = failed_links.txt

+	bool debug_mode : "Debug Mode" = False

+	int max_download_time : "Max Download Time" = 5

+	int download_speed_limit : "Download Speed Limit" = 0

+	bool checksum : "Use Checksum" = True

+	int min_free_space : "Min Free Space (MB)" = 200

+	bool folder_per_package : "Create folder for each package" = False

+	ip download_interface : "Outgoing IP address for downloads" = None

+updates - "Updates":

+	bool search_updates : "Search" = True

+	bool install_updates : "Install" = False

+reconnect - "Reconnect":

+	bool activated : "Use Reconnect" = False

+	str method : "Method" = None

+	time startTime : "Start" = 0:00

+	time endTime : "End" = 0:00

+downloadTime - "Download Time":

+	time start : "Start" = 0:00

+	time end : "End" = 0:00

+proxy - "Proxy":

+	bool activated : "Activated" = False

+	str adress : "Adress" = http://localhost:8080

+	str protocol : "Protocol" = http
\ No newline at end of file
diff --git a/module/config/plugin_default.config b/module/config/plugin_default.config
new file mode 100644
index 000000000..a10b03587
--- /dev/null
+++ b/module/config/plugin_default.config
@@ -0,0 +1,14 @@
+remote - "Remote":
+    int port : "Port" = 7227
+    ip listenaddr : "Adress" = 0.0.0.0
+    str username : "Username" = admin
+    str password : "Password" = pwhere
+SSL - "SSL":
+    bool activated : "Activated" = False
+    file key : "SSL - Cert" = /home/martin/pyload/ssl.crt1
+    file cert : "SSL - Key" = /home/martin/pyload/ssl.key
+    int list : "A List" = [ 1 , 2 , 3 ,
+						4,
+						5,
+						6,
+						]
\ No newline at end of file
diff --git a/module/config/plugin_default.xml b/module/config/plugin_default.xml
deleted file mode 100644
index d9105d5d4..000000000
--- a/module/config/plugin_default.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" ?>
-<config name="Configuration" version="0.1">
-    <RapidshareCom>
-        <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>
-    </RapidshareCom>
-    <NetloadIn>
-        <premium>False</premium>
-        <username></username>
-        <password></password>
-    </NetloadIn>
-    <UploadedTo>
-        <premium>False</premium>
-        <username></username>
-        <password></password>
-    </UploadedTo>
-    <ShareonlineBiz>
-        <premium>False</premium>
-        <username></username>
-        <password></password>
-    </ShareonlineBiz>
-    <HotfileCom>
-        <premium>False</premium>
-        <username></username>
-        <password></password>
-    </HotfileCom>
-    <YoutubeCom>
-        <quality>hd</quality><!-- hd: high definition, hq: high quality, sd: standard definition -->
-    </YoutubeCom>
-    <YoutubeChannel>
-        <!-- False for no limitation -->
-        <max_videos>False</max_videos>
-        <video_groups name="Video Groups" type="str" input="uploads;favorites">uploads,favorites</video_groups>
-    </YoutubeChannel>
-    <SerienjunkiesOrg>
-        <preferredHoster>RapidshareCom,UploadedTo,NetloadIn,FilefactoryCom</preferredHoster>
-    </SerienjunkiesOrg>
-</config>