Skip to content

erp5
erp5
Commit 6fb49c15 authored by Mukul's avatar Mukul Committed by Vincent Bechu
Browse files
Options

[erp5_officejs][erp5_web_renderjs_ui] Adds erp5 storage support in media player app.

parent 62c8a741
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2102 additions and 11 deletions
bt5/erp5_multimedia/DocumentTemplateItem/portal_components/document.erp5.Sound.py
View file @ 6fb49c15
...@@ -35,7 +35,10 @@ class Sound(File): ...@@ -35,7 +35,10 @@ class Sound(File):
def index_html(self, REQUEST, RESPONSE, format=_MARKER, inline=_MARKER, **kw): def index_html(self, REQUEST, RESPONSE, format=_MARKER, inline=_MARKER, **kw):
"""XXXXXX""" """XXXXXX"""
range = REQUEST.get_header('Range', None) range = REQUEST.get_header('Range', None)
if range is not None: if range is None:
start = None
end = None
else:
ranges = HTTPRangeSupport.parseRange(range) ranges = HTTPRangeSupport.parseRange(range)
(start, end) = ranges[0] (start, end) = ranges[0]
...@@ -63,8 +66,11 @@ class Sound(File): ...@@ -63,8 +66,11 @@ class Sound(File):
raise Forbidden('You are not allowed to get this document in this ' \ raise Forbidden('You are not allowed to get this document in this ' \
'format') 'format')
mime, data = self.convert(format, **kw) mime, data = self.convert(format, **kw)
total_length = len(data)
data = data[start:end-1] if end is None:
end = total_length
if start is not None:
data = data[start:end-1]
RESPONSE.setHeader('Content-Length', len(data)) RESPONSE.setHeader('Content-Length', len(data))
RESPONSE.setHeader('Content-Type', mime) RESPONSE.setHeader('Content-Type', mime)
...@@ -74,5 +80,10 @@ class Sound(File): ...@@ -74,5 +80,10 @@ class Sound(File):
RESPONSE.setHeader('Content-Disposition', RESPONSE.setHeader('Content-Disposition',
'attachment; filename="%s"' % filename) 'attachment; filename="%s"' % filename)
RESPONSE.setHeader('Accept-Ranges', 'bytes') RESPONSE.setHeader('Accept-Ranges', 'bytes')
RESPONSE.setStatus(206) if start is None:
RESPONSE.setStatus(200)
else:
RESPONSE.setHeader('Content-Range',
'bytes %s-%s/%s' % (start, end-1, total_length))
RESPONSE.setStatus(206)
return str(data) return str(data)
\ No newline at end of file
bt5/erp5_multimedia/SkinTemplateItem/portal_skins/erp5_multimedia/Sound_view.xml
View file @ 6fb49c15
...@@ -115,6 +115,7 @@ ...@@ -115,6 +115,7 @@
<string>my_filename</string> <string>my_filename</string>
<string>my_translated_external_processing_state_title</string> <string>my_translated_external_processing_state_title</string>
<string>my_revision</string> <string>my_revision</string>
<string>your_player</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_media_player_router_html.html
View file @ 6fb49c15
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<script data-renderjs-configuration="document_title" type="text/x-renderjs-configuration">Sound</script> <script data-renderjs-configuration="document_title" type="text/x-renderjs-configuration">Sound</script>
<script data-renderjs-configuration="document_title_plural" type="text/x-renderjs-configuration">Sounds</script> <script data-renderjs-configuration="document_title_plural" type="text/x-renderjs-configuration">Sounds</script>
<script data-renderjs-configuration="parent_relative_url" type="text/x-renderjs-configuration">sound_module</script> <script data-renderjs-configuration="parent_relative_url" type="text/x-renderjs-configuration">sound_module</script>
<script data-renderjs-configuration="erp5_attachment_synchro" type="text/x-renderjs-configuration">true</script> <script data-renderjs-configuration="erp5_attachment_synchro" type="text/x-renderjs-configuration">/{+id}/Base_downloadWithCors</script>
<script data-renderjs-configuration="dropbox_app_key" type="text/x-renderjs-configuration">i73co5a6nmddy3m</script> <script data-renderjs-configuration="dropbox_app_key" type="text/x-renderjs-configuration">i73co5a6nmddy3m</script>
<div data-gadget-url="gadget_erp5_router.html" data-gadget-scope="erp5_router"></div> <div data-gadget-url="gadget_erp5_router.html" data-gadget-scope="erp5_router"></div>
</body> </body>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_media_player_router_html.xml
View file @ 6fb49c15
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>965.45219.51840.21862</string> </value> <value> <string>965.45199.37081.46216</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -297,7 +297,7 @@ ...@@ -297,7 +297,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1522308345.15</float> <float>1519397987.34</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_officejs_connector/SkinTemplateItem/portal_skins/erp5_officejs_jio_connector/Sound_viewAsJio.xml 0 → 100644
View file @ 6fb49c15
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ERP5 Form" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string>Base_edit</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>form_view_editable\n
ooffice_view</string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
<string>your_modification_date</string>
<string>my_content_type</string>
<string>my_portal_type</string>
<string>my_reference</string>
<string>my_revision</string>
</list>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Sound_viewAsJio</string> </value>
</item>
<item>
<key> <string>method</string> </key>
<value> <string>POST</string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>WebTable_viewAsJio</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_view_editable</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>stored_encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_officejs_connector/bt/dependency_list
View file @ 6fb49c15
erp5_hal_json_style erp5_hal_json_style
erp5_web_renderjs_ui erp5_web_renderjs_ui
\ No newline at end of file erp5_multimedia
\ No newline at end of file
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_jio_js.js
View file @ 6fb49c15
...@@ -261,7 +261,10 @@ ...@@ -261,7 +261,10 @@
.declareMethod('get', function (id) { .declareMethod('get', function (id) {
return wrapJioCall(this, 'get', [id]); return wrapJioCall(this, 'get', [id]);
}) })
.declareMethod('getAttachment', function (id, name) { .declareMethod('getAttachment', function (id, name, options) {
if (options) {
return wrapJioCall(this, 'getAttachment', [id, name, options]);
}
return wrapJioCall(this, 'getAttachment', [id, name, {format: "json"}]); return wrapJioCall(this, 'getAttachment', [id, name, {format: "json"}]);
}) })
.declareMethod('putAttachment', function (id, name, json) { .declareMethod('putAttachment', function (id, name, json) {
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_jio_js.xml
View file @ 6fb49c15
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>965.65535.18355.17288</string> </value> <value> <string>964.58846.58534.49066</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1520357812.73</float> <float>1520612423.57</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7