Commit Graph

43 Commits

Author SHA1 Message Date
cahrens
6272817c07 Tests fail with split modulestore.
Have not been able to work out why.
2015-02-09 09:26:05 -05:00
John Eskew
df5ba26ac6 Handle the correct exception to cause a 404 error upon asset not found
instead of a 500 error. Add 404 test.
2015-01-15 09:44:05 -05:00
Sarina Canelake
b4d24f36c8 s/pylint: disable=E1103/pylint: disable=maybe-no-member/ 2014-12-01 11:22:09 -05:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
muhammad-ammar
fcaa783e43 Unit Test Improvements
TE-489
2014-10-31 11:55:13 +00:00
John Eskew
786a32e7cf Wrap all asset read operations.
First step in moving assets out of the contentstore (optionally).
https://openedx.atlassian.net/browse/PLAT-77
2014-10-28 14:20:36 -04:00
Usman Khalid
5af162ebdf Refactored ContentServer tests to use ddt.
PLAT-104
2014-09-23 21:36:46 +05:00
Usman Khalid
7e29a5a65c Added tests for parse_range_header() in contentserver.
PLAT-104
2014-09-23 21:36:45 +05:00
Usman Khalid
ec508f591c StaticContentServer middleware conforms closer to spec for byte range requests.
This commit makes the following changes:
1. If there are syntactic errors in the Range header, it is ignored and
the full content is returned. This conforms to the spec.
2. In case of multiple ranges in the header, the full content is returned.
This behavior differs from the spec which says that a multipart response
should be returned.

PLAT-104
2014-09-23 21:36:45 +05:00
David Baumgold
fb0ee690f2 Cleaning up a few quality violations 2014-08-19 11:49:43 -04:00
MarCnu
77f7f26933 Add HTTP_RANGE compatibility for ContentStore file streaming
Currently, users can only download ContentStore files from first byte to
last byte.

With this change, when a request to the ContentStore includes the HTTP
"Range" parameter, it is parsed and StaticContentStream will stream the
requested bytes.

This change makes possible to stream video files (.mp4 especially) from
the ContentStore. Users can now seek a specific time in the video
without loading all the file.

This is useful for courses with a limited number of students that
doesn't require a dedicated video server.
2014-08-19 16:46:31 +02:00
Nimisha Asthagiri
ec3011635d LMS-11179 Fix Assets with Split 2014-08-07 17:59:38 -04:00
Nimisha Asthagiri
d7cf8b7fa0 Implement close_connections and drop_database on modulestores. 2014-07-14 16:01:10 -04:00
Nimisha Asthagiri
8855b12b76 Update tests to allow LMS tests to use published branch setting.
Conflicts:
	cms/djangoapps/contentstore/views/tests/test_container_page.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/tests/test_login.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/branding/tests.py
	lms/djangoapps/courseware/tests/test_submitting_problems.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/instructor_task/tests/test_base.py
	lms/djangoapps/instructor_task/tests/test_integration.py
2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
ea32529866 Fix all modulestore calls to pass in user ids. 2014-07-09 21:10:12 -04:00
Don Mitchell
cc6dfbbc75 Asset support in split
LMS-2876
2014-07-07 17:11:43 -04:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540
Refactor get_parent_locations STUD-1663
2014-06-26 18:00:11 -04:00
Don Mitchell
3c9b10112f Refactor heartbeat to delegate to the modulestores and sql
LMS-2801
2014-06-16 13:16:32 -04:00
Julia Hansbrough
6ccb11f03e Change Location, CourseLocator, etc to reference opaque-keys library 2014-05-30 20:32:38 +00:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library
[LMS-2757]
2014-05-29 17:03:35 -04:00
Calen Pennington
e2bfcf2a36 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates common/djangoapps.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-07 12:54:49 -04:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Don Mitchell
8fe99a6be2 Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation""
This reverts commit a517dc2085.
2013-10-18 09:22:30 -04:00
John Jarvis
a517dc2085 Revert "Merge pull request #1240 from edx/dhm/config_separation"
This reverts commit ec01253e30, reversing
changes made to ae8c9710e5.
2013-10-10 13:14:08 -04:00
Don Mitchell
44d0494d33 Segregate the mongo db config from the modulestore config
as a first step to separating db connection from modeling
and to support location mapper and contentstore using same db config as modulestore
2013-10-08 15:01:48 -04:00
Julian Arni
1a0b752a81 Review fixes 2013-09-24 14:59:07 -04:00
Julian Arni
e5c90d33fc Fix middleware order in CMS.
And include Don's fix for partial course_id lookup.
2013-09-23 15:11:06 -04:00
Julian Arni
b4e6a8b209 Fix order-dependency in tests 2013-09-23 10:52:05 -04:00
Julian Arni
268b5b47ae Remove cache workaround 2013-09-20 17:25:43 -04:00
Julian Arni
bf633f9c5d Perform auth checks in middleware
Includes static server tests.
2013-09-20 17:22:08 -04:00
David Baumgold
5e0767ccd0 logging is unused 2013-07-09 19:16:09 -04:00
Chris Dodge
6642cdddae support uploading and referencing assets as streams rather than having to read everything into memory first 2013-07-09 19:15:58 -04:00
Don Mitchell
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00
Chris Dodge
b0e2c82ad3 actually.. return a 400 rather than a 404 because the request is malformed. Also add unit test. 2013-03-26 20:02:29 -04:00
Chris Dodge
a44ecdfcd6 if we parse an invalid location in the content store middleware, then return a 404, not a 500 2013-03-26 16:45:47 -04:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Chris Dodge
3fa1fe0cd6 change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404. 2013-02-05 16:26:07 -05:00
Chris Dodge
84bc81f7eb refactor StaticContent id scheme to be the same as moduledata. Also expose a new 'get all content for course' which will be needed to support a asset management page. 2012-10-03 09:07:09 -04:00
Chris Dodge
1ee7646cfc per feedback, use reverse() when generating callback urls. Also generate thumbnails when ingesting static images. We'll need these handy for the CMS UI. 2012-09-28 10:20:57 -04:00
Chris Dodge
adad3c550b Support asset library references in CapaModule. Also some code refactoring/cleanup. Preparing for review and submit 2012-09-27 12:31:45 -04:00
Chris Dodge
39e64c1e56 work in progress. Need to commit before rebasing to master 2012-09-27 10:24:53 -04:00
Chris Dodge
7bf7eab616 support client-side caching through 'Last-Modified' response headers 2012-09-27 10:24:53 -04:00
Chris Dodge
7512b78eb2 work-in-flight for uploading/serving of static content for courses 2012-09-27 10:24:53 -04:00