diff --git a/README b/README index aaf70d45..65a9b030 100644 --- a/README +++ b/README @@ -63,11 +63,9 @@ schedule: crude grid of events in a room and time slot. review titles meeting announcement: meant for usergroup meetings, doesn't scale well to a large event. -cloud_sync.sh - rsync titles to nextdayvideo.com - add_to_richard.py = creates landing page for videos -email_title.py - emails url of title and landing page to presenters for review. +email_title.py - emails url of title image and landing page to presenters for review. recording sheets: pdf to be printed and put next to each recoreding station runing DVswitch. @@ -107,7 +105,9 @@ browse http://0.0.0.0:8080/main/E/1 (for a fresh system, else find your show) DV files that might belong to the talk are marked to be included. un mark [x]Apply the ones that should not be included. -If there are ones missing, .. get help. Either use fixdv.py to fix batches, or use django's admin UI to add one by one. +If there are ones missing, .. get help. +use "add raw file" at bottom of page. +or use fixdv.py to fix batches, or use django's admin UI to add one by one. If a dv needs junk trimmed from the start or end, put the time offset in "Cut List - Start/End" 1 or 0:0:1 means trim 1 second from start. 1:2:3 means the clip ends 1 hour 2 min 3 seconds from the start of the file, so in this case 1h 2m 3 seconds would be used. @@ -115,14 +115,15 @@ If a dv needs junk trimmed from the start or end, put the time offset in "Cut Li Set Episode.state to Encode (2) 10. encode files to upload -enc.py:# encodes to ogg, flv, m4v +enc.py:# encodes to ogg, flv, m4v, webm, mpeg adds titles too. 11. upload -push.py - sends copy to private cloud stoage. -post_yt.py - sends to youtube (and archive.. eww, terible hack.) +push.py - sends copy to private cloud stoage. (currently disabled) +post_yt.py - sends to youtube (and archive and rax cuz eww, terible hack.) post_blip.py - posts to blip.tv, +post_vimeo.py - posts to vimeo (not used in years, suffers from bit rot) pw.py holds user/passwords, not checked in, make one from pw_samp.py add_to_richard.py - adds video url's to landing page diff --git a/dj/scripts/add_to_richard.py b/dj/scripts/add_to_richard.py index 91241971..606aaaaf 100755 --- a/dj/scripts/add_to_richard.py +++ b/dj/scripts/add_to_richard.py @@ -108,7 +108,7 @@ def process_ep(self, ep): pprint.pprint(video_data) if \ - not video_data['video_mp4_url'] \ + not video_data['video_webm_url'] \ or not video_data['source_url'] \ or not video_data['embed']: import code @@ -231,7 +231,8 @@ def create_pyvideo_episode_dict(self, ep, state=1): 'language': 'English', 'duration': int(ep.get_minutes()*60), 'video_ogv_url': ep.archive_ogv_url, - 'video_mp4_url': ep.rax_mp4_url, + # 'video_mp4_url': ep.rax_mp4_url, + 'video_webm_url': ep.rax_mp4_url, # shuch a hack. 'video_mp4_download_only': False, } return video_data diff --git a/dj/scripts/mk_audio_png.py b/dj/scripts/mk_audio_png.py index b5c77a98..43d7e249 100755 --- a/dj/scripts/mk_audio_png.py +++ b/dj/scripts/mk_audio_png.py @@ -16,7 +16,7 @@ class mk_audio_png(process): ready_state = 3 ret = None - def file2cdn(self, show, src, dst=None): + def old_file2cdn(self, show, src, dst=None): """ src is relitive to the show dir. src and dst get filled to full paths. diff --git a/dj/scripts/post_yt.py b/dj/scripts/post_yt.py index 834725f6..c67c992c 100755 --- a/dj/scripts/post_yt.py +++ b/dj/scripts/post_yt.py @@ -319,14 +319,14 @@ def process_ep(self, ep): if self.options.verbose: pprint.pprint(meta) # upload - if not ep.show.client.youtube_id: youtube_success = True - else: youtube_success = self.do_yt(ep,files,True,meta) + # if not ep.show.client.youtube_id: youtube_success = True + # else: youtube_success = self.do_yt(ep,files,True,meta) # if not ep.show.client.archive_id: archive_success = True # else: archive_success = self.do_arc(ep,files,meta) - # if not ep.show.client.rax_id: rax_success = True - # else: rax_success = self.do_rax(ep,files,meta) + if not ep.show.client.rax_id: rax_success = True + else: rax_success = self.do_rax(ep,files,meta) # tring to fix the db timeout problem try: @@ -337,7 +337,8 @@ def process_ep(self, ep): connection.connection = None ep.save() - return youtube_success + return True + # youtube_success # and archive_success \ # and rax_success diff --git a/utils/dv2ogv.py b/utils/dv2ogv.py index d6e4a365..bc48ebde 100755 --- a/utils/dv2ogv.py +++ b/utils/dv2ogv.py @@ -8,7 +8,7 @@ def dv2ogv(dv,ogv): # cmd="ffmpeg2theora --videoquality 1 --audioquality 3 --audiobitrate 48 --speedlevel 2 --width 360 --keyint 256 --channels 1".split() - cmd="ffmpeg2theora --videoquality 3 --audioquality 3 --audiobitrate 48 --speedlevel 2 --width 360 --keyint 256 ".split() + cmd="ffmpeg2theora --videoquality 4 --audioquality 3 --audiobitrate 48 --speedlevel 2 --width 360 --keyint 256 ".split() cmd+=[ '-o', ogv, dv ] print ' '.join(cmd)