From: Oleg Broytman Date: Wed, 10 Jan 2024 00:50:54 +0000 (+0300) Subject: Merge branch 'master' into wx X-Git-Tag: 0.3.0~9^2~1 X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=f02f8a6f7fd47bb6ab22966d783a017d821c4609;hp=7b3352daa8d57878f0d727f1a4f4b1f2fc9609da;p=m_librarian.git Merge branch 'master' into wx --- diff --git a/m_librarian/download.py b/m_librarian/download.py index 281efca..c0bc101 100755 --- a/m_librarian/download.py +++ b/m_librarian/download.py @@ -71,6 +71,8 @@ _library_path = None def download(book, dest_path=None, lib_path=None, a_format=None): + if dest_path is None: + dest_path = get_config().getpath('download', 'path') if lib_path is None: global _library_path if _library_path is None: diff --git a/m_librarian/web/app.py b/m_librarian/web/app.py index 283ddb7..7885d46 100644 --- a/m_librarian/web/app.py +++ b/m_librarian/web/app.py @@ -65,16 +65,21 @@ def download_books(): for bid in form.getall(k): books_ids.append(bid) if books_ids: - download_path = get_config().getpath('download', 'path') - for bid in books_ids: - book = Book.get(int(bid)) - download(book, download_path) - return { - 'message': u'Книги сохранены.', - } + try: + for bid in books_ids: + book = Book.get(int(bid)) + download(book) + except Exception as e: + return { + 'error': str(e), + } + else: + return { + 'message': u'Книги сохранены.', + } else: return { - 'message': u'Не выбрано книг для сохранения.', + 'error': u'Не выбрано книг для сохранения.', } diff --git a/m_librarian/web/views/download.py b/m_librarian/web/views/download.py index ef05ca4..c207ccb 100644 --- a/m_librarian/web/views/download.py +++ b/m_librarian/web/views/download.py @@ -33,12 +33,12 @@ VFFSL=valueFromFrameOrSearchList VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '3.1.0' -__CHEETAH_versionTuple__ = (3, 1, 0, 'final', 1) -__CHEETAH_genTime__ = 1523146500.915016 -__CHEETAH_genTimestamp__ = 'Sun Apr 8 03:15:00 2018' +__CHEETAH_version__ = '3.3.1' +__CHEETAH_versionTuple__ = (3, 3, 1, 'final', 0) +__CHEETAH_genTime__ = 1704845598.39619 +__CHEETAH_genTimestamp__ = 'Wed Jan 10 03:13:18 2024' __CHEETAH_src__ = 'download.tmpl' -__CHEETAH_srcLastModified__ = 'Sun Apr 8 03:14:43 2018' +__CHEETAH_srcLastModified__ = 'Wed Jan 10 03:10:53 2024' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -91,10 +91,18 @@ class download(layout): if _v is not None: write(_filter(_v, rawExpr=u'$title')) # from line 5, col 5. write(u''' -

''') - _v = VFFSL(SL,"message",True) # u'$message' on line 7, col 4 - if _v is not None: write(_filter(_v, rawExpr=u'$message')) # from line 7, col 4. - write(u'''

+''') + if VFFSL(SL,"getVar",False)('error', None): # generated from line 7, col 1 + write(u'''

''') + _v = VFFSL(SL,"error",True) # u'$error' on line 8, col 23 + if _v is not None: write(_filter(_v, rawExpr=u'$error')) # from line 8, col 23. + write(u'''

+''') + else: # generated from line 9, col 1 + write(u'''

''') + _v = VFFSL(SL,"message",True) # u'$message' on line 10, col 4 + if _v is not None: write(_filter(_v, rawExpr=u'$message')) # from line 10, col 4. + write(u'''

