[Debconf-video-commits] r257 - package/trunk/src

[des at alioth.debian.org]

Author: des
Date: 2008-08-16 00:24:50 +0000 (Sat, 16 Aug 2008)
New Revision: 257

Modified:
   package/trunk/src/dc-publish
Log:
* Fixed problem parsing dates
* Make the rsync+rss go file at once
* Add some more options to rsync command


Modified: package/trunk/src/dc-publish
===================================================================
--- package/trunk/src/dc-publish	2008-08-15 22:40:07 UTC (rev 256)
+++ package/trunk/src/dc-publish	2008-08-16 00:24:50 UTC (rev 257)
@@ -78,7 +78,7 @@
     for (published_time, start_time, end_time, base_name,
          event_id, title, event_desc) in cur.fetchall():
         # Convert string date-times back to proper types
-        published_time = timestamp(published_time)
+        published_time = timestamp(published_time.split ('.')[0])
         start_time = interval(start_time)
         end_time = interval(end_time)
 
@@ -115,7 +115,7 @@
 def publish(config, file_names):
     os.chdir(config['FILE_BASE'])
     os.spawnvp(os.P_WAIT, 'rsync',
-               ['rsync', '--relative', '--partial', '--times']
+               ['rsync', '--relative', '--partial', '--times', '-e ssh', '-vvv', '--bwlimit=20000']
                + file_names
                + [config['PUBLICATION_PATH']])
 
@@ -131,8 +131,6 @@
                 {'title': conference_title})
     conference_id = cur.fetchone()
 
-    file_ids = []
-    file_names = []
 
     cur.execute("""
 SELECT video_target_file.id, target_format_abbr, event_recording_base_name,
@@ -151,22 +149,16 @@
 """,
                 {'conference_id': conference_id})
     for file_id, format_abbr, base_name, format_ext in cur.fetchall():
-        file_ids.append(file_id)
-        file_names.append('%s/%s%s' % (format_abbr, base_name, format_ext))
-
-    publish(config, file_names)
-
-    cur.execute("""
+        publish(config, ['%s/%s%s' % (format_abbr, base_name, format_ext)])
+        cur.execute("""
 UPDATE video_target_file
 SET published_time = (CURRENT_TIMESTAMP AT TIME ZONE 'GMT')
-WHERE id IN (%s)
-"""
-                % (','.join(str(file_id) for file_id in file_ids)))
+WHERE id = %(file_id)s
+""",
+                {'file_id': file_id})
+        make_rss(config, cur)
+        publish(config, ['index.rss'])
 
-    make_rss(config, cur)
-
-    publish(config, ['index.rss'])
-
 if __name__ == '__main__':
     sys.path.insert(0, '/usr/share/debconf-video-store')
     import shellconfig