| 1 | --- transcoding.py.orig 2010-03-15 09:43:25.000000000 -0400
|
|---|
| 2 | +++ transcoding.py 2010-03-15 12:12:56.000000000 -0400
|
|---|
| 3 | @@ -9,6 +9,7 @@
|
|---|
| 4 | from urlparse import urlparse
|
|---|
| 5 |
|
|---|
| 6 |
|
|---|
| 7 | +
|
|---|
| 8 | def setup_transcoding(obj):
|
|---|
| 9 | if not obj.video_file.getFilename():
|
|---|
| 10 | return
|
|---|
| 11 | @@ -34,22 +35,36 @@
|
|---|
| 12 | #TODO - get better way of discovering the path to the video file
|
|---|
| 13 | path = obj.absolute_url_path().replace('/Zope2/','/') # in case of ftp upload remove the /Zope2 path prefix
|
|---|
| 14 | if config.plonesite_address:
|
|---|
| 15 | + print 'transcoding.py_1 config.plonesite_address', config.plonesite_address
|
|---|
| 16 | plonesite = urlparse(config.plonesite_address)
|
|---|
| 17 | else:
|
|---|
| 18 | plonesite = urlparse(obj.absolute_url())
|
|---|
| 19 | - url_format = "%s://%s:%s@%s%s/@@streaming_RPC"
|
|---|
| 20 | +
|
|---|
| 21 | + if config.plonesite_instancename:
|
|---|
| 22 | + instance_name = '/' + config.plonesite_instancename
|
|---|
| 23 | + else:
|
|---|
| 24 | + instance_name = ''
|
|---|
| 25 | +
|
|---|
| 26 | + print 'transcoding.py_2 config.plonesite_instancename', config.plonesite_instancename
|
|---|
| 27 | + print 'transcoding.py_3 instance_name', instance_name
|
|---|
| 28 | +
|
|---|
| 29 | + url_format = "%s://%s:%s@%s%s%s/@@streaming_RPC"
|
|---|
| 30 |
|
|---|
| 31 | cb_url = url_format % ( plonesite[0], #protocol
|
|---|
| 32 | config.plonesite_login,
|
|---|
| 33 | - config.plonesite_password,
|
|---|
| 34 | - plonesite[1], #netloc
|
|---|
| 35 | + config.plonesite_password,
|
|---|
| 36 | + plonesite[1], #netloc
|
|---|
| 37 | + instance_name,
|
|---|
| 38 | urllib.quote(path)) #path (for this video)
|
|---|
| 39 |
|
|---|
| 40 | - transcodeInput=dict(path = ( plonesite[0] + "://" + \
|
|---|
| 41 | - plonesite[1] + path + \
|
|---|
| 42 | + transcodeInput=dict(path = ( plonesite[0] + \
|
|---|
| 43 | + "://" + \
|
|---|
| 44 | + plonesite[1] + \
|
|---|
| 45 | + instance_name + \
|
|---|
| 46 | + path + \
|
|---|
| 47 | '/download/video_file/' + \
|
|---|
| 48 | obj.video_file.getFilename().replace(' ','+') ),
|
|---|
| 49 | - type=obj.video_file.getContentType())
|
|---|
| 50 | + type=obj.video_file.getContentType())
|
|---|
| 51 |
|
|---|
| 52 | trans = transaction.get()
|
|---|
| 53 | for transcodeProfile in transcodeProfiles:
|
|---|
