From 413a60ca316d4cbfd4170e039059604b011ea22e Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Mon, 12 Oct 2015 08:05:59 +0200 Subject: [PATCH] Code review: 262650043: Updated AUTHORS and worked on update script #113 --- ACKNOWLEDGEMENTS | 2 ++ AUTHORS | 30 +++++++++--------- config/dpkg/changelog | 2 +- plaso/__init__.py | 2 +- utils/create_authors.py | 67 ----------------------------------------- utils/update_authors.sh | 19 ++++++++++++ 6 files changed, 38 insertions(+), 84 deletions(-) delete mode 100644 utils/create_authors.py create mode 100755 utils/update_authors.sh diff --git a/ACKNOWLEDGEMENTS b/ACKNOWLEDGEMENTS index 0f7bed817b..c05157d64b 100644 --- a/ACKNOWLEDGEMENTS +++ b/ACKNOWLEDGEMENTS @@ -25,6 +25,8 @@ Thanks to contributors (alphabetically based on last name): * Parsers * BEncode * Java IDX parser +* Christian Buia + * SCCM * Johan Berggren * SQLite plugins * Zeitgeist activity database diff --git a/AUTHORS b/AUTHORS index 5ba5eea4b1..5e575f2758 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,28 +9,28 @@ # See python fnmatch module documentation for more information. Google Inc. (*@google.com) -Kristinn Gudjonsson (kiddi@kiddaland.net) -Joachim Metz (joachim.metz@gmail.com) -Brian Baskin (brian@thebaskins.com) +Kristinn Gudjonsson (kristinn@log2timeline.net) +Keith Wall (kwallster@gmail.com) +Eric Mak (ericmak@gmail.com) David Nides (david.nides@gmail.com) Dominique Kilman (lexistar97@gmail.com) -Elizabeth Schweinsberg (beth@bethlogic.net) -Eric Mak (ericmak@gmail.com) +Joachim Metz (joachim.metz@gmail.com) Francesco Picasso (francesco.picasso@gmail.com) -Joaquin Moreno Garijo (Joaquin.MorenoGarijo.2013@live.rhul.ac.uk) -Keith Wall (kwallster@gmail.com) -Marc Seguin (segumarc@gmail.com) +Elizabeth Schweinsberg (bethlogic@gmail.com) Oliver Jensen (ojensen5115@gmail.com) +Marc Seguin (segumarc@gmail.com) +Brian Baskin (brian@thebaskins.com) +Daniel White (onager@deerpie.com) +Johan Berggren (jberggren@gmail.com) +Joaquin Moren Garijo (bastionado@gmail.com) +Jerome Marty (jahrome11@gmail.com) Petter Bjelland (petter.bjelland@gmail.com) +Marc Leavitt (marc.leavitt@fmr.com) Ashley Holtz (ashley.a.holtz@gmail.com) Preston Miller (preston.miller@dpmforensics.com) Eric John (ej.infotech@gmail.com) -Daniel White (onager@deerpie.com) -Johan Berggren (jberggren@gmail.com) -DC3 (dc3.plaso@gmail.com) +Georg Lukas (georg@op-co.de) Omer Yampel (omeryampel@gmail.com) +DC3 (dc3.plaso@gmail.com) Jason Blanks (jason.blanks@gmail.com) -Georg Lukas (georg@op-co.de) -Jerome Marty (jahrome11@gmail.com) -Marc Leavitt (Marc.Leavitt@fmr.com) - +Christian Buia (christianbuia@gmail.com) diff --git a/config/dpkg/changelog b/config/dpkg/changelog index fc782b629c..0b424dda14 100644 --- a/config/dpkg/changelog +++ b/config/dpkg/changelog @@ -2,4 +2,4 @@ python-plaso (1.3.1-1) unstable; urgency=low * Auto-generated - -- Log2Timeline Sun, 11 Oct 2015 10:03:15 +0200 + -- Log2Timeline Mon, 12 Oct 2015 08:05:59 +0200 diff --git a/plaso/__init__.py b/plaso/__init__.py index 53b90db93b..a82655f1e4 100644 --- a/plaso/__init__.py +++ b/plaso/__init__.py @@ -3,7 +3,7 @@ __version__ = '1.3.1' VERSION_DEV = True -VERSION_DATE = '20151011' +VERSION_DATE = '20151012' def GetVersion(): diff --git a/utils/create_authors.py b/utils/create_authors.py deleted file mode 100644 index b1623226f7..0000000000 --- a/utils/create_authors.py +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -"""This file simply creates the AUTHOR file based on parser content.""" - -from __future__ import print_function -import fnmatch -import os - - -def ProcessFile(file_path): - """Process a single file to match for an author tag.""" - # TODO: Change to do a "proper" import of modules and - # check the __author__ attribute of it. - # Current approach does not work if the author tag is a list - # instead of a single attribute (current files as of writing do - # not have that behavior, but that might change in the future). - ret = '' - with open(file_path, 'rb') as fh: - for line in fh: - if '__author__' in line: - _, _, ret = line[:-1].partition(' = ') - return ret[1:-1] - - -if __name__ == '__main__': - header = """# Names should be added to this file with this pattern: -# -# For individuals: -# Name (email address) -# -# For organizations: -# Organization (fnmatch pattern) -# -# See python fnmatch module documentation for more information. - -Google Inc. (*@google.com) -Kristinn Gudjonsson (kiddi@kiddaland.net) -Joachim Metz (joachim.metz@gmail.com) -Eric Mak (ericmak@gmail.com) -Elizabeth Schweinsberg (beth@bethlogic.net) -Keith Wall (kwallster@gmail.com) -""" - authors = [] - - with open('AUTHORS', 'wb') as out_file: - out_file.write(header) - - for path, folders, files in os.walk('.'): - if path in ('utils', 'build', 'dist'): - continue - for filematch in fnmatch.filter(files, '*.py'): - author = ProcessFile(os.path.join(path, filematch)) - if not author: - continue - if isinstance(author, (list, tuple)): - for author_name in author: - if author_name not in authors: - authors.append(author) - else: - if author not in authors: - authors.append(author) - - - out_file.write('\n'.join(authors)) - out_file.write('\n') - - print(u'Added {0:d} authors from files.'.format(len(authors))) diff --git a/utils/update_authors.sh b/utils/update_authors.sh new file mode 100755 index 0000000000..fe7a29538f --- /dev/null +++ b/utils/update_authors.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# Script to update the authors information. + +cat > AUTHORS <> AUTHORS; +