Zaroz
5511925ba2
Removed elif "url" identifier format type
...
Removed elif "url" identifier format type, since else output is identical
2021-03-03 21:18:08 -06:00
Zaroz
940c9c45d7
Updated db.py
...
changed __repr__ else statement to allow for custom id entries
2021-03-02 23:46:02 -06:00
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
```
2021-02-18 17:02:58 +01:00
Ozzie Isaacs
a9cedb3fca
Add logger to db.py
2021-01-23 13:35:30 +01:00
Ozzie Isaacs
e5f754ed0e
improved session handling
2021-01-11 14:18:01 +01:00
Ozzie Isaacs
6f9e52792a
No autoflush on metadata.db change
2021-01-10 11:01:54 +01:00
Ozzieisaacs
27dcbcd7e1
paged and orderable shelfs
...
Fix for non writable settings db with non configured calibre-web
2020-12-27 10:24:51 +01:00
Ozzieisaacs
b637a63e71
Refactored exception logging
2020-12-12 08:11:00 +01:00
OzzieIsaacs
8f36128fe3
Merge branch 'session' into Develop
2020-12-08 11:49:39 +01:00
Ozzieisaacs
f677dcb1f4
Fix missing optional parameter initSession
2020-12-08 08:19:18 +01:00
Ozzieisaacs
1a9b220ec2
Session no longer expires on commit (only in worker thread)
2020-12-08 08:04:46 +01:00
Ozzieisaacs
d15d252af7
Session no longer expires on commit
2020-12-08 08:01:42 +01:00
Ozzieisaacs
777c2726d3
Changed session_handing
2020-12-07 08:52:52 +01:00
jvoisin
2c99e71626
Remove a superfluous space
2020-10-29 18:17:32 +01:00
Ozzieisaacs
e16c0caebb
Fix opds search
2020-10-10 12:53:10 +02:00
Ozzieisaacs
2e67bd2407
Fix add to shelf from search
2020-10-10 10:32:53 +02:00
OzzieIsaacs
d70ded0993
Fix for search
2020-10-10 07:47:27 +02:00
OzzieIsaacs
bb03026589
Fixes from merge problems
2020-10-10 07:30:03 +02:00
OzzieIsaacs
3b8e5ddfb3
Merge remote-tracking branch 'worker/db' into Develop
...
# Conflicts:
# cps/tasks/convert.py
2020-10-06 21:40:47 +02:00
Ozzieisaacs
6e6f144b7a
Paginated search and advanced search
...
Wraparound on books list deactivated
2020-10-04 19:23:06 +02:00
Ozzieisaacs
7c8f6ce62f
Merge branch 'master' into Develop
...
# Conflicts:
# cps/comic.py
# cps/editbooks.py
# cps/isoLanguages.py
2020-09-26 07:54:38 +02:00
Ozzieisaacs
2d712a3841
Fix #1612
2020-09-20 10:03:05 +02:00
blitzmann
0480edce2a
Clarify need for WeakSet
2020-09-18 21:52:45 -04:00
Alexander Yakovlev
4eded82102
Add ISFDB
2020-09-15 17:39:13 +07:00
Alexander Yakovlev
ec4ff83465
Add ISSN tags
2020-09-15 13:50:34 +07:00
Alexander Yakovlev
8745b8b051
nice title for Litres tags
2020-09-15 13:47:57 +07:00
Alexander Yakovlev
4e28c3cadb
add Litres references
2020-09-15 13:41:01 +07:00
blitzmann
76c724c783
Remove global session object, this is now wrapped in the CalibreDB class
2020-09-13 21:37:47 -04:00
blitzmann
032cb59388
Fix resetting the session when first configuring the calibre-db on first boot up
2020-09-13 13:16:11 -04:00
blitzmann
18d16f9a8b
Initial attempt at setting up CalibreDB as a class that carries the engine and DB connection, and the instance being the session
2020-09-11 22:52:40 -04:00
OzzieIsaacs
670cbcd336
Merge branch 'master' into Develop
2020-09-07 21:33:11 +02:00
Ozzieisaacs
449d31e8a1
Refactored update_dir_structure_file
2020-09-07 21:26:59 +02:00
Ozzieisaacs
1450a21d00
Fix links to amazon ( #1461 )
2020-09-07 18:27:43 +02:00
Ozzieisaacs
e012726cd4
Fix #1461 (parse Amazon_* identifiers)
2020-09-06 19:31:31 +02:00
Ozzieisaacs
f49688fdb9
Fix #1461 (parse Amazon_* identifiers)
2020-09-06 19:31:03 +02:00
Ozzieisaacs
e32b017431
Revert "Test revert global Session"
...
This reverts commit 393869e538
.
2020-09-06 10:59:34 +02:00
Ozzieisaacs
393869e538
Test revert global Session
2020-09-06 10:27:10 +02:00
Ozzieisaacs
eaed53e25b
Fix for author edit error (2 same sort_authors lead maybe to choose wrong one)
2020-09-05 18:23:14 +02:00
OzzieIsaacs
feacbe8ebd
Possible Fix for database crash after adding new format and accessing calibre database afterwards
2020-09-05 10:24:32 +02:00
blitzmann
6322919bc7
Merge branch 'Develop' into tasks
...
# Conflicts:
# cps/db.py
2020-08-25 00:15:41 -04:00
blitzmann
5ec1283bb1
Remove threading for the calibre DB class
2020-08-24 21:03:59 -04:00
blitzmann
0f28dc5e55
Remove the queue stuff for CalibreDB (is no longer used)
2020-08-23 23:17:07 -04:00
blitzmann
bf41b04cfa
Remove convert task from db.py - with the fixed from #1565 , this no longer seems to be needed
2020-08-23 13:07:24 -04:00
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)
2020-08-22 23:35:48 -04:00
OzzieIsaacs
ad144922fb
Merge with master
2020-08-22 09:23:29 +02:00
OzzieIsaacs
1535bdbcd8
Merge remote-tracking branch 'memorydatabase/issue/1564'
2020-08-15 12:08:59 +02:00
OzzieIsaacs
f9c6fb30bf
Excluded series type again, as it causes problems upon reconnect
2020-08-14 19:43:54 +02:00
Ozzie Isaacs
94ad93ebd7
Added series like custom columns #1501
2020-08-11 18:56:34 +02:00
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
2020-08-11 12:44:55 -04:00
Ozzieisaacs
c18d5786dd
Improved validation check
2020-06-12 13:45:07 +02:00