Commit Graph

284 Commits (master)

Author SHA1 Message Date
Michael Shavit 41a3623fcc [Kobo] Add Shelf/Collection support.
Implements the v1/library/tags set of endpoints to sync CalibreWeb
shelves with the Kobo device.
Drive-by: Refactors shelf.py to consolidate how user permissions are checked.
Drive-by: Fix issue with the sync endpoint that arrises when a book is
hard-deleted.
4 years ago
Ozzieisaacs 09e7d76c6f Merge remote-tracking branch 'kobo_book_delete' into Develop
# Conflicts:
#	cps/kobo.py
#	cps/services/SyncToken.py
#	cps/templates/book_edit.html
#	cps/ub.py
4 years ago
Michael Shavit 8e1641dac9 Add support for syncing Kobo reading state. 4 years ago
Michael Shavit 57d37ffba8 Add schema support for more reading states to the ReadBook table. 4 years ago
Ozzieisaacs fc4436f091 Update Translation 4 years ago
Ozzieisaacs 9fc0c3b3de Merge remote-tracking branch 'English_texts/master'
# Conflicts:
#	cps/templates/config_edit.html
#	cps/templates/config_view_edit.html
#	cps/templates/layout.html
#	cps/templates/search_form.html
#	cps/templates/user_edit.html
4 years ago
Michael Shavit 7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 4 years ago
Ozzieisaacs ba6b5f8fd1 Merge branch 'master' into Develop 4 years ago
Josh O'Brien 8f518993a4
Merge branch 'master' into master 4 years ago
Ozzieisaacs a9a6f5b97e Renamed restrict -> deny 4 years ago
Ozzieisaacs 2ea45b1fdc Removed shebang on non executable scripts 4 years ago
Josh O'Brien 9b49125776 English Language Updates
Changes to provide consistency for English language.
4 years ago
Michael Shavit 9804a98af8 Merge remote-tracking branch 'original/Develop' into kobo_book_delete 4 years ago
Ozzieisaacs 0955c6d6fb Update Kobo 4 years ago
Michael Shavit 4547c328bc Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI. 4 years ago
Michael Shavit c0239a659c Add UI support for archived books.
Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view.
4 years ago
Michael Shavit e404da4192 Add support for book 'deletion' (i.e archiving) from a Kobo device. 4 years ago
Ozzieisaacs cd9bb56db5 Cleanup Kobo integration 4 years ago
Ozzieisaacs 79a9ef4859 Make Kobo optional
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
4 years ago
Ozzieisaacs 661ed17d23 Handle stream output in logviewer
Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction
4 years ago
Ozzieisaacs d9adb4fc94 Improvements for limit tags 4 years ago
Ozzieisaacs 513ac6cfb4 Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
4 years ago
Ozzieisaacs 1da4efec86 Merge branch 'master' into Develop 4 years ago
Ozzieisaacs 1c18a788f4 Merge remote-tracking branch 'tags_restrict/master' into Develop 4 years ago
Ozzieisaacs 5887f0fe6b Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 4 years ago
Ozzieisaacs bbe91f439a Merge from master 4 years ago
Michael Shavit 27d084ce39 Remove the KoboUserKey-based Authentication.
Instead, the user generates the api_endpoint url to set on their device
by visiting http://.../kobo_auth/generate_auth_token.
The generated url will contain a RemoteAuthorizationToken that will be
included on all subsequent requests from the device to the kobo/
endpoints. (In contrast, the device is authenticated using a session cookie on
requests to the download endpoint).

Also use Flask.url_for to generate download urls.
5 years ago
Michael Shavit 9ede01f130 * Add a UserKeyToken to the User table for Kobo authorization.
* Add proper authorization checks on the new Kobo endpoints.

