From 1cd354335176c5f1850a36c01100103d52fc9c6a Mon Sep 17 00:00:00 2001 From: barbequesauce Date: Fri, 20 Jul 2018 13:05:07 -0400 Subject: [PATCH] BUG: change comic ID, series ID to avoid namespace collisions --- mylar/opds.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mylar/opds.py b/mylar/opds.py index bf9538e6..18f261a5 100644 --- a/mylar/opds.py +++ b/mylar/opds.py @@ -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)),