Merge lp:~jsjgruber/ubuntu/precise/lernid/ubuntu-proposed into lp:ubuntu/precise/lernid

[John S. Gruber]

Patches to fix the two related bugs. Tested 11 Apr 12 in #ubuntu-classroom with a member of the classroom team.

I'm afraid I mastakenly burned through 0.8.2.2ubuntu1 in testing, please use 0.8.2.2ubuntu2 as the release version.

Built package at ppa:jsjgruber/test-lernid-ppa, with its buildlog at https://launchpadlibrarian.net/100043879/buildlog_ubuntu-precise-i386.lernid_0.8.2.2ubuntu2~testlernidppa2_BUILDING.txt.gz

Log of testing in #ubuntu-classroom at http://irclogs.ubuntu.com/2012/04/11/%23ubuntu-classroom.html#t22:59

Changes needed because of two API changes, one in telepathy-idle and one in poppler.

lernid is not in Debian or other non-Ubuntu distribution.

[John S. Gruber (jsjgruber)]

To test, bring up lernid from a terminal with the command:

lernid -v
and see that, starting in a couple of minutes, you get the messages:
DEBUG:root:Started ical load
DEBUG:root:Finished ical load
about every minute.

[John S. Gruber (jsjgruber)]

Patches are from upstream development and are to be included in our next upstream release.

[Brian Murray (brian-murray)]

The development of Precise has now reached Final Freeze so we are working all updates as Stable Release Updates. Subsequently, the bugs that this branch fixes will need test cases so we can recreate the problem and ensure that the fix does work. Could you please update the bugs appropriately? Thanks!

review: Needs Fixing

[John S. Gruber (jsjgruber)]

The bugs have been update with test cases.

Package is in universe.

See also http://irclogs.ubuntu.com/2012/04/11/%23ubuntu-classroom.html#t22:59 for the test of the merge candidate in #ubuntu-classroom

Thank you.

review: Needs Resubmitting

[Daniel Holbach (dholbach)]

