mirror
/
mylar
mirror of https://github.com/evilhero/mylar
1
0
Fork 0
Code Issues Releases Wiki Activity

BUG: change comic ID, series ID to avoid namespace collisions

This commit is contained in:
barbequesauce 2018-07-20 13:05:07 -04:00 committed by evilhero
parent b71a4a170f
commit 1cd3543351
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mylar/opds.py
View File

@ -267,10 +267,10 @@ class OPDS(object):
if comic['haveissues'] > 0:
entries.append(
{
'title': escape('%s (%s) (%s)' % (comic['ComicName'], comic['ComicYear'], comic['haveissues'])),
'title': escape('%s (%s)' % (comic['ComicName'], comic['ComicYear'])),
'id': escape('comic:%s (%s)' % (comic['ComicName'], comic['ComicYear'])),
'updated': comic['DateAdded'],
'content': escape('%s (%s) (%s)' % (comic['ComicName'], comic['ComicYear'], comic['haveissues'])),
'content': escape('%s (%s)' % (comic['ComicName'], comic['ComicYear'])),
'href': '%s?cmd=Comic&comicid=%s' % (self.opdsroot, quote_plus(comic['ComicID'])),
'kind': 'acquisition',
'rel': 'subsection',
@ -304,10 +304,10 @@ class OPDS(object):
if comic['ComicPublisher'] == kwargs['pubid'] and comic['haveissues'] > 0:
entries.append(
{
'title': escape('%s (%s) (%s)' % (comic['ComicName'], comic['ComicYear'], comic['haveissues'])),
'title': escape('%s (%s)' % (comic['ComicName'], comic['ComicYear'])),
'id': escape('comic:%s (%s)' % (comic['ComicName'], comic['ComicYear'])),
'updated': comic['DateAdded'],
'content': escape('%s (%s) (%s)' % (comic['ComicName'], comic['ComicYear'], comic['haveissues'])),
'content': escape('%s (%s)' % (comic['ComicName'], comic['ComicYear'])),
'href': '%s?cmd=Comic&comicid=%s' % (self.opdsroot, quote_plus(comic['ComicID'])),
'kind': 'acquisition',
'rel': 'subsection',
@ -383,7 +383,7 @@ class OPDS(object):
entries.append(
{
'title': title,
'id': escape('comic:%s - %s' % (issue['ComicName'], issue['Issue_Number'])),
'id': escape('comic:%s (%s) - %s' % (issue['ComicName'], comic['ComicYear'], issue['Issue_Number'])),
'updated': updated,
'content': escape('%s' % (metainfo[0]['summary'])),
'href': '%s?cmd=Issue&issueid=%s&file=%s' % (self.opdsroot, quote_plus(issue['IssueID']),quote_plus(issue['Location'].encode('utf-8'))),
@ -460,7 +460,7 @@ class OPDS(object):
entries.append(
{
'title': title,
'id': escape('comic:%s - %s' % (issuebook['ComicName'], issuebook['Issue_Number'])),
'id': escape('comic:%s (%s) - %s' % (issuebook['ComicName'], comic['ComicYear'], issuebook['Issue_Number'])),
'updated': updated,
'content': escape('%s' % (metainfo[0]['summary'])),
'href': '%s?cmd=Issue&issueid=%s&file=%s' % (self.opdsroot, quote_plus(issuebook['IssueID']),quote_plus(location)),