Commit Graph

1343 Commits (5756f171dc7e02b3a3c035c23ad51652e7410b08)

Author SHA1 Message Date
Raymond Yee 15888b8a76 fix regluit.core.tests.BookLoaderTests.test_add_by_local_yaml by adjust how ebook_name mocked 2016-05-16 15:11:03 -07:00
eric 30874ad832 handle toggling of active 2016-05-16 14:08:47 -07:00
eric 66ce157f97 large covers, archive 2016-05-16 16:47:58 -04:00
eric 66c0d84029 add work.formats() 2016-05-16 16:43:03 -04:00
Raymond Yee bf41bfccc6 change bookloader to load books by names of book in release and a command to deactivate currently broken ebooks 2016-05-16 12:43:11 -07:00
Raymond Yee 1b329f1b82 date for regluit.core.tests.CampaignTests.test_b2u needs to be kept within about 3 years of current date to pass 2016-05-16 08:18:42 -07:00
eric 4e8a834d02 fix test 2016-05-12 12:56:25 -04:00
eric 5eb7ec366a add OSI license catch-all
for BSD, MIT, and other OSI approved licenses
2016-05-12 11:00:52 -04:00
Raymond Yee cc9b4ed7c0 Merge pull request #568 from Gluejar/really-delete-ebook-files
delete files when deleting ebookfiles
2016-05-10 17:46:31 -07:00
eric f662920c2a Merge branch 'master' into push 2016-05-10 17:33:54 -04:00
eric 50930ce2b1 send kindle from s3
add file archiving code, because we needed it for push distribution.

