X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fsplit_done.py;h=3d07287240f18fb4e5272274dffc53fa8fe7d760;hb=dd80b169287a128cd9e3b833852fbf68106385b5;hp=a628b2c4e3bf25fe70faa5764c36f656322eaea6;hpb=59fd5aa2a8be3b76dbc968429c457f096adfa472;p=dak.git

diff --git a/dak/split_done.py b/dak/split_done.py
index a628b2c4..3d072872 100755
--- a/dak/split_done.py
+++ b/dak/split_done.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2004, 2005  James Troup <james@nocrew.org>
-# $Id: nina,v 1.2 2005-11-15 09:50:32 ajt Exp $
+""" 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,30 +20,35 @@
 
 ################################################################################
 
-import glob, os, stat, time;
-import utils;
+import glob, os, stat, time
+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"]));
+    count = 0
+    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]);
-            dirname = time.strftime("%Y/%m/%d", 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);
+                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) ;
-            os.rename(filename, dest);
-            count = count + 1;
-    print "Moved %d files." % (count);
+                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)
 
 ############################################################