From 516bc4e413cf0000eb6f4b93befdd72fa0b3acc2 Mon Sep 17 00:00:00 2001 From: Phil Borman Date: Tue, 17 Jul 2018 19:24:50 +0200 Subject: [PATCH] Allow replacing "Open" button with "Have" --- data/interfaces/bookstrap/audio.html | 9 +++++++-- data/interfaces/bookstrap/author.html | 9 +++++++-- data/interfaces/bookstrap/books.html | 9 +++++++-- lazylibrarian/__init__.py | 6 ++++-- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/data/interfaces/bookstrap/audio.html b/data/interfaces/bookstrap/audio.html index 26e47188..6e5f5316 100644 --- a/data/interfaces/bookstrap/audio.html +++ b/data/interfaces/bookstrap/audio.html @@ -144,8 +144,13 @@ var flag = row[13] btn = btn + flag if ( btn.indexOf('Open') >= 0 ) { - btn = ' ' + btn + ''} + %if lazylibrarian.CONFIG['OPEN_LINK'] == True: + btn = ' ' + btn + '' + %else: + btn = ' ' + btn.replace("Open", "Have") + '' + %endif + } else if ( btn.indexOf('Wanted') >= 0 ) { %if perm&lazylibrarian.perm_force: btn = '

' + btn + '

Search

' diff --git a/data/interfaces/bookstrap/author.html b/data/interfaces/bookstrap/author.html index e6666e60..cb4b1f6b 100644 --- a/data/interfaces/bookstrap/author.html +++ b/data/interfaces/bookstrap/author.html @@ -287,8 +287,13 @@ var flag = row[13] btn = btn + flag if ( btn.indexOf('Open') >= 0 ) { - btn = ' ' + btn + ''} + %if lazylibrarian.CONFIG['OPEN_LINK'] == True: + btn = ' ' + btn + '' + %else: + btn = ' ' + btn.replace("Open", "Have") + '' + %endif + } else if ( btn.indexOf('Wanted') >= 0 ) { btn = '

' + btn + '

Search

'} else if ( btn.indexOf('Snatched') >= 0 ) { diff --git a/data/interfaces/bookstrap/books.html b/data/interfaces/bookstrap/books.html index ecc17101..8f462757 100644 --- a/data/interfaces/bookstrap/books.html +++ b/data/interfaces/bookstrap/books.html @@ -153,8 +153,13 @@ var flag = row[13] btn = btn + flag if ( btn.indexOf('Open') >= 0 ) { - btn = ' ' + btn + ''} + %if lazylibrarian.CONFIG['OPEN_LINK'] == True: + btn = ' ' + btn + '' + %else: + btn = ' ' + btn.replace("Open", "Have") + '' + %endif + } else if ( btn.indexOf('Wanted') >= 0 ) { %if perm&lazylibrarian.perm_force: btn = '

' + btn + '

Search

' diff --git a/lazylibrarian/__init__.py b/lazylibrarian/__init__.py index ac383c61..372bbbc2 100644 --- a/lazylibrarian/__init__.py +++ b/lazylibrarian/__init__.py @@ -162,8 +162,8 @@ isbn_978_dict = { # Any _NOT_ in the web ui will remain unchanged on config save CONFIG_GIT = ['GIT_REPO', 'GIT_USER', 'GIT_BRANCH', 'LATEST_VERSION', 'GIT_UPDATED', 'CURRENT_VERSION', 'COMMITS_BEHIND', 'INSTALL_TYPE', 'AUTO_UPDATE'] -CONFIG_NONWEB = ['NAME_POSTFIX', 'DIR_PERM', 'FILE_PERM', 'BLOCKLIST_TIMER', 'DISPLAYLENGTH', - 'WALL_COLUMNS', 'ADMIN_EMAIL', 'HTTP_TIMEOUT', 'PROXY_LOCAL', 'SKIPPED_EXT', +CONFIG_NONWEB = ['NAME_POSTFIX', 'DIR_PERM', 'FILE_PERM', 'BLOCKLIST_TIMER', 'DISPLAYLENGTH', 'ISBN_LOOKUP', + 'WALL_COLUMNS', 'ADMIN_EMAIL', 'HTTP_TIMEOUT', 'PROXY_LOCAL', 'SKIPPED_EXT', 'OPEN_LINK', 'SYS_ENCODING', 'LT_DEVKEY', 'HIST_REFRESH', 'HTTP_EXT_TIMEOUT', 'CALIBRE_RENAME'] # default interface does not know about these items, so leave them unchanged CONFIG_NONDEFAULT = ['BOOKSTRAP_THEME', 'AUDIOBOOK_TYPE', 'AUDIO_DIR', 'AUDIO_TAB', 'REJECT_AUDIO', @@ -406,6 +406,7 @@ CONFIG_DEFINITIONS = { 'NO_ISBN': ('bool', 'LibraryScan', 0), 'NO_SETS': ('bool', 'LibraryScan', 0), 'NO_LANG': ('bool', 'LibraryScan', 0), + 'ISBN_LOOKUP': ('bool', 'LibraryScan', 1), 'IMP_IGNORE': ('bool', 'LibraryScan', 0), 'IMP_GOOGLEIMAGE': ('bool', 'LibraryScan', 0), 'EBOOK_DEST_FOLDER': ('str', 'PostProcess', '$Author/$Title'), @@ -505,6 +506,7 @@ CONFIG_DEFINITIONS = { 'OPDS_USERNAME': ('str', 'OPDS', ''), 'OPDS_PASSWORD': ('str', 'OPDS', ''), 'OPDS_METAINFO': ('bool', 'OPDS', 0), + 'OPEN_LINK': ('bool', 'General', 0), }