commonmeta-py 0.133__py3-none-any.whl → 0.134__py3-none-any.whl

commonmeta/__init__.py

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

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/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.133.dist-info → commonmeta_py-0.134.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonmeta-py
-Version: 0.133
+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.133.dist-info → commonmeta_py-0.134.dist-info}/RECORD

@@ -1,11 +1,11 @@
-commonmeta/__init__.py,sha256=LXbxDYjamWbC_7LWnUezqclzNROGBmiQXfm_gQkkd2o,2118
+commonmeta/__init__.py,sha256=sdVgn7G0IJoJuvtc2tOynuaqDbOgAKT9W4Ss7f3De_g,2118
 commonmeta/api_utils.py,sha256=P8LMHHYiF4OTi97_5k4KstcBreooMkOAKZ4ebxsAv4o,2691
 commonmeta/author_utils.py,sha256=3lYW5s1rOUWNTKs1FP6XLfEUY3yCLOe_3L_VdJTDMp0,8585
 commonmeta/base_utils.py,sha256=-MGy9q2uTiJEkPWQUYOJMdq-3tRpNnvBwlLjvllQ5g8,11164
 commonmeta/cli.py,sha256=kBDSn7hL29I_ICn8XKFFEaIWl_ZVE_KrNWpzfar9v3g,8639
 commonmeta/constants.py,sha256=wSTEUiHeRdXLwjXEQD9AU2hxFyEKi5OTX2iHOKO6nF0,19844
 commonmeta/date_utils.py,sha256=H2cCobX0JREIUOT_cCigGd3MG7prGiQpXk1m4ZNrFwU,6318
-commonmeta/doi_utils.py,sha256=WCERy6sJ8C7KRxYU-ZGnvmFe6YIdl_jtYO4lQ23aeYA,11510
+commonmeta/doi_utils.py,sha256=uB5Zxr5ezo-5Pp_M_FCGM7jwuZ8ylRBtS1WHOCCLpsU,11491
 commonmeta/file_utils.py,sha256=eFYDWyR8Gr722nvFmp542hCm-TGmO_q4ciZ85IPHpjA,2893
 commonmeta/metadata.py,sha256=90aTe47d071wHxwcNsOqU5lSVPKP8wAPnPHhddj3Fuo,18443
 commonmeta/schema_utils.py,sha256=zn3gqAHciUOQmrw9okR68weFs-yqPPyORFt-Zl1D3Lw,1924
@@ -22,7 +22,7 @@ commonmeta/readers/csl_reader.py,sha256=OxzC2AZKfv43BCah4XGYvlK_LUK-5mxXFcjdzB5v
 commonmeta/readers/datacite_reader.py,sha256=4b_AP8m_aOUNVnVB0nU9j4-a8WTpmYJA8QPr5v35qyw,12219
 commonmeta/readers/datacite_xml_reader.py,sha256=nsPc7JBbIKgx6Yaauq8vmhUE-o6K0t_MAuExv6FO2AU,13205
 commonmeta/readers/inveniordm_reader.py,sha256=DtSloEZDu8bL-QLQAqAW1aDsS6ESTDZyhme379IekjY,8502
-commonmeta/readers/jsonfeed_reader.py,sha256=sLwQwoFuOJ5yVqSi-EQVHSCo0VkwY_l6WxLGURP8yPo,15889
+commonmeta/readers/jsonfeed_reader.py,sha256=2ezpXyUD7evniDG_f5R8rXhTxFVQRNJCD39VElVnLRA,15906
 commonmeta/readers/kbase_reader.py,sha256=0Y9cHRNs_7kHyocN4IESXbgmXJiq4TXoxvGeUYGml1s,6896
 commonmeta/readers/openalex_reader.py,sha256=4HUkBsut_iUjhUcC5c1GHgxnKsYQc-fgY43QILgVZEg,12826
 commonmeta/readers/ris_reader.py,sha256=nwK8Eux0wPjwKqXFWS4Cfd6FAY7Id4Mi_hgkTwPntHs,3766
@@ -83,8 +83,8 @@ commonmeta/writers/datacite_writer.py,sha256=bcinpwhq7XnVthKHH8-sdXA34dSlvFH4ImY
 commonmeta/writers/inveniordm_writer.py,sha256=tiuq9JEkz02l615yVe9wUcJQqiIPJLUqNDyofEE8Aus,26726
 commonmeta/writers/ris_writer.py,sha256=3SdyEvMRaPRP1SV1MB-MXBlunE7x6og7RF1zuWtetPc,2094
 commonmeta/writers/schema_org_writer.py,sha256=s18_x0ReXwAGBoEAwp2q-HCgFQ-h5qRg6JyAlqCoSFE,5871
-commonmeta_py-0.133.dist-info/METADATA,sha256=mkjntJUhPLkq6tY_n54BHPwzGClmKKAozrlQX0SUO3A,7656
-commonmeta_py-0.133.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-commonmeta_py-0.133.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
-commonmeta_py-0.133.dist-info/licenses/LICENSE,sha256=wsIvxF9Q9GC9vA_s79zTWP3BkXJdfUNRmALlU8GbW1s,1074
-commonmeta_py-0.133.dist-info/RECORD,,
+commonmeta_py-0.134.dist-info/METADATA,sha256=7coMa1NsJzvwn2hbXpYJwcNEjxWrsbTyRz4Ivaz6Ziw,7656
+commonmeta_py-0.134.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+commonmeta_py-0.134.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
+commonmeta_py-0.134.dist-info/licenses/LICENSE,sha256=wsIvxF9Q9GC9vA_s79zTWP3BkXJdfUNRmALlU8GbW1s,1074
+commonmeta_py-0.134.dist-info/RECORD,,