''') ######################################## @@ -161,7 +169,7 @@ if not hasattr(download, '_initCheetahAttributes'): # CHEETAH was developed by Tavis Rudd and Mike Orr # with code, advice and input from many other volunteers. -# For more information visit http://cheetahtemplate.org/ +# For more information visit https://cheetahtemplate.org/ ################################################## ## if run from command line: diff --git a/m_librarian/web/views/download.tmpl b/m_librarian/web/views/download.tmpl index cf7e5bf..f9bf363 100644 --- a/m_librarian/web/views/download.tmpl +++ b/m_librarian/web/views/download.tmpl @@ -4,5 +4,9 @@ #def body

$title

+#if $getVar('error', None) +

$error

+#else

$message

+#end if #end def diff --git a/m_librarian/web/views/search_authors_form.py b/m_librarian/web/views/search_authors_form.py index b5229bc..ab02908 100644 --- a/m_librarian/web/views/search_authors_form.py +++ b/m_librarian/web/views/search_authors_form.py @@ -33,12 +33,12 @@ VFFSL=valueFromFrameOrSearchList VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '3.1.0' -__CHEETAH_versionTuple__ = (3, 1, 0, 'final', 1) -__CHEETAH_genTime__ = 1527353789.984589 -__CHEETAH_genTimestamp__ = 'Sat May 26 19:56:29 2018' +__CHEETAH_version__ = '3.3.1' +__CHEETAH_versionTuple__ = (3, 3, 1, 'final', 0) +__CHEETAH_genTime__ = 1704845598.452284 +__CHEETAH_genTimestamp__ = 'Wed Jan 10 03:13:18 2024' __CHEETAH_src__ = 'search_authors_form.tmpl' -__CHEETAH_srcLastModified__ = 'Sat May 26 19:56:28 2018' +__CHEETAH_srcLastModified__ = 'Wed Jan 10 03:02:59 2024' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -172,7 +172,7 @@ class search_authors_form(Template): \u0420\u0430\u0437\u043b\u0438\u0447\u0430\u0442\u044c \u043f\u0440\u043e\u043f\u0438\u0441\u043d\u044b\u0435/\u0441\u0442\u0440\u043e\u0447\u043d\u044b\u0435
- +
''') @@ -213,7 +213,7 @@ if not hasattr(search_authors_form, '_initCheetahAttributes'): # CHEETAH was developed by Tavis Rudd and Mike Orr # with code, advice and input from many other volunteers. -# For more information visit http://cheetahtemplate.org/ +# For more information visit https://cheetahtemplate.org/ ################################################## ## if run from command line: diff --git a/m_librarian/web/views/search_authors_form.tmpl b/m_librarian/web/views/search_authors_form.tmpl index 675d7cb..721f149 100644 --- a/m_librarian/web/views/search_authors_form.tmpl +++ b/m_librarian/web/views/search_authors_form.tmpl @@ -26,6 +26,6 @@ checked#slurp Различать прописные/строчные
- +
diff --git a/m_librarian/web/views/search_books_form.py b/m_librarian/web/views/search_books_form.py index 487aaaf..01b8770 100644 --- a/m_librarian/web/views/search_books_form.py +++ b/m_librarian/web/views/search_books_form.py @@ -33,12 +33,12 @@ VFFSL=valueFromFrameOrSearchList VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '3.1.0' -__CHEETAH_versionTuple__ = (3, 1, 0, 'final', 1) -__CHEETAH_genTime__ = 1528667817.826233 -__CHEETAH_genTimestamp__ = 'Mon Jun 11 00:56:57 2018' +__CHEETAH_version__ = '3.3.3' +__CHEETAH_versionTuple__ = (3, 3, 3, 'final', 0) +__CHEETAH_genTime__ = 1704324466.1203597 +__CHEETAH_genTimestamp__ = 'Thu Jan 4 02:27:46 2024' __CHEETAH_src__ = 'search_books_form.tmpl' -__CHEETAH_srcLastModified__ = 'Mon Jun 11 00:30:36 2018' +__CHEETAH_srcLastModified__ = 'Thu Jan 4 02:27:28 2024' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -87,7 +87,7 @@ class search_books_form(Template): ## START - generated method body if VFFSL(SL,"getVar",False)('search_type', '') == VFFSL(SL,"value",True): # generated from line 4, col 1 - write(u'''checked''') + write('''checked''') ######################################## ## END - generated method body @@ -115,7 +115,7 @@ class search_books_form(Template): ## START - generated method body if VFFSL(SL,"getVar",False)('case_sensitive', None): # generated from line 9, col 1 - write(u'''checked''') + write('''checked''') ######################################## ## END - generated method body @@ -143,7 +143,7 @@ class search_books_form(Template): ## START - generated method body if VFFSL(SL,"getVar",False)('use_filters', VFN(VFFSL(SL,"get_config",False)(),"getint",False)('filters', 'use_in_search_forms', 1)): # generated from line 14, col 1 - write(u'''checked''') + write('''checked''') ######################################## ## END - generated method body @@ -169,43 +169,43 @@ class search_books_form(Template): ######################################## ## START - generated method body - write(u'''
+ write('''
+ if _v is not None: write(_filter(_v, rawExpr="$html_escape($getVar('search_books',\n ''))")) # from line 20, col 37. + write('''" type="text" style="width: 100%">
- \u041f\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u0430 \u0432 \u043d\u0430\u0447\u0430\u043b\u0435 + _v = VFFSL(SL,"search_type_checked",False)('start') # "$search_type_checked('start')" on line 23, col 43 + if _v is not None: write(_filter(_v, rawExpr="$search_type_checked('start')")) # from line 23, col 43. + write(''' type="radio"> + Подстрока в начале - \u041f\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u0430 + _v = VFFSL(SL,"search_type_checked",False)('substring') # "$search_type_checked('substring')" on line 25, col 47 + if _v is not None: write(_filter(_v, rawExpr="$search_type_checked('substring')")) # from line 25, col 47. + write(''' type="radio"> + Подстрока - \u0422\u043e\u0447\u043d\u043e\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435 + _v = VFFSL(SL,"search_type_checked",False)('full') # "$search_type_checked('full')" on line 27, col 42 + if _v is not None: write(_filter(_v, rawExpr="$search_type_checked('full')")) # from line 27, col 42. + write(''' type="radio"> + Точное совпадение
- \u0420\u0430\u0437\u043b\u0438\u0447\u0430\u0442\u044c \u043f\u0440\u043e\u043f\u0438\u0441\u043d\u044b\u0435/\u0441\u0442\u0440\u043e\u0447\u043d\u044b\u0435 + _v = VFFSL(SL,"case_sensitive_checked",True) # '$case_sensitive_checked' on line 30, col 48 + if _v is not None: write(_filter(_v, rawExpr='$case_sensitive_checked')) # from line 30, col 48. + write('''> + Различать прописные/строчные - \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0444\u0438\u043b\u044c\u0442\u0440\u044b + _v = VFFSL(SL,"use_filters_check",True) # '$use_filters_check' on line 32, col 45 + if _v is not None: write(_filter(_v, rawExpr='$use_filters_check')) # from line 32, col 45. + write('''> + Использовать фильтры
- +
''') @@ -246,7 +246,7 @@ if not hasattr(search_books_form, '_initCheetahAttributes'): # CHEETAH was developed by Tavis Rudd and Mike Orr # with code, advice and input from many other volunteers. -# For more information visit http://cheetahtemplate.org/ +# For more information visit https://cheetahtemplate.org/ ################################################## ## if run from command line: diff --git a/m_librarian/web/views/search_books_form.tmpl b/m_librarian/web/views/search_books_form.tmpl index d5e0c0e..6ac0ca7 100644 --- a/m_librarian/web/views/search_books_form.tmpl +++ b/m_librarian/web/views/search_books_form.tmpl @@ -33,6 +33,6 @@ checked#slurp Использовать фильтры
- +