Good work. Thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-31 02:04:45 +0000
+++ debian/changelog	2012-04-12 16:09:22 +0000
@@ -1,3 +1,21 @@
+lernid (0.8.2.2ubuntu2) UNRELEASED; urgency=low
+
+  * Prepare for application to Ubuntu (universe)
+
+ -- John S Gruber <[e-mail]>  Thu, 12 Apr 2012 11:38:30 -0400
+
+lernid (0.8.2.2ubuntu2~testlernidppa2) precise; urgency=low
+
+  * Dynamically load the schedule each minute at 5 seconds past the minute
+    Addresses LP: #925756
+
+  * Slide.py have poppler render to a cairo surface and use a trick to
+    get that into the pixmap. (LP: #972069)
+    (Technique from diogodivision's "BlingSwitcher" through 
+    http://www.mikedesjardins.net. Thank you.)
+
+ -- John S Gruber <[e-mail]>  Wed, 04 Apr 2012 22:05:00 -0400
+
 lernid (0.8.2.2~lr2build1) precise; urgency=low
 
   * Rebuild to drop python2.6 dependencies.
 
=== modified file 'lernid/Event.py'
--- lernid/Event.py	2011-09-03 23:25:12 +0000
+++ lernid/Event.py	2012-04-12 16:09:22 +0000
@@ -41,7 +41,10 @@
 
     @property
     def icalurl(self):
-        return self._icalurl
+        if self._icalurl.upper().startswith("HTTPS"):
+            return self._icalurl[0:4] + self._icalurl[5:]
+        else:
+            return self._icalurl
 
     @property
     def classroom(self):
 
=== modified file 'lernid/Sessions.py'
--- lernid/Sessions.py	2011-09-03 23:25:12 +0000
+++ lernid/Sessions.py	2012-04-12 16:09:22 +0000
@@ -25,6 +25,7 @@
 
 import lernid.DateTime as dt
 import io
+import gio, glib
 from datetime import timedelta
 
 one_week = timedelta(days=7)
@@ -35,8 +36,15 @@
 
     def __init__(self, **kwargs):
         for k, v in kwargs.iteritems():
-            if k in ('title', 'description', 'instructors', 'helpers', 'local_start', 'local_end', 'slides', 'event', 'locale', 'question_token'):
-                setattr(self, '_'+k, v)
+            if k in ('uid', 'title', 'description', 'instructors', 
+               'helpers', 'local_start', 'local_end', 'slides', 
+               'event', 'locale', 
+               'question_token'):
+                    setattr(self, '_'+k, v)
+
+    @property
+    def uid(self):
+        return self._uid
 
     @property
     def title(self):
@@ -103,9 +111,12 @@
         if now > end:
             return self.PAST
 
+def start_read_ical(url, when_done):
+    gfile = gio.File(uri=url)
+    r = gfile.load_contents_async(when_done)
 
-def parse_ical(event):
-    """Parse iCal schedule for event and generate a list of Session objects"""
+def read_ical(gfile,result,userdata):
+    event, old_ical = userdata
     default_cal_error = (
 u"""BEGIN:VCALENDAR
 BEGIN:VEVENT
@@ -115,7 +126,23 @@
 SUMMARY: """ +   _('Unable to load calendar %s\n') + 
 u"""END:VEVENT
 END:VCALENDAR""")   % event.icalurl
-    default_cal_error2 = (
+
+    try:
+        
+        calstring = gfile.load_contents_finish(result)[0]
+        ical = io.StringIO(unicode(calstring))
+    except (gio.Error, glib.GError):
+        logging.error('Unable to open calendar %s' % event.icalurl)
+        if old_ical:
+            ical = old_ical
+            ical.seek(0)
+        else:
+            ical = io.StringIO(default_cal_error)
+    return ical
+
+
+def parse_ical(event, ical):
+    default_cal_error = (
 u"""BEGIN:VCALENDAR
 BEGIN:VEVENT
 DTSTART:20100101T000000Z
@@ -124,16 +151,12 @@
 SUMMARY: """ + _('Unable to parse calendar %s\n') + 
 u"""END:VEVENT
 END:VCALENDAR""") % event.icalurl
-    try:
-        ical = urllib2.urlopen(event.icalurl, None, 30)
-    except IOError:
-        logging.error('Unable to open calendar %s' % event.icalurl)
-        ical = io.StringIO(default_cal_error)
+
     try:
         cal = vobject.readOne(ical)
     except:
         logging.critical('Error parsing calendar at %s' % event.icalurl)
-        cal = vobject.readOne(io.StringIO(default_cal_error2))
+        cal = vobject.readOne(io.StringIO(default_cal_error))
 
     sessions = []
 
@@ -158,12 +181,17 @@
             summary = session.summary.value
         else:
             summary = _('Missing Session Name')
+        if hasattr(session, "uid"):
+            uid = session.uid
+        else:
+            uid = 0
         if eventstart_local <= local_start <= eventend_local:
             if local_start > dt.now_local() - one_week:
                 sessions.append(Session(
                     title = summary,
                     local_start = local_start,
                     local_end = local_end,
+                    uid = uid,
                     **session_data))
 
     # reverse the list to get the events in chronological order
 
=== modified file 'lernid/widgets/Browser.py'
--- lernid/widgets/Browser.py	2011-09-03 23:25:12 +0000
+++ lernid/widgets/Browser.py	2012-04-12 16:09:22 +0000
@@ -205,7 +205,7 @@
             self.set_location(url)
 
     def _classroom_msg_received(self, classroom, chan, sender, text):
-        if not Options.get('unsafe-override') and not chan.is_moderated() and not self._on_faculty(sender):
+        if not Options.get('unsafe-override') and not self._on_faculty(sender):
             return
         load, ignore = self._parse_urls(text)
         if load and not self._paused:
 
=== modified file 'lernid/widgets/Schedule.py'
--- lernid/widgets/Schedule.py	2011-09-03 23:25:12 +0000
+++ lernid/widgets/Schedule.py	2012-04-12 16:09:22 +0000
@@ -23,6 +23,8 @@
 import gtk
 import os
 import time
+import urlparse
+import random
 import pynotify
 import logging
 from datetime import timedelta
@@ -30,7 +32,7 @@
 import lernid.DateTime as dt
 from lernid.widgets.Widget import Widget
 from lernid.lernidconfig import get_data_path
-from lernid.Sessions import Session, parse_ical
+from lernid.Sessions import Session, parse_ical, read_ical, start_read_ical
 
 
 class Schedule(Widget):
@@ -116,11 +118,68 @@
         self._schedule = None
         self._current_session = None
         self._update_handle = None
+        self._ical = None
+        self._icalurl = None
+        self._connected = False
 
         self.show_all()
 
     def do_event_connect(self, event_man, event):
         self._event = event_man.current_event()
+        self._connected = True
+        def finished_initial_ical_load(gfile, result):
+            self._ical = read_ical(gfile, result, (event,self._ical))
+            logging.debug('Finished initial ical load')
+            if not (gfile.get_uri() == self._icalurl):
+                logging.debug('Old I/O completion ignored')
+                return
+            self._update(event, self._ical)
+            secs = time.localtime().tm_sec
+            self._update_handle = glib.timeout_add_seconds(65-secs, set_timeout)
+        def scramble_case(string):
+            random.seed()
+            newstring = ''
+            for s in string:
+                if random.random() >= .5:
+                   newstring += s.upper()
+                else:
+                   newstring += s.lower()
+            return newstring
+        # scramble the case of the url for this event connection.
+        # Avoids occasional problem with gvfsd-http wedging 
+        # particular url's after loss of connectivity
+        parsed = [j for j in urlparse.urlparse(event.icalurl)]
+        parsed[1]= scramble_case(parsed[1])
+        self._icalurl = urlparse.urlunparse(parsed)
+        start_read_ical(self._icalurl, finished_initial_ical_load)
+        logging.debug('Started initial ical load %s' % self._icalurl)
+
+        def set_timeout():
+            if self._connected:
+                self._update_handle = glib.timeout_add_seconds(60, self._calendar_refresh, event, self._ical)
+            # Wait at least one minute before updating again,
+            # to avoid duplicate notifications.
+            logging.debug("In set_timeout")
+            return False
+
+    def _calendar_refresh(self, event, ical):
+        def finished_refresh_ical_load(gfile, result):
+            self._ical = read_ical(gfile, result, (event, self._ical))
+            if not (gfile.get_uri() == self._icalurl):
+                logging.debug('Old I/O completion ignored')
+                return
+            logging.debug('Finished ical load')
+            if not self._connected:
+                return
+            self._update(event, self._ical)
+            secs = time.localtime().tm_sec
+            self._update_handle = glib.timeout_add_seconds(65-secs, self._calendar_refresh, event, self._ical) 
+            return
+        start_read_ical(self._icalurl, finished_refresh_ical_load)
+        logging.debug('Started ical load')
+        return False
+
+    def _update(self, event, ical):
         def quote(text):
             quote_table = {
                  '<' : '&lt;',
@@ -134,7 +193,7 @@
                 return_value= return_value + quote_table.get(l,l)
             return return_value
 
-        self._schedule = parse_ical(event)
+        self._schedule = parse_ical(event, ical)
         self._model.clear()
         self._scroll_to = None
         for session in self._schedule:
@@ -153,22 +212,16 @@
             current_row = self._model.append(sessionrow)
             if not self._scroll_to and session.state in (session.FUTURE, session.NOW):
                 self._scroll_to = self._model.get_path(current_row)
-
-        self._update()
+        self._update_currency()
 
         if self._scroll_to:
             self._treeview.scroll_to_cell(self._scroll_to, use_align=True, row_align=.2)
 
-        def set_timeout():
-            self._update_handle = glib.timeout_add_seconds(60, self._update)
-        # Wait at least one minute before updating again,
-        # to avoid duplicate notifications.
-        secs = time.localtime().tm_sec
-        glib.timeout_add_seconds(65-secs, set_timeout)
 
         self._treeview.set_headers_visible(True)
 
     def do_event_disconnect(self, event_man, event):
+        self._connected = False
         self._schedule = []
         self._current_session = None
         self._model.clear()
@@ -176,13 +229,15 @@
             glib.source_remove(self._update_handle)
         self._treeview.set_headers_visible(False)
 
-    def _update(self):
+    def _update_currency(self):
         ended = False
         if self._current_session and self._current_session.state == Session.PAST:
             ended = True
             self._current_session = None
         for i, row in enumerate(self._model):
             session = row[self.COL_SESSION]
+            if self._current_session and self._current_session.uid == session.uid:
+                self._current_session = session  
             if session.state == Session.NOW:
                 row[self.COL_ICON] = gtk.STOCK_GO_FORWARD
                 if session != self._current_session:
 
=== modified file 'lernid/widgets/Slide.py'
--- lernid/widgets/Slide.py	2011-09-03 23:25:12 +0000
+++ lernid/widgets/Slide.py	2012-04-12 16:09:22 +0000
@@ -26,6 +26,8 @@
 import logging
 import gio
 import webbrowser
+import cairo
+import StringIO
 
 from lernid.widgets.Widget import Widget
 from lernid.lernidconfig import save_cache_path
@@ -113,17 +115,17 @@
     def _classroom_msg_received(self, classroom, chan, sender, text):
         matches = re.search(r'\[(?i)SLIDE\s+(\d+).*\]', text)
         if matches and self._session_slide_downloaded:
-            if chan.is_moderated() or self._on_faculty(sender):
+            if self._on_faculty(sender):
                 self._change_slide_page(int(matches.groups()[0]))
                 return
         matches = re.search(r'\[(?i)SLIDEFILE\s+(\S+)\s+(\d+).*\]', text)
         if matches:
-            if chan.is_moderated() or self._on_faculty(sender):
+            if self._on_faculty(sender):
                 self._download_slides(matches.groups()[0], int(matches.groups()[1]))
                 return
         matches = re.search(r'\[(?i)SLIDEFILE\s+(\S+).*\]', text)
         if matches:
-            if chan.is_moderated() or self._on_faculty(sender):
+            if self._on_faculty(sender):
                 self._download_slides(matches.groups()[0], 1)
                 return
 
@@ -137,8 +139,19 @@
                 return
             page = pdf.get_page(int(pagenumber) - 1)
             w, h = page.get_size()
-            pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False, 8, int(w), int(h))
-            page.render_to_pixbuf(0,0,int(w),int(h),1,0, pixbuf)
+            w, h = (int(w), int(h))
+            surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, w, h)
+            context = cairo.Context(surface)
+            page.render(context)
+            # technique from diogodivision's "BlingSwitcher",
+            # through http://www.mikedesjardins.net
+            temp = StringIO.StringIO()
+            surface.write_to_png(temp)
+            temp.seek(0)
+            loader = gtk.gdk.PixbufLoader()
+            loader.write(temp.getvalue())
+            loader.close()
+            pixbuf = loader.get_pixbuf()
         except:
             Statusbar.push_message(_('An error was encountered while trying to load slide number {0}'.format(pagenumber)), duration=120)
             logging.debug("Something went wrong when loading slide %s" % pagenumber)