mirror of
https://github.com/evilhero/mylar
synced 2025-02-08 07:15:16 +00:00
- Added ComicName to issues and annuals in 'getComic' command - Revamped 'getReadList' command
This commit is contained in:
parent
e2f2a8f03b
commit
61632d67a0
1 changed files with 21 additions and 4 deletions
25
mylar/api.py
25
mylar/api.py
|
@ -155,7 +155,8 @@ class Api(object):
|
||||||
Issue_Number as number,\
|
Issue_Number as number,\
|
||||||
ReleaseDate as releaseDate,\
|
ReleaseDate as releaseDate,\
|
||||||
IssueDate as issueDate,\
|
IssueDate as issueDate,\
|
||||||
Status as status\
|
Status as status,\
|
||||||
|
ComicName as comicName\
|
||||||
FROM issues'
|
FROM issues'
|
||||||
|
|
||||||
def _selectForAnnuals(self):
|
def _selectForAnnuals(self):
|
||||||
|
@ -165,9 +166,19 @@ class Api(object):
|
||||||
Issue_Number as number,\
|
Issue_Number as number,\
|
||||||
ReleaseDate as releaseDate,\
|
ReleaseDate as releaseDate,\
|
||||||
IssueDate as issueDate,\
|
IssueDate as issueDate,\
|
||||||
Status as status\
|
Status as status,\
|
||||||
|
ComicName as comicName\
|
||||||
FROM annuals'
|
FROM annuals'
|
||||||
|
|
||||||
|
def _selectForReadList(self):
|
||||||
|
return 'SELECT \
|
||||||
|
IssueID as id,\
|
||||||
|
Issue_Number as number,\
|
||||||
|
IssueDate as issueDate,\
|
||||||
|
Status as status,\
|
||||||
|
ComicName as comicName\
|
||||||
|
FROM readlist'
|
||||||
|
|
||||||
def _dic_from_query(self, query):
|
def _dic_from_query(self, query):
|
||||||
myDB = db.DBConnection()
|
myDB = db.DBConnection()
|
||||||
rows = myDB.select(query)
|
rows = myDB.select(query)
|
||||||
|
@ -227,7 +238,13 @@ class Api(object):
|
||||||
return
|
return
|
||||||
|
|
||||||
def _getReadList(self, **kwargs):
|
def _getReadList(self, **kwargs):
|
||||||
self.data = self._dic_from_query('SELECT * from readlist order by IssueDate ASC')
|
|
||||||
|
readListQuery ='{select} ORDER BY IssueDate ASC'.format(
|
||||||
|
select = self._selectForReadList()
|
||||||
|
)
|
||||||
|
|
||||||
|
self.data = self._dic_from_query(readListQuery)
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
def _getComic(self, **kwargs):
|
def _getComic(self, **kwargs):
|
||||||
|
|
Loading…
Reference in a new issue