# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1276450422 -3600
# Node ID 0792141abac71cbd40c62437f4672a8131217dde
# Parent  398d483e91bbf02a1ff13c0f74b0ca46aba66fa3
DBRUtils - zipped baseline comparisons: Fixed so we only need the md5s.

diff -r 398d483e91bb -r 0792141abac7 dbrtools/dbr/dbrenv.py
--- a/dbrtools/dbr/dbrenv.py	Sun Jun 13 15:29:20 2010 +0100
+++ b/dbrtools/dbr/dbrenv.py	Sun Jun 13 18:33:42 2010 +0100
@@ -64,6 +64,8 @@
     for file in common:
       if(int(self.db[file]['time']) != int(other.db[file]['time'])):
         touched.add(file)
+      if(int(self.db[file]['time']) ==0 or int(other.db[file]['time']) == 0): #workaround for zipped dbs
+        touched.add(file)
 
     sizechanged = set()
     for file in common:
diff -r 398d483e91bb -r 0792141abac7 dbrtools/dbr/dbrutils.py
--- a/dbrtools/dbr/dbrutils.py	Sun Jun 13 15:29:20 2010 +0100
+++ b/dbrtools/dbr/dbrutils.py	Sun Jun 13 18:33:42 2010 +0100
@@ -99,55 +99,21 @@
 
 def getzippedDB(location):
     db = dict()
-    #This is really crude, but will do for now
-#    temp = tempfile.NamedTemporaryFile()
-#    print temp.name
-    #       Date      Time    Attr         Size   Compressed  Name
-    #------------------- ----- ------------ ------------  ------------------------
-    #2010-03-10 01:02:30 D....            0            0  epoc32
-    #2010-03-10 01:02:30 D....            0            0  epoc32\relinfo
-    #2010-03-10 00:49:12 .....      2327835       575578  epoc32\relinfo\epoc32_data.md5
-    reattribs = re.compile('(\d+-\d+-\d+\s\d+:\d+:\d+)\s+\..+\s+(\d+)\s+\d*\s*(\S.+)')
-    fixpath = re.compile('\\\\')
-
-    tmpfilename = os.tmpnam( )
-    print tmpfilename    
-
-#    exestr = '7z l -i!epoc32 -x!epoc32/relinfo %s/*.zip >%s' % (path,temp.name)
-    exestr = '7z l -i!epoc32 -x!epoc32/relinfo %s/*.zip >%s' % (location,tmpfilename)
-
-    exeresult = os.system(exestr) 
-    if(exeresult):
-      sys.exit('Fatal error executing: %s\nReported error: %s' % (exestr,os.strerror(exeresult)))
-    else:
-      temp = open(tmpfilename,'r')           
-      for line in temp:
-        res = reattribs.match(line)
-        if(res):
-            entry = dict()
-            entry['time'] = int(time.mktime(time.strptime(res.group(1), '%Y-%m-%d %H:%M:%S')))
-            entry['size'] = res.group(2)
-            entry['md5'] = 'xxx'
-            filename = string.lower(fixpath.sub('/',res.group(3))) 
-            db[filename] = entry
-      temp.close()
-      os.unlink(tmpfilename)      
-      #now fill with the MD5s...
-      md5zip = os.path.join(location,'build_md5.zip')
-      print md5zip 
-      temp_dir = tempfile.mkdtemp()
-      print temp_dir 
-      if(os.path.exists(md5zip)):
-        files = set();
-        files.add('*')
-        extractfromzip(files,md5zip,temp_dir)
-        globsearch = os.path.join(temp_dir, os.path.join(patch_path_internal(),'*.md5'))
-        print globsearch 
-        hashes = glob.glob(globsearch)
-        for file in hashes:
-            print 'Reading: %s\n' % file
-            gethashes(db, file, False)
-      shutil.rmtree(temp_dir)            
+    md5zip = os.path.join(location,'build_md5.zip')
+    print md5zip 
+    temp_dir = tempfile.mkdtemp()
+    print temp_dir 
+    if(os.path.exists(md5zip)):
+      files = set();
+      files.add('*')
+      extractfromzip(files,md5zip,temp_dir)
+      globsearch = os.path.join(temp_dir, os.path.join(patch_path_internal(),'*.md5'))
+      print globsearch 
+      hashes = glob.glob(globsearch)
+      for file in hashes:
+#          print 'Reading: %s\n' % file
+          gethashes(db, file, True)
+    shutil.rmtree(temp_dir)            
     return db
 
 
@@ -173,7 +139,7 @@
       if(exeresult):
         sys.exit('Fatal error executing: %s\nReported error: %s' % (exestr,os.strerror(exeresult)))
       else:  
-        db = gethashes(db,outputfile, False)
+        db = gethashes(db, outputfile, True)
         os.unlink(outputfile)
         os.unlink(tmpfilename)
     return db
@@ -197,8 +163,8 @@
 #            print "found %s" % filename
             if(create):
               entry = dict()
-              entry['time'] = 'xxx'
-              entry['size'] = 'xxx'
+              entry['time'] = '0'
+              entry['size'] = '0'
               entry['md5'] = res.group(3)
               db[filename] = entry
             else: