Commit Graph

226 Commits (master)

Author SHA1 Message Date
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 4 years ago
Ozzieisaacs 24c743d23d Code cosmetics 4 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
4 years ago
Ozzieisaacs 65105d9dbe Merge remote-tracking branch 'cc/develop/custom_float' into Develop 4 years ago
Ozzieisaacs 1c630eb604 fixes from tests 4 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
5 years ago
Ozzieisaacs 2de4bfdcf2 Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/helper.py
#	cps/web.py
5 years ago
Ozzieisaacs 544405f5aa Update search for cyrillic letters #877 5 years ago
Ozzieisaacs e1e79a73e8 Fix #884 5 years ago
Ozzieisaacs a00d93a2d9 Working again (basically) 5 years ago
Ozzieisaacs 836c6fd245 Updated translations
Added license texts in flies
5 years ago
Ozzieisaacs 32568c9009 Update testing
Update custom columns unicode enums
5 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
PJ Eby 83db0f9ad5 Render 'url:' ID type as a link
Calibre allows 'url:' as a kind of book identifier
and shows it in the UI as a link; this change
makes calibre-web do the same.
6 years ago
OzzieIsaacs bf44774f22 Tags in detail view are sorted now 6 years ago
Eric Le Lay 513355e2e5 fix #513 OPDS updated date format invalid per Atom specification
replace space separating date from time with 'T'
6 years ago
OzzieIsaacs f1fac28203 Improved error handling for renaming authors and titles (changes related to filesystem and not only to database) 7 years ago
unknown 4a04ec898e case-insensitive search for non-ASCII - improved 7 years ago
unknown d2ea3a6c19 case-insensitive search for non-ASCII 7 years ago
Jonathan Rehm cc916a4eb4 Add timestamp to default publishing date 7 years ago
Jonathan Rehm 04b04e200f Add ability to edit publish date
If a date is not set, default to “0101-01-01”
7 years ago
OzzieIsaacs 0a08a07193 Fixed Deleting user 7 years ago
nanu-c 3acf80c42b remove debuggingtool 7 years ago
nanu-c 26f314d371 support int custom fields 7 years ago
Murat L b6fccbd486 Added Google Books and Kobo links (#189)
* Added Google Books and Kobo links

* International link to google
7 years ago
Ozzie Isaacs 2d918bfb72 Fix for invalid db path 7 years ago
OzzieIsaacs ab534b21c1 Code cosmetics 7 years ago
OzzieIsaacs 986f40b80a Code cosmetics 7 years ago
OzzieIsaacs 78067b87bc Code cosmetics 7 years ago
OzzieIsaacs 80f1276624 Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
# Conflicts:
#	cps/db.py
#	cps/web.py
#	requirements.txt
7 years ago
OzzieIsaacs edadf84710 Added editing star rating graphically
Added ability to reload database connection (refresh problem)
Bugfix display hot books (no hot books, hot books are deleted books, no longer result in error 500)
7 years ago
林檎 6e3d4877ed Change exception from legacy code.
Change all except: clause to except Exception as e:  for further revise.
7 years ago
林檎 b70191ca2a Least change to adapt with python3
change some syntax
- except clause
- unicode -> bulitins.str
- sqllite uri
- fix import local path
- 01 to 1  (0 is meaningless)

add module
- future
- builtins (from future)
- imp (python3 )
- past (from future)
- sqlalchemy (update one)

refer to
http://python-future.org/compatible_idioms.html
7 years ago
林檎 879510da82 Upload support detection of language 7 years ago
OzzieIsaacs 1a83ad713c Additional version info for sqlite database 7 years ago
OzzieIsaacs 7e19e1dd9d Added Publisher and search/advanced search/opds search for publisher 7 years ago
OzzieIsaacs 93b19165cf Added polish in readme to supported UI languages
Handling of missing tags in fb import
naming of path is more imitating calibre (replacement of special characters, "pinyining" of author names if unidecode is available )
Sorting of authors (similar to calibre for jr./sr./I..IV endings)
bugfix pathseparator on windows and linux during upload
bugfix os.rename for authordir
publishing date on detailview is formated according to slected locale
filename on downloading from web ui is now correct displayed
added ids to html for testing
7 years ago
OzzieIsaacs 241c4cef8f - added best rated section in normal view
- added most downloaded section in opds view
- imporved fb2 upload, correct handling of missing elements
- author sort is set on editing and uploading files
- Encoding stuff on uploading files
7 years ago
OzzieIsaacs 2c615fdf05 Finalize graphical setup for calibre-web 7 years ago
OzzieIsaacs 75c89c28e1 Bugfix for accessing config database
Title now displaed on every page
Title can be changed from within application
7 years ago
OzzieIsaacs 4eee58c21c Started migration of config to app database 7 years ago
OzzieIsaacs afdfb30d80 Update email settings 7 years ago
idalin 6fcd65b4ce added identifier for Douban 7 years ago
OzzieIsaacs 3590665614 Added goodreads link (fnally closes #80) 8 years ago
OzzieIsaacs fac83a10eb Added display and linking of IDs (Amazon, ISBN, and DIO Links are working) 8 years ago
OzzieIsaacs ba44a15891 changes for #77
Code cosmetics
#75:
- More debug infos for kindlegen and sending e-mail.
- Button for sending test e-mail.
- timeout of 5min for sending e-mail
8 years ago
OzzieIsaacs bbf6d9b026 Translation of UI (german and english)
Bugfix for feeds
    - removed categories related and up
    - load new books now working
    - category random now working
login page is free of non accessible elements
boolean custom column is vivible in UI
books with only with certain languages can be shown
book shelfs can be deleted from UI
Anonymous user view is more resticted
Added browse of series in sidebar
Dependencys in vendor folder are updated to newer versions (licencs files are now present)
Bugfix editing Authors names
Made upload on windows working
8 years ago
cervinko 52ba2adf73 Merge pull request #48 from OzzieIsaacs/patch-1
Fix for #45 DB_ROOT not found
8 years ago
cervinko 79f373d4e6 Merge pull request #49 from OzzieIsaacs/patch-2
Fix for non Ascii Characters in database paths #46
8 years ago
OzzieIsaacs 59136a9cc2 Linux path problem solved (finally) 8 years ago
OzzieIsaacs 9aac40bfc4 Fix #20
Series and custom composite coloums are also excluded in the view
8 years ago
OzzieIsaacs 3b5be5dbc4 Update db.py 8 years ago
Cervinko Cera 704198655b custom columns unfinished 8 years ago
Cervinko Cera 202cbc26a7 custom columns unfinished 8 years ago
Cervinko Cera 0ee46e4b5e custom columns unfinished 8 years ago
Cervinko Cera 3ddecc007c Adding unfinished upload function 8 years ago
Cervinko Cera d979ed89c6 Fixes for editing Authors 8 years ago
Jan Broer f163ef2202 make pretty filenames for downloads; remove random books section on most pages 8 years ago
Jan Broer 288b67d862 Show book language 9 years ago
Jan Broer 64a9cbce2d Initial Fork from https://bitbucket.org/raphaelmutschler/calibreserver/ 9 years ago