Moovida

Merge lp://staging/~cassidy/moovida/moovida-escape-uri into lp://staging/moovida

  1. moovida-escape-uri
  2. Merge into relook
Proposed by Guillaume Desmottes
Status: Rejected
Rejected by: Michał Sawicz
Proposed branch: lp://staging/~cassidy/moovida/moovida-escape-uri
Merge into: lp://staging/moovida
Diff against target: 46 lines (+4/-4)
3 files modified
elisa-plugins/elisa/plugins/gstreamer/decodebin2_pipeline.py (+1/-1)
elisa-plugins/elisa/plugins/gstreamer/old_pipeline.py (+1/-1)
elisa-plugins/elisa/plugins/poblesec/player_video.py (+2/-2)
To merge this branch: bzr merge lp://staging/~cassidy/moovida/moovida-escape-uri
Reviewer Review Type Date Requested Status
Olivier Tilloy Disapprove
Review via email: mp+16748@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

The issue was fixed with a different approach (see bug #491874).

review: Disapprove

Unmerged revisions

1608. By Guillaume Desmottes

Don't escape reserved characters in URI (#502488)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'elisa-plugins/elisa/plugins/gstreamer/decodebin2_pipeline.py'
2--- elisa-plugins/elisa/plugins/gstreamer/decodebin2_pipeline.py 2009-11-13 18:24:48 +0000
3+++ elisa-plugins/elisa/plugins/gstreamer/decodebin2_pipeline.py 2010-01-03 01:40:29 +0000
4@@ -675,7 +675,7 @@
5 self.debug('unknown pad %s, caps %s' % (pad, caps))
6
7 def _plug_src(self, uri):
8- quoted_uri = quote(uri, '/:')
9+ quoted_uri = quote(uri, ';/?:@&=+$,')
10 src = gst.element_make_from_uri(gst.URI_SRC, quoted_uri)
11 # FIXME: workaround for jpegdec that does a gst_buffer_join for each
12 # gst_pad_chain.
13
14=== modified file 'elisa-plugins/elisa/plugins/gstreamer/old_pipeline.py'
15--- elisa-plugins/elisa/plugins/gstreamer/old_pipeline.py 2009-11-13 18:24:48 +0000
16+++ elisa-plugins/elisa/plugins/gstreamer/old_pipeline.py 2010-01-03 01:40:29 +0000
17@@ -541,7 +541,7 @@
18 self.debug('unknown pad %s, caps %s' % (pad, caps))
19
20 def _plug_src(self, uri):
21- quoted_uri = quote(uri, '/:')
22+ quoted_uri = quote(uri, ';/?:@&=+$,')
23 src = gst.element_make_from_uri(gst.URI_SRC, quoted_uri)
24 # FIXME: workaround for jpegdec that does a gst_buffer_join for each
25 # gst_pad_chain.
26
27=== modified file 'elisa-plugins/elisa/plugins/poblesec/player_video.py'
28--- elisa-plugins/elisa/plugins/poblesec/player_video.py 2009-12-01 12:16:26 +0000
29+++ elisa-plugins/elisa/plugins/poblesec/player_video.py 2010-01-03 01:40:29 +0000
30@@ -695,7 +695,7 @@
31 unicode_uri = unicode(file_uri)
32 sub_uri = \
33 unicode_uri.encode(locale_helper.gst_file_encoding())
34- quoted_sub_uri = quote(sub_uri, '/:')
35+ quoted_sub_uri = quote(sub_uri, ';/?:@&=+$,')
36 self.pipeline.set_property('suburi', quoted_sub_uri)
37 self.info("Loaded subtitles at %r", sub_uri)
38 found = True
39@@ -808,7 +808,7 @@
40 self.filename = model.title or model.uri.filename
41 self.stop()
42 uri = unicode(model.uri).encode(locale_helper.gst_file_encoding())
43- quoted_uri = quote(uri, '/:')
44+ quoted_uri = quote(uri, ';/?:@&=+$,')
45 self.pipeline.set_property('uri', quoted_uri)
46 self._load_subs(model.uri)
47

Subscribers

People subscribed via source and target branches