diff options
| author | J08nY | 2024-02-05 18:28:01 +0100 |
|---|---|---|
| committer | J08nY | 2024-02-05 18:28:01 +0100 |
| commit | 40d89ff77f3e59455082da48e49b0e9f7b57d78a (patch) | |
| tree | 6dd5b537a14734c0bb6864ffd982112ad68df00c | |
| parent | 4e24bb278c9da4e4f6c75f92187c6173d4269010 (diff) | |
| download | sec-certs-40d89ff77f3e59455082da48e49b0e9f7b57d78a.tar.gz sec-certs-40d89ff77f3e59455082da48e49b0e9f7b57d78a.tar.zst sec-certs-40d89ff77f3e59455082da48e49b0e9f7b57d78a.zip | |
Fix broken filename rules.
| -rw-r--r-- | src/sec_certs/rules.yaml | 4 | ||||
| -rw-r--r-- | src/sec_certs/sample/cc.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/sec_certs/rules.yaml b/src/sec_certs/rules.yaml index a0e1c82d..4305b8cd 100644 --- a/src/sec_certs/rules.yaml +++ b/src/sec_certs/rules.yaml @@ -126,11 +126,11 @@ cc_cert_id: ##### cc_filename_cert_id: DE: - - "(?P<counter>[0-9]{3,5})(?:(?P<version>[vV][0-9]))?a?(?:_pdf)?" + #- "(?P<counter>[0-9]{3,5})(?:(?P<version>[vV][0-9]))?a?(?:_pdf)?" - "(?P<year>[0-9]{4})(?P<month>[0-9]{2})(?P<day>[0-9]{2})_(?P<counter>[0-9]{3,5})(?:(?P<version>[vV][0-9]))?a?(?:_pdf)?" FR: - "(?P<year>[0-9]{4})[_-](?P<counter>[0-9]{2})([vV](?P<version>[0-9]))?" - - "(?P<year>[0-9]{2})(?P<counter>[0-9]{2})([vV](?P<version>[0-9]))?" + #- "(?P<year>[0-9]{2})(?P<counter>[0-9]{2})([vV](?P<version>[0-9]))?" NL: - "(?:NSCIB-|CC-|NSCIB-CC-)(?P<core>((?P<year>[0-9]{2})-)?(?:-?[0-9]+)+)(?:-?(?P<doc>(?:CR|MA|MR)[0-9]*))?" "NO": diff --git a/src/sec_certs/sample/cc.py b/src/sec_certs/sample/cc.py index 8948bb76..ef1ff984 100644 --- a/src/sec_certs/sample/cc.py +++ b/src/sec_certs/sample/cc.py @@ -338,13 +338,16 @@ class CCCertificate( if not self.report_filename: return {} scheme_filename_rules = rules["cc_filename_cert_id"][scheme] + if not scheme_filename_rules: + return {} scheme_meta = schemes[scheme] matches: Counter = Counter() for rule in scheme_filename_rules: match = re.search(rule, self.report_filename) if match: try: - cert_id = scheme_meta(match.groupdict()) + meta = match.groupdict() + cert_id = scheme_meta(meta) matches[cert_id] += 1 except Exception: continue |