dryad2dataverse 0.7.4__py3-none-any.whl → 0.7.6__py3-none-any.whl

dryad2dataverse/__init__.py

@@ -24,7 +24,7 @@ Modules included:
 '''
 import sys
 
-VERSION = (0, 7, 4)
+VERSION = (0, 7, 6)
 __version__ = '.'.join([str(x) for x in VERSION])
 USERAGENT = (f'dryad2dataverse/v{__version__} ({sys.platform.capitalize()}); '
              f'Python {sys.version[:sys.version.find("(")-1]}')

dryad2dataverse/scripts/dryadd.py

@@ -14,6 +14,7 @@ import glob
 import logging
 import logging.handlers
 import os
+import pathlib
 import shutil
 import smtplib
 import sys
@@ -27,7 +28,7 @@ import dryad2dataverse.serializer
 import dryad2dataverse.transfer
 from dryad2dataverse.handlers import SSLSMTPHandler
 
-VERSION = (0, 5, 4)
+VERSION = (0, 6, 3)
 __version__ = '.'.join([str(x) for x in VERSION])
 
 DRY = 'https://datadryad.org/api/v2'
@@ -372,6 +373,21 @@ def argp():
                         type=int,
                         dest='warn',
                         default=15)
+    parser.add_argument('--testmode-on',
+                        help=('Turn on test mode. '
+                              'Number of transfers will be limited '
+                              'to the value in --testmode-limit '
+                              'or 5 if you don\'t set --testmode-limit '),
+                        action='store_true',
+                        dest='testmode')
+    parser.add_argument('--testmode-limit',
+                        help=('Test mode - only transfer first [n] '
+                              'of the total number of (new) records. Old ones will '
+                              'still be updated, though. '
+                              'Default: 5'),
+                        type=int,
+                        default=5,
+                        dest='testlimit')
     parser.add_argument('--version', action='version',
                         version='%(prog)s '+__version__
                         +'; dryad2dataverse '+
@@ -391,6 +407,8 @@ def set_constants(args):
         dryad2dataverse.constants.DVURL = args.url
     if args.dbase:
         dryad2dataverse.constants.DBASE = args.dbase
+    if args.tmp:
+        dryad2dataverse.constants.TMP = args.tmp
 
 def email_log(mailhost, fromaddr, toaddrs, credentials, port=465, secure=(),
               level=logging.WARNING, timeout=100):
@@ -416,7 +434,8 @@ def email_log(mailhost, fromaddr, toaddrs, credentials, port=465, secure=(),
     '''
     #pylint: disable=too-many-arguments
     #Because consistency is for suckers and yahoo requires full hostname
