summaryrefslogtreecommitdiffstats
path: root/module/remote
diff options
context:
space:
mode:
Diffstat (limited to 'module/remote')
-rw-r--r--module/remote/pyload.thrift12
-rw-r--r--module/remote/ttypes.py21
-rw-r--r--module/remote/ttypes_debug.py1
3 files changed, 21 insertions, 13 deletions
diff --git a/module/remote/pyload.thrift b/module/remote/pyload.thrift
index 902c01534..0c4eea9c4 100644
--- a/module/remote/pyload.thrift
+++ b/module/remote/pyload.thrift
@@ -33,7 +33,7 @@ enum DownloadStatus {
}
// Download states, combination of several downloadstatuses
-// defined in Filedatabase
+// defined in Api
enum DownloadState {
All,
Finished,
@@ -68,10 +68,13 @@ enum PackageStatus {
// 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
-// Todo: how about: time, int, ip, file, s.o.
+// Todo: how about: time, ip, s.o.
enum Input {
NA,
Text,
+ Int,
+ File,
+ Folder,
Textbox,
Password,
Bool, // confirm like, yes or no dialog
@@ -126,6 +129,7 @@ struct ProgressInfo {
8: optional DownloadProgress download
}
+# TODO: Maybe more are needed? Should be simple values
struct ServerStatus {
1: bool pause,
2: i16 active,
@@ -328,6 +332,7 @@ service Pyload {
///////////////////////
string getServerVersion(),
+ string getWSAddress(),
ServerStatus statusServer(),
void pauseServer(),
void unpauseServer(),
@@ -340,9 +345,6 @@ service Pyload {
bool isTimeReconnect(),
bool toggleReconnect(),
- // TODO
- //void scanDownloadFolder(),
-
list<ProgressInfo> getProgressInfo(),
///////////////////////
diff --git a/module/remote/ttypes.py b/module/remote/ttypes.py
index 0412c3709..36b56d961 100644
--- a/module/remote/ttypes.py
+++ b/module/remote/ttypes.py
@@ -40,14 +40,17 @@ class FileStatus:
class Input:
NA = 0
Text = 1
- Textbox = 2
- Password = 3
- Bool = 4
- Click = 5
- Select = 6
- Multiple = 7
- List = 8
- Table = 9
+ Int = 2
+ File = 3
+ Folder = 4
+ Textbox = 5
+ Password = 6
+ Bool = 7
+ Click = 8
+ Select = 9
+ Multiple = 10
+ List = 11
+ Table = 12
class MediaType:
All = 0
@@ -438,6 +441,8 @@ class Iface(object):
pass
def getUserPlugins(self):
pass
+ def getWSAddress(self):
+ pass
def hasAddonHandler(self, plugin, func):
pass
def isInteractionWaiting(self, mode):
diff --git a/module/remote/ttypes_debug.py b/module/remote/ttypes_debug.py
index 0e5312fdc..1b7065d9a 100644
--- a/module/remote/ttypes_debug.py
+++ b/module/remote/ttypes_debug.py
@@ -82,6 +82,7 @@ methods = {
'getServerVersion': basestring,
'getUserData': UserData,
'getUserPlugins': (list, ConfigInfo),
+ 'getWSAddress': basestring,
'hasAddonHandler': bool,
'isInteractionWaiting': bool,
'isTimeDownload': bool,