Important Note: As a side-effect, all CalibreWeb API calls can be
authorized using this token (i.e without a username&password).
5 years ago
Ozzieisaacs 38f3c2d5b9 Reenabled multiple oauth provider
deleted duplicate download counting function
5 years ago
Ozzieisaacs c6542fdec6 New Oauth code 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 e734bb120a Merge remote-tracking branch 'github/config_sql' into Develop 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 32af660f86 Improvements for logfile viewer
Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE)
5 years ago
Ozzieisaacs cc8a431532 Merge remote-tracking branch 'socket/unix-socket' into Develop 5 years ago
Daniel Pavel e254565901 support binding the http server to a unix socket file instead of TCP socket 5 years ago
Ozzieisaacs f40fc5aa75 Update LDAP 5 years ago
Ozzieisaacs 9b74d51f21 Merge remote-tracking branch 'ldap/master' into Develop
# Conflicts:
#	cps/server.py
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	optional-requirements-ldap.txt
#	setup.cfg
5 years ago
Krakinou 4437d7376d
Merge pull request #2 from Krakinou/flaskldap
Solve typo
5 years ago
Krakinou 304db0d20e Solve typo 5 years ago
Ozzieisaacs 26949970d8 Revert logging functions
Fix access logger for tornado
5 years ago
Ozzieisaacs 546ed65e1d Update logging
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
5 years ago
Krakinou 9a5ab97d78
Merge branch 'master' into master 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
Krakinou 97d12b94f6 Correct settings update 5 years ago
Krakinou e4d801bbaf initial flask_simpleldap implementation 5 years ago
Ozzieisaacs 87ca05f129 Merge remote-tracking branch 'setup/feature/setuptools-integration' 5 years ago
Ozzieisaacs 4fecce0a0d Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
#	cps/static/js/archive/unrar.js
#	cps/templates/readcbr.html
#	cps/templates/readpdf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.mo
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.mo
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.mo
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.mo
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.mo
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
#	optional-requirements.txt
5 years ago
Ozzieisaacs ed91048a63 Fix for magic link with python 3 5 years ago
Ozzieisaacs f70c839014 Added additional permission viewer 5 years ago
Ozzieisaacs 0c80f5c63a Update Teststatus 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 4ae9d4a749 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	cps/worker.py
5 years ago
Ozzieisaacs 4552208c02 Fix #848 5 years ago
tomjmul 8e8486497f Restirct a user to a set of tags 5 years ago
Ozzieisaacs 3f2a9c8bae Code improvement 5 years ago
Ozzieisaacs 9c1b3f136f Improved sorting for rated,random, hot books, read/unread book 5 years ago
Ozzieisaacs a66873a9e2 Added file formats view 5 years ago
Ozzieisaacs da3fcb9a72 Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
5 years ago
Ozzieisaacs 8612dce97c Merge remote-tracking branch 'author/shorten-authors' 5 years ago
Ozzieisaacs 9144a7ceb9 Fix for sqlalchemy 1.3 5 years ago
Ozzieisaacs f483ca3214 Code cosmetics
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
5 years ago
Ozzieisaacs 0be17ed157 Refactored sidebar (some parts are missing) 5 years ago
Ozzieisaacs f0de822ce7 Start refactor sidebar and view settings sidebar 5 years ago
Virgil Grigoras e5bc1ae020 Add new database field for storing max_authors 5 years ago
Ozzieisaacs a0be02e687 Ldap working 5 years ago
Ozzieisaacs 237502ae6b Output of errormessage for invalid CALIBRE_PORT value 5 years ago
Ozzieisaacs 37007dafee Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
5 years ago
Ozzieisaacs 56826f67fc progressbar during upload thanks to jim3ma 5 years ago
Ozzieisaacs 0fa45f5800 Merge remote-tracking branch 'github/master'
Improvement for #814
5 years ago
Ozzieisaacs 4230226716 Link fixes
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
5 years ago
Ozzieisaacs c1ef1bcd19 User and admin pages are working again 5 years ago
Ozzieisaacs f5235b1d4c Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
5 years ago
Ozzieisaacs d6ee8f75e9 More refactoring 5 years ago
Ozzieisaacs a00d93a2d9 Working again (basically) 5 years ago
Ozzieisaacs 80582573f5 Merge remote-tracking branch 'oauth/oauth' into Develop
# Conflicts:
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/web.py
5 years ago
Ozzieisaacs 3683e4e7eb Merge remote-tracking branch 'ldap/master' into Develop 5 years ago
Ozzieisaacs 836c6fd245 Updated translations
Added license texts in flies
5 years ago
Ozzieisaacs bacb6fb561 New updater with default setting -> only stable releases #653 5 years ago
Ozzieisaacs 32568c9009 Update testing
Update custom columns unicode enums
5 years ago
Krakinou d763168dec Merge branch 'master' of https://github.com/Krakinou/calibre-web 5 years ago
Krakinou 7ccc40cf5b Moving import LDAP
Correct optional-requirements-ldap.txt spelling
5 years ago
Krakinou aafb267787
Merge branch 'master' into master 5 years ago
Krakinou 2e37c14d94 Clean some comment 5 years ago
Krakinou 91f0908059 insert into db
connect via LDAP config
5 years ago
Krakinou 8d284b151d Edit html config 5 years ago
Ozzieisaacs 36030b559c Choosing Theme is now a global setting 5 years ago
Krakinou 30954cc27f Initial LDAP support 5 years ago
Ozzieisaacs 6ec9bc9e5c Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users)
404 messages on non existing categorys, languages, series
Updated Testresult
6 years ago
Jim Ma 1abbcfa3c6 Add OAuth support: GitHub & Google 6 years ago
Virgil Grigoras 5129bc3601 Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page 6 years ago
OzzieIsaacs 3f35200a0b Merge remote-tracking branch 'Comic/comic_server'
# Conflicts:
#	cps/helper.py
#	cps/static/js/archive.js
#	cps/static/js/io.js
#	cps/static/js/kthoom.js
#	cps/static/js/unrar.js
#	cps/static/js/untar.js
#	cps/static/js/unzip.js
#	cps/templates/config_edit.html
#	cps/templates/detail.html
#	cps/templates/readcbr.html
#	cps/templates/stats.html
#	cps/ub.py
#	cps/web.py
#	optional-requirements.txt
6 years ago
OzzieIsaacs cedc183987 Fix #590, #589.
Unified wording Calibre-Web
Replaced one table on admin page, deleted password column
Removed spaces on layout page
Removed uesless commit calls during db migration
Implementation of registering by email
6 years ago
OzzieIsaacs d414bf3263 Massadd of books to shelfs (#203, #404) from advanced search
Code cosmetics
bugfix error message on failed emails
refactored language name generation
6 years ago
OzzieIsaacs cdb1b52652 Bugfix Get gdrive instances (#554, #525)
Metadata.db download works again
removed DEVELOPMENT constant
removed db logging in debug mode (too, noisy, to less information)
code refactoring url_for_other_page
feed languge set to en-EN
update status shos local time instead of UTC
Error handling (back to index page) in case of gdrive authenticate aborted
Mistyping page register fixed
Mistyping bokk fixed
Added uploaded books to tasklist (#442)
Error handling for failed file update added
Code refactoring worker thread
Tasks now never show any decimal values
Converter function unified
removed shell from subprocess call
preparation for limiting domain for registering emails
Book series can now increased in 0.1 steps (#562)
Accordion panels in config are now usable on touch devices like iPad (#545)
Gdrive authenticate button only visible after logged in (#525)
Fixed misstyping in german translation
6 years ago
OzzieIsaacs b0cbd0a37a Added feature to send emails in a background-task 6 years ago
OzzieIsaacs 2449b4049b Code cleaning Stats page
Enable calibre's ebook-convert as converter for mobi files (#411, #533)
6 years ago
OzzieIsaacs ae0c5d7ec2 Fix for #549 6 years ago
OzzieIsaacs 0e83546d40 - Updated translation (it's now always Google Drive)
- Integrated feature #409 (linking read status from calibre)
6 years ago
OzzieIsaacs a8040ad3fa #538:
-Refactoring gdrive and file handling
-Improved error handling for gdrive
-bugfix "gdrive stopping after a while"
- Renaming book title working
- Still Bugs in upload file to gdrive and renaming author
6 years ago
OzzieIsaacs c66bb54478 Fix #534 6 years ago
OzzieIsaacs 204cd504a9 - Completly new setup of GDrive (every data is taken from client_secret.json file)
- If cover on Google Drive is missing, the generic cover will be used
- Better error handling during configuration of google drive (missing hook callback verification, missing files)
- less errors on console during use of Gdrive, more log file output in case of error
- removed standalone flask development mode
- removed gdrive template file and vendor setup script
6 years ago
OzzieIsaacs 671bf5cf8d Integrated #454 (css is loaded remote) 6 years ago
OzzieIsaacs af5a897d1d Added SSL Options (#416) 6 years ago
OzzieIsaacs f6ece5fe72 Fix for #448 6 years ago
OzzieIsaacs b74a075aa6 Added posibility to change settings db via command line for multiple instances (#247) 7 years ago
OzzieIsaacs aee5ca0e06 #396 implemented 7 years ago
OzzieIsaacs f1fac28203 Improved error handling for renaming authors and titles (changes related to filesystem and not only to database) 7 years ago
OzzieIsaacs 8c573ff6d8 Unrar/tar and unzip on server side 7 years ago
OzzieIsaacs ba54b9a357 Fix #365 7 years ago
OzzieIsaacs af8d908bba Fix #371, #372 7 years ago
Cory Sitko 8fd67fb1fc UserBase methods should be properties not classmethods 7 years ago
Cory Sitko 7ade2ecd35 make is_active, is_authenticated, and is_anonymous properties on the Anonymous class so that the login_required decorator will work correctly and disable anonymous browsing 7 years ago
OzzieIsaacs 366bf9739b Fix for #360 and guest accounts 7 years ago
unknown 70d093b193 unicode gave an NameError with python3 7 years ago
Jonathan Rehm 374b5f4c6e Save ePub bookmarks to database
Save ePub bookmark to database. Also use library's built-in restore feature to restore all information from localStorage.
7 years ago
Jonathan Rehm 08d0404e9c Add mature_content property to Anonymous class 7 years ago
OzzieIsaacs fb8ce693f3 Bugfix mature content
Update german translation
7 years ago
Jonathan Rehm aee8aad976 Add option to hide mature content from some users
Uses a configurable list of tags to denote what is mature and hides those books from the user
7 years ago
OzzieIsaacs 1e2edcf753 Merge remote-tracking branch 'adv/author-info' 7 years ago
OzzieIsaacs 74e93e1cdf Code cosmetics 7 years ago
Jonathan Rehm fe68c8a7f8 Add support for displaying author information from Goodreads
Requires the "goodread" module (added to optional-requirements.txt) and an API key

Retrieves Goodreads author information and displays their photo and "about" text
7 years ago
Jonathan Rehm 623f5c8ef0 Add "magic link" functionality
When using a device that is bothersome to log in on (e.g. a Kindle) you can use a magic link to log in via another device.

Configuration was added and is disabled by default.
7 years ago
OzzieIsaacs 6d597f96e5 Integrate Iso639 language name translations to russian translation 7 years ago
OzzieIsaacs 9c679c8908 Delete books should now work (#119) 7 years ago
OzzieIsaacs cd0d450829 Allow deleting books (fixes #119) 7 years ago
OzzieIsaacs ab534b21c1 Code cosmetics 7 years ago
OzzieIsaacs 7dd70db837 Code cosmetics 7 years ago
OzzieIsaacs 7c6d527a55 Code cosmetics 7 years ago
OzzieIsaacs 66181daf6d Merge remote-tracking branch 'custom-dbpath' 7 years ago
OzzieIsaacs 986f40b80a Code cosmetics 7 years ago
OzzieIsaacs 78067b87bc Code cosmetics 7 years ago
Ivan Smirnov 2c173f9848 Read dbpath from $CALIBRE_DBPATH if present
This is an exploration in potentially enabling multiple libraries to run using the same engine. 

Since app config is all in the db, we should get no port conflicts and be able to run multiple instances of this app with no issues.

Using os.getenv instead of os.environ.get allows us to provide CALIBRE_DBPATH inline with the invocation of the file (`CALIBRE_DBPATH=/foo/bar/` python cps.py)
7 years ago
OzzieIsaacs cbc807f3ff Fix #138 7 years ago
OzzieIsaacs 0e0e72fb71 Fixes for gevent/gdrive 7 years ago
Jack Darlington b352bbfd14 Fix for gevent as optional 7 years ago
Jack Darlington 21b1a45023 Merge branch 'develop' into personal
# Conflicts:
#	cps/web.py
7 years ago
Jack Darlington cf1ca21bbc Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/ub.py
#	cps/web.py
#	readme.md
#	requirements.txt
7 years ago
OzzieIsaacs c725afc3a8 Merge remote-tracking branch 'JackED42/feature/ignorable_columns' 7 years ago
林檎 6e3d4877ed Change exception from legacy code.
Change all except: clause to except Exception as e:  for further revise.
7 years ago
林檎 1da3b57f5a no need future module for python2
fix missing StringIO
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
Jack Darlington c702b14340 Fixes for READ/UNREAD 7 years ago
Jack Darlington 27cbab6cb7 Fixes for READ/UNREAD 7 years ago
Jack Darlington 015d82ae2b Revert "Merging ignorable columns"
This reverts commit 8745d65ff6.
7 years ago
Jack Darlington 8745d65ff6 Merging ignorable columns 7 years ago
Jack Darlington 141eb7901c Add ignorable columns 7 years ago
Jack Darlington d9c48a6203 Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/web.py
7 years ago
OzzieIsaacs 1a83ad713c Additional version info for sqlite database 7 years ago