Skip to content
Browse files

sync url lengths with richard

  • Loading branch information...
1 parent 9653892 commit 06f0b0604f452f6383000445000e2bc7840a9222 @CarlFK committed
Showing with 25 additions and 14 deletions.
  1. +8 −1 TODO.txt
  2. +3 −3 dj/main/models.py
  3. +1 −1 dj/main/views.py
  4. +3 −1 dj/scripts/add_to_richard.py
  5. +8 −6 dj/scripts/process.py
  6. +2 −2 dj/updb.sh
View
9 TODO.txt
@@ -45,6 +45,9 @@ veyepar:
delete old version when replaced by new encode.
invalid tags = fail and loop forever.
+ state - need something to handle Canceled talks, breaks, etc.
+ disposition?
+
upload in draft state:
it is not meant for public viewing yet.
there is no security blocking access
@@ -58,7 +61,7 @@ veyepar:
state:2 api is broken.
html-atize desceription.
- Stop - make it work again
+ Stop - make it work again - fixed.. confirm.
encoding:
soften jump cuts
@@ -113,3 +116,7 @@ for unit tests:
Transcriptions
Need a place to host transcriptions
mix transcriptions with video for sub titling
+
+OCR - http://software-carpentry.org
+
+
View
6 dj/main/models.py
@@ -202,11 +202,11 @@ class Episode(models.Model):
help_text = "URL of page video is hosted")
public_url = models.CharField(max_length=135, null=True,blank=True,
help_text = "URL public should use (like pvo or some aggregator")
- archive_ogv_url = models.CharField(max_length=235, null=True,blank=True,
+ archive_ogv_url = models.CharField(max_length=255, null=True,blank=True,
help_text = "URL public should use (like pvo or some aggregator")
- archive_url = models.CharField(max_length=235, null=True,blank=True,
+ archive_url = models.CharField(max_length=255, null=True,blank=True,
help_text = "URL public can use to dl an ogv (like archive.org")
- archive_mp4_url = models.CharField(max_length=235, null=True,blank=True,
+ archive_mp4_url = models.CharField(max_length=255, null=True,blank=True,
help_text = "URL public can use to dl an mp4. (like archive.org")
twitter_url = models.CharField(max_length=135, null=True,blank=True,
help_text = "URL of tweet to email presenters for retweeting")
View
2 dj/main/views.py
@@ -771,7 +771,7 @@ def episodes(request, client_slug=None, show_slug=None, location_slug=None,
# state = request.REQUEST.get('state')
# raise Exception((client_slug, show_slug, state, start_day, location_slug))
locations=show.locations.filter(active=True).order_by('sequence')
- episodes=Episode.objects.filter(show=show).order_by('sequence')
+ episodes=Episode.objects.filter(show=show).order_by('start')
kwargs = {'location': location_slug, 'start__day':start_day, 'state':state}
# raise Exception(episodes.filter(**kwargs))
View
4 dj/scripts/add_to_richard.py
@@ -42,7 +42,8 @@ def process_ep(self, ep):
tags = ep.tags.split(',')
# remove blacklisted tags,
# and tags with a / in them.
- tags = [t for t in tags if t not in [
+ # and strip spaces
+ tags = [t.strip() for t in tags if t not in [
u'enthought',
u'scipy_2012',
u'Introductory/Intermediate',
@@ -167,6 +168,7 @@ def process_ep(self, ep):
self.pvo_url = "http://%s/video/%s/%s" % (
host['host'], vid['id'],vid['slug'])
if self.options.verbose: print self.pvo_url
+ print self.pvo_url
ep.public_url = self.pvo_url
ret = self.pvo_url
View
14 dj/scripts/process.py
@@ -36,8 +36,8 @@ class process(object):
extra_options={}
- # set to True to stop processing at the end of episode
- # will not abort an encode, upload or anything like that.
+ # set stop to True to stop processing at the end of episode
+ # will not abort a process, like an encode, upload or anything like that.
# it just exits these loops:
# for e in es: (process episodes) and do while not Done: (poll)
stop = False
@@ -45,7 +45,8 @@ class process(object):
ready_state=None
# defaults to ntsc stuff
- fps=29.98
+ # fps=29.98
+ fps=30000/1001.0
bpf=120000
def run_cmd(self,cmd):
@@ -233,11 +234,12 @@ def process_eps(self, episodes):
self.log_out(ep)
if ep.stop:
if self.options.verbose: print ".STOP set on the episode."
- # send message to .poll
+ # send message to .process_eps which bubbles up to .poll
self.stop = True
# re-set the stop flag.
ep.stop = False
ep.save()
+ break
else:
if self.options.verbose:
@@ -250,8 +252,8 @@ def process_eps(self, episodes):
def one_show(self, show):
"""
-
-"""
+
+ """
self.set_dirs(show)
locs = Location.objects.filter(show=show)
View
4 dj/updb.sh
@@ -5,8 +5,8 @@ if grep ^DATABASES local_settings.py; then
exit
fi
-ssh -p 222 veyepar@nextdayvideo.com /home/veyepar/veyepar/dj/dumpdata.sh
-scp -P 222 veyepar@nextdayvideo.com:veyepar/dj/veyepar_main.json .
+# ssh -p 222 veyepar@nextdayvideo.com /home/veyepar/veyepar/dj/dumpdata.sh
+# scp -P 222 veyepar@nextdayvideo.com:veyepar/dj/veyepar_main.json .
touch veyepar.db
mv veyepar.db ~/temp

0 comments on commit 06f0b06

Please sign in to comment.
Something went wrong with that request. Please try again.