diff --git a/comictaggerlib/comicvinetalker.py b/comictaggerlib/comicvinetalker.py index ad334e9..f0df263 100644 --- a/comictaggerlib/comicvinetalker.py +++ b/comictaggerlib/comicvinetalker.py @@ -184,7 +184,7 @@ class ComicVineTalker(QObject): return cached_volume_result - volume_url = self.api_base_url + "/volume/" + CVTypeID.Volume + "-" + str(series_id) + "/?api_key=" + self.api_key + "&format=json" + volume_url = self.api_base_url + "/volume/" + CVTypeID.Volume + "-" + str(series_id) + "/?api_key=" + self.api_key + "&field_list=name,id,start_year,publisher,count_of_issues&format=json" content = self.getUrlContent(volume_url) cv_response = json.loads(content) @@ -308,10 +308,6 @@ class ComicVineTalker(QObject): num_s = IssueString(issue_results['issue_number']).asString() metadata.issue = num_s metadata.title = issue_results['name'] - - # ComicVine gives redundant info in the title. Strip out the - # volume name and issue number - metadata.title = re.sub( ".* #.+ - ", "", metadata.title ) metadata.publisher = volume_results['publisher']['name'] diff --git a/comictaggerlib/issueselectionwindow.py b/comictaggerlib/issueselectionwindow.py index a4c18d4..56364ca 100644 --- a/comictaggerlib/issueselectionwindow.py +++ b/comictaggerlib/issueselectionwindow.py @@ -117,10 +117,9 @@ class IssueSelectionWindow(QtGui.QDialog): self.twList.setItem(row, 0, item) item_text = record['name'] - # ComicVine gives redundant info in the title. Strip out the - # volume name and issue number - item_text = re.sub( ".* #.+ - ", "", item_text ) - + if item_text is None: + item_text = "" + item = QtGui.QTableWidgetItem(item_text) item.setData( QtCore.Qt.ToolTipRole, item_text ) item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)