Merge pull request #4 from MITLibraries/code-refactoring

Code refactoring

Author: ehanson8

.gitignore

@@ -45,8 +45,7 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
-secrets.py
-secretsProd.py
+secrets*
 *.pyc
 data/*
 local/*

Pipfile

@@ -7,6 +7,8 @@ verify_ssl = true
 
 [packages]
 requests = "*"
+click = "*"
+attrs = "*"
 
 [requires]
 python_version = "3.7"

Pipfile.lock

@@ -24,7 +24,7 @@
 session = requests.post(baseURL + '/rest/login', headers=header,
                         verify=verify, params=data).cookies['JSESSIONID']
 cookies = {'JSESSIONID': session}
-headerFileUpload = {'accept': 'application/json'}
+
 
 status = requests.get(baseURL + '/rest/status', headers=header,
                       cookies=cookies, verify=verify).json()

addKeyValuePairOnHandleCSV.py

@@ -18,14 +18,16 @@
 skipColl = secrets.skipColl
 
 parser = argparse.ArgumentParser()
-parser.add_argument('-k', '--key', help='the key to be added. optional - if \
-not provided, the script will ask for input')
-parser.add_argument('-v', '--value', help='the value to be added. optional - \
-if not provided, the script will ask for input')
-parser.add_argument('-l', '--language', help='the language tag to be added. \
-optional - if not provided, the script will ask for input')
-parser.add_argument('-i', '--handle', help='handle of the collection. optional \
-- if not provided, the script will ask for input')
+parser.add_argument('-k', '--key', help='the key to be added. optional - if '
+                    'not provided, the script will ask for input')
+parser.add_argument('-v', '--value', help='the value to be added. optional - '
+                    'if not provided, the script will ask for input')
+parser.add_argument('-l', '--language', help='the language tag to be added. '
+                    'optional - if not provided, the script will ask for '
+                    'input')
+parser.add_argument('-i', '--handle', help='handle of the collection. '
+                    'optional - if not provided, the script will ask for '
+                    'input')
 args = parser.parse_args()
 
 if args.key:
@@ -53,7 +55,7 @@
 session = requests.post(baseURL + '/rest/login', headers=header,
                         verify=verify, params=data).cookies['JSESSIONID']
 cookies = {'JSESSIONID': session}
-headerFileUpload = {'accept': 'application/json'}
+
 
 status = requests.get(baseURL + '/rest/status', headers=header,
                       cookies=cookies, verify=verify).json()
@@ -105,8 +107,9 @@
     addedMetadataElement['value'] = addedValue
     addedMetadataElement['language'] = addedLanguage
     itemMetadataProcessed.append(addedMetadataElement)
-    provNote = '\'' + addedKey + ': ' + addedValue + '\' was added through a \
-    batch process on ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S') + '.'
+    provNote = ('\'' + addedKey + ': ' + addedValue + '\' was added through a '
+                + 'batch process on '
+                + datetime.now().strftime('%Y-%m-%d %H:%M:%S') + '.')
     provNoteElement = {}
     provNoteElement['key'] = 'dc.description.provenance'
     provNoteElement['value'] = provNote

addKeyValuePairToCollection.py

@@ -18,14 +18,15 @@
 skipColl = secrets.skipColl
 
 parser = argparse.ArgumentParser()
-parser.add_argument('-k', '--key', help='the key to be added. optional - if \
-not provided, the script will ask for input')
-parser.add_argument('-v', '--value', help='the value to be added. optional - \
-if not provided, the script will ask for input')
-parser.add_argument('-l', '--language', help='the language tag to be added. \
-optional - if not provided, the script will ask for input')
-parser.add_argument('-i', '--handle', help='handle of the community. optional \
-- if not provided, the script will ask for input')
+parser.add_argument('-k', '--key', help='the key to be added. optional - if '
+                    'not provided, the script will ask for input')
+parser.add_argument('-v', '--value', help='the value to be added. optional - '
+                    'if not provided, the script will ask for input')
+parser.add_argument('-l', '--language', help='the language tag to be added. '
+                    'optional - if not provided, the script will ask for '
+                    'input')
+parser.add_argument('-i', '--handle', help='handle of the community. optional '
+                    '- if not provided, the script will ask for input')
 args = parser.parse_args()
 
 if args.key:
@@ -53,7 +54,7 @@
 session = requests.post(baseURL + '/rest/login', headers=header, verify=verify,
                         params=data).cookies['JSESSIONID']
 cookies = {'JSESSIONID': session}
-headerFileUpload = {'accept': 'application/json'}
+
 
 status = requests.get(baseURL + '/rest/status', headers=header,
                       cookies=cookies, verify=verify).json()

addKeyValuePairToCommunity.py

@@ -20,12 +20,15 @@
 skipColl = secrets.skipColl
 
 parser = argparse.ArgumentParser()
-parser.add_argument('-d', '--directory', help='the directory of files to be \
-ingested. optional - if not provided, the script will ask for input')
-parser.add_argument('-e', '--fileExtension', help='the extension of files to \
-be ingested. optional - if not provided, the script will ask for input')
-parser.add_argument('-i', '--handle', help='handle of the object to retreive. \
-optional - if not provided, the script will ask for input')
+parser.add_argument('-d', '--directory', help='the directory of files to be '
+                    'ingested. optional - if not provided, the script will '
+                    'ask for input')
+parser.add_argument('-e', '--fileExtension', help='the extension of files to '
+                    'be ingested. optional - if not provided, the script will '
+                    'ask for input')
+parser.add_argument('-i', '--handle', help='handle of the object to retreive. '
+                    'optional - if not provided, the script will ask for '
+                    'input')
 args = parser.parse_args()
 
 if args.directory:
@@ -68,11 +71,12 @@
 session = requests.post(baseURL + '/rest/login', headers=header, verify=verify,
                         params=data).cookies['JSESSIONID']
 cookies = {'JSESSIONID': session}
-headerFileUpload = {'accept': 'application/json'}
+
 status = requests.get(baseURL + '/rest/status', headers=header,
                       cookies=cookies, verify=verify).json()
 userFullName = status['fullname']
 print('authenticated', userFullName)
+headerFileUpload = {'accept': 'application/json'}
 
 # Get collection ID
 endpoint = baseURL + '/rest/handle/' + handle

addNewItemsToCollection.py

@@ -9,17 +9,17 @@ def main():
     parser = argparse.ArgumentParser()
 
     parser.add_argument('-i', '--inventory', required=True,
-                        help='csv file containing the inventory. the path, if \
-                        given, can be absolute or relative to this script')
+                        help='csv file containing the inventory. the path, if '
+                        'given, can be absolute or relative to this script')
 
     parser.add_argument('-d', '--dataDir',
-                        help='directory containing the data. if omitted, data \
-                        will be read from the directory containing the \
-                        inventory file')
+                        help='directory containing the data. if omitted, data '
+                        'will be read from the directory containing the '
+                        'inventory file')
 
     parser.add_argument('-f', '--field',
-                        help='field in the csv containing the fileNames. \
-                        default: name')
+                        help='field in the csv containing the fileNames. '
+                        'default: name')
 
     parser.add_argument('-v', '--verbose', action='store_true',
                         help='increase output verbosity')

checkInventory.py

@@ -16,12 +16,15 @@
 skipColl = secrets.skipColl
 
 parser = argparse.ArgumentParser()
-parser.add_argument('-1', '--key', help='the first key to be output. \
-optional - if not provided, the script will ask for input')
-parser.add_argument('-2', '--key2', help='the second key to be output. \
-optional - if not provided, the script will ask for input')
-parser.add_argument('-i', '--handle', help='handle of the community to \
-retreive. optional - if not provided, the script will ask for input')
+parser.add_argument('-1', '--key', help='the first key to be output. '
+                    'optional - if not provided, the script will ask for '
+                    'input')
+parser.add_argument('-2', '--key2', help='the second key to be output. '
+                    'optional - if not provided, the script will ask for '
+                    'input')
+parser.add_argument('-i', '--handle', help='handle of the community to '
+                    'retreive. optional - if not provided, the script will '
+                    'ask for input')
 args = parser.parse_args()
 
 if args.key:
@@ -45,7 +48,7 @@
 session = requests.post(baseURL + '/rest/login', headers=header, verify=verify,
                         params=data).cookies['JSESSIONID']
 cookies = {'JSESSIONID': session}
-headerFileUpload = {'accept': 'application/json'}
+
 
 status = requests.get(baseURL + '/rest/status', headers=header,
                       cookies=cookies, verify=verify).json()

compareTwoKeysInCommunity.py

@@ -23,7 +23,7 @@
 session = requests.post(baseURL + '/rest/login', headers=header, verify=verify,
                         params=data).cookies['JSESSIONID']
 cookies = {'JSESSIONID': session}
-headerFileUpload = {'accept': 'application/json'}
+
 
 status = requests.get(baseURL + '/rest/status', headers=header,
                       cookies=cookies, verify=verify).json()