From 6eae782f13953dd0ba2bbe1b582cf33fd4d7d90a Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Mon, 19 Dec 2011 23:10:49 +0100
Subject: configparser v2, warning CONFIG will be DELETED.

---
 module/remote/thriftbackend/pyload.thrift | 39 +++++++++++++++++--------------
 1 file changed, 22 insertions(+), 17 deletions(-)

(limited to 'module/remote/thriftbackend/pyload.thrift')

diff --git a/module/remote/thriftbackend/pyload.thrift b/module/remote/thriftbackend/pyload.thrift
index 1542e651a..ace24e709 100644
--- a/module/remote/thriftbackend/pyload.thrift
+++ b/module/remote/thriftbackend/pyload.thrift
@@ -93,20 +93,6 @@ struct ServerStatus {
   7: bool reconnect
 }
 
-struct ConfigItem {
-  1: string name,
-  2: string description,
-  3: string value,
-  4: string type,
-}
-
-struct ConfigSection {
-  1: string name,
-  2: string description,
-  3: list<ConfigItem> items,
-  4: optional string outline
-}
-
 struct FileData {
   1: FileID fid,
   2: string url,
@@ -149,6 +135,24 @@ struct InteractionTask {
   9: string plugin,
 }
 
+struct ConfigItem {
+  1: string name,
+  2: string long_name,
+  3: string description,
+  4: string type,
+  5: string default_value,
+  6: string value,
+}
+
+struct ConfigSection {
+  1: string name,
+  2: string long_name,
+  3: string description,
+  4: string long_description,
+  5: optional list<ConfigItem> items,
+  6: optional map<string, InteractionTask> handler,
+}
+
 struct CaptchaTask {
   1: i16 tid,
   2: binary data,
@@ -225,10 +229,11 @@ exception ServiceException{
 service Pyload {
 
   //config
-  string getConfigValue(1: string category, 2: string option, 3: string section),
-  void setConfigValue(1: string category, 2: string option, 3: string value, 4: string section),
+  string getConfigValue(1: string section, 2: string option),
+  void setConfigValue(1: string section, 2: string option, 3: string value),
   map<string, ConfigSection> getConfig(),
-  map<string, ConfigSection> getPluginConfig(),
+  map<PluginName, ConfigSection> getPluginConfig(),
+  ConfigSection configureSection(1: string section),
 
   // server status
   void pauseServer(),
-- 
cgit v1.2.3


From c9a359b75905d4910e42127cef8cbe62d4a13657 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Tue, 20 Dec 2011 21:35:43 +0100
Subject: some bugfixes

---
 module/remote/thriftbackend/pyload.thrift | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'module/remote/thriftbackend/pyload.thrift')

diff --git a/module/remote/thriftbackend/pyload.thrift b/module/remote/thriftbackend/pyload.thrift
index ace24e709..c498ef8bf 100644
--- a/module/remote/thriftbackend/pyload.thrift
+++ b/module/remote/thriftbackend/pyload.thrift
@@ -34,11 +34,6 @@ enum Destination {
   Queue
 }
 
-enum ElementType {
-  Package,
-  File
-}
-
 // types for user interaction
 // some may only be place holder currently not supported
 // also all input - output combination are not reasonable, see InteractionManager for further info
@@ -162,9 +157,7 @@ struct CaptchaTask {
 
 struct EventInfo {
   1: string eventname,
-  2: optional i32 id,
-  3: optional ElementType type,
-  4: optional Destination destination
+  2: list<string> args,
 }
 
 struct UserData {
@@ -176,14 +169,15 @@ struct UserData {
 }
 
 struct AccountInfo {
-  1: i64 validuntil,
+  1: PluginName plugin,
   2: string login,
-  3: map<string, list<string>> options,
-  4: bool valid,
+  3: bool valid,
+  4: i64 validuntil,
   5: i64 trafficleft,
   6: i64 maxtraffic,
   7: bool premium,
-  8: string type,
+  8: bool activated,
+  9: map<string list<string>> options,
 }
 
 struct ServiceCall {
-- 
cgit v1.2.3


From 958bf611f5d9d117f19f824990ec6fd6b537e967 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Thu, 22 Dec 2011 23:45:38 +0100
Subject: accountmanager v2, delete your accounts.conf and re-enter them in
 pyload, new nice debug functions, try core.shell() and core.breakpoint()

---
 module/remote/thriftbackend/pyload.thrift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/remote/thriftbackend/pyload.thrift')

diff --git a/module/remote/thriftbackend/pyload.thrift b/module/remote/thriftbackend/pyload.thrift
index c498ef8bf..414a1ebf2 100644
--- a/module/remote/thriftbackend/pyload.thrift
+++ b/module/remote/thriftbackend/pyload.thrift
@@ -157,7 +157,7 @@ struct CaptchaTask {
 
 struct EventInfo {
   1: string eventname,
-  2: list<string> args,
+  2: list<string> event_args,
 }
 
 struct UserData {
@@ -170,14 +170,14 @@ struct UserData {
 
 struct AccountInfo {
   1: PluginName plugin,
-  2: string login,
+  2: string loginname,
   3: bool valid,
   4: i64 validuntil,
   5: i64 trafficleft,
   6: i64 maxtraffic,
   7: bool premium,
   8: bool activated,
-  9: map<string list<string>> options,
+  9: map<string, list<string>> options,
 }
 
 struct ServiceCall {
-- 
cgit v1.2.3