dinislage/CouchPotatoServer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3817 from seedzero/tv

Browse Source
This commit is contained in:
Dean Gardiner committed 2014-08-20 13:54:45 +12:00
2 parents deb7943203 ba14c95e82
commit 7d5efad20c
2 files changed
+32 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

couchpotato/core/media/_base/media/main.py
+31 -14
View File
@@ -44,15 +44,15 @@ class MediaPlugin(MediaBase):
'desc': 'List media', 'desc': 'List media',
'params': { 'params': {
'type': {'type': 'string', 'desc': 'Media type to filter on.'}, 'type': {'type': 'string', 'desc': 'Media type to filter on.'},
'status': {'type': 'array or csv', 'desc': 'Filter movie by status. Example:"active,done"'}, 'status': {'type': 'array or csv', 'desc': 'Filter media by status. Example:"active,done"'},
'release_status': {'type': 'array or csv', 'desc': 'Filter movie by status of its releases. Example:"snatched,available"'}, 'release_status': {'type': 'array or csv', 'desc': 'Filter media by status of its releases. Example:"snatched,available"'},
'limit_offset': {'desc': 'Limit and offset the movie list. Examples: "50" or "50,30"'}, 'limit_offset': {'desc': 'Limit and offset the media list. Examples: "50" or "50,30"'},
'starts_with': {'desc': 'Starts with these characters. Example: "a" returns all movies starting with the letter "a"'}, 'starts_with': {'desc': 'Starts with these characters. Example: "a" returns all media starting with the letter "a"'},
'search': {'desc': 'Search movie title'}, 'search': {'desc': 'Search media title'},
}, },
'return': {'type': 'object', 'example': """{ 'return': {'type': 'object', 'example': """{
'success': True, 'success': True,
'empty': bool, any movies returned or not, 'empty': bool, any media returned or not,
'media': array, media found, 'media': array, media found,
}"""} }"""}
}) })
@@ -312,9 +312,22 @@ class MediaPlugin(MediaBase):
def addSingleListView(self): def addSingleListView(self):
for media_type in fireEvent('media.types', merge = True): for media_type in fireEvent('media.types', merge = True):
def tempList(*args, **kwargs): tempList = lambda media_type = media_type, *args, **kwargs : self.listView(type = media_type, **kwargs)
return self.listView(types = media_type, **kwargs) addApiView('%s.list' % media_type, tempList, docs = {
addApiView('%s.list' % media_type, tempList) 'desc': 'List media',
'params': {
'status': {'type': 'array or csv', 'desc': 'Filter ' + media_type + ' by status. Example:"active,done"'},
'release_status': {'type': 'array or csv', 'desc': 'Filter ' + media_type + ' by status of its releases. Example:"snatched,available"'},
'limit_offset': {'desc': 'Limit and offset the ' + media_type + ' list. Examples: "50" or "50,30"'},
'starts_with': {'desc': 'Starts with these characters. Example: "a" returns all ' + media_type + 's starting with the letter "a"'},
'search': {'desc': 'Search ' + media_type + ' title'},
},
'return': {'type': 'object', 'example': """{
'success': True,
'empty': bool, any """ + media_type + """s returned or not,
'media': array, media found,
}"""}
})
def availableChars(self, types = None, status = None, release_status = None): def availableChars(self, types = None, status = None, release_status = None):
@@ -381,8 +394,7 @@ class MediaPlugin(MediaBase):
def addSingleCharView(self): def addSingleCharView(self):
for media_type in fireEvent('media.types', merge = True): for media_type in fireEvent('media.types', merge = True):
def tempChar(*args, **kwargs): tempChar = lambda media_type = media_type, *args, **kwargs : self.charView(type = media_type, **kwargs)
return self.charView(types = media_type, **kwargs)
addApiView('%s.available_chars' % media_type, tempChar) addApiView('%s.available_chars' % media_type, tempChar)
def delete(self, media_id, delete_from = None): def delete(self, media_id, delete_from = None):
@@ -451,9 +463,14 @@ class MediaPlugin(MediaBase):
def addSingleDeleteView(self): def addSingleDeleteView(self):
for media_type in fireEvent('media.types', merge = True): for media_type in fireEvent('media.types', merge = True):
def tempDelete(*args, **kwargs): tempDelete = lambda media_type = media_type, *args, **kwargs : self.deleteView(type = media_type, **kwargs)
return self.deleteView(types = media_type, *args, **kwargs) addApiView('%s.delete' % media_type, tempDelete, docs = {
addApiView('%s.delete' % media_type, tempDelete) 'desc': 'Delete a ' + media_type + ' from the wanted list',
'params': {
'id': {'desc': 'Media ID(s) you want to delete.', 'type': 'int (comma separated)'},
'delete_from': {'desc': 'Delete ' + media_type + ' from this page', 'type': 'string: all (default), wanted, manage'},
}
})
def restatus(self, media_id): def restatus(self, media_id):
couchpotato/core/media/show/_base/main.py
+1
View File
@@ -18,6 +18,7 @@ class ShowBase(MediaBase):
def __init__(self): def __init__(self):
super(ShowBase, self).__init__() super(ShowBase, self).__init__()
self.initType()
addApiView('show.add', self.addView, docs = { addApiView('show.add', self.addView, docs = {
'desc': 'Add new show to the wanted list', 'desc': 'Add new show to the wanted list',