From 8c7a8a954a5a1e9734f25d494da172f4bc240cfb Mon Sep 17 00:00:00 2001 From: OzzieIsaacs Date: Mon, 3 Apr 2017 20:05:55 +0200 Subject: [PATCH] Code cosmetics --- cps/helper.py | 6 ++- cps/static/js/edit_books.js | 26 ++++++------- cps/static/js/main.js | 76 ++++++++++++++++++------------------- 3 files changed, 56 insertions(+), 52 deletions(-) diff --git a/cps/helper.py b/cps/helper.py index 36a25d0e..c4cdf03f 100755 --- a/cps/helper.py +++ b/cps/helper.py @@ -289,7 +289,7 @@ def update_dir_stucture(book_id, calibrepath): os.rename(path, new_title_path) path = new_title_path book.path = book.path.split('/')[0] + '/' + new_titledir - + if authordir != new_authordir: new_author_path = os.path.join(os.path.join(calibrepath, new_authordir), os.path.basename(path)) os.renames(path, new_author_path) @@ -358,9 +358,11 @@ class Updater(threading.Thread): def get_update_status(self): return self.status + @classmethod def file_to_list(self, file): return [x.strip() for x in open(file, 'r') if not x.startswith('#EXT')] + @classmethod def one_minus_two(self, one, two): return [x for x in one if x not in set(two)] @@ -384,6 +386,7 @@ class Updater(threading.Thread): break return list(set(new_delete)) + @classmethod def reduce_files(self, remove_items, exclude_items): rf = [] for item in remove_items: @@ -391,6 +394,7 @@ class Updater(threading.Thread): rf.append(item) return rf + @classmethod def moveallfiles(self, root_src_dir, root_dst_dir): change_permissions = True if sys.platform == "win32" or sys.platform == "darwin": diff --git a/cps/static/js/edit_books.js b/cps/static/js/edit_books.js index 810869a5..8a1a36d1 100644 --- a/cps/static/js/edit_books.js +++ b/cps/static/js/edit_books.js @@ -20,13 +20,13 @@ function prefixedSource(prefix, query, cb, bhAdapter) { } function getPath(){ var jsFileLocation = $("script[src*=edit_books]").attr("src"); // the js file path - jsFileLocation = jsFileLocation.replace("/static/js/edit_books.js", ''); // the js folder path + jsFileLocation = jsFileLocation.replace("/static/js/edit_books.js", ""); // the js folder path return jsFileLocation; } var authors = new Bloodhound({ name: "authors", - datumTokenizer: function(datum) { + datumTokenizer(datum) { return [datum.name]; }, queryTokenizer: Bloodhound.tokenizers.whitespace, @@ -37,15 +37,15 @@ var authors = new Bloodhound({ var series = new Bloodhound({ name: "series", - datumTokenizer: function(datum) { + datumTokenizer(datum) { return [datum.name]; }, - queryTokenizer: function(query) { + queryTokenizer(query) { return [query]; }, remote: { url: getPath()+"/get_series_json?q=", - replace: function(url, query) { + replace(url, query) { return url+encodeURIComponent(query); } } @@ -54,10 +54,10 @@ var series = new Bloodhound({ var tags = new Bloodhound({ name: "tags", - datumTokenizer: function(datum) { + datumTokenizer(datum) { return [datum.name]; }, - queryTokenizer: function(query) { + queryTokenizer(query) { var tokens = query.split(","); tokens = [tokens[tokens.length-1].trim()]; return tokens; @@ -69,15 +69,15 @@ var tags = new Bloodhound({ var languages = new Bloodhound({ name: "languages", - datumTokenizer: function(datum) { + datumTokenizer(datum) { return [datum.name]; }, - queryTokenizer: function(query) { + queryTokenizer(query) { return [query]; }, remote: { url: getPath()+"/get_languages_json?q=", - replace: function(url, query) { + replace(url, query) { return url+encodeURIComponent(query); } } @@ -112,7 +112,7 @@ var promiseAuthors = authors.initialize(); }, { name: "authors", displayKey: "name", - source: function(query, cb){ + source(query, cb){ return sourceSplit(query, cb, "&", authors); //sourceSplit //("&") } }); @@ -141,7 +141,7 @@ var promiseTags = tags.initialize(); }, { name: "tags", displayKey: "name", - source: function(query, cb){ + source(query, cb){ return sourceSplit(query, cb, ",", tags); } }); @@ -156,7 +156,7 @@ var promiseLanguages = languages.initialize(); }, { name: "languages", displayKey: "name", - source: function(query, cb){ + source(query, cb){ return sourceSplit(query, cb, ",", languages); //(",") } }); diff --git a/cps/static/js/main.js b/cps/static/js/main.js index 10e4dc08..7b409c0d 100644 --- a/cps/static/js/main.js +++ b/cps/static/js/main.js @@ -3,6 +3,40 @@ var updateTimerID; var updateText; $(function() { + + function restartTimer() { + $("#spinner").addClass("hidden"); + $("#RestartDialog").modal("hide"); + } + + function updateTimer() { + $.ajax({ + dataType: "json", + url: window.location.pathname+"/../../get_updater_status", + success: function(data) { + // console.log(data.status); + $("#UpdateprogressDialog #Updatecontent").html(updateText[data.status]); + if (data.status >6){ + clearInterval(updateTimerID); + $("#spinner2").hide(); + $("#UpdateprogressDialog #updateFinished").removeClass("hidden"); + $("#check_for_update").removeClass("hidden"); + $("#perform_update").addClass("hidden"); + } + }, + error() { + // console.log('Done'); + clearInterval(updateTimerID); + $("#spinner2").hide(); + $("#UpdateprogressDialog #Updatecontent").html(updateText[7]); + $("#UpdateprogressDialog #updateFinished").removeClass("hidden"); + $("#check_for_update").removeClass("hidden"); + $("#perform_update").addClass("hidden"); + }, + timeout:2000 + }); + } + $(".discover .row").isotope({ // options itemSelector : ".book", @@ -33,7 +67,7 @@ $(function() { dataType: "json", url: window.location.pathname+"/../../shutdown", data: {"parameter":0}, - success: function(data) { + success(data) { $("#spinner").show(); displaytext=data.text; setTimeout(restartTimer, 3000);} @@ -44,7 +78,7 @@ $(function() { dataType: "json", url: window.location.pathname+"/../../shutdown", data: {"parameter":1}, - success: function(data) { + success(data) { return alert(data.text);} }); }); @@ -54,7 +88,7 @@ $(function() { $.ajax({ dataType: "json", url: window.location.pathname+"/../../get_update_status", - success: function(data) { + success(data) { $("#check_for_update").html(buttonText); if (data.status === true) { $("#check_for_update").addClass("hidden"); @@ -79,7 +113,7 @@ $(function() { dataType: "json", data: { start: "True"}, url: window.location.pathname+"/../../get_updater_status", - success: function(data) { + success(data) { updateText=data.text; $("#UpdateprogressDialog #Updatecontent").html(updateText[data.status]); // console.log(data.status); @@ -87,40 +121,6 @@ $(function() { }); }); - function restartTimer() { - $("#spinner").addClass("hidden"); - $("#RestartDialog").modal("hide"); - } - - function updateTimer() { - $.ajax({ - dataType: "json", - url: window.location.pathname+"/../../get_updater_status", - success: function(data) { - // console.log(data.status); - $("#UpdateprogressDialog #Updatecontent").html(updateText[data.status]); - if (data.status >6){ - clearInterval(updateTimerID); - $("#spinner2").hide(); - $("#UpdateprogressDialog #updateFinished").removeClass("hidden"); - $("#check_for_update").removeClass("hidden"); - $("#perform_update").addClass("hidden"); - } - }, - error: function() { - // console.log('Done'); - clearInterval(updateTimerID); - $("#spinner2").hide(); - $("#UpdateprogressDialog #Updatecontent").html(updateText[7]); - $("#UpdateprogressDialog #updateFinished").removeClass("hidden"); - $("#check_for_update").removeClass("hidden"); - $("#perform_update").addClass("hidden"); - }, - timeout:2000 - }); - } - - $(window).resize(function(event) { $(".discover .row").isotope("reLayout"); });