diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py index f528f050..b41813c8 100644 --- a/cps/gdriveutils.py +++ b/cps/gdriveutils.py @@ -194,7 +194,6 @@ def downloadFile(drive, path, filename, output): f.GetContentFile(output) def backupCalibreDbAndOptionalDownload(drive, f=None): - pass if not drive: drive=getDrive() if drive.auth.access_token_expired: @@ -354,12 +353,11 @@ def getChangeById (drive, change_id): drive=getDrive() if drive.auth.access_token_expired: drive.auth.Refresh() - """Print a single Change resource information. - - Args: - service: Drive API service instance. - change_id: ID of the Change resource to retrieve. - """ + # Print a single Change resource information. + # + # Args: + # service: Drive API service instance. + # change_id: ID of the Change resource to retrieve. try: change = drive.auth.service.changes().get(changeId=change_id).execute() return change diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js index f9fa5b60..583abea2 100644 --- a/cps/static/js/get_meta.js +++ b/cps/static/js/get_meta.js @@ -65,7 +65,7 @@ $(document).ready(function () { $("#description").val(meta.summary); $("#bookAuthor").val(meta.author.join(" & ")); $("#book_title").val(meta.title); - var tags = ''; + tags = ''; for (var i = 0; i < meta.tags.length; i++) { tags = tags + meta.tags[i].title + ','; } @@ -74,7 +74,8 @@ $(document).ready(function () { return; } } - do_search = function (keyword) { + + function do_search (keyword) { show_flag = 0; $("#meta-info").text(msg.loading); var keyword = $("#keyword").val(); @@ -84,26 +85,6 @@ $(document).ready(function () { } } - db_search_book = function (title) { - var url = douban + dbSearch + '?q=' + title + '&fields=all&count=10'; - $.ajax({ - url: url, - type: "GET", - dataType: "jsonp", - jsonp: 'callback', - success: function (data) { - db_results = data.books; - }, - error: function () { - $('#meta-info').html('
'+ msg.search_error+'!
'); - }, - complete: function () { - dbDone = true; - show_result(); - } - }); - } - function show_result () { show_flag++; if (show_flag == 1) { @@ -163,6 +144,26 @@ $(document).ready(function () { } } + db_search_book = function (title) { + var url = douban + dbSearch + '?q=' + title + '&fields=all&count=10'; + $.ajax({ + url: url, + type: "GET", + dataType: "jsonp", + jsonp: 'callback', + success: function (data) { + db_results = data.books; + }, + error: function () { + $('#meta-info').html(''+ msg.search_error+'!
'); + }, + complete: function () { + dbDone = true; + show_result(); + } + }); + } + $("#do-search").click(function () { var keyword = $("#keyword").val(); if (keyword) {