dryad2dataverse 0.6.1__py3-none-any.whl → 0.7.1__py3-none-any.whl

dryad2dataverse/__init__.py

@@ -23,6 +23,6 @@ Modules included:
     dryad2dataverse.exceptions : Custom exceptions.
 '''
 
-VERSION = (0, 6, 1)
+VERSION = (0, 7, 1)
 
 __version__ = '.'.join([str(x) for x in VERSION])

dryad2dataverse/scripts/dryadd.py

@@ -27,7 +27,7 @@ import dryad2dataverse.serializer
 import dryad2dataverse.transfer
 from dryad2dataverse.handlers import SSLSMTPHandler
 
-VERSION = (0, 5, 2)
+VERSION = (0, 5, 3)
 __version__ = '.'.join([str(x) for x in VERSION])
 
 DRY = 'https://datadryad.org/api/v2'
@@ -509,7 +509,7 @@ def verbo(verbosity:bool, **kwargs)->None:
         for key, value in kwargs.items():
             print(f'{key}: {value}')
 
-def main(log='/var/log/dryadd.log', level=logging.warning):
+def main(log='/var/log/dryadd.log', level=logging.WARNING):
     '''
     Main Dryad transfer daemon
 

dryad2dataverse/serializer.py

@@ -202,7 +202,11 @@ class Serializer():
             files = page['_embedded'].get('stash:files')
             if files:
                 for f in files:
-                    downLink = f['_links']['stash:file-download']['href']
+                    #This broke with this commit:
+                    # https://github.com/datadryad/dryad-app/commit/b8a333ba34b14e55cbc1d7ed5aa4451e0f41db66
+
+                    #downLink = f['_links']['stash:file-download']['href']
+                    downLink = f['_links']['stash:download']['href']
                     downLink = f'{constants.DRYURL}{downLink}'
                     name = f['path']
                     mimeType = f['mimeType']

dryad2dataverse/transfer.py

@@ -9,7 +9,9 @@ import logging
 import os
 import time
 import traceback
+import zlib #crc32, adler32
 
+import Crypto.Hash.MD2 #md2
 import requests
 from requests.adapters import HTTPAdapter
 from requests_toolbelt.multipart.encoder import MultipartEncoder
@@ -20,6 +22,15 @@ from dryad2dataverse import exceptions
 LOGGER = logging.getLogger(__name__)
 URL_LOGGER = logging.getLogger('urllib3')
 
+HASHTABLE = {'adler-32' : zlib.adler32, #zlib?
+             'crc-32' : zlib.crc32, #zlib
+             'md2' : Crypto.Hash.MD2, #insecure
+             'md5' : hashlib.md5,
+             'sha-1' : hashlib.sha1,
+             'sha-256' : hashlib.sha256,
+             'sha-384' : hashlib.sha384,
+             'sha-512': hashlib.sha512}
+
 class Transfer():
     '''
     Transfers metadata and data files from a
@@ -342,7 +353,7 @@ class Transfer():
         return self.dvpid
 
     @staticmethod
-    def _check_md5(infile):
+    def _check_md5(infile, dig_type):
         '''
         Returns the md5 checksum of a file.
 
@@ -351,25 +362,51 @@ class Transfer():
 
         infile : str
             — Complete path to target file.
+
+        dig_type : str or None
+            — Digest type
         ----------------------------------------
         '''
+        #From Ryan Scherle
+        #When Dryad calculates a digest, it only uses MD5.
+        #But if you have precomputed some other type of digest, we should accept it.
+        #The list of allowed values is:
+        #('adler-32','crc-32','md2','md5','sha-1','sha-256','sha-384','sha-512')
+        #hashlib doesn't support adler-32, crc-32, md2
+
         blocksize = 2**16
+        #Well, this is inelegant
         with open(infile, 'rb') as m:
-            fmd5 = hashlib.md5()
-            fblock = m.read(blocksize)
-            while fblock:
-                fmd5.update(fblock)
+            #fmd5 = hashlib.md5()
+            ## var name kept for posterity. Maybe refactor
+            if dig_type in ['sha-1', 'sha-256', 'sha-384', 'sha-512', 'md5', 'md2']:
+                if dig_type == 'md2':
+                    fmd5 = Crypto.Hash.MD2.new()
+                else:
+                    fmd5 = HASHTABLE[dig_type]()
+                fblock = m.read(blocksize)
+                while fblock:
+                    fmd5.update(fblock)
+                    fblock = m.read(blocksize)
+                return fmd5.hexdigest()
+            if dig_type in ['adler-32', 'crc-32']:
                 fblock = m.read(blocksize)
-        return fmd5.hexdigest()
+                curvalue = HASHTABLE[dig_type](fblock)
+                while fblock:
+                    fblock = m.read(blocksize)
+                    curvalue = HASHTABLE[dig_type](fblock, curvalue)
+                return curvalue
+        raise exceptions.HashError(f'Unable to determine hash type for{infile}: {dig_type}')
 
-    def download_file(self, url, filename, tmp=None,
-                      size=None, chk=None, timeout=45):
+
+    def download_file(self, url=None, filename=None, tmp=None,
+                      size=None, chk=None, timeout=45, **kwargs):
         '''
         Downloads a file via requests streaming and saves to constants.TMP.
