From 3700a9c4b138cab1d1dac8ab1aad02acc18d798b Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Sun, 22 Jan 2012 01:32:09 +0100
Subject: Revert "Preliminary handling of ctime/mtime reset"

This reverts commit e96e5b8ac44095668198e3e6797a3f77d9fb4634.
Everything is already in a branch
---
 mat/archive.py  |  9 ---------
 mat/audio.py    |  2 --
 mat/exiftool.py |  1 -
 mat/misc.py     |  1 -
 mat/office.py   |  4 ----
 mat/parser.py   | 31 ++-----------------------------
 6 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/mat/archive.py b/mat/archive.py
index 84ef10a..9993102 100644
--- a/mat/archive.py
+++ b/mat/archive.py
@@ -5,7 +5,6 @@
 import zipfile
 import shutil
 import os
-import time
 import logging
 import tempfile
 
@@ -13,10 +12,6 @@ import parser
 import mat
 from tarfile import tarfile
 
-#Zip fileformat does not handle dates
-#prior to 1980
-ZIP_TIME = 315529200 #1jan1980
-
 
 class GenericArchiveStripper(parser.GenericParser):
     '''
@@ -166,9 +161,6 @@ harmless format' % item.filename)
         zipout.close()
         logging.info('%s treated' % self.filename)
         self.do_backup()
-        #time = 1980
-        # TODO
-        #self.set_time(time)
         return True
 
 
@@ -212,7 +204,6 @@ class TarStripper(GenericArchiveStripper):
         tarin.close()
         tarout.close()
         self.do_backup()
-        self.set_time(parser.EPOCH)
         return True
 
     def is_file_clean(self, current_file):
diff --git a/mat/audio.py b/mat/audio.py
index 4682db1..ed849ee 100644
--- a/mat/audio.py
+++ b/mat/audio.py
@@ -35,7 +35,6 @@ class OggStripper(parser.GenericParser):
         mfile = OggVorbis(self.filename)
         mfile.delete()
         mfile.save()
-        self.set_time(parser.EPOCH)
         return True
 
     def is_clean(self):
@@ -75,7 +74,6 @@ class FlacStripper(parser.GenericParser):
         mfile.delete()
         mfile.clear_pictures()
         mfile.save()
-        self.set_time(parser.EPOCH)
         return True
 
     def is_clean(self):
diff --git a/mat/exiftool.py b/mat/exiftool.py
index 47e7dfc..758a094 100644
--- a/mat/exiftool.py
+++ b/mat/exiftool.py
@@ -43,7 +43,6 @@ class ExiftoolStripper(parser.GenericParser):
                     [ 'exiftool', '-m', '-All=', '-overwrite_original', self.filename ],
                     stdout=open('/dev/null'))
                 process.wait()
-            self.set_time(parser.EPOCH)
             return True
         except:
             return False
diff --git a/mat/misc.py b/mat/misc.py
index 80ccc79..d084861 100644
--- a/mat/misc.py
+++ b/mat/misc.py
@@ -60,5 +60,4 @@ class TorrentStripper(parser.GenericParser):
         with open(self.output, 'w') as f:  # encode the decoded torrent
             f.write(bencode.bencode(decoded))  # and write it in self.output
         self.do_backup()
-        self.set_time(parser.EPOCH)
         return True
diff --git a/mat/office.py b/mat/office.py
index 5ff9a83..e1d738e 100644
--- a/mat/office.py
+++ b/mat/office.py
@@ -100,7 +100,6 @@ class OpenDocumentStripper(archive.GenericArchiveStripper):
         zipin.close()
         zipout.close()
         self.do_backup()
-        self.set_time(archive.ZIP_TIME)
         return True
 
     def is_clean(self):
@@ -214,8 +213,6 @@ class PdfStripper(parser.GenericParser):
         if processed is False:
             logging.error('Please install either pdfrw, or exiftool to\
                     fully handle PDF files')
-
-        self.set_time(parser.EPOCH)
         return processed
 
     def get_meta(self):
@@ -277,7 +274,6 @@ class OpenXmlStripper(archive.GenericArchiveStripper):
         zipin.close()
         zipout.close()
         self.do_backup()
-        self.set_time(archive.ZIP_TIME)
         return True
 
     def is_clean(self):
diff --git a/mat/parser.py b/mat/parser.py
index 0c6f0ee..6dc5d0b 100644
--- a/mat/parser.py
+++ b/mat/parser.py
@@ -6,18 +6,15 @@ import hachoir_core
 import hachoir_editor
 
 import os
-import time
-import sys
 
 import mat
 
 NOMETA = ('.bmp', '.rdf', '.txt', '.xml', '.rels')
-EPOCH = 0
 #bmp : image
 #rdf : text
 #txt : plain text
 #xml : formated text
-#rels : openxml formated text
+#rels : openxml foramted text
 
 
 FIELD = object()
@@ -58,14 +55,7 @@ class GenericParser(object):
             if remove is FIELD:
                 if not self._is_clean(field):
                     return False
-
-    def is_time_clean(self):
-        '''
-            Check if the atime and the mtime
-            of self.filename is Epoch
-        '''
-        stat = os.stat(self.filename)
-        return stat.st_atime == 0 and stat.st_mtime == 0
+        return True
 
     def remove_all(self):
         '''
@@ -74,7 +64,6 @@ class GenericParser(object):
         state = self._remove_all(self.editor)
         hachoir_core.field.writeIntoFile(self.editor, self.output)
         self.do_backup()
-        self.set_time(EPOCH)
         return state
 
     def _remove_all(self, fieldset):
@@ -139,19 +128,3 @@ class GenericParser(object):
         if self.backup is False:
             mat.secure_remove(self.filename)
             os.rename(self.output, self.filename)
-
-    def set_time(self, time):
-        '''
-            Set the ctime of the file to $time
-        '''
-        filename = ''
-        if self.backup is True:
-            filename = self.output
-        else:
-            filename = self.filename
-
-        try:
-            os.utime(filename, (time, time))
-        except:
-            print "Unable to set %s's date to %s" % (filename, time)
-            sys.exit(1)
-- 
cgit v1.3