Merged in [8237] from rcross@amsl.com:

Changes to support video content in proceedings ('recording' document type).
 - Legacy-Id: 8462
Note: SVN reference [8237] has been migrated to Git commit 96bccc7

Author: levkowetz

ietf/doc/models.py

@@ -3,7 +3,9 @@
 import datetime, os
 
 from django.db import models
+from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse as urlreverse
+from django.core.validators import URLValidator
 from django.contrib.contenttypes.models import ContentType
 from django.conf import settings
 from django.utils.html import mark_safe
@@ -90,6 +92,19 @@ def get_file_path(self):
             return settings.DOCUMENT_PATH_PATTERN.format(doc=self)
 
     def href(self):
+        # If self.external_url truly is an url, use it.  This is a change from
+        # the earlier resulution order, but there's at the moment one single
+        # instance which matches this (with correct results), so we won't
+        # break things all over the place.
+        # XXX TODO: move all non-URL 'external_url' values into a field which is
+        # better named, or regularize the filename based on self.name
+        validator = URLValidator()
+        try:
+            validator(self.external_url)
+            return self.external_url
+        except ValidationError:
+            pass
+
         meeting_related = self.meeting_related()
 
         settings_var = settings.DOC_HREFS

ietf/secr/proceedings/forms.py

@@ -5,9 +5,9 @@
 from django.template.defaultfilters import filesizeformat
 
 from ietf.doc.models import Document
+from ietf.group.models import Group
 from ietf.name.models import DocTypeName
-from ietf.meeting.models import Meeting
-
+from ietf.meeting.models import Meeting, Session
 
 
 # ---------------------------------------------
@@ -22,6 +22,14 @@
 # Forms
 #----------------------------------------------------------
 
+class AjaxChoiceField(forms.ChoiceField):
+    '''
+    Special ChoiceField to use when populating options with Ajax.  The submitted value
+    is not in the initial choices list so we need to override valid_value().
+    '''
+    def valid_value(self, value):
+        return True
+
 class EditSlideForm(forms.ModelForm):
     class Meta:
         model = Document
@@ -42,6 +50,37 @@ def clean(self):
             raise forms.ValidationError('A meeting already exists for this date.')
         return cleaned_data
 
+class RecordingForm(forms.Form):
+    group = forms.CharField(max_length=40)
+    external_url = forms.URLField(label='Url')
+    session = AjaxChoiceField(choices=(('','----'),))
+    
+    def clean_session(self):
+        '''
+        Emulate ModelChoiceField functionality
+        '''
+        id = self.cleaned_data.get('session')
+        try:
+            return Session.objects.get(id=id)
+        except Session.DoesNotExist:
+            raise forms.ValidationError('Invalid Session')
+    
+    def clean_group(self):
+        acronym = self.cleaned_data.get('group')
+        try:
+            return Group.objects.get(acronym=acronym)
+        except Group.DoesNotExist:
+            raise forms.ValidationError('Invalid group name')
+
+class RecordingEditForm(forms.ModelForm):
+    class Meta:
+        model = Document
+        fields = ['external_url']
+        
+    def __init__(self, *args, **kwargs):
+        super(RecordingEditForm, self).__init__(*args, **kwargs)
+        self.fields['external_url'].label='Url'
+
 class ReplaceSlideForm(forms.ModelForm):
     file = forms.FileField(label='Select File')
 

ietf/secr/proceedings/proc_utils.py

@@ -12,22 +12,74 @@
 from django.conf import settings
 from django.shortcuts import render_to_response
 
-from ietf.doc.models import Document, RelatedDocument, DocEvent
+from ietf.doc.models import Document, RelatedDocument, DocEvent, NewRevisionDocEvent, State
 from ietf.group.models import Group, Role
 from ietf.group.utils import get_charter_text
 from ietf.meeting.helpers import get_schedule
 from ietf.meeting.models import Session, Meeting, ScheduledSession
+from ietf.person.models import Person
 from ietf.secr.proceedings.models import InterimMeeting    # proxy model
 from ietf.secr.proceedings.models import Registration
 from ietf.secr.utils.document import get_rfc_num
 from ietf.secr.utils.group import groups_by_session
