Commit Graph

1372 Commits (1ebe75f9f7a294abf46a0b7155186746abecd66d)

Author SHA1 Message Date
eric ff38f063d0 update noftifications
needed a new way to populate the noticetype table because of signal
deprecation
2016-07-22 18:44:54 -04:00
eric 9da195dcc8 remove south, fix migration problems 2016-07-21 16:09:42 -04:00
eric f3cb6c9edf switch to contrib_comments
removed in 1.8
2016-07-21 16:05:57 -04:00
eric d8eb4297d9 migrations 2016-07-21 15:38:09 -04:00
Raymond Yee cf706a1203 Merge pull request #610 from Gluejar/bugfixes
3 Bugfixes
2016-07-19 10:18:20 -07:00
Raymond Yee 9e514c48e9 Merge pull request #609 from Gluejar/opds-indirect
implement indirectAcquisition element
2016-07-18 14:21:15 -07:00
Raymond Yee 4c395bbec4 Merge pull request #601 from Gluejar/fix-headings
fix headings like "!lcsh: whatever"
2016-07-18 13:16:14 -07:00
eric f110e02297 match licenses
noted that rights for gitenberg ebooks was not getting set properly
2016-07-14 19:02:22 -04:00
eric 3001aed8c8 implement indirectAcquisition element 2016-07-12 14:50:13 -04:00
Raymond Yee 4edd9127a8 hopefully, this will fix http://jenkins.unglueit.com/job/regluit/3708/console 2016-06-28 08:48:06 -07:00
eric c234b0ea45 management command
Management command to fix subject headings with yaml tags in the
heading name
2016-06-17 17:44:40 -04:00
Raymond Yee 251073b9a7 Merge pull request #595 from Gluejar/fix-push
mistake in error logging
2016-06-15 12:10:17 -10:00
Raymond Yee 5a22544d11 Merge pull request #592 from Gluejar/fix-preferred-edition
squash the missing edition problem
2016-06-15 11:13:22 -10:00
eric 2a505bc1cc mistake in error logging 2016-06-14 13:40:44 -04:00
eric a8a24c1208 add to test 2016-06-10 18:15:53 -04:00
eric c3057b6aef add code to deal with OBP, fix bugs. 2016-06-10 17:57:53 -04:00
eric 8cb502d5b9 squash the missing edition problem 2016-06-10 16:30:03 -04:00
eric 66bd4a043e add management command
this command already deployed; minimal testing required
2016-06-08 15:27:49 -04:00
Raymond Yee 9c59b701ed Merge pull request #587 from Gluejar/fix-survey-runinfo
Improve survey app
2016-05-31 16:13:34 -07:00
eshellman f99b621c19 Merge pull request #585 from Gluejar/push
FTP Push seconds on the onix file is a good idea
2016-05-30 10:30:34 -04:00
eric a40160f191 quick display and creation of landings 2016-05-26 12:19:33 -04:00
Raymond Yee 9364bd7a78 a bit more cleanup 2016-05-24 16:21:36 -07:00
Raymond Yee c39324831e get authors to match now once the utf8_general_ci collation we're using for authors taken into account. 2016-05-24 15:01:56 -07:00
Raymond Yee 7f9478e758 first pass at tests -- some cleanup needed 2016-05-23 17:03:55 -07:00
Raymond Yee 83756c5779 code in progress to test https://github.com/Gluejar/regluit/pull/584 2016-05-21 14:51:52 -07:00
eric bf220c5c6f Merge branch 'master' into push
# Conflicts:
#	settings/common.py
2016-05-20 16:44:13 -04:00
eric 11ea9b4d93 onix and cover improvements
onix recipients need both a pubdate and an isbn in the records.

the cover imagefiles from thumbnail occasionally result in broken
images- these are now detected.
2016-05-20 16:32:26 -04:00
eric cb3581e932 code for loading umich spreadsheet 2016-05-19 09:17:23 -04:00
eric 605d971078 prefer editions with covers 2016-05-18 13:52:33 -04:00
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