updated oletimes to use olefile, improved usage display and comments

Philippe Lagadec
1 parent 4a10d004
Showing 2 changed files with 47 additions and 32 deletions
oletools/olemeta.py
oletools/oletimes.py
 #!/usr/bin/env python
 """
-olemeta.py - Philippe Lagadec 2013-07-24
+olemeta.py
 olemeta is a script to parse OLE files such as MS Office documents (e.g. Word,
 Excel), to extract all standard properties present in the OLE file.
@@ -58,6 +58,9 @@ __version__ = &#39;0.02&#39;
 import sys
 import thirdparty.olefile as olefile
+
+#=== MAIN =================================================================
+
 try:
     ole = olefile.OleFileIO(sys.argv[1])
 except IndexError:
 #!/usr/bin/env python
 """
-oletimes.py - Philippe Lagadec 2013-07-24
+oletimes.py
 oletimes is a script to parse OLE files such as MS Office documents (e.g. Word,
 Excel), to extract creation and modification times of all streams and storages
@@ -12,49 +12,61 @@ oletimes project website: http://www.decalage.info/python/oletimes
 oletimes is part of the python-oletools package:
 http://www.decalage.info/python/oletools
-
-oletimes is copyright (c) 2013, Philippe Lagadec (http://www.decalage.info)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
-__version__ = '0.01'
+#=== LICENSE =================================================================
+
+# oletimes is copyright (c) 2013-2014, Philippe Lagadec (http://www.decalage.info)
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 #------------------------------------------------------------------------------
 # CHANGELOG:
-# 2013-07-24 v0.01 PL
+# 2013-07-24 v0.01 PL: - first version
+# 2014-11-29 v0.02 PL: - use olefile instead of OleFileIO_PL
+#                      - improved usage display
+
+__version__ = '0.02'
 #------------------------------------------------------------------------------
 # TODO:
 # + optparse
-# + nicer output
-# - CSV output
-# - option to only show available timestamps (by default?)
+# + nicer output: table with fixed columns, datetime, etc
+# + CSV output
+# + option to only show available timestamps (by default?)
+
+#=== IMPORTS =================================================================
 import sys
-from thirdparty.OleFileIO_PL import OleFileIO_PL
+import thirdparty.olefile as olefile
+
+#=== MAIN =================================================================
-ole = OleFileIO_PL.OleFileIO(sys.argv[1])
+try:
+    ole = olefile.OleFileIO(sys.argv[1])
+except IndexError:
+    sys.exit(__doc__)
 print'- Root mtime=%s ctime=%s' % (ole.root.getmtime(), ole.root.getctime())