diff --git a/cps/metadata_provider/comicvine.py b/cps/metadata_provider/comicvine.py index 8f496608..00c34599 100644 --- a/cps/metadata_provider/comicvine.py +++ b/cps/metadata_provider/comicvine.py @@ -26,7 +26,7 @@ class ComicVine(Metadata): __name__ = "ComicVine" __id__ = "comicvine" - def search(self, query, __): + def search(self, query, generic_cover=""): val = list() apikey = "57558043c53943d5d1e96a9ad425b0eb85532ee6" if self.active: diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py index f3d02d8e..cf166f2e 100644 --- a/cps/metadata_provider/google.py +++ b/cps/metadata_provider/google.py @@ -26,14 +26,14 @@ class Google(Metadata): __name__ = "Google" __id__ = "google" - def search(self, query, __): + def search(self, query, generic_cover=""): if self.active: val = list() result = requests.get("https://www.googleapis.com/books/v1/volumes?q="+query.replace(" ","+")) for r in result.json()['items']: v = dict() v['id'] = r['id'] - v['title'] = r['volumeInfo']['title'] + v['title'] = r['volumeInfo'].get('title',"") v['authors'] = r['volumeInfo'].get('authors', []) v['description'] = r['volumeInfo'].get('description', "") v['publisher'] = r['volumeInfo'].get('publisher', "") diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py index 6e13c768..5ff078b9 100644 --- a/cps/metadata_provider/scholar.py +++ b/cps/metadata_provider/scholar.py @@ -20,7 +20,6 @@ from scholarly import scholarly from cps.services.Metadata import Metadata - class scholar(Metadata): __name__ = "Google Scholar" __id__ = "googlescholar" @@ -32,7 +31,7 @@ class scholar(Metadata): i = 0 for publication in scholar_gen: v = dict() - v['id'] = "1234" # publication['bib'].get('title') + v['id'] = publication['url_scholarbib'].split(':')[1] v['title'] = publication['bib'].get('title') v['authors'] = publication['bib'].get('author', []) v['description'] = publication['bib'].get('abstract', "") @@ -41,8 +40,8 @@ class scholar(Metadata): v['publishedDate'] = publication['bib'].get('pub_year')+"-01-01" else: v['publishedDate'] = "" - v['tags'] = "" - v['ratings'] = 0 + v['tags'] = [] + v['rating'] = 0 v['series'] = "" v['cover'] = generic_cover v['url'] = publication.get('pub_url') or publication.get('eprint_url') or "", diff --git a/cps/search_metadata.py b/cps/search_metadata.py index e837fe21..b88f222f 100644 --- a/cps/search_metadata.py +++ b/cps/search_metadata.py @@ -103,9 +103,9 @@ def metadata_search(): data = list() active = current_user.view_settings.get('metadata', {}) if query: - static_cover = url_for('static', filename='generic_cover.jpg') + generic_cover = "" with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor: - meta = {executor.submit(c.search, query, static_cover): c for c in cl if active.get(c.__id__, True)} + meta = {executor.submit(c.search, query, generic_cover): c for c in cl if active.get(c.__id__, True)} for future in concurrent.futures.as_completed(meta): data.extend(future.result()) return Response(json.dumps(data), mimetype='application/json') diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js index 51ab740d..2ad4d53b 100644 --- a/cps/static/js/get_meta.js +++ b/cps/static/js/get_meta.js @@ -40,7 +40,7 @@ $(function () { $("#book_title").val(book.title); $("#tags").val(uniqueTags.join(", ")); $("#rating").data("rating").setValue(Math.round(book.rating)); - if(book.cover !== null){ + if(book.cover){ $(".cover img").attr("src", book.cover); $("#cover_url").val(book.cover); } @@ -128,9 +128,7 @@ $(function () { e.preventDefault(); keyword = $("#keyword").val(); $('.pill').each(function(){ - // console.log($(this).data('control')); $(this).data("initial", $(this).prop('checked')); - // console.log($(this).data('initial')); }); doSearch(keyword); });