-    subject = 'Dryad to Dataverse transfer error'
+    #subject = 'Dryad to Dataverse transfer error'
+    subject = 'Dryad to Dataverse logger message'
     elog = logging.getLogger('email_log')
     mailer = SSLSMTPHandler(mailhost=(mailhost, port),
                             fromaddr=fromaddr,
@@ -485,16 +504,13 @@ def checkwarn(val:int, **kwargs) -> None:
         {'warn_too_many': bool}
 
     '''
-    print(kwargs)
-    #print(vars(kwargs))
-    return
     if not kwargs.get('warn_too_many'):
         return
     if val >= kwargs.get('warn',0):
         mess = ('Large number of updates detected. '
                 f'{val} new studies exceeds threshold of {kwargs.get("warn", 0)}. '
                 'Program execution halted.')
-        subject = ('Dryad to Dataverse large update warning')
+        subject = 'Dryad to Dataverse large update warning'
         for logme in kwargs.get('loggers'):
             logme.warning(mess)
         notify(msgtxt=(subject, mess),
@@ -539,9 +555,18 @@ def main(log='/var/log/dryadd.log', level=logging.WARNING):
     monitor = dryad2dataverse.monitor.Monitor(args.dbase)
     #copy the database to make a backup, because paranoia is your friend
     if os.path.exists(dryad2dataverse.constants.DBASE):
-        shutil.copyfile(dryad2dataverse.constants.DBASE,
-                        dryad2dataverse.constants.DBASE+'.'+
-                        datetime.datetime.now().strftime('%Y-%m-%d-%H%M'))
+        bu_db = pathlib.Path(dryad2dataverse.constants.DBASE)
+        try:
+            shutil.copyfile( bu_db,
+                            pathlib.Path(bu_db.parent,
+                                         bu_db.stem + '_' +
+                                         datetime.datetime.now().strftime('%Y-%m-%d-%H%M') +
+                                         bu_db.suffix)
+                            )
+        except FileNotFoundError:
+            print(dryad2dataverse.constants.DBASE)
+            print(bu_db)
+            sys.exit()
     #list comprehension includes untimestamped dbase name, hence 2+
     fnames = glob.glob(os.path.abspath(dryad2dataverse.constants.DBASE)
                        +'*')
@@ -557,15 +582,24 @@ def main(log='/var/log/dryadd.log', level=logging.WARNING):
     logger.info('Total new files: %s', len(updates))
     elog.info('Total new files: %s', len(updates))
 
-    checkwarn(val=len(updates),
+    checkwarn(val=len(updates) if not args.testmode else
+              min(args.testlimit, len(updates)),
               loggers=[logger],
               **vars(args))
+    if args.testmode:
+        logger.warning('Test mode is ON - number of updates limited to %s', args.testlimit)
+        elog.warning('Test mode is ON - number of updates limited to %s', args.testlimit)
 
     #update all the new files
     verbo(args.verbosity, **{'Total to process': len(updates)})
+
     try:
         count = 0
+        testcount = 0
         for doi in updates:
+            if args.testmode and (testcount >= args.testlimit):
+                logger.info('Test limit of %s reached', args.testlimit)
+                break
             count += 1
             logger.info('Start processing %s of %s', count, len(updates))
             logger.info('DOI: %s, Dryad URL: https://datadryad.org/stash/dataset/%s',
@@ -611,6 +645,7 @@ def main(log='/var/log/dryadd.log', level=logging.WARNING):
                 transfer.set_correct_date()
                 notify(new_content(study),
                        **vars(args))
+                testcount+=1
 
             elif update_type == 'updated':
                 logger.info('Updated metadata: %s', doi[0])
@@ -674,23 +709,9 @@ def main(log='/var/log/dryadd.log', level=logging.WARNING):
         print(f'Error: {err}. Exiting. For details see log at {args.log}.')
         sys.exit()
 
-def main2(log='/var/log/dryadd.log', level=logging.WARNING):
-    '''
-    Main Dryad transfer daemon
-
-    log : str
-        path to logfile
-    level : int
-        log level, usually one of logging.LOGLEVEL (ie, logging.warning)
-    '''
-    #pylint: disable=too-many-branches
-    #pylint: disable=too-many-statements
-    #pylint: disable=too-many-locals
-    parser = argp()
-    args = parser.parse_args()
-    print(args)
-    checkwarn(val=26,
-              loggers=[],
-              **vars(args))
 if __name__ == '__main__':
-    main2()
+    main()
+    _parser = argp()
+    _args = _parser.parse_args()
+    print('This is what you would have done had you actually run this')
+    print(_args)

{dryad2dataverse-0.7.4.dist-info → dryad2dataverse-0.7.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dryad2dataverse
-Version: 0.7.4
+Version: 0.7.6
 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

{dryad2dataverse-0.7.4.dist-info → dryad2dataverse-0.7.6.dist-info}/RECORD

@@ -1,13 +1,13 @@
-dryad2dataverse/__init__.py,sha256=13WoiArwE8vvmWq4vGGDVH8BHhn0QEZrPVFE8boCFd4,865
+dryad2dataverse/__init__.py,sha256=jAPJzOKbatarco3wW4I_BI9wbfR8tqcOk-ePPq5VQig,865
 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=KOyWCpPTZLYRStB-RN0e5kgHTfbxHsByD72K1VtEPP8,26406
 dryad2dataverse/serializer.py,sha256=DoIjHYKtoH047X5Gd-WUdoLpL-kvTtSAPg-lUElCx8c,33865
 dryad2dataverse/transfer.py,sha256=83tju_o4DSgSkF7JDLsgTpAwm03b0CMb0OjcKAEACuY,37548
-dryad2dataverse/scripts/dryadd.py,sha256=rv8waNgJ7sdVF-nfiPCNa1_5p568CfSvBWUWwYYRP_A,26836
-dryad2dataverse-0.7.4.dist-info/METADATA,sha256=Er-lR8tTWTOKGC0QhT7sKWX9F894DaJXL46kfjADBy0,3299
-dryad2dataverse-0.7.4.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-dryad2dataverse-0.7.4.dist-info/entry_points.txt,sha256=9kBsBa5SivAtfAox__vZGL7H-HI7Vd-jGztCh_eIJEc,63
-dryad2dataverse-0.7.4.dist-info/top_level.txt,sha256=0X45AghpKfL69Oc51sRddeiHtq8o-OyOhFX3AMal6YI,16
-dryad2dataverse-0.7.4.dist-info/RECORD,,
+dryad2dataverse/scripts/dryadd.py,sha256=WQUbibzbeNamRntMyJBFYLXSk5qVjgJffQSRQuIls0I,28192
+dryad2dataverse-0.7.6.dist-info/METADATA,sha256=yqKN__bCVpVu2ImSIwwSSVLjetF1DX3HQDoHOHvvL78,3299
+dryad2dataverse-0.7.6.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+dryad2dataverse-0.7.6.dist-info/entry_points.txt,sha256=9kBsBa5SivAtfAox__vZGL7H-HI7Vd-jGztCh_eIJEc,63
+dryad2dataverse-0.7.6.dist-info/top_level.txt,sha256=0X45AghpKfL69Oc51sRddeiHtq8o-OyOhFX3AMal6YI,16
+dryad2dataverse-0.7.6.dist-info/RECORD,,

{dryad2dataverse-0.7.4.dist-info → dryad2dataverse-0.7.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any