Ozzie Isaacs
fc85586809
Bugfixes for sqlalchemy 1.4.0
4 years ago
Ozzie Isaacs
9864d932e0
Changed user.nickname to user.name
...
Added function to view downloads of all users for admins
4 years ago
Ozzie Isaacs
59ebc1af8a
Code refactoring
4 years ago
Ozzie Isaacs
5d8d796807
Compatibility for sqlalchemy 2.0
4 years ago
Ozzie Isaacs
f3d88fc746
Update sqlalchemy 1.4 working
4 years ago
Ozzie Isaacs
f52fa41439
Fix restart server
...
Some code cosmetics
4 years ago
Zaroz
5511925ba2
Removed elif "url" identifier format type
...
Removed elif "url" identifier format type, since else output is identical
4 years ago
Zaroz
940c9c45d7
Updated db.py
...
changed __repr__ else statement to allow for custom id entries
4 years ago
jvoisin
bc876a159e
Declare variables before using them
...
It should fix the following stacktrace:
```
[2021-02-18 14:46:14,771] ERROR {cps:1891} Exception on / [GET]
Traceback (most recent call last):
File "/opt/calibre/vendor/flask/app.py", line 2447, in wsgi_app
response = self.full_dispatch_request()
File "/opt/calibre/vendor/flask/app.py", line 1952, in full_dispatch_request
rv = self.handle_user_exception(e)
File "/opt/calibre/vendor/flask/app.py", line 1821, in handle_user_exception
reraise(exc_type, exc_value, tb)
File "/opt/calibre/vendor/flask/_compat.py", line 39, in reraise
raise value
File "/opt/calibre/vendor/flask/app.py", line 1950, in full_dispatch_request
rv = self.dispatch_request()
File "/opt/calibre/vendor/flask/app.py", line 1936, in dispatch_request
return self.view_functions[rule.endpoint](**req.view_args)
File "/opt/calibre/cps/usermanagement.py", line 38, in decorated_view
return login_required(func)(*args, **kwargs)
File "/opt/calibre/vendor/flask_login/utils.py", line 272, in decorated_view
return func(*args, **kwargs)
File "/opt/calibre/cps/web.py", line 719, in index
return render_books_list("newest", sort_param, 1, page)
File "/opt/calibre/cps/web.py", line 422, in render_books_list
entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order)
File "/opt/calibre/cps/db.py", line 610, in fill_indexpage
return self.fill_indexpage_with_archived_books(page, pagesize, database, db_filter, order, False, *join)
File "/opt/calibre/cps/db.py", line 635, in fill_indexpage_with_archived_books
# book = self.order_authors(book)
UnboundLocalError: local variable 'entries' referenced before assignment
```
4 years ago
Ozzie Isaacs
a9cedb3fca
Add logger to db.py
4 years ago
Ozzie Isaacs
e5f754ed0e
improved session handling
4 years ago
Ozzie Isaacs
6f9e52792a
No autoflush on metadata.db change
4 years ago
Ozzieisaacs
27dcbcd7e1
paged and orderable shelfs
...
Fix for non writable settings db with non configured calibre-web
4 years ago
Ozzieisaacs
b637a63e71
Refactored exception logging
4 years ago
OzzieIsaacs
8f36128fe3
Merge branch 'session' into Develop
4 years ago
Ozzieisaacs
f677dcb1f4
Fix missing optional parameter initSession
4 years ago
Ozzieisaacs
1a9b220ec2
Session no longer expires on commit (only in worker thread)
4 years ago
Ozzieisaacs
d15d252af7
Session no longer expires on commit
4 years ago
Ozzieisaacs
777c2726d3
Changed session_handing
4 years ago
jvoisin
2c99e71626
Remove a superfluous space
4 years ago
Ozzieisaacs
e16c0caebb
Fix opds search
4 years ago
Ozzieisaacs
2e67bd2407
Fix add to shelf from search
4 years ago
OzzieIsaacs
d70ded0993
Fix for search
4 years ago
OzzieIsaacs
bb03026589
Fixes from merge problems
4 years ago
OzzieIsaacs
3b8e5ddfb3
Merge remote-tracking branch 'worker/db' into Develop
...
# Conflicts:
# cps/tasks/convert.py
4 years ago
Ozzieisaacs
6e6f144b7a
Paginated search and advanced search
...
Wraparound on books list deactivated
4 years ago
Ozzieisaacs
7c8f6ce62f
Merge branch 'master' into Develop
...
# Conflicts:
# cps/comic.py
# cps/editbooks.py
# cps/isoLanguages.py
4 years ago
Ozzieisaacs
2d712a3841
Fix #1612
4 years ago
blitzmann
0480edce2a
Clarify need for WeakSet
4 years ago
Alexander Yakovlev
4eded82102
Add ISFDB
4 years ago
Alexander Yakovlev
ec4ff83465
Add ISSN tags
4 years ago
Alexander Yakovlev
8745b8b051
nice title for Litres tags
4 years ago
Alexander Yakovlev
4e28c3cadb
add Litres references
4 years ago
blitzmann
76c724c783
Remove global session object, this is now wrapped in the CalibreDB class
4 years ago
blitzmann
032cb59388
Fix resetting the session when first configuring the calibre-db on first boot up
4 years ago
blitzmann
18d16f9a8b
Initial attempt at setting up CalibreDB as a class that carries the engine and DB connection, and the instance being the session
4 years ago
OzzieIsaacs
670cbcd336
Merge branch 'master' into Develop
4 years ago
Ozzieisaacs
449d31e8a1
Refactored update_dir_structure_file
4 years ago
Ozzieisaacs
1450a21d00
Fix links to amazon ( #1461 )
4 years ago
Ozzieisaacs
e012726cd4
Fix #1461 (parse Amazon_* identifiers)
4 years ago
Ozzieisaacs
f49688fdb9
Fix #1461 (parse Amazon_* identifiers)
4 years ago
Ozzieisaacs
e32b017431
Revert "Test revert global Session"
...
This reverts commit 393869e538
.
4 years ago
Ozzieisaacs
393869e538
Test revert global Session
4 years ago
Ozzieisaacs
eaed53e25b
Fix for author edit error (2 same sort_authors lead maybe to choose wrong one)
4 years ago
OzzieIsaacs
feacbe8ebd
Possible Fix for database crash after adding new format and accessing calibre database afterwards
4 years ago
blitzmann
6322919bc7
Merge branch 'Develop' into tasks
...
# Conflicts:
# cps/db.py
4 years ago
blitzmann
5ec1283bb1
Remove threading for the calibre DB class
4 years ago
blitzmann
0f28dc5e55
Remove the queue stuff for CalibreDB (is no longer used)
4 years ago
blitzmann
bf41b04cfa
Remove convert task from db.py - with the fixed from #1565 , this no longer seems to be needed
4 years ago
blitzmann
414043ded1
Remove references to old worker, turn off calibre_db task queue (for now until I can determine if it's needed still), and attempt to re-implement email progress tracking (not working at the moment)
4 years ago
OzzieIsaacs
ad144922fb
Merge with master
4 years ago
OzzieIsaacs
1535bdbcd8
Merge remote-tracking branch 'memorydatabase/issue/1564'
4 years ago
OzzieIsaacs
f9c6fb30bf
Excluded series type again, as it causes problems upon reconnect
4 years ago
Ozzie Isaacs
94ad93ebd7
Added series like custom columns #1501
4 years ago
blitzmann
0e1ec5034e
Fix for #1564 - using memory database in multiple threads.
...
See also: https://docs.sqlalchemy.org/en/13/dialects/sqlite.html#using-a-memory-database-in-multiple-threads
4 years ago
Ozzieisaacs
c18d5786dd
Improved validation check
4 years ago
Ozzieisaacs
1c681ee378
Improvements for books table editor
4 years ago
Ozzieisaacs
4038cb5b85
Internal paged Search prepared
...
Search for table list is working
4 years ago
Ozzieisaacs
0dd0605a1f
Book list for merging
4 years ago
Ozzieisaacs
827b0c6e50
Changed pubdate to timestamp
4 years ago
Ozzieisaacs
27ed918896
Enabled search for archived books
4 years ago
Ozzieisaacs
46197d82b5
Edit and Upload books refactored
4 years ago
OzzieIsaacs
d0e15da352
Fix lcase function
4 years ago
Ozzieisaacs
5f0660a4e5
Refactored helper.py and db.py
4 years ago
OzzieIsaacs
b7535b9526
Merging master branch
...
- fix title sort function
- fix focus on search
4 years ago
Ozzieisaacs
098dab889a
Fixed title sorting routine
4 years ago
Ozzieisaacs
1a458fe39f
Fix for #1407 converting books should now be possible again
4 years ago
Ozzieisaacs
b75497231e
Additional fix for #1407 (metadata.db is now held in memory, app.db is attached to it -> joins between both databases possible -> book_read_link is joined for getting result)
4 years ago
Ozzieisaacs
47641eee59
Merge branch 'master' into Develop
4 years ago
Ozzieisaacs
b48afa38ac
Fix #1386 (Add asin to recognized identifiers)
4 years ago
Ozzieisaacs
16a3deec2c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
4 years ago
jvoisin
dd3b562f1a
Change some links from http to https
4 years ago
Ozzieisaacs
718d50a037
Starting again without traceback (moved gdriveutil import)
4 years ago
Ozzieisaacs
e1439b529b
Config Options for limiting email size, change username to e-mail adress, use kepubify
...
Added work on Unrar5 decompression (breaks comic reader totally)
4 years ago
Ozzieisaacs
0adcd1b3d9
UI Improvements
...
Added additional restrictions to Calibre DB interface
4 years ago
Ozzieisaacs
b160a8de0b
Merge branch 'master' into Develop
...
# Conflicts:
# cps/__init__.py
# cps/comic.py
# cps/editbooks.py
# cps/helper.py
# cps/kobo.py
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/uploader.py
# cps/web.py
4 years ago
Ozzieisaacs
2d92818613
Code cosmetics
5 years ago
Ozzieisaacs
24c743d23d
Code cosmetics
5 years ago
Ozzieisaacs
4749eccfa5
Added fix for python2 regex
...
Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap
5 years ago
Ozzieisaacs
65105d9dbe
Merge remote-tracking branch 'cc/develop/custom_float' into Develop
5 years ago
Ozzieisaacs
1c630eb604
fixes from tests
5 years ago
Ozzieisaacs
f705889c23
Inital Kobo
5 years ago
Ozzieisaacs
26a7d9ef30
Merge branch 'Develop'
...
# Conflicts:
# cps/__init__.py
# cps/about.py
# cps/admin.py
# cps/cli.py
# cps/config_sql.py
# cps/constants.py
# cps/converter.py
# cps/db.py
# cps/editbooks.py
# cps/gdriveutils.py
# cps/helper.py
# cps/logger.py
# cps/oauth.py
# cps/server.py
# cps/services/simpleldap.py
# cps/ub.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
# setup.cfg
# setup.py
5 years ago
Daniel Pavel
a836df9a5a
more robust disposing of database session
...
avoid spamming the log with debug messages from libraries
5 years ago
Ozzieisaacs
4708347c16
Merge branch 'Develop'
...
# Conflicts:
# MANIFEST.in
# README.md
# cps/helper.py
# cps/static/js/archive/archive.js
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/updater.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
5 years ago
Daniel Pavel
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
5 years ago
Ozzieisaacs
572b5427c7
Fix Encoding issues for python2
5 years ago
Ozzieisaacs
14b6202eec
Code cosmetics
...
Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script
5 years ago
Ozzieisaacs
50973ffb72
Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
5 years ago
Daniel Pavel
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
5 years ago
Ozzieisaacs
bb0d5c5538
Working for pip and "normal" start for python3 and python2
5 years ago
Ozzieisaacs
406d1c76c9
Sorting and filtering of lists working (except file formats)
...
Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view
6 years ago
Ozzieisaacs
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
6 years ago
Ozzieisaacs
544405f5aa
Update search for cyrillic letters #877
6 years ago
Ozzieisaacs
e1e79a73e8
Fix #884
6 years ago
Ozzieisaacs
a00d93a2d9
Working again (basically)
6 years ago
Ozzieisaacs
836c6fd245
Updated translations
...
Added license texts in flies
6 years ago
Ozzieisaacs
32568c9009
Update testing
...
Update custom columns unicode enums
6 years ago
Ozzie Isaacs
7be328c535
Converting ebooks in background
...
additional sorting of tasklist according to date and runtime
codecosmetics
6 years ago
Ozzie Isaacs
6a76dce870
Fix change user (in case of reboot required)
...
Fix no existing database
Update required version for sqlalchemy
6 years ago