-from ietf.secr.utils.meeting import get_upload_root, get_proceedings_path, get_material, get_session
-
+from ietf.secr.utils.meeting import get_upload_root, get_proceedings_path, get_materials, get_session
 
 
 # -------------------------------------------------
 # Helper Functions
 # -------------------------------------------------
+def check_audio_files(group,meeting):
+    '''
+    Checks for audio files and creates corresponding materials (docs) for the Session
+    Expects audio files in the format ietf[meeting num]-[room]-YYYMMDD-HHMM-*,
+    
+    Example: ietf90-salonb-20140721-1710-pm3.mp3
+    
+    '''
+    for session in Session.objects.filter(group=group,meeting=meeting,status__in=('sched','schedw')):
+        timeslot = session.official_scheduledsession().timeslot
+        room = timeslot.location.name.lower()
+        room = room.replace(' ','')
+        room = room.replace('/','')
+        time = timeslot.time.strftime("%Y%m%d-%H%M")
+        filename = 'ietf{}-{}-{}-*'.format(meeting.number,room,time)
+        path = os.path.join(settings.MEETING_RECORDINGS_DIR,'ietf{}'.format(meeting.number),filename)
+        for file in glob.glob(path):
+            url = 'http://www.ietf.org/audio/ietf{}/{}'.format(meeting.number,os.path.basename(file))
+            doc = Document.objects.filter(external_url=url).first()
+            if not doc:
+                create_recording(session,meeting,group,url)
+
+def create_recording(session,meeting,group,url):
+    '''
+    Creates the Document type=recording, setting external_url and creating
+    NewRevisionDocEvent
+    '''
+    sequence = get_next_sequence(group,meeting,'recording')
+    name = 'recording-{}-{}-{}'.format(meeting.number,group.acronym,sequence)
+    time = session.official_scheduledsession().timeslot.time.strftime('%Y-%m-%d %H:%M')
+    if url.endswith('mp3'):
+        title = 'Audio recording for {}'.format(time)
+    else:
+        title = 'Video recording for {}'.format(time)
+        
+    doc = Document.objects.create(name=name,
+                                  title=title,
+                                  external_url=url,
+                                  group=group,
+                                  rev='00',
+                                  type_id='recording')
+    doc.set_state(State.objects.get(type='recording', slug='active'))
+    
+    # create DocEvent
+    NewRevisionDocEvent.objects.create(type='new_revision',
+                                       by=Person.objects.get(name='(System)'),
+                                       doc=doc,
+                                       rev=doc.rev,
+                                       desc='New revision available',
+                                       time=doc.time)
+    session.materials.add(doc)
+    
 def mycomp(timeslot):
     '''
     This takes a timeslot object and returns a key to sort by the area acronym or None
@@ -141,6 +193,13 @@ def get_progress_stats(sdate,edate):
 
     return data
 
+def get_next_sequence(group,meeting,type):
+    '''
+    Returns the next sequence number to use for a document of type = type.
+    Takes a group=Group object, meeting=Meeting object, type = string
+    '''
+    return Document.objects.filter(name__startswith='{}-{}-{}-'.format(type,meeting.number,group.acronym)).count() + 1
+
 def write_html(path,content):
     f = open(path,'w')
     f.write(content)
@@ -188,14 +247,8 @@ def create_proceedings(meeting, group, is_final=False):
     if meeting.type_id == 'ietf' and int(meeting.number) < 79:
         return
 
-    sessions = Session.objects.filter(meeting=meeting,group=group)
-    if sessions:
-        session = sessions[0]
-        agenda,minutes,slides = get_material(session)
-    else:
-        agenda = None
-        minutes = None
-        slides = None
+    check_audio_files(group,meeting)
+    materials = get_materials(group,meeting)
 
     chairs = group.role_set.filter(name='chair')
     secretaries = group.role_set.filter(name='secr')
@@ -215,7 +268,7 @@ def create_proceedings(meeting, group, is_final=False):
             settings.MEDIA_URL,
             meeting.date.strftime('%Y/%m/%d'),
             group.acronym)
-
+    
     # Only do these tasks if we are running official proceedings generation,
     # otherwise skip them for expediency.  This procedure is called any time meeting
     # materials are uploaded/deleted, and we don't want to do all this work each time.
@@ -313,9 +366,7 @@ def create_proceedings(meeting, group, is_final=False):
         'tas': tas,
         'meeting': meeting,
         'rfcs': rfcs,
-        'slides': slides,
-        'minutes': minutes,
-        'agenda': agenda}
+        'materials': materials}
     )
 
     # save proceedings

ietf/secr/proceedings/tests.py

@@ -2,10 +2,11 @@
 
 from django.core.urlresolvers import reverse
 
-from ietf.utils.test_utils import TestCase
-from ietf.meeting.models import Meeting
+from ietf.group.models import Group
+from ietf.meeting.models import Meeting, Session
+from ietf.meeting.test_data import make_meeting_test_data
 from ietf.utils.test_data import make_test_data
-
+from ietf.utils.test_utils import TestCase
 
 SECR_USER='secretary'
 
@@ -18,11 +19,30 @@ def test_main(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
-    def test_view(self):
-        "View Test"
+class RecordingTestCase(TestCase):
+    def test_page(self):
         make_test_data()
-        meeting = Meeting.objects.all()[0]
-        url = reverse('meetings_view', kwargs={'meeting_id':meeting.number})
+        meeting = Meeting.objects.first()
+        url = reverse('proceedings_recording', kwargs={'meeting_num':meeting.number})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
+    def test_post(self):
+        make_meeting_test_data()
+        meeting = Meeting.objects.first()
+        group = Group.objects.get(acronym='mars')
+        session = Session.objects.filter(meeting=meeting,group=group,status__in=('sched','schedw')).first()
+        url = reverse('proceedings_recording', kwargs={'meeting_num':meeting.number})
+        data = dict(group=group.acronym,external_url='http://youtube.com/xyz',session=session.pk)
+        self.client.login(username="secretary", password="secretary+password")
+        response = self.client.post(url,data,follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.failUnless(group.acronym in response.content)
+        
+        # now test edit
+        doc = session.materials.filter(type='recording').first()
+        external_url = 'http://youtube.com/aaa'
+        url = reverse('proceedings_recording_edit', kwargs={'meeting_num':meeting.number,'name':doc.name})
+        response = self.client.post(url,dict(external_url=external_url),follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.failUnless(external_url in response.content)

ietf/secr/proceedings/urls.py

@@ -3,6 +3,7 @@
 urlpatterns = patterns('ietf.secr.proceedings.views',
     url(r'^$', 'main', name='proceedings'),
     url(r'^ajax/generate-proceedings/(?P<meeting_num>\d{1,3})/$', 'ajax_generate_proceedings', name='proceedings_ajax_generate_proceedings'),
+    url(r'^ajax/get-sessions/(?P<meeting_num>\d{1,3})/(?P<acronym>[A-Za-z0-9_\-\+]+)/', 'ajax_get_sessions', name='proceedings_ajax_get_sessions'),
     url(r'^ajax/order-slide/$', 'ajax_order_slide', name='proceedings_ajax_order_slide'),
     # special offline URL for testing proceedings build
     url(r'^build/(?P<meeting_num>\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/(?P<acronym>[A-Za-z0-9_\-\+]+)/$',
@@ -15,6 +16,8 @@
     url(r'^progress-report/(?P<meeting_num>\d{1,3})/$', 'progress_report', name='proceedings_progress_report'),
     url(r'^replace-slide/(?P<slide_id>[A-Za-z0-9._\-\+]+)/$', 'replace_slide', name='proceedings_replace_slide'),
     url(r'^(?P<meeting_num>\d{1,3})/$', 'select', name='proceedings_select'),
+    url(r'^(?P<meeting_num>\d{1,3})/recording/$', 'recording', name='proceedings_recording'),
+    url(r'^(?P<meeting_num>\d{1,3})/recording/edit/(?P<name>[A-Za-z0-9_\-\+]+)$', 'recording_edit', name='proceedings_recording_edit'),
     # NOTE: we have two entries here which both map to upload_unified, passing session_id or acronym
     url(r'^(?P<meeting_num>\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/(?P<session_id>\d{1,6})/$',
         'upload_unified', name='proceedings_upload_unified'),