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

[des at alioth.debian.org]

Author: des
Date: 2008-08-15 19:48:22 +0000 (Fri, 15 Aug 2008)
New Revision: 255

Modified:
   package/trunk/src/dc-import-recordings
Log:
Make --delete respect the conference configuration


Modified: package/trunk/src/dc-import-recordings
===================================================================
--- package/trunk/src/dc-import-recordings	2008-08-14 22:49:38 UTC (rev 254)
+++ package/trunk/src/dc-import-recordings	2008-08-15 19:48:22 UTC (rev 255)
@@ -20,7 +20,8 @@
     conf_id = cur.fetchone()[0]
 
     # Find currently known recordings.
-    cur.execute('SELECT recording_filename FROM video_recording')
+    cur.execute('SELECT recording_filename FROM video_recording WHERE conference_id=%(conf_id)d',
+                {'conf_id': conf_id})
     known_filenames = set(tup[0] for tup in cur.fetchall())
 
     if do_delete:
@@ -31,12 +32,14 @@
             if not os.path.exists(filename):
                 try:
                     cur.execute('DELETE FROM video_recording'
-                                ' WHERE recording_filename=%(filename)s',
-                                {'filename': filename})
-                except pgdb.DatabaseError:
+                                ' WHERE recording_filename=%(filename)s'
+                                ' AND  conference_id=%(conf_id)d',
+                                {'filename': filename,
+                                'conf_id': conf_id})
+                except pgdb.DatabaseError, e:
                     print >>sys.stderr, 'WARN: File', filename, 'no longer exists but is referenced in the database'
-                else:
-                    cur.execute('COMMIT')
+                    print >>sys.stderr, '      ', e
+                cur.execute('COMMIT')
                 cur.execute('BEGIN')
 
     for filename in glob.glob(config['FILE_BASE'] + '/dv/*/*/*.dv'):