56 |
56 |
57 def stream_src(): #@NoSelf |
57 def stream_src(): #@NoSelf |
58 |
58 |
59 def fget(self): |
59 def fget(self): |
60 res_src = self.src.rstrip() |
60 res_src = self.src.rstrip() |
61 if self.videopath and self.videopath.startswith("rtmp://"): |
61 if self.videopath and self.videopath.startswith("rtmp://") and "mp3:" not in res_src and "mp4:" not in res_src: |
62 extension = res_src.split(".")[-1] |
62 extension = res_src.split(".")[-1] |
63 res_src = { |
63 res_src = { |
64 'flv': lambda s: s, |
64 'flv': lambda s: s, |
65 'mp3': lambda s: "%s:%s" % ("mp3", res_src[:-4]), |
65 'mp3': lambda s: "%s:%s" % ("mp3", res_src[:-4]), |
66 'mp4': lambda s: "%s:%s" % ("mp4", res_src[:-4]), |
66 'mp4': lambda s: "%s:%s" % ("mp4", res_src), |
67 'f4v': lambda s: "%s:%s" % ("mp4", res_src[:-4]), |
67 'f4v': lambda s: "%s:%s" % ("mp4", res_src), |
|
68 'mov': lambda s: "%s:%s" % ("mp4", res_src), |
68 }.get(extension, lambda s:s)(res_src.lower()) |
69 }.get(extension, lambda s:s)(res_src.lower()) |
69 return res_src |
70 return res_src |
70 |
71 |
71 return locals() |
72 return locals() |
72 |
73 |
73 stream_src = property(**stream_src()) |
74 stream_src = property(**stream_src()) |
74 |
75 |
75 def save(self, *args, **kwargs): |
76 def save(self, *args, **kwargs): |
76 super(Media, self).save(*args, **kwargs) |
77 super(Media, self).save(*args, **kwargs) |
77 for content in self.content_set.all(): |
78 for content in self.content_set.all(): |
78 content.sync_iri_file() |
79 content.sync_iri_file() |
210 def fget(self): |
211 def fget(self): |
211 if self.media_obj is None: |
212 if self.media_obj is None: |
212 empty_media = self.__get_empty_media() |
213 empty_media = self.__get_empty_media() |
213 if empty_media: |
214 if empty_media: |
214 return empty_media.videopath |
215 return empty_media.videopath |
215 else: |
216 else: |
216 return None |
217 return None |
217 else: |
218 else: |
218 return self.media_obj.videopath |
219 return self.media_obj.videopath |
219 |
220 |
220 def fset(self, value): |
221 def fset(self, value): |