Commit Graph

432 Commits (d5f711c46e725cb01b981c9fbc587366dcb1b425)

Author SHA1 Message Date
OzzieIsaacs c9f36a4d1a Merge remote-tracking branch 'adv/bookmarks' 7 years ago
OzzieIsaacs b6b5313f2d Fix for #315 7 years ago
OzzieIsaacs f860694487 Merge remote-tracking branch 'adv/goodreads-more-by' 7 years ago
OzzieIsaacs 5ee1950828 Merge remote-tracking branch 'adv/sqlalchemy-bool' 7 years ago
Jonathan Rehm 58abc1d024 Fuzzy match book titles to eliminate duplicates
Titles with a Levenshtein ratio of 70% or greater are considered duplicates.
7 years ago
Jonathan Rehm 53c687251e Show "More by" on author page
Uses Goodread's list of author's books, filtering out the books that are already in the user's library.

Requires the Goodreads dependency and API information.
7 years ago
Jonathan Rehm 6b8de017ab Use SQLAlchemy boolean
Seems to make a difference sometimes.

Ref #300
7 years ago
Jonathan Rehm 8e1cfa1cbf Re-apply `db_filter`
Accidentally removed when the language and content filters were moved to `common_filters`.
7 years ago
OzzieIsaacs a8b53ab38a Merge remote-tracking branch 'adv/common-filters' 7 years ago
OzzieIsaacs d5e1dba0fe Merge remote-tracking branch 'adv/goodreads-more-by' 7 years ago
Jonathan Rehm 3213bf50b3 Move common filters into function
Instead of duplicating functionality across lots of functions, combine it into one common function. It makes reading and modifying it much easier.
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 a682c95ec1 Show "More by" on author page
Uses Goodread's list of author's books, filtering out the books that are already in the user's library.

Requires the Goodreads dependency and API information.
7 years ago
OzzieIsaacs 193605df4a Fix for #286 7 years ago
OzzieIsaacs 6b1f3aa531 Merge remote-tracking branch 'adv/cache-buster' 7 years ago
marblepebble 97f573c41a Set ipv4 address explicitly for docker usage 7 years ago
OzzieIsaacs e3d416db4c Merge remote-tracking branch 'adv/cover-upload' 7 years ago
Jonathan Rehm a27848b351 Add static asset cache busting
Calculates MD5 hash of static assets on server start. These are appended to the file name's when url_for is used, telling browsers to download the latest version of the files, e.g. style.css?q=81cf0ee.

Inspired by https://github.com/ChrisTM/Flask-CacheBust but uses query strings instead of rewriting the path because fonts inside CSS files break when the path is rewritten.
7 years ago
OzzieIsaacs 91cdb5f60f Merge remote-tracking branch 'Upper_case/master' 7 years ago
OzzieIsaacs fb8ce693f3 Bugfix mature content
Update german translation
7 years ago
OzzieIsaacs b596734c36 Merge remote-tracking branch 'adv/mature-content' 7 years ago
Ruben Herold 68e3867af3 fix books with uppercase extension 7 years ago
Jonathan Rehm 6f797ba478 Check if JPEG via response content-type header instead of URL extension
That way we can use dynamic URLs, such as those returned by the "Get Metadata" request.
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
kyos 51bc0e82a4 Added series and series_index metadata handler 8 years ago
kyos 4bba3558b7 Added tags metadata handler for epubs 8 years ago
OzzieIsaacs 626e2e393e Merge remote-tracking branch 'adv/edit-publish-date' 8 years ago
Jonathan Rehm 04b04e200f Add ability to edit publish date
If a date is not set, default to “0101-01-01”
8 years ago
Jonathan Rehm cf7196ae5e Refactor to remove nested if-statements 8 years ago
Jonathan Rehm a95e6aab6b Do not attempt to create the YAML file when Google Drive is disabled (#246) 8 years ago
OzzieIsaacs cb5f196f4b Merge remote-tracking branch 'adv/modal-details'
# Conflicts:
#	cps/static/js/main.js
#	cps/templates/detail.html
8 years ago
OzzieIsaacs 1e2edcf753 Merge remote-tracking branch 'adv/author-info' 8 years ago
OzzieIsaacs c403fdfa2e Merge remote-tracking branch 'adv/sorting' 8 years ago
Jonathan Rehm 5c3a5b6c39 Use ajax to add/remove books from shelves
Gracefully fall back to standard requests if JavaScript is disabled
8 years ago
Jonathan Rehm c9c6529567 Use SECRET_KEY from environment variable (#232) 8 years ago
OzzieIsaacs 74e93e1cdf Code cosmetics 8 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
8 years ago
OzzieIsaacs 31e0025099 Update Translation 8 years ago
OzzieIsaacs 5a6ad970d8 Merge remote-tracking branch 'button_padding/magic-link' 8 years ago
Jonathan Rehm d799b859ea Make changes suggested by codacy 8 years ago
Jonathan Rehm 675e8dd5cd Show book details in modal dialog
With them shown in a modal, you don't lose your place in the pagination. If the request comes via Ajax, the minimal layout is used. If via a normal request, the full layout is used. That lets you open the details in a new tab and have the full experience, but if you're clicking through the results of a search, you can view many without losing your place.
8 years ago
OzzieIsaacs 93dfb96174 Added Translation of title for read/unread books 8 years ago
OzzieIsaacs 2929d95b26 Display all authors names in shelf, like on all other pages (#202) 8 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.
8 years ago
Jonathan Rehm b138c9edd5 Show read/unread counts 8 years ago
Jonathan Rehm 7631eea32e Add sort options when viewing books
Default view still shows the most recently added books, but adds ability to sort by newest/oldest books and books sorted alphabetically (ascending & descending).

I did not include translations for the next text, but they are split up for easy translating and are otherwise ready for translating.
8 years ago
OzzieIsaacs 4ea9df753e For failed logins the source ip-adress is logged now ( #201) 8 years ago
OzzieIsaacs e6c6c26fd1 No error 500 if kindlegen is not excecutable 8 years ago
OzzieIsaacs 0a08a07193 Fixed Deleting user 8 years ago
OzzieIsaacs 7ab8a5877b read PDF/TXT without temporary files (#197) 8 years ago
OzzieIsaacs 1366b36c32 Added integer-field to supported custom colums 8 years ago
nanu-c 26f314d371 support int custom fields 8 years ago
OzzieIsaacs 38fa9ce206 At deleting a book, the book is also deleted from all Shelfs, Download list and read list (#192) 8 years ago
OzzieIsaacs c80e517c28 Delete books prepared for deleting on doogle drive 8 years ago
OzzieIsaacs 7667da6e12 Books now really deleted from hard disk (#119) 8 years ago
OzzieIsaacs 2b8c29c535 Further fix delete books (#119) 8 years ago
OzzieIsaacs 9c679c8908 Delete books should now work (#119) 8 years ago
OzzieIsaacs cd0d450829 Allow deleting books (fixes #119) 8 years ago
OzzieIsaacs daaee5b67e remove unused variables 8 years ago
林檎 b51afe3ead Code Fix
Fix pagination logic.

_ is gettext , use __ as dummy variable instead of _

Need more test.

Test on following
http://localhost:8083/opds/new
http://localhost:8083/opds/new?offset=60
http://localhost:8083/opds/new?offset=120
8 years ago
OzzieIsaacs 699bd036e8 Code cosmetics 8 years ago
OzzieIsaacs dc45b53b24 code cosmetics 8 years ago
OzzieIsaacs d59be5faf4 Code cosmetics
Bugfix upload
8 years ago
OzzieIsaacs 7dd70db837 Code cosmetics 8 years ago
OzzieIsaacs 7c6d527a55 Code cosmetics 8 years ago
OzzieIsaacs 5044b78b08 Code cosmetics 8 years ago
OzzieIsaacs 00462237fe Merge remote-tracking branch 'chinese_translation/master' 8 years ago
OzzieIsaacs 78067b87bc Code cosmetics 8 years ago
OzzieIsaacs 395c6679b7 Fix #163 8 years ago
林檎 ebb3acecca Fix Download Bug. 8 years ago
OzzieIsaacs cbc807f3ff Fix #138 8 years ago
OzzieIsaacs 60f3fefaec Added Read/Unread to feed
Prevent books from getting multiple times added to shelf
Updated German Translation
8 years ago
OzzieIsaacs 0e0e72fb71 Fixes for gevent/gdrive 8 years ago
Jack Darlington 3916205a95 Gdrive optional 8 years ago
Jack Darlington 06a4af44cc Merge branch 'master' into develop
# Conflicts:
#	cps/web.py
8 years ago
OzzieIsaacs a87fab8774 - Smaller cover picturees on small devices
- filename for download with underscore
8 years ago
Jack Darlington ff89d9c20d Merge branch 'master' into develop 8 years ago
Kennyl 59bf568f7e Merge branch 'master' into fix/python3-patch-20170308 8 years ago
Jack Darlington 29462e2278 Fix for updater 8 years ago
OzzieIsaacs 74a3e6842a Merge remote-tracking branch 'kennyl/travis'
# Conflicts:
#	cps/web.py
8 years ago
OzzieIsaacs b081bc8672 Fix #157 8 years ago
OzzieIsaacs 16cac6ac4f Merge remote-tracking branch 'polish_update/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po

Fix for #147
8 years ago
Jack Darlington dad251d02c Fix for revoking already expired channel (drive) 8 years ago
林檎 a766784ef1 Merge branch 'feature/download-suffix-20170308' into travis 8 years ago
林檎 d7d29827f4 fix behind 8 years ago
林檎 a7d361a0ff merge conflict 8 years ago
林檎 dcc0958c39 Merge branch 'master' into travis
# Conflicts:
#	cps/epub.py
#	cps/web.py
#	readme.md
8 years ago
林檎 8c625dfb93 Fix #146
For WebUI only
OPDS remains previous behaviour
8 years ago
林檎 d7afbdc349 use quote instead of urllib.quote 8 years ago
林檎 108302ff9b remove dependency on future function
no need six or future if there is only one function.
8 years ago
Jack Darlington 6ab8d0330a Fix for editing book cover with drive + fixed found bug that has_cover not set 8 years ago
Jack Darlington cf1ca21bbc Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/ub.py
#	cps/web.py
#	readme.md
#	requirements.txt
8 years ago
OzzieIsaacs c725afc3a8 Merge remote-tracking branch 'JackED42/feature/ignorable_columns' 8 years ago
OzzieIsaacs 80f1276624 Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
# Conflicts:
#	cps/db.py
#	cps/web.py
#	requirements.txt
8 years ago
OzzieIsaacs acac0570e5 Merge remote-tracking branch 'use_pip/use-pip'
# Conflicts:
#	cps.py
#	readme.md
#	vendor/wand/api.py
#	vendor/wand/drawing.py
#	vendor/wand/exceptions.py
#	vendor/wand/image.py
#	vendor/wand/version.py
8 years ago
OzzieIsaacs 72ec9a9f17 Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307' 8 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)
8 years ago
林檎 53cc84ec18 #fix 148 8 years ago
Kennyl fc10f55bd4 Merge branch 'master' into fix/syntax-python3-20170305 8 years ago
林檎 7a14101d6f Merge branch 'master' into travis
# Conflicts:
#	cps/helper.py
#	cps/web.py
8 years ago
Jack Darlington e4a27be1a9 Made stream download for normal download as well as odds 8 years ago
Jack Darlington e3e26d418d Finished code to chunk successfully. 8 years ago
Jack Darlington 10b129cb07 add timestamps 8 years ago
Jack Darlington 76e8117b0c initial version 8 years ago
Jack Darlington 3ba76526ee Merge branch 'master' into feature/ignorable_columns 8 years ago
Jack Darlington fabfcb2036 Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	cps/web.py
8 years ago
OzzieIsaacs 789a1af68f Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304' 8 years ago
OzzieIsaacs 26438f97ab Bugfix Filename without unidecode dependency 8 years ago
林檎 07ad73caca Merge branch 'fix/syntax-python3-20170305' into travis 8 years ago
林檎 297a08cd5f xrange fix
range to xrange
8 years ago
林檎 dc985e76df python3 fix 8 years ago
林檎 3421db2096 Merge branch 'fix/attachment-patch-20170305' into travis 8 years ago
林檎 0c9eacb024 fix opds 8 years ago
林檎 3369972073 Merge branch 'fix/syntax-python3-20170305' into travis
# Conflicts:
#	cps/epub.py
#	cps/web.py
8 years ago
林檎 4dfa157161 use condition rather than try/catch 8 years ago
林檎 6e3d4877ed Change exception from legacy code.
Change all except: clause to except Exception as e:  for further revise.
8 years ago
林檎 0bc4f52783 Fix except clause
except: will catch specific error.
8 years ago
林檎 80bcf131ee add requirement.txt 8 years ago
林檎 1da3b57f5a no need future module for python2
fix missing StringIO
8 years ago
林檎 bf8688fee1 missing urllib migration 8 years ago
林檎 da8d0c2a9f Merge branch 'fix/syntax-python3-20170305' into travis 8 years ago
林檎 c3fd205b7d fix /stat 8 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
8 years ago
林檎 2c32696417 Merge branch 'fix/slugify-filename-20170305' into travis 8 years ago
林檎 35b9e423ec Merge branch 'fix/attachment-patch-20170305' into travis 8 years ago
林檎 9ca88840eb “-“ is removed at helper ,
so use “_” instead
8 years ago
林檎 e845bdbd56 Fix attachment filename
File attachment should be url encode rather than utf-8 format
8 years ago
林檎 29f21480ab Reuse original code logic.
iteration loop dc:*  add dc:language

removal of bookmeta[‘comments’] , reusing bootmeta[‘description’]
8 years ago
Jack Darlington 27cbab6cb7 Fixes for READ/UNREAD 8 years ago
OzzieIsaacs 8c7ba2ccdf Merge remote-tracking branch 'gitignore/bookmeta-patch-20170302'
# Conflicts:
#	cps/epub.py
8 years ago
林檎 1a10859a57 When upload pub, add description to comment accord opf file 8 years ago
Jack Darlington 015d82ae2b Revert "Merging ignorable columns"
This reverts commit 8745d65ff6.
8 years ago
Jack Darlington b6da3c3153 Fix for read/unread for anonymous users 8 years ago
Jack Darlington fb6a37eec3 Update for covers download via opds + inserts permissions if needed (only available with a link) 8 years ago
林檎 879510da82 Upload support detection of language 8 years ago
Jack Darlington df9124f78b Fix OPDS download 8 years ago
Jack b8137d2c70 Fixing error with uploading new book / metadata as file was being backed up 8 years ago
Jack Darlington 8e85d1b5bd Merge branch 'develop' into personal 8 years ago
Jack Darlington 78abf81b2f Fix for editing metadata and uploading for GDrive 8 years ago
林檎 583380e71a path join bug
, instead of + because get_main_dir is not endswith os.sep
8 years ago
Jack Darlington 8745d65ff6 Merging ignorable columns 8 years ago
Jack Darlington 141eb7901c Add ignorable columns 8 years ago
Jack Darlington d9c48a6203 Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/web.py
8 years ago
OzzieIsaacs 00763d6e4c Read book is now tied to the right downlolad books for guest users (fixes #110) 8 years ago
OzzieIsaacs 1a83ad713c Additional version info for sqlite database 8 years ago
OzzieIsaacs 41a20fe3e1 Added version info of dependencys in about section 8 years ago
OzzieIsaacs 0277d08706 Merged #123.
Thanks @idalin.
I think this solves permanently sending to kindle issues like (#94)
8 years ago
idalin 3dcfebca60 update translations 8 years ago
Jack Darlington 51bd888765 Fix registering watch callback 8 years ago
Jack Darlington 82d01c9001 Merge branch 'master' into develop
# Conflicts:
#	cps/web.py
8 years ago
Jack Darlington 7b709c15c2 GitIgnore update + fixes for initial setup 8 years ago
OzzieIsaacs 7e19e1dd9d Added Publisher and search/advanced search/opds search for publisher 8 years ago
Jack Darlington 6d30382ae0 Initial gdrive commit
Work on watching metadata

More efficient storing folder keys to database

Nearly completed. Need to do final touches to callback for when metadata.db updated on real server, as cannot test locally

Changed callback for file changes from being hard coded to mine

used url_for in template as apposed to hard coded links

Fix to drive template

First attempt at redownload metadata.db

Fixed incorrect call to downloadFile

Added logging

Fixed call to copy file

Added exception logging to gdriveutils + fixed string long concat

Fix file download

Fix backup metadata

Added slashes to paths

Removed threading temporarily

Fix for reloading database

Fix reinitialising of variables

Fix check to see if custom column already setup

Update to showing authenticate google drive callback + fix for reinitialising database

Fixed logic for showing authenticate with google drive
8 years ago
OzzieIsaacs 6ec4e0a651 Bugfix Updater
Improved logging
8 years ago
OzzieIsaacs 709fa88c62 Navbar reduced to icons on smaller screens
Feedback updater improved (#81)
8 years ago
Jack Darlington f71fa5d935 Accidentally committed WIP google drive integration 8 years ago
Jack Darlington d29d079d15 Now shows read in website, and can be toggled by clicking, two extra options in sidebar (read/unread books) 8 years ago
OzzieIsaacs ad40a2b5a6 Bugfix parsing publishing date with milliseconds (#114) 8 years ago
OzzieIsaacs ed459ddb9b Bugfix display of commit date 8 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
8 years ago
OzzieIsaacs 1692044d46 Merge remote-tracking branch 'default_user_settings/master' (#105) 8 years ago
idalin bff86f02ca settings for default role of new register user 8 years ago
OzzieIsaacs 63379fe5db Fix for #101 8 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
8 years ago
OzzieIsaacs e46320b12f folders now relying on ids not names (removes all encoding issues on link folders)
Language filter working in opds feed
removed redundant code
authos now paginating in opds feed
8 years ago
OzzieIsaacs 176c7dce70 - Fix for #100
- Fix migration of shelf order
- fix show random books in detail view for authors and series
8 years ago
OzzieIsaacs c45968a1ed Bugfix Updater 8 years ago
OzzieIsaacs 296d2615fe Code cosmetics 8 years ago
OzzieIsaacs 1d3be7f4c6 Bugfix Git ident id 8 years ago
OzzieIsaacs b1293c84bc - Implemented autoupdater for testing
- failed logins are logged
- no of backups for log-file increased to 2
8 years ago
OzzieIsaacs 935b6e3143 Code cosmetics
Bugfix download opds
added changable title to opds feed
removed unused search.xml file
8 years ago
OzzieIsaacs e9d0bff559 - added statistics for Tags and series
- Loglevel is displayed as text instead of value
8 years ago
OzzieIsaacs 2c615fdf05 Finalize graphical setup for calibre-web 8 years ago
OzzieIsaacs 75c89c28e1 Bugfix for accessing config database
Title now displaed on every page
Title can be changed from within application
8 years ago
OzzieIsaacs 4eee58c21c Started migration of config to app database 8 years ago
OzzieIsaacs a2a48515d4 Fixed language and locale preset for new users 8 years ago
OzzieIsaacs afdfb30d80 Update email settings 8 years ago
OzzieIsaacs 0967b03a22 Merge branch 'master' into patch1 8 years ago
OzzieIsaacs 5a8dd19b4b Bugfix Authentication for opds search calibre companion 8 years ago
idalin 9f1f678bef reset to last commit url_for without _external 8 years ago
idalin 4a2f67bc00 fixed url_for return without port when port is not the standard port. 8 years ago
idalin eb22fbf9fa fixed url_for return without port when port is not the standard port. 8 years ago
OzzieIsaacs e5d881edf8 Bugfix empty search for opds feed 8 years ago
OzzieIsaacs 4b8fdb04e6 Improvement mimetypes for downloaded files 8 years ago
OzzieIsaacs 99430fc98e Bugfix (#79).
- Fixed download with anonymous user in opds feed
- Added mor filetypes to opds feed, if unknown filetype, nothing is published instead of mobi
8 years ago
OzzieIsaacs 2335252b1f Merge branch 'Chinese_tanslation' (#90)
Thanks @idalin user language should be detected from browser, or otherwise with enabled anonymous browsing it can be selected as admin (configure language for user guest). Annymous browsing can be deactivated afterwards
8 years ago
OzzieIsaacs 8759edd587 Calibre-companion now working (#79) 8 years ago
OzzieIsaacs 0107c52b66 Anonymous account now can also be configured like normal user (e.g. download permissions, change visibility of sidebar) (#35)
Search now working for calibre-companion (#79), download not working yet
metadata view 80% finished
8 years ago
OzzieIsaacs beca61a596 Nonexisting books are deleted from downloaded list (#91) 8 years ago
OzzieIsaacs c6d1c186f0 Metadata viewing should work with calibre-companion now (#79) 8 years ago
OzzieIsaacs 6cf82dc9b9 Loading further items in calibrecompanion should now work (#79) 8 years ago
idalin 9f65eae024 add default language configuration 8 years ago
OzzieIsaacs 9927a6cc71 Covers should now be downloadable with calibre-companion (#79) 8 years ago
OzzieIsaacs c13a2a4557 OPDS Marvin (and Marvin 3) now really work (#79)
OPDS should now also work with reverse proxy configuration
Changed readme (reverse proxy configuration)
No progress for calibre companion
8 years ago
OzzieIsaacs a16321179d Improvements for OPDS on iOS with Bookari- and Chunky-Reader 8 years ago
OzzieIsaacs c7b35250c6 Bugfix E-Mailsettings 8 years ago
OzzieIsaacs ea2e8205e3 Added code for rearranging shelfs #73 8 years ago
OzzieIsaacs 490f8ef5f2 Shelfs of diffrent users can have the same name now
Removing ratings by giving a rating of zero is now possible (like in calibre)
8 years ago
OzzieIsaacs 453d04b566 Final fix for #86 (reverse proxy error)
renamed admin_user to admin
added configuration infos inm admin panel
8 years ago
OzzieIsaacs 0bcdbc4a82 Bugfix Search opds feed
Improvement OPDS feed for displaying covers
8 years ago