Commit Graph

226 Commits (master)

Author SHA1 Message Date
Ozzieisaacs 8e5bb02a28 Merge author rename 3 years ago
Ozzieisaacs 4fd4cf4355 Merge branch 'master' into Develop
# Conflicts:
#	cps/static/css/style.css
#	cps/web.py
3 years ago
Ozzieisaacs add502d236 Fix opds search and opds list of read books 3 years ago
Ozzieisaacs c1f4ca36b6 Current sorting order visible in all sidebar selectors, and search results
Sorting "hot" books only ascending and descending according to download numbers
Downloaded books sorting according to authors name working
3 years ago
Ozzie Isaacs f6a2b8a9ef Read and archive bit visible in book table 3 years ago
Ozzie Isaacs 4c7b5999f7 Archived Flag available in book list array 3 years ago
Ozzie Isaacs bb20979c71 Merge branch 'master' into Develop 3 years ago
Ozzie Isaacs 917909cfdb Refactored books detail page 3 years ago
Ozzie Isaacs 708861bcd5 Enabed edit of custom texts (including categories) in books list 3 years ago
Ozzie Isaacs 9d5e9b28ae Enabled editing of "number" custom_columns in books list 3 years ago
Ozzie Isaacs bad4c01474 Fix stored css bug in all typeahead functions (update typeahead -> bugfix typeahead) 3 years ago
Ozzie Isaacs ed26d34961 Code cleaning (remove python2) 3 years ago
Ozzieisaacs 58735caff3 Enhancements for displaying languages on non english locale 3 years ago
Ozzie Isaacs a32b36bf81 Fixed missing joins for sorting according to series in read/unread and rated views 3 years ago
Ozzie Isaacs 018f3ca250 Sort authors additionally to series and series_index (Fix #2001)
Sqlalchemy version2 is now a global flag
3 years ago
Ozzie Isaacs 93e8c5be32 Fixes for flask version 2.1
Fixes for compatibility with sqlalchemy 2.0
3 years ago
Ozzie Isaacs a47d6cd937 Fix confirm dialog database change
Gdrive setup basically working again
Moved basicconfig behind login
Database setup separated from other setup
Config page is using ajax (flask >2 and slow computers)
3 years ago
Ozzie Isaacs 6bf360fbfb Added "comments" type to supported custom columns 3 years ago
Ozzie Isaacs b0cc52e0aa Enable custom column datetime (adv. search not working yet) #1984 3 years ago
Ozzieisaacs 541c8c4b93 Improved error handling for disapearing custom column linked to visiblility restrictions 3 years ago
Ozzie Isaacs bb4749c65b Result for testrun
Added mass delete of users
refactores user table refresh
Bugfix for sorting with selected users
Bugfix delete books #1938
3 years ago
Ozzie Isaacs 6e5a1a1f4d Merge remote-tracking branch 'add_Babelio/patch-1' into master 3 years ago
Ozzie Isaacs 39bbee0eeb Books sort with non Books table column working #1938 3 years ago
malletfils 3973362457
Update db.py
Just adding support for Babelio (french website about books) in the link section
3 years ago
Ozzie Isaacs 90f2b3fb21 Refactored list checkbox sort 3 years ago
Ozzieisaacs b6177b27f4 Sorting of users in table according to selection possible 3 years ago
Ozzie Isaacs 2d73f541c0 Bugfix sort books list and user list
Prevent transferring password hash to client
3 years ago
Ozzie Isaacs 8acd1f1fe4 Code refactoring and improved error handling for edit user list
Update teststatus
3 years ago
Ozzie Isaacs 2b17bf4114 Update tests
Fixes upload book
3 years ago
Ozzie Isaacs fc85586809 Bugfixes for sqlalchemy 1.4.0 3 years ago
Ozzie Isaacs 9864d932e0 Changed user.nickname to user.name
Added function to view downloads of all users for admins
3 years ago
Ozzie Isaacs 59ebc1af8a Code refactoring 3 years ago
Ozzie Isaacs 5d8d796807 Compatibility for sqlalchemy 2.0 3 years ago
Ozzie Isaacs f3d88fc746 Update sqlalchemy 1.4 working 3 years ago
Ozzie Isaacs f52fa41439 Fix restart server
Some code cosmetics
3 years ago
Zaroz 5511925ba2
Removed elif "url" identifier format type
Removed elif "url" identifier format type, since else output is identical
3 years ago
Zaroz 940c9c45d7
Updated db.py
changed __repr__ else statement to allow for custom id entries
3 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
```
3 years ago
Ozzie Isaacs a9cedb3fca Add logger to db.py 3 years ago
Ozzie Isaacs e5f754ed0e improved session handling 3 years ago
Ozzie Isaacs 6f9e52792a No autoflush on metadata.db change 3 years ago
Ozzieisaacs 27dcbcd7e1 paged and orderable shelfs
Fix for non writable settings db with non configured calibre-web
3 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