-        returns md5sum on success and an exception on failure.
+        returns checksum on success and an exception on failure.
 
         ----------------------------------------
-        Parameters:
+        Required keyword arguments:
 
         url : str
             — URL of download.
@@ -388,8 +425,11 @@ class Transfer():
             — Reported file size in bytes.
               Defaults to dryad2dataverse.constants.MAX_UPLOAD.
 
+        digest_type: str
+            — checksum type (ie, md5, sha-256, etc)
+
         chk : str
-            - md5 sum of file (if available and known).
+            —  checksum of file (if available and known).
         ----------------------------------------
         '''
         LOGGER.debug('Start download sequence')
@@ -430,11 +470,13 @@ class Transfer():
                         LOGGER.exception(e)
                         raise
             #now check the md5
-            md5 = Transfer._check_md5(f'{tmp}{os.sep}{filename}')
-            if chk:
+            md5 = None
+            if chk and kwargs.get('digest_type') in HASHTABLE:
+                md5 = Transfer._check_md5(f'{tmp}{os.sep}{filename}',
+                                      kwargs['digest_type'])
                 if md5 != chk:
                     try:
-                        raise exceptions.HashError('Hex digest mismatch: {md5} : {chk}')
+                        raise exceptions.HashError(f'Hex digest mismatch: {md5} : {chk}')
                         #is this really what I want to do on a bad checksum?
                     except exceptions.HashError as e:
                         LOGGER.exception(e)
@@ -474,7 +516,13 @@ class Transfer():
             files = self.files
         try:
             for f in files:
-                self.download_file(f[0], f[1], size=f[3], chk=f[-1])
+                self.download_file(url=f[0],
+                                   filename=f[1],
+                                   mimetype=f[2],
+                                   size=f[3],
+                                   descr=f[4],
+                                   digest_type=f[5],
+                                   chk=f[-1])
         except exceptions.DataverseDownloadError as e:
             LOGGER.exception('Unable to download file with info %s\n%s', f, e)
             raise

{dryad2dataverse-0.6.1.dist-info → dryad2dataverse-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dryad2dataverse
-Version: 0.6.1
+Version: 0.7.1
 Summary: Utility for copying and syncing data from a Dryad data repository to a Dataverse repository
 Author-email: Paul Lesack <paul.lesack@ubc.ca>
 Project-URL: Homepage, https://ubc-library-rc.github.io/dryad2dataverse
@@ -17,13 +17,14 @@ Classifier: Topic :: Internet :: WWW/HTTP :: Site Management
 Classifier: Topic :: Utilities
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Requires-Dist: certifi (>=2022.12.7)
-Requires-Dist: charset-normalizer (>=2.0.4)
-Requires-Dist: chardet (>=3.0.4)
-Requires-Dist: idna (>=2.10)
-Requires-Dist: requests (>=2.26.0)
-Requires-Dist: requests-toolbelt (>=0.9.1)
-Requires-Dist: urllib3 (>=1.26.6)
+Requires-Dist: certifi >=2022.12.7
+Requires-Dist: charset-normalizer >=2.0.4
+Requires-Dist: chardet >=3.0.4
+Requires-Dist: idna >=2.10
+Requires-Dist: pycryptodome >=3.20.0
+Requires-Dist: requests >=2.26.0
+Requires-Dist: requests-toolbelt >=0.9.1
+Requires-Dist: urllib3 >=1.26.6
 
 # dryad2dataverse
 

dryad2dataverse-0.7.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+dryad2dataverse/__init__.py,sha256=OM5T0B0PkVEvsHStz5XY4bdEAmWI3P_r3wy6xo_vQF4,712
+dryad2dataverse/constants.py,sha256=ZfD2N0f742nnP8NPUV0QsDdVVAbrW-3Py8Lg9al1Z5c,1429
+dryad2dataverse/exceptions.py,sha256=oIP1_fSEvLF3HpK6gOYb05vUisY-IAxwXZDeNoAvCPM,1008
+dryad2dataverse/handlers.py,sha256=Xb0vvs1HE92qaK6g-Gu3eyHkLrSwU0-RQjLcl6FZPUY,1487
+dryad2dataverse/monitor.py,sha256=qj-jXl3_SJBPof1qKOiSHQCvc083PHH2afkl-y_qQAU,26267
+dryad2dataverse/serializer.py,sha256=1RKfV6flLCR61s51MqY-AUMIMOoLrxai3Wi9cOGtt1s,33706
+dryad2dataverse/transfer.py,sha256=W8b-sHTjClM-CzVx_OrBAsrZ5hQ1-XmTpq1qB4PFlVA,36233
+dryad2dataverse/scripts/dryadd.py,sha256=chQVEAYWTHvKa5QZH0PIj1EgBlJO4qd1Xw2vkf1c_i8,26291
+dryad2dataverse-0.7.1.dist-info/METADATA,sha256=fttUJsmVA2e0to1oE5JJc2qH-DQO8ByR7LpbOVEdurc,3297
+dryad2dataverse-0.7.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dryad2dataverse-0.7.1.dist-info/entry_points.txt,sha256=9kBsBa5SivAtfAox__vZGL7H-HI7Vd-jGztCh_eIJEc,63
+dryad2dataverse-0.7.1.dist-info/top_level.txt,sha256=0X45AghpKfL69Oc51sRddeiHtq8o-OyOhFX3AMal6YI,16
+dryad2dataverse-0.7.1.dist-info/RECORD,,

{dryad2dataverse-0.6.1.dist-info → dryad2dataverse-0.7.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

dryad2dataverse-0.6.1.dist-info/RECORD

@@ -1,13 +0,0 @@
-dryad2dataverse/__init__.py,sha256=LNerhTEGz21nqTNhmnfFp0IpVzANJnAUjy1ls5qmyQc,712
-dryad2dataverse/constants.py,sha256=ZfD2N0f742nnP8NPUV0QsDdVVAbrW-3Py8Lg9al1Z5c,1429
-dryad2dataverse/exceptions.py,sha256=oIP1_fSEvLF3HpK6gOYb05vUisY-IAxwXZDeNoAvCPM,1008
-dryad2dataverse/handlers.py,sha256=Xb0vvs1HE92qaK6g-Gu3eyHkLrSwU0-RQjLcl6FZPUY,1487
-dryad2dataverse/monitor.py,sha256=qj-jXl3_SJBPof1qKOiSHQCvc083PHH2afkl-y_qQAU,26267
-dryad2dataverse/serializer.py,sha256=fM5owzRfdZb799fTg45n0iqzBWZSUHpTp2pXnuKg_z0,33476
-dryad2dataverse/transfer.py,sha256=tfuSSfOsXTCMEJ_K65J0hyOI9O_5GFUHEpPyNQGXVbs,34125
-dryad2dataverse/scripts/dryadd.py,sha256=RMsXK2shWjQzNjicD4v9dpYPH0ctSmXHqC0gZ3_x_Dk,26291
-dryad2dataverse-0.6.1.dist-info/METADATA,sha256=Jz8fH-Dp7E-RbvxfSQR7iwv3PNDDURiAqAb-aQkmhGA,3274
-dryad2dataverse-0.6.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-dryad2dataverse-0.6.1.dist-info/entry_points.txt,sha256=9kBsBa5SivAtfAox__vZGL7H-HI7Vd-jGztCh_eIJEc,63
-dryad2dataverse-0.6.1.dist-info/top_level.txt,sha256=0X45AghpKfL69Oc51sRddeiHtq8o-OyOhFX3AMal6YI,16
-dryad2dataverse-0.6.1.dist-info/RECORD,,