commonmeta-py 0.132__tar.gz → 0.134__tar.gz

{commonmeta_py-0.132 → commonmeta_py-0.134}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonmeta-py
-Version: 0.132
+Version: 0.134
 Summary: Library for conversions to/from the Commonmeta scholarly metadata format
 Project-URL: Homepage, https://python.commonmeta.org
 Project-URL: Repository, https://github.com/front-matter/commonmeta-py

{commonmeta_py-0.132 → commonmeta_py-0.134}/commonmeta/__init__.py

@@ -10,7 +10,7 @@ commonmeta-py is a Python library to convert scholarly metadata
 """
 
 __title__ = "commonmeta-py"
-__version__ = "0.132"
+__version__ = "0.134"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 

{commonmeta_py-0.132 → commonmeta_py-0.134}/commonmeta/cli.py

@@ -1,3 +1,4 @@
+import importlib.metadata
 import time
 
 import click
@@ -280,5 +281,11 @@ def update_ghost_post(id, api_key, api_url):
     click.echo(output)
 
 
+@cli.command()
+def version():
+    version = importlib.metadata.version("commonmeta-py")
+    click.echo(f"commonmeta-py {version}")
+
+
 if __name__ == "__main__":
     cli()

{commonmeta_py-0.132 → commonmeta_py-0.134}/commonmeta/doi_utils.py

@@ -356,29 +356,28 @@ def generate_wordpress_doi(prefix: str, slug: str, guid: str) -> str:
     return doi
 
 
-def generate_doi_from_guid(prefix: str, guid: str, checksum=True) -> Optional[str]:
+def validate_doi_from_guid(prefix: str, guid: str, checksum=True) -> bool:
     """Validates a GUID that is a DOI"""
     import base32_lib as base32
 
     if not prefix:
-        return ""
+        return False
 
     doi = normalize_doi(guid)
     if not doi:
-        return ""
+        return False
 
     p = validate_prefix(doi)
     if not p or p != prefix:
-        return ""
+        return False
 
     suffix = doi.split("/")[-1]
 
     try:
         number = base32.decode(suffix, checksum)
-        if number != 0:
-            return doi
+        return number != 0
     except (ValueError, IndexError):
-        return None
+        return False
 
 
 def generate_substack_doi(prefix: str, guid: str) -> str:

{commonmeta_py-0.132 → commonmeta_py-0.134}/commonmeta/readers/jsonfeed_reader.py

@@ -13,12 +13,12 @@ from ..date_utils import get_date_from_unix_timestamp
 from ..doi_utils import (
     doi_from_url,
     encode_doi,
-    generate_doi_from_guid,
     generate_substack_doi,
     generate_wordpress_doi,
     is_rogue_scholar_doi,
     normalize_doi,
     validate_doi,
+    validate_doi_from_guid,
     validate_prefix,
 )
 from ..utils import (
@@ -74,11 +74,14 @@ def read_jsonfeed(data: Optional[dict], **kwargs) -> Commonmeta:
                 _id = generate_wordpress_doi(prefix, slug, guid)
             elif generator == "Substack" and prefix and guid:
                 _id = generate_substack_doi(prefix, guid)
-            elif prefix and guid:
-                # don't use checksum as some legacy GUIDs (generated with commonmeta Go between May 2024
-                # and April 2025) don't have valued checksum
-                guid = guid[:-2]  # remove checksum
-                _id = generate_doi_from_guid(prefix, guid, checksum=False)
+            # don't use checksum as some legacy GUIDs (generated with commonmeta Go between May 2024
+            # and April 2025) don't have valid checksum
+            elif (
+                prefix
+                and guid
+                and validate_doi_from_guid(prefix, guid[:-2], checksum=False)
+            ):
+                _id = guid
 
         # If still no DOI but prefix provided and not registered for DOI generation
         elif py_.get(meta, "blog.prefix") and not py_.get(meta, "blog.doi_reg", False):

{commonmeta_py-0.132 → commonmeta_py-0.134}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "commonmeta-py"
-version = "0.132"
+version = "0.134"
 description = "Library for conversions to/from the Commonmeta scholarly metadata format"
 authors = [{ name = "Martin Fenner", email = "martin@front-matter.io" }]
 requires-python = ">=3.9,<4.0"