WiP

pontos/updateheader/updateheader.py

@@ -72,6 +72,7 @@
     "GNU Affero General Public License for more details.",
     "GNU General Public License for more details.",
     "You should have received a copy of the GNU Affero General Public License",
+    "You should have received a copy of the GNU General Public License",
     "along with this program.  If not, see <http://www.gnu.org/licenses/>.",
     "along with this program; if not, write to the Free Software",
     "Foundation, Inc\., 51 Franklin St, Fifth Floor, Boston, MA 02110\-1301 USA\.",  # noqa: E501
@@ -136,14 +137,17 @@ def _add_header(
         raise ValueError
 
 
-def _remove_outdated(
+def _remove_outdated_lines(
     content: str, cleanup_regexes: List[re.Pattern]
 ) -> Optional[str]:
     """Remove lines that contain outdated copyright header ..."""
     changed = False
     splitted_lines = content.splitlines()
     i = 0
     for line in splitted_lines[:20]:
+        if i > 3 and re.match(r"^(([#*]|//) ?)", line):
+            splitted_lines.pop(i)
+            i = i - 1
         for regex in cleanup_regexes:
             if regex.match(line):
                 changed = True
@@ -152,7 +156,8 @@ def _remove_outdated(
                 break
         i = i + 1
     if changed:
-        return "\n".join(splitted_lines) + "\n"
+        new_content = "\n".join(splitted_lines) + "\n"
+        return new_content
     return None
 
 
@@ -226,15 +231,6 @@ def _update_file(
                         "is not existing."
                     )
                 return 1
-            # old header existing - cleanup?
-            if cleanup_regexes:
-                old_content = file.read_text(encoding="utf-8")
-                new_content = _remove_outdated(
-                    content=old_content, cleanup_regexes=cleanup_regexes
-                )
-                if new_content:
-                    file.write_text(new_content, encoding="utf-8")
-                    print(f"{file}: Cleaned up!")
             # replace found header and write it to file
             if copyright_match and (
                 not copyright_match["modification_year"]
@@ -265,13 +261,22 @@ def _update_file(
 
             else:
                 print(f"{file}: License Header is ok.")
-            return 0
     except FileNotFoundError as e:
         print(f"{file}: File is not existing.")
         raise e
     except UnicodeDecodeError as e:
         print(f"{file}: Ignoring binary file.")
         raise e
+    # old header existing - cleanup?
+    if cleanup_regexes:
+        old_content = file.read_text(encoding="utf-8")
+        new_content = _remove_outdated_lines(
+            content=old_content, cleanup_regexes=cleanup_regexes
+        )
+        if new_content:
+            file.write_text(new_content, encoding="utf-8")
+            print(f"{file}: Cleaned up!")
+    return 0
 
 
 def _get_exclude_list(

tests/updateheader/test_header.py

@@ -39,7 +39,9 @@
     _get_modified_year as get_modified_year,
 )
 from pontos.updateheader.updateheader import _parse_args as parse_args
-from pontos.updateheader.updateheader import _remove_outdated as remove_outdated
+from pontos.updateheader.updateheader import (
+    _remove_outdated_lines as remove_outdated_lines,
+)
 from pontos.updateheader.updateheader import _update_file as update_file
 from pontos.updateheader.updateheader import main
 
@@ -533,7 +535,7 @@ def test_main_never_happen(self, argparser_mock, mock_stdout):
             ret,
         )
 
-    def test_remove_outdated(self):
+    def test_remove_outdated_lines(self):
         test_content = """* This program is free software: you can redistribute it and/or modify
 *it under the terms of the GNU Affero General Public License as
 // published by the Free Software Foundation, either version 3 of the
@@ -547,12 +549,12 @@ def test_remove_outdated(self):
 
         compiled_regexes = compile_outdated_regex()
 
-        new_content = remove_outdated(
+        new_content = remove_outdated_lines(
             content=test_content, cleanup_regexes=compiled_regexes
         )
         self.assertEqual(new_content, "\n")
 
-    def test_remove_outdated2(self):
+    def test_remove_outdated_lines2(self):
         test_content = """the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -566,7 +568,7 @@ def test_remove_outdated2(self):
 
         compiled_regexes = compile_outdated_regex()
 
-        new_content = remove_outdated(
+        new_content = remove_outdated_lines(
             content=test_content, cleanup_regexes=compiled_regexes
         )
         self.assertEqual(new_content, "\n")