commonmeta-py 0.142__py3-none-any.whl → 0.144__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.142"
+__version__ = "0.144"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 

commonmeta/doi_utils.py

@@ -350,17 +350,18 @@ def generate_wordpress_doi(prefix: str, slug: str, guid: str) -> str:
     pattern = re.compile(r"p=(\d+)$")
     matched = pattern.search(guid)
 
-    if not matched:
-        return ""
+    if matched:
+        suffix = f"{slug}.{matched.group(1)}"
+    else:
+        # post_id not found, use random base32 encoding
+        suffix = base32.generate(length=10, split_every=5, checksum=True)
 
-    doi = f"https://doi.org/{prefix}/{slug}.{matched.group(1)}"
+    doi = f"https://doi.org/{prefix}/{suffix}"
     return doi
 
 
 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 False
 
@@ -383,8 +384,6 @@ def validate_doi_from_guid(prefix: str, guid: str, checksum=True) -> bool:
 
 def generate_substack_doi(prefix: str, guid: str) -> str:
     """Generate a DOI from a Substack GUID"""
-    import base32_lib as base32
-
     if not prefix or not guid:
         return ""
 
@@ -393,7 +392,6 @@ def generate_substack_doi(prefix: str, guid: str) -> str:
     except ValueError:
         return ""
 
-    # encode the number using base32 with length=4, split_every=8, and checksum=True
-    suffix = base32.encode(i, length=4, split_every=8, checksum=True)
+    suffix = base32.encode(i, split_every=5, min_length=10, checksum=True)
     doi = f"https://doi.org/{prefix}/{suffix}"
     return doi

commonmeta/writers/inveniordm_writer.py

@@ -417,6 +417,7 @@ def push_inveniordm(metadata: Commonmeta, host: str, token: str, **kwargs) -> Di
                     "identifier"
                 ):
                     record["uuid"] = identifier.get("identifier")
+                    continue
 
         if hasattr(metadata, "relations") and metadata.relations:
             community_index = None
@@ -430,7 +431,7 @@ def push_inveniordm(metadata: Commonmeta, host: str, token: str, **kwargs) -> Di
                         record["community"] = slug
                         record["community_id"] = community_id
                         community_index = i
-                        break
+                        continue
 
             if community_index is not None:
                 metadata.relations.pop(community_index)
@@ -445,6 +446,7 @@ def push_inveniordm(metadata: Commonmeta, host: str, token: str, **kwargs) -> Di
         record = update_external_services(metadata, host, token, record, **kwargs)
 
     except Exception as e:
+        print(f"Error in push_inveniordm: {str(e)}")
         logger.error(
             f"Unexpected error in push_inveniordm: {str(e)}",
             exc_info=True,

{commonmeta_py-0.142.dist-info → commonmeta_py-0.144.dist-info}/METADATA

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

@@ -1,11 +1,11 @@
-commonmeta/__init__.py,sha256=flGktKafFlGpFmjOnBStAN3DV86X8gVHHYqiSRw2LeY,2118
+commonmeta/__init__.py,sha256=VPRya2OKHRRVIAhd10O8afGbXOJrRZykMj6G2f501VA,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=0g53aGwYCLHmZZBpRBnxTO39IsF3fcDltEWbRMBY4HE,11511
+commonmeta/doi_utils.py,sha256=dmHy6QsF3v69cDwvw-v9RX2uys72w6UPsqzAnNePO2w,11512
 commonmeta/file_utils.py,sha256=eFYDWyR8Gr722nvFmp542hCm-TGmO_q4ciZ85IPHpjA,2893
 commonmeta/metadata.py,sha256=xh5RNy9f7uKu5AjoPKyLqHGx149tGFy3IZwrf-fYHzg,18597
 commonmeta/schema_utils.py,sha256=zn3gqAHciUOQmrw9okR68weFs-yqPPyORFt-Zl1D3Lw,1924
@@ -80,11 +80,11 @@ commonmeta/writers/commonmeta_writer.py,sha256=QpfyhG__7o_XpsOTCPWxGymO7YKwZi2LQ
 commonmeta/writers/crossref_xml_writer.py,sha256=nyNgnyluzd9jZ6jysrSg_TpMNOQuVjfMo7pN0HUb3c0,34832
 commonmeta/writers/csl_writer.py,sha256=4gDYs1EzK4_L2UIRTfs25wgHmYRwdRP2zmfxF9387oU,2779
 commonmeta/writers/datacite_writer.py,sha256=bcinpwhq7XnVthKHH8-sdXA34dSlvFH4ImYH768iaQU,6428
-commonmeta/writers/inveniordm_writer.py,sha256=l9q2rBWJP7VheSCEDenWHUPJ1CugXRI9BoXLQiowLsY,27154
+commonmeta/writers/inveniordm_writer.py,sha256=OzFz59dc5997x6feSF7J6rorxG1HBiFN6Z2yzKSxRcw,27239
 commonmeta/writers/ris_writer.py,sha256=3SdyEvMRaPRP1SV1MB-MXBlunE7x6og7RF1zuWtetPc,2094
 commonmeta/writers/schema_org_writer.py,sha256=s18_x0ReXwAGBoEAwp2q-HCgFQ-h5qRg6JyAlqCoSFE,5871
-commonmeta_py-0.142.dist-info/METADATA,sha256=-D5EZz-YEGAuJNXuSz6bTN8CTbmdA58rrjQRTFo9hGk,7656
-commonmeta_py-0.142.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-commonmeta_py-0.142.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
-commonmeta_py-0.142.dist-info/licenses/LICENSE,sha256=wsIvxF9Q9GC9vA_s79zTWP3BkXJdfUNRmALlU8GbW1s,1074
-commonmeta_py-0.142.dist-info/RECORD,,
+commonmeta_py-0.144.dist-info/METADATA,sha256=FgnMR4Dn-fYtcGP20-h1wBAfX7-3SxbKyL2dJJ-jDdE,7656
+commonmeta_py-0.144.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+commonmeta_py-0.144.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
+commonmeta_py-0.144.dist-info/licenses/LICENSE,sha256=wsIvxF9Q9GC9vA_s79zTWP3BkXJdfUNRmALlU8GbW1s,1074
+commonmeta_py-0.144.dist-info/RECORD,,