From 14ecf91716fd403922b44567d75d4cbe3abea617 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 20 Feb 2013 23:11:33 +0100 Subject: parse category from addons --- module/remote/pyload.thrift | 2 +- module/remote/ttypes.py | 6 +++--- module/remote/ttypes_debug.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'module/remote') diff --git a/module/remote/pyload.thrift b/module/remote/pyload.thrift index 6a77bdc1d..7eadd54e6 100644 --- a/module/remote/pyload.thrift +++ b/module/remote/pyload.thrift @@ -250,7 +250,7 @@ struct ConfigInfo { 1: string name 2: string label, 3: string description, - 4: bool addon, + 4: string category, 5: bool user_context, 6: optional bool activated, } diff --git a/module/remote/ttypes.py b/module/remote/ttypes.py index 1592829a3..1f91403d5 100644 --- a/module/remote/ttypes.py +++ b/module/remote/ttypes.py @@ -139,13 +139,13 @@ class ConfigHolder(BaseObject): self.handler = handler class ConfigInfo(BaseObject): - __slots__ = ['name', 'label', 'description', 'addon', 'user_context', 'activated'] + __slots__ = ['name', 'label', 'description', 'category', 'user_context', 'activated'] - def __init__(self, name=None, label=None, description=None, addon=None, user_context=None, activated=None): + def __init__(self, name=None, label=None, description=None, category=None, user_context=None, activated=None): self.name = name self.label = label self.description = description - self.addon = addon + self.category = category self.user_context = user_context self.activated = activated diff --git a/module/remote/ttypes_debug.py b/module/remote/ttypes_debug.py index 84b56e55d..f7f02b127 100644 --- a/module/remote/ttypes_debug.py +++ b/module/remote/ttypes_debug.py @@ -10,7 +10,7 @@ classes = { 'AddonInfo' : [basestring, basestring, basestring], 'AddonService' : [basestring, basestring, (list, basestring), (None, int)], 'ConfigHolder' : [basestring, basestring, basestring, basestring, (list, ConfigItem), (None, (list, AddonInfo)), (None, (list, InteractionTask))], - 'ConfigInfo' : [basestring, basestring, basestring, bool, bool, (None, bool)], + 'ConfigInfo' : [basestring, basestring, basestring, basestring, bool, (None, bool)], 'ConfigItem' : [basestring, basestring, basestring, basestring, (None, basestring), basestring], 'DownloadInfo' : [basestring, basestring, basestring, int, basestring, basestring], 'DownloadProgress' : [int, int, int, int], -- cgit v1.2.3