More lazy charset regex with '--standard-headers' argument and fix expected header not found header not being triggered as error in 'check-metadata' hook.

Author: mondeja

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.3
+current_version = 1.3.4
 
 [bumpversion:file:setup.cfg]
 

README.md

@@ -11,7 +11,7 @@ Hooks for pre-commit useful working with PO files.
 
 ```yaml
 - repo: https://github.com/mondeja/pre-commit-po-hooks
-  rev: v1.3.3
+  rev: v1.3.4
   hooks:
     - id: obsolete-messages
     - id: untranslated-messages
@@ -77,7 +77,7 @@ on the next regular expressions:
 - `Last-Translator`: `.+\s<.+@.+\..+>`
 - `Language-Team`: `.+\s<.+@.+\..+>`
 - `Language`: `\w\w_?\w?\w?(@\w+)?`
-- `Content-Type`: `text/plain; charset=[a-zA-Z\-]+`
+- `Content-Type`: `text/plain; charset=[0-9a-zA-Z\-]+`
 - `Content-Transfer-Encoding`: `\d+bits?`
 
 If you need to replace some fields with other regular expressions, you can do

hooks/check_metadata.py

@@ -46,6 +46,8 @@ def check_metadata(
 
     exitcode = 0
     for filename in filenames:
+        headers_matched = []
+
         with open(filename) as f:
             content_lines = f.readlines()
 
@@ -99,6 +101,7 @@ def check_metadata(
                 header = header.lstrip('"')
 
                 if header in headers_spec_regex:
+                    headers_matched.append(header)
                     value = re.sub(r"(\n|\\n|\"$)+", "", value)
                     regex = headers_spec_regex[header]
                     if re.match(regex, value) is None:
@@ -111,6 +114,14 @@ def check_metadata(
                                 f" '{value}' in header '{header}')\n"
                             )
 
+            for header in headers_spec.keys():
+                if header not in headers_matched:
+                    sys.stderr.write(
+                        f"Metadata header '{header}' expected at file"
+                        f" {filename}:{_first_metadata_line}, but not found\n"
+                    )
+                    exitcode = 1
+
     return exitcode
 
 
@@ -199,7 +210,7 @@ def main():
             "Last-Translator": r".+\s<.+@.+\..+>",
             "Language-Team": r".+\s<.+@.+\..+>",
             "Language": r"\w\w_?\w?\w?(@\w+)?",
-            "Content-Type": r"text/plain; charset=[a-zA-Z\-]+",
+            "Content-Type": r"text/plain; charset=[0-9a-zA-Z\-]+",
             "Content-Transfer-Encoding": r"\d+bits?",
         }
         if headers_spec:

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pre_commit_po_hooks
-version = 1.3.3
+version = 1.3.4
 description = pre-commit hooks for PO files
 long_description = file: README.md
 long_description_content_type = text/markdown