Also use archive for kindle. tweak send-to-kindle docs.
2016-05-09 18:32:38 -04:00
eric ee0d19810c delete files when deleting ebookfiles
apparently the behavior changed after django 1.2. Anyway, we should
delete files from s3 before we delete the referring object
2016-05-06 15:28:19 -04:00
Raymond Yee ba516cd08d Merge branch 'master' into dj16 2016-05-04 13:52:25 -07:00
Raymond Yee 7ec9a98206 separate out failing test 2016-04-29 08:55:12 -07:00
eric 730c46c02a Merge branch 'master' into dj16 2016-04-27 12:03:41 -04:00
eric 9c6ff70e65 add comments 2016-04-24 10:34:13 -04:00
eric c5886e5584 allow thanks campaign after success 2016-04-23 17:55:01 -04:00
Raymond Yee db0ab1ac39 accidental extra characters 2016-04-21 13:39:28 -07:00
Raymond Yee 0f31a617c5 fix missing comma 2016-04-21 13:37:59 -07:00
eric a4d0b2d172 no, don't deactivate other ebooks 2016-04-21 14:44:50 -04:00
eric b47d166eda 1.6 transaction sideeffect 2016-04-09 13:24:44 -04:00
eric 2b9fd4e021 undo deletion of "edition.unglued" 2016-04-09 13:23:36 -04:00
eric bca17837a0 add fixtures in testcases 2016-04-09 13:21:12 -04:00
eric a4e9855b35 revert to older, patched Notification 2016-04-08 18:45:50 -04:00
eric 14829c327a misc fixes for 1.6 2016-04-08 18:12:10 -04:00
eric 562be5f12d patch django-notification 2016-04-07 20:37:54 -04:00
Raymond Yee 182e784144 add a comment to clarify distinction betwen Ebookfile and Ebook 2016-03-30 14:59:04 -07:00
eric a72ac07dcf add function to generate mobi from the active epub 2016-03-29 13:06:23 -04:00
eric c902d6503c can add asks to non-ebf ebooks
(and can start a thanks campaign with non-ebf ebooks
2016-03-28 17:53:33 -04:00
eric 7180661fe3 generate mobi on ask 2016-03-28 14:30:05 -04:00
eric ab0c8814b4 add management command 2016-03-25 23:44:18 -04:00
Raymond Yee 7bd29807f6 fix problem with Obama book in Chinese 2016-03-25 15:07:31 -07:00
Raymond Yee bf914a53de make use of settings.CONTENT_TYPES to compute EBOOK_FORMATS 2016-03-07 13:30:40 -08:00
Raymond Yee c5b7c20593 mock_ebook -> test_mode (much clearer) 2016-03-07 13:17:33 -08:00
Raymond Yee abe04a02c7 * Modified core.bookloader.load_from_yaml to go from assuming that there is an epub to enumerating
ebooks from corresponding release specified in yaml_url

* add GitHubTests.test_ebooks_in_github_release

* modified bookloader.load_from_yaml to allow for mock loading of epub in core.tests.BookLoaderTests.test_add_by_local_yaml
2016-03-04 12:09:30 -08:00
Raymond Yee 1ab3711bbf placeholder for updating load_from_yaml to handle formats other than epub -- e.g., mobi, pdf 2016-03-03 09:49:48 -08:00
Raymond Yee f9320c6279 recognize that get_or_create returns (ebook, created) in load_from_yaml 2016-02-10 16:23:58 -08:00
Raymond Yee 45cb7d4eac [#113378215] prevent a duplicate ebooks with exact same metadata from being created by /api/loader/yaml
add dedupe_ebooks_with_same_urls.py command for deleting duplicate ebooks
2016-02-10 11:04:06 -08:00
eric a575de59b6 make pubname and authname unique 2016-01-25 14:08:37 -05:00
eric 2b100ece61 fix pub_id not integet 2016-01-25 13:29:18 -05:00
Raymond Yee bf8e385cb1 Merge pull request #545 from Gluejar/improve-opds
Improve opds
2016-01-20 17:19:31 -08:00
eric 51f5ac990b fix test 2016-01-19 20:53:55 -05:00
eric f33cd6e487 revamp sitemap priority, add to opds 2016-01-19 17:28:45 -05:00
eric 561ae6b94a handle the exception 2016-01-18 10:13:43 -05:00
eric 4dc4e2d898 add test to reproduce duplicate pubname
Unglue.it error on January 11, 2016 at 5:02 AM:
Traceback (most recent call last):

 File
"/opt/regluit/ENV/local/lib/python2.7/site-packages/django/core/handlers
/base.py", line 109, in get_response
   response = callback(request, *callback_args, **callback_kwargs)

 File "/opt/regluit/frontend/views.py", line 795, in googlebooks
   edition = bookloader.add_by_googlebooks_id(googlebooks_id)

 File "/opt/regluit/core/bookloader.py", line 343, in
add_by_googlebooks_id
   e.set_publisher(d.get('publisher'))

 File "/opt/regluit/core/models.py", line 1827, in set_publisher
   pub_name = PublisherName.objects.get(name=publisher_name)

 File
"/opt/regluit/ENV/local/lib/python2.7/site-packages/django/db/models/man
ager.py", line 131, in get
   return self.get_query_set().get(*args, **kwargs)

 File
"/opt/regluit/ENV/local/lib/python2.7/site-packages/django/db/models/que
ry.py", line 368, in get
   % (self.model._meta.object_name, num, kwargs))

MultipleObjectsReturned: get() returned more than one PublisherName --
it returned 2! Lookup parameters were {'name': u'North-Holland'}
2016-01-18 10:08:58 -05:00
eric 3d3a90941a switch to obscure book for tests 2016-01-18 09:59:52 -05:00
Raymond Yee bac02db88a Merge pull request #540 from Gluejar/missing-work-title
fixed work title in templates
2015-12-19 15:32:17 -05:00
Raymond Yee c662da6a32 Merge pull request #538 from Gluejar/fix-merge-ui
Fix merge ui
2015-12-19 15:04:09 -05:00
Raymond Yee 65b0ded78b fix failing http://jenkins.unglueit.com/view/All/job/regluit/3436/console -- Google books api data change 2015-12-19 14:10:51 -05:00
eric ff5263c185 fix at the core 2015-12-18 14:28:49 -05:00
eric a35c39b96f supply a value for the work selectable
fixes a problem, but I'm mystified why this problem appeared. perhaps
we redefined work.__unicode__() ?
2015-12-14 12:03:38 -05:00
Raymond Yee 5544aeb70c Merge pull request #531 from Gluejar/pubdate-range
Pubdate range
2015-11-17 13:56:59 -08:00
Raymond Yee d417eeec2d Re [#108339512] (https://www.pivotaltracker.com/story/show/108339512) -- for now
just mark the failing Google Books API tests as expected failures.
2015-11-17 08:00:08 -08:00
eric 7b7d7cf174 Merge branch 'master' into pubdate-range 2015-11-16 11:06:21 -05:00
Raymond Yee 2a07aa32dc Merge pull request #526 from Gluejar/edition_loader
Edition loader
2015-10-07 14:36:14 -07:00
Raymond Yee 27d4a354db Merge pull request #527 from Gluejar/repair-relation-migration
fix relator model
2015-10-07 14:17:27 -07:00
Raymond Yee 271663054c Merge pull request #525 from Gluejar/bisac-tree
Bisac headings in edition edit
2015-10-07 11:14:34 -07:00
eric 1ccdc144ba display publication range
needs a migration
2015-10-05 19:17:16 -04:00
eric 841bcb66ec fix relator model
this error was causing subsequent core migrations to fail
2015-10-05 17:17:53 -04:00
eric a74a2c47b2 now handles loading multiple editions 2015-09-24 17:58:34 -04:00
eric a3a1a72b46 add management command to convert ungluit subjects to bisac 2015-09-21 21:04:11 -04:00
eric d69921c109 loader now aware that agent_name is reversed 2015-09-12 19:20:08 -04:00
eric 2aa49e8d15 bug fixes and api cleanup 2015-08-27 15:23:25 -04:00
eric 0ae55a3bfa add edition level filter 2015-08-27 15:22:21 -04:00
Raymond Yee 40cdd1b141 Merge pull request #515 from Gluejar/recover-edition
fix occasional bug
2015-08-24 20:50:14 -07:00
eric 1833318c2d fix occasional bug 2015-08-22 14:29:35 -04:00
eric 16cc217f2b test ridiculously long 2015-08-21 18:31:52 -04:00
eric fa440d7935 wrong code for gutenberg id 2015-08-21 18:13:50 -04:00
eric 6bba8b0ef6 reduce load on converter 2015-08-21 18:09:35 -04:00
eric c34ffdd883 implement sorel-thumbnail
uses thumbnail for all non-google covers
2015-08-21 17:54:39 -04:00
eric 86ef74662b add author role selector
Previously, to change an author role, you had to delete and add the
author.
2015-08-21 13:47:04 -04:00
eric 4244a5fb98 fix tests 2015-08-18 14:34:52 -04:00
eric 779ba45d97 don't add v to version string
don't load ebook if version string starts with 0.0.
add test with local version
2015-08-18 06:57:14 -04:00
eric 42c66c29b6 fix rights lookup
also sync cc.py in core with cc.py in gitenberg metadata. Will DRY
later.
2015-08-07 01:21:15 -04:00
eric 11cf5b2869 Merge branch 'master' into publisher-opds
Conflicts:
	api/urls.py
2015-08-06 13:39:16 -04:00
Raymond Yee 749420eb30 Merge pull request #502 from Gluejar/load_from_yaml
Load from yaml
2015-08-06 10:28:23 -07:00
eric 6184b32b4d missing relator case 2015-08-04 12:58:48 -04:00
eric cc21ac2edb add publisher feed
but don't expose it
2015-08-03 16:58:02 -04:00
eric a469b025d3 add filter for ebooks
so only pdf ebooks are shown in pdf feeds, only CC-BY ebooks are shown
in  CC BY feeds
2015-08-03 16:22:40 -04:00
eric f79daf09db use gitenberg.metadata 2015-08-03 10:04:07 -04:00
eric c9ae756743 add url to loaded ids 2015-07-31 16:34:47 -04:00
eric 7932e047d7 basic api wiring 2015-07-30 00:34:05 -04:00
eric 098eddc327 work in progress 2015-07-29 23:01:43 -04:00
eric 5185410825 get tests to pass 2015-07-28 09:41:55 -04:00
eric 1462d9e04d tweaks 2015-07-28 01:29:55 -04:00
eric 44cd1eb19b add relation support to edition edit 2015-07-28 00:52:21 -04:00
eric 7c31bb115e fix authors.remove 2015-07-27 23:44:34 -04:00
eric e386dccb49 show non-author relations 2015-07-27 23:21:11 -04:00
eric 088bdff782 fix add_author 2015-07-27 23:20:30 -04:00
eric 50429e4f1b migrate model
add through relation to authors
add authority code to subjects
2015-07-27 16:22:04 -04:00
Raymond Yee 7b3360b235 Merge pull request #497 from Gluejar/catch_stk_timeouts
move mock ebook class to acq
2015-07-09 14:09:24 -07:00
eric 449f38fe7d move mock ebook class to acq 2015-07-09 15:08:16 -04:00
Raymond Yee 153a582cf0 Merge pull request #484 from Gluejar/add_yahoo
Add yahoo sign-in
2015-06-17 16:39:47 -07:00
Raymond Yee 3b575d10f6 changed default python social auth exception handling to catch the exception and send backend/error message to error page.
I've decided to display the backend but not the error message.
2015-06-17 15:39:27 -07:00
Raymond Yee bb74261013 sample book (temporarily) not recognized by Google Books API 2015-05-27 12:37:47 -07:00
eric 8d53a016f9 update facebook picture 2015-04-17 11:46:29 -04:00
eric f340826276 fb id to bigint 2015-04-16 23:20:29 -04:00
eric 7715551671 fix auth pipeline classes 2015-04-15 10:50:36 -04:00
eric 4944df8e78 error introduced by a comment 2015-04-10 15:10:55 -04:00
eric dab8954388 this is why we have tests 2015-04-09 13:12:22 -04:00
eric 97579bda71 re-establish un length limit 2015-04-09 12:41:00 -04:00
eric a8cab6c0ae get google oauth2 working 2015-04-07 22:55:30 -04:00
Raymond Yee 53a37b1b31 Merge branch 'master' into mobigen_integrate 2015-04-03 10:05:02 -07:00
eric 1739e94177 returned gbooks thumbnail urls have changed 2015-03-18 14:59:38 -04:00
Raymond Yee b0550999e1 incorporate changes from kindle safe title changes.
Merge branch 'master' into kindle_file_size

Conflicts:
	frontend/views.py
2015-03-09 10:56:20 -07:00
Raymond Yee 71c8a95b90 add comment about what fix_kindle_bugs does 2015-03-06 15:16:04 -08:00
eric 0c4550fe4a save ebook file size on send_to_kindle
don't deal with booxtream (b2u) ebooks at a all, only deal with free
ebooks
2015-03-05 22:30:03 -05:00
eric f05b276118 provide a title that's kindle-safe 2015-03-03 17:39:23 -05:00
Raymond Yee 9c4d609579 Merge pull request #459 from Gluejar/download-nits
add inactive download counts in rh tools [fix #88928040]
2015-02-25 11:21:08 -08:00
eric 84227748db add inactive download counts in rh tools 2015-02-23 16:52:55 -05:00
eric 53ecbfcb5f DRY for safe_get_work 2015-02-18 12:47:19 -05:00
Raymond Yee a9d4a71912 fixed an incorrect reference, uncovered by the tests! 2015-02-03 15:41:38 -08:00
Raymond Yee edd65c08c3 make sure the campaigns for the editions returned by editions_to_convert are not b2u. 2015-02-02 15:05:36 -08:00
eric 53b62642cd more idiomatic increment 2015-02-02 13:31:10 -05:00
eric c714de0d67 also for doab records 2015-01-30 11:39:48 -05:00
eric 7cb0f473de remove many-commas subjects, prevent their addition 2015-01-30 11:33:22 -05:00
Raymond Yee 32ec6b0a03 Merge pull request #449 from Gluejar/improve_gifts
Improve gifts
2015-01-28 11:59:27 -08:00
Raymond Yee 0b7f522232 first pass at a command to convert all the convertible campaign ebooks to mobi 2015-01-26 12:19:26 -08:00
Raymond Yee dfbdf9bbd7 add a test for mobigen 2015-01-26 09:48:16 -08:00
Raymond Yee e9d8080c3b First cut of celery tasks for converting to mobi 2015-01-23 15:52:35 -08:00
Raymond Yee 6c1630905b Merge branch 'master' into mobigen_integrate 2015-01-23 10:43:33 -08:00
eric ea5adba871 add notifications for unredeemed gifts 2015-01-23 13:11:19 -05:00
Raymond Yee 61c0de3fbc add a command to delete subjects with non-xml characters 2015-01-22 15:48:04 -08:00
Raymond Yee b4776f36e2 Merge branch 'master' into mobigen_integrate 2015-01-20 13:13:58 -08:00
eric aa14bcb5c9 fix github matcher 2015-01-19 12:10:07 -05:00
Raymond Yee 1be246586c Merge pull request #443 from Gluejar/edit_kw
Edit kw
2015-01-16 09:17:11 -08:00
eric 154701bea5 show most common keywords first 2015-01-16 08:56:36 -05:00
Raymond Yee 50fae7d544 Running into validation problems with OPDS because "image/image" mime-type for
urls like https://github.com/Gluejar/open_access_ebooks_ebook/blob/master/open_access_ebooks/EPUB/cover.120.jpg?raw=true

Fix by looking at the ending of the path of a url, not the fragement, parameter, or query string
2015-01-14 18:29:17 -08:00
eric 4f0cc87b48 temp add kw 2015-01-14 15:07:54 -05:00
eric ea4e489213 fix the odds implementation of kw facet
mostly, fixing missing url encoding
2015-01-12 12:03:47 -05:00
Raymond Yee 134988f082 modify migration to handle situation in which a subject does not exist (e.g., Selenium tests) 2015-01-11 12:44:31 -08:00
Raymond Yee 684c518324 add comments to clarify intention of parts of facets.py, based on Eric's answers to Raymond's questions 2015-01-11 12:18:30 -08:00
eric 62daa67880 coming together! (needs migration) 2015-01-09 17:05:34 -05:00
Raymond Yee f08c721d2e Merge pull request #434 from Gluejar/give_btu
Give btu updates: gift table revamp, add gift admin
2014-12-22 15:31:50 -05:00
eric 5e4b7a7b89 fix wrong field type in model 2014-12-22 13:49:39 -05:00
eric 6fc3eb8703 turns out we can't send notifications to inactive accounts
I had intended that gift redemption would activate the account, but
that doesn't work. Need to figure out the downside to having unverified
active accounts.
2014-12-22 13:24:22 -05:00
Raymond Yee 642653c4f8 Merge pull request #433 from Gluejar/give_btu
bug fix in give_btu
2014-12-22 11:50:18 -05:00
eric c85fd340d8 how did that sneak through? 2014-12-22 11:47:34 -05:00
Raymond Yee 05686ffaec Merge pull request #432 from Gluejar/give_btu
Give btu updates
2014-12-22 09:04:08 -05:00
eric ae208286f0 handle case of double gifts
also make gift redemption experience uniform
2014-12-21 16:02:02 -05:00
Raymond Yee 20c3ffe12e Merge pull request #430 from Gluejar/give_btu
As requested by Eric, I'm now going to do the merge to get this PR on just.  Then I'll test downloads.  Noting the current commit on master in case we need to revert: 25dcb06f46
2014-12-20 15:42:00 -05:00
eric 5719f7f90c forgot to actually test the code 2014-12-20 13:14:05 -05:00
eric b01562b630 Properly handle gifts to existing users 2014-12-20 12:47:15 -05:00
eric f18acfc091 notify the giver when the gift is redeemed
migration needed
2014-12-19 15:13:54 -05:00
eric 2c44a29aa7 regifting 2014-12-18 13:37:28 -05:00
eric 1c651f2458 everything more or less works except resifting 2014-12-18 01:07:59 -05:00
eric 41163d81a2 purchase and provisioning the gift 2014-12-16 14:18:51 -05:00
Raymond Yee b9aee9095b Merge branch 'master' into mobigen_integrate 2014-12-16 08:55:51 -08:00
Raymond Yee ac39075ccd a comment to explain logic of reset_free_flag 2014-12-15 11:46:59 -08:00
eric 7b5174aca6 ui and model for buy as a gift 2014-12-15 00:56:08 -05:00