Done isn't a queue either

[dak.git] / dak / split_done.py

diff --git a/dak/split_done.py b/dak/split_done.py
index 2f99131022b7ab963f9dc99f58691b9ea2861b14..3d07287240f18fb4e5272274dffc53fa8fe7d760 100755 (executable)
--- a/dak/split_done.py
+++ b/dak/split_done.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 
+""" Split queue/done into date based subdirectories """
 # Copyright (C) 2004, 2005, 2006  James Troup <james@nocrew.org>
+# Copyright (C) 2008  Joerg Jaspert <joerg@debian.org>
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,26 +21,31 @@
 ################################################################################
 
 import glob, os, stat, time
-import dak.lib.utils as utils
+from daklib import utils
 
 ################################################################################
 
 def main():
     Cnf = utils.get_conf()
     count = 0
-    os.chdir(Cnf["Dir::Queue::Done"])
-    files = glob.glob("%s/*" % (Cnf["Dir::Queue::Done"]))
+    move_date = int(time.time())
+    os.chdir(Cnf["Dir::Done"])
+    files = glob.glob("%s/*" % (Cnf["Dir::Done"]))
     for filename in files:
         if os.path.isfile(filename):
-            mtime = time.gmtime(os.stat(filename)[stat.ST_MTIME])
+            filemtime = os.stat(filename)[stat.ST_MTIME]
+            if filemtime > move_date:
+                continue
+            mtime = time.gmtime(filemtime)
             dirname = time.strftime("%Y/%m/%d", mtime)
             if not os.path.exists(dirname):
                 print "Creating: %s" % (dirname)
                 os.makedirs(dirname)
             dest = dirname + '/' + os.path.basename(filename)
             if os.path.exists(dest):
-                utils.fubar("%s already exists." % (dest))
-            print "Move: %s -> %s" % (filename, dest) 
+                utils.warn("%s already exists." % (dest))
+                continue
+            print "Move: %s -> %s" % (filename, dest)
             os.rename(filename, dest)
             count = count + 1
     print "Moved %d files." % (count)