1 files changed, 38 insertions, 31 deletions

diff --git a/module/remote/thriftbackend/thriftgen/pyload/Pyload-remote b/module/remote/thriftbackend/thriftgen/pyload/Pyload-remote
index a84de7978..78d251501 100755
--- a/module/remote/thriftbackend/thriftgen/pyload/Pyload-remote
+++ b/module/remote/thriftbackend/thriftgen/pyload/Pyload-remote
@@ -35,12 +35,12 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
   print '  bool isTimeDownload()'
   print '  bool isTimeReconnect()'
   print '  bool toggleReconnect()'
-  print '  void scanDownloadFolder()'
-  print '  string getConfigValue(string section, string option)'
-  print '  void setConfigValue(string section, string option, string value)'
   print '   getConfig()'
-  print '   getPluginConfig()'
-  print '  ConfigSection configureSection(string section)'
+  print '   getGlobalPlugins()'
+  print '   getUserPlugins()'
+  print '  ConfigHolder configurePlugin(PluginName plugin)'
+  print '  void saveConfig(ConfigHolder config)'
+  print '  void deleteConfig(ConfigHolder config)'
   print '  void setConfigHandler(PluginName plugin, InteractionID iid, JSONString value)'
   print '   checkURLs(LinkList urls)'
   print '   parseURLs(string html, string url)'
@@ -95,7 +95,8 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
   print '   getEvents(string uuid)'
   print '   getAccounts(bool refresh)'
   print '   getAccountTypes()'
-  print '  void updateAccount(PluginName plugin, string account, string password,  options)'
+  print '  void updateAccount(PluginName plugin, string account, string password)'
+  print '  void updateAccountInfo(AccountInfo account)'
   print '  void removeAccount(PluginName plugin, string account)'
   print '  bool login(string username, string password)'
   print '  UserData getUserData()'
@@ -233,41 +234,41 @@ elif cmd == 'toggleReconnect':
     sys.exit(1)
   pp.pprint(client.toggleReconnect())
 
-elif cmd == 'scanDownloadFolder':
+elif cmd == 'getConfig':
   if len(args) != 0:
-    print 'scanDownloadFolder requires 0 args'
+    print 'getConfig requires 0 args'
     sys.exit(1)
-  pp.pprint(client.scanDownloadFolder())
+  pp.pprint(client.getConfig())
 
-elif cmd == 'getConfigValue':
-  if len(args) != 2:
-    print 'getConfigValue requires 2 args'
+elif cmd == 'getGlobalPlugins':
+  if len(args) != 0:
+    print 'getGlobalPlugins requires 0 args'
     sys.exit(1)
-  pp.pprint(client.getConfigValue(args[0],args[1],))
+  pp.pprint(client.getGlobalPlugins())
 
-elif cmd == 'setConfigValue':
-  if len(args) != 3:
-    print 'setConfigValue requires 3 args'
+elif cmd == 'getUserPlugins':
+  if len(args) != 0:
+    print 'getUserPlugins requires 0 args'
     sys.exit(1)
-  pp.pprint(client.setConfigValue(args[0],args[1],args[2],))
+  pp.pprint(client.getUserPlugins())
 
-elif cmd == 'getConfig':
-  if len(args) != 0:
-    print 'getConfig requires 0 args'
+elif cmd == 'configurePlugin':
+  if len(args) != 1:
+    print 'configurePlugin requires 1 args'
     sys.exit(1)
-  pp.pprint(client.getConfig())
+  pp.pprint(client.configurePlugin(eval(args[0]),))
 
-elif cmd == 'getPluginConfig':
-  if len(args) != 0:
-    print 'getPluginConfig requires 0 args'
+elif cmd == 'saveConfig':
+  if len(args) != 1:
+    print 'saveConfig requires 1 args'
     sys.exit(1)
-  pp.pprint(client.getPluginConfig())
+  pp.pprint(client.saveConfig(eval(args[0]),))
 
-elif cmd == 'configureSection':
+elif cmd == 'deleteConfig':
   if len(args) != 1:
-    print 'configureSection requires 1 args'
+    print 'deleteConfig requires 1 args'
     sys.exit(1)
-  pp.pprint(client.configureSection(args[0],))
+  pp.pprint(client.deleteConfig(eval(args[0]),))
 
 elif cmd == 'setConfigHandler':
   if len(args) != 3:
@@ -594,10 +595,16 @@ elif cmd == 'getAccountTypes':
   pp.pprint(client.getAccountTypes())
 
 elif cmd == 'updateAccount':
-  if len(args) != 4:
-    print 'updateAccount requires 4 args'
+  if len(args) != 3:
+    print 'updateAccount requires 3 args'
+    sys.exit(1)
+  pp.pprint(client.updateAccount(eval(args[0]),args[1],args[2],))
+
+elif cmd == 'updateAccountInfo':
+  if len(args) != 1:
+    print 'updateAccountInfo requires 1 args'
     sys.exit(1)
-  pp.pprint(client.updateAccount(eval(args[0]),args[1],args[2],eval(args[3]),))
+  pp.pprint(client.updateAccountInfo(eval(args[0]),))
 
 elif cmd == 'removeAccount':
   if len(args) != 2: