Commit Graph

333 Commits

Author SHA1 Message Date
kyos
9086f4e0e7 Added option to upload a new format to a given book 2017-09-11 10:48:30 +02:00
OzzieIsaacs
c9f36a4d1a Merge remote-tracking branch 'adv/bookmarks' 2017-09-10 15:00:27 +02:00
OzzieIsaacs
b6b5313f2d Fix for #315 2017-09-09 14:23:25 +02:00
OzzieIsaacs
f860694487 Merge remote-tracking branch 'adv/goodreads-more-by' 2017-09-01 20:29:45 +02:00
OzzieIsaacs
5ee1950828 Merge remote-tracking branch 'adv/sqlalchemy-bool' 2017-09-01 20:11:48 +02:00
Jonathan Rehm
58abc1d024 Fuzzy match book titles to eliminate duplicates
Titles with a Levenshtein ratio of 70% or greater are considered duplicates.
2017-08-29 07:15:33 -07:00
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.
2017-08-29 07:15:33 -07:00
Jonathan Rehm
6b8de017ab Use SQLAlchemy boolean
Seems to make a difference sometimes.

Ref #300
2017-08-29 07:14:57 -07:00
Jonathan Rehm
8e1cfa1cbf Re-apply db_filter
Accidentally removed when the language and content filters were moved to `common_filters`.
2017-08-29 07:13:31 -07:00
OzzieIsaacs
a8b53ab38a Merge remote-tracking branch 'adv/common-filters' 2017-08-27 09:36:02 +02:00
OzzieIsaacs
d5e1dba0fe Merge remote-tracking branch 'adv/goodreads-more-by' 2017-08-27 09:24:02 +02:00
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.
2017-08-26 08:12:16 -07:00
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.
2017-08-23 08:55:40 -07:00
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.
2017-08-21 08:56:08 -07:00
OzzieIsaacs
193605df4a Fix for #286 2017-08-20 07:47:47 +02:00
OzzieIsaacs
6b1f3aa531 Merge remote-tracking branch 'adv/cache-buster' 2017-08-19 08:36:12 +02:00
marblepebble
97f573c41a Set ipv4 address explicitly for docker usage 2017-08-18 21:53:52 +01:00
OzzieIsaacs
e3d416db4c Merge remote-tracking branch 'adv/cover-upload' 2017-08-17 15:27:32 +02:00
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.
2017-08-13 09:32:29 -07:00
OzzieIsaacs
91cdb5f60f Merge remote-tracking branch 'Upper_case/master' 2017-08-12 19:02:57 +02:00
OzzieIsaacs
fb8ce693f3 Bugfix mature content
Update german translation
2017-08-12 18:52:56 +02:00
OzzieIsaacs
b596734c36 Merge remote-tracking branch 'adv/mature-content' 2017-08-12 18:16:45 +02:00
Ruben Herold
68e3867af3 fix books with uppercase extension 2017-08-10 12:29:08 +02:00
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.
2017-08-09 10:03:02 -07:00
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
2017-08-08 10:38:28 -07:00
kyos
51bc0e82a4 Added series and series_index metadata handler 2017-07-31 09:00:09 +02:00
kyos
4bba3558b7 Added tags metadata handler for epubs 2017-07-31 08:46:29 +02:00
OzzieIsaacs
626e2e393e Merge remote-tracking branch 'adv/edit-publish-date' 2017-07-30 06:37:18 +02:00
Jonathan Rehm
04b04e200f Add ability to edit publish date
If a date is not set, default to “0101-01-01”
2017-07-23 13:35:35 -07:00
Jonathan Rehm
cf7196ae5e Refactor to remove nested if-statements 2017-07-23 13:35:35 -07:00
Jonathan Rehm
a95e6aab6b Do not attempt to create the YAML file when Google Drive is disabled (#246) 2017-07-23 22:26:43 +02:00
OzzieIsaacs
cb5f196f4b Merge remote-tracking branch 'adv/modal-details'
# Conflicts:
#	cps/static/js/main.js
#	cps/templates/detail.html
2017-07-23 14:03:02 +02:00
OzzieIsaacs
1e2edcf753 Merge remote-tracking branch 'adv/author-info' 2017-07-23 13:36:50 +02:00
OzzieIsaacs
c403fdfa2e Merge remote-tracking branch 'adv/sorting' 2017-07-23 13:18:24 +02:00
Jonathan Rehm
5c3a5b6c39 Use ajax to add/remove books from shelves
Gracefully fall back to standard requests if JavaScript is disabled
2017-07-21 21:15:03 -07:00
Jonathan Rehm
c9c6529567 Use SECRET_KEY from environment variable (#232) 2017-07-11 18:35:55 +02:00
OzzieIsaacs
74e93e1cdf Code cosmetics 2017-07-09 20:15:15 +02:00
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
2017-07-08 16:07:45 -07:00
OzzieIsaacs
31e0025099 Update Translation 2017-07-08 19:50:44 +02:00
OzzieIsaacs
5a6ad970d8 Merge remote-tracking branch 'button_padding/magic-link' 2017-07-08 19:26:08 +02:00
Jonathan Rehm
d799b859ea Make changes suggested by codacy 2017-07-08 09:15:40 -07:00
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.
2017-07-08 09:15:40 -07:00
OzzieIsaacs
93dfb96174 Added Translation of title for read/unread books 2017-07-08 16:47:07 +02:00
OzzieIsaacs
2929d95b26 Display all authors names in shelf, like on all other pages (#202) 2017-07-08 13:50:21 +02:00
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.
2017-07-07 18:29:16 -07:00
Jonathan Rehm
b138c9edd5 Show read/unread counts 2017-07-06 22:33:57 -07:00
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.
2017-07-06 21:14:45 -07:00
OzzieIsaacs
4ea9df753e For failed logins the source ip-adress is logged now ( #201) 2017-06-07 18:08:15 +02:00
OzzieIsaacs
e6c6c26fd1 No error 500 if kindlegen is not excecutable 2017-05-25 09:30:20 +02:00
OzzieIsaacs
0a08a07193 Fixed Deleting user 2017-05-25 09:09:35 +02:00
OzzieIsaacs
7ab8a5877b read PDF/TXT without temporary files (#197) 2017-05-25 08:46:33 +02:00
OzzieIsaacs
1366b36c32 Added integer-field to supported custom colums 2017-05-25 08:20:19 +02:00
nanu-c
26f314d371 support int custom fields 2017-05-22 22:54:53 +02:00
OzzieIsaacs
38fa9ce206 At deleting a book, the book is also deleted from all Shelfs, Download list and read list (#192) 2017-05-19 20:36:58 +02:00
OzzieIsaacs
c80e517c28 Delete books prepared for deleting on doogle drive 2017-04-15 18:24:48 +02:00
OzzieIsaacs
7667da6e12 Books now really deleted from hard disk (#119) 2017-04-15 18:18:08 +02:00
OzzieIsaacs
2b8c29c535 Further fix delete books (#119) 2017-04-15 18:07:53 +02:00
OzzieIsaacs
9c679c8908 Delete books should now work (#119) 2017-04-15 11:35:05 +02:00
OzzieIsaacs
cd0d450829 Allow deleting books (fixes #119) 2017-04-14 20:29:11 +02:00
OzzieIsaacs
daaee5b67e remove unused variables 2017-04-14 19:16:39 +02:00
林檎
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
2017-04-14 21:57:27 +08:00
OzzieIsaacs
699bd036e8 Code cosmetics 2017-04-04 19:05:09 +02:00
OzzieIsaacs
dc45b53b24 code cosmetics 2017-04-03 21:05:28 +02:00
OzzieIsaacs
d59be5faf4 Code cosmetics
Bugfix upload
2017-04-03 19:57:45 +02:00
OzzieIsaacs
7dd70db837 Code cosmetics 2017-04-02 10:27:37 +02:00
OzzieIsaacs
7c6d527a55 Code cosmetics 2017-04-02 10:05:07 +02:00
OzzieIsaacs
5044b78b08 Code cosmetics 2017-03-31 18:31:16 +02:00
OzzieIsaacs
00462237fe Merge remote-tracking branch 'chinese_translation/master' 2017-03-31 16:52:25 +02:00
OzzieIsaacs
78067b87bc Code cosmetics 2017-03-29 21:43:55 +02:00
OzzieIsaacs
395c6679b7 Fix #163 2017-03-29 20:59:37 +02:00
林檎
ebb3acecca Fix Download Bug. 2017-03-29 12:59:20 +08:00
OzzieIsaacs
cbc807f3ff Fix #138 2017-03-19 20:29:35 +01:00
OzzieIsaacs
60f3fefaec Added Read/Unread to feed
Prevent books from getting multiple times added to shelf
Updated German Translation
2017-03-19 19:22:45 +01:00
OzzieIsaacs
0e0e72fb71 Fixes for gevent/gdrive 2017-03-19 17:14:16 +01:00
Jack Darlington
3916205a95 Gdrive optional 2017-03-16 23:36:37 +00:00
Jack Darlington
06a4af44cc Merge branch 'master' into develop
# Conflicts:
#	cps/web.py
2017-03-16 21:02:11 +00:00
OzzieIsaacs
a87fab8774 - Smaller cover picturees on small devices
- filename for download with underscore
2017-03-14 19:48:17 +01:00
Jack Darlington
ff89d9c20d Merge branch 'master' into develop 2017-03-13 14:56:51 +00:00
Kennyl
59bf568f7e Merge branch 'master' into fix/python3-patch-20170308 2017-03-13 15:52:08 +08:00
Jack Darlington
29462e2278 Fix for updater 2017-03-13 00:44:20 +00:00
OzzieIsaacs
74a3e6842a Merge remote-tracking branch 'kennyl/travis'
# Conflicts:
#	cps/web.py
2017-03-12 21:13:25 +01:00
OzzieIsaacs
b081bc8672 Fix #157 2017-03-12 20:01:20 +01:00
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
2017-03-12 19:12:17 +01:00
Jack Darlington
dad251d02c Fix for revoking already expired channel (drive) 2017-03-12 00:24:53 +00:00
林檎
a766784ef1 Merge branch 'feature/download-suffix-20170308' into travis 2017-03-09 12:19:46 +08:00
林檎
d7d29827f4 fix behind 2017-03-08 23:59:56 +08:00
林檎
a7d361a0ff merge conflict 2017-03-08 23:52:41 +08:00
林檎
dcc0958c39 Merge branch 'master' into travis
# Conflicts:
#	cps/epub.py
#	cps/web.py
#	readme.md
2017-03-08 23:50:14 +08:00
林檎
8c625dfb93 Fix #146
For WebUI only
OPDS remains previous behaviour
2017-03-08 13:56:13 +08:00
林檎
d7afbdc349 use quote instead of urllib.quote 2017-03-08 13:26:52 +08:00
林檎
108302ff9b remove dependency on future function
no need six or future if there is only one function.
2017-03-08 11:48:12 +08:00
Jack Darlington
6ab8d0330a Fix for editing book cover with drive + fixed found bug that has_cover not set 2017-03-08 00:26:15 +00:00
Jack Darlington
cf1ca21bbc Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/ub.py
#	cps/web.py
#	readme.md
#	requirements.txt
2017-03-07 22:03:10 +00:00
OzzieIsaacs
c725afc3a8 Merge remote-tracking branch 'JackED42/feature/ignorable_columns' 2017-03-07 20:36:43 +01:00
OzzieIsaacs
80f1276624 Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
# Conflicts:
#	cps/db.py
#	cps/web.py
#	requirements.txt
2017-03-07 20:22:28 +01:00
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
2017-03-07 19:46:23 +01:00
OzzieIsaacs
72ec9a9f17 Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307' 2017-03-07 19:15:40 +01:00
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)
2017-03-07 19:10:17 +01:00
林檎
53cc84ec18 #fix 148 2017-03-07 16:32:55 +08:00
Kennyl
fc10f55bd4 Merge branch 'master' into fix/syntax-python3-20170305 2017-03-07 14:06:29 +08:00