From 477697c6843b3a3ff95003d1f85bf8d440a7eea5 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <ymherklotz@gmail.com>
Date: Sun, 13 Aug 2017 20:28:42 +0100
Subject: Improving style and continuing work on version headers

---
 scripts/add_version_headers | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

(limited to 'scripts/add_version_headers')

diff --git a/scripts/add_version_headers b/scripts/add_version_headers
index d41f5a08..def7d55a 100755
--- a/scripts/add_version_headers
+++ b/scripts/add_version_headers
@@ -48,26 +48,21 @@ class HeaderUpdate(object):
         self.exclude_build = True
         self.exclude_dir = ".*build.*"
         self.match_dir = ""
+        self.comment_match = "^\/[*] -+"
+        self.starting_dir = os.getcwd()
         for key, value in kwargs.items():
             setattr(self, key, value)
 
     def writeHeader(self):
-        for subdir, dirs, files in os.walk(os.getcwd()):
-            if (not re.match(self.exclude_dir, subdir)) and \
-               (re.match(self.match_dir, subdir)):
-                for file_ in files:
-                    if (re.match(self.match_re, file_)) and \
-                       (not re.match(self.exclude_re, file_)):
-                        with open(os.path.join(subdir, file_), 'r') \
-                             as src_file:
-                            src = src_file.read()
-                        if not re.match("^\/[*] -+", src):
-                            print(os.path.join(subdir, file_), end=" ")
-                            with open(os.path.join(subdir, file_),
-                                      'w') as src_file_lic:
-                                src_file_lic.write(header.format(file_))
-                                src_file_lic.write(src)
-                            print("-- done")
+        def writeFileOperation(filePath, src):
+            if not re.match(self.comment_match, src):
+                print(filePath, end=" ")
+                with open(filePath, 'w') as src_file_lic:
+                    src_file_lic.write(header.format(filePath))
+                    src_file_lic.write(src)
+                print("-- done")
+
+        self._traverseDir(self.starting_dir, writeFileOperation)
 
     def updateHeader(self):
         ...
@@ -75,6 +70,18 @@ class HeaderUpdate(object):
     def removeHeader(self):
         ...
 
+    def _traverseDir(self, path, fileOperation):
+        for subdir, dirs, files in os.walk(os.getcwd()):
+            if (not re.match(self.exclude_dir, subdir)) and \
+               (re.match(self.match_dir, subdir)):
+                for fileName in files:
+                    if (re.match(self.match_re, fileName)) and \
+                       (not re.match(self.exclude_re, fileName)):
+                        with open(os.path.join(subdir, fileName), 'r') \
+                             as src_file:
+                            src = src_file.read()
+                        fileOperation(os.path.join(subdir, fileName), src)
+
 
 def main(argv):
     update = HeaderUpdate(exclude_re="^picopng[.]cpp",
-- 
cgit