diff --git a/addKeyValuePairOnHandleCSV.py b/addKeyValuePairOnHandleCSV.py index 3d41f04..9d83b62 100644 --- a/addKeyValuePairOnHandleCSV.py +++ b/addKeyValuePairOnHandleCSV.py @@ -4,6 +4,7 @@ import csv from datetime import datetime import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -88,3 +89,6 @@ print(post) f.writerow([itemID] + [addedMetadataElement['key']] + [addedMetadataElement['value']] + [delete] + [post]) + +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/addKeyValuePairToCollection.py b/addKeyValuePairToCollection.py index 1efe0a4..227afdd 100644 --- a/addKeyValuePairToCollection.py +++ b/addKeyValuePairToCollection.py @@ -5,6 +5,7 @@ from datetime import datetime import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -90,10 +91,8 @@ itemID = items[k]['uuid'] itemList.append(itemID) offset = offset + 200 -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Item list creation time: ', '%d:%02d:%02d' % (h, m, s)) + +dsFunc.elapsedTime(startTime, 'Item list creation time') recordsEdited = 0 f = csv.writer(open(filePath + 'addKeyValuePair' @@ -139,7 +138,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/addKeyValuePairToCommunity.py b/addKeyValuePairToCommunity.py index 2abbf6e..58ef13c 100644 --- a/addKeyValuePairToCommunity.py +++ b/addKeyValuePairToCommunity.py @@ -5,6 +5,7 @@ from datetime import datetime import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -101,10 +102,8 @@ itemID = items[k]['uuid'] itemList.append(itemID) offset = offset + 200 -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Item list creation time: ', '%d:%02d:%02d' % (h, m, s)) + +dsFunc.elapsedTime(startTime, 'Item list creation time') recordsEdited = 0 f = csv.writer(open(filePath + 'addKeyValuePair' @@ -157,7 +156,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/addNewItemsToCollection.py b/addNewItemsToCollection.py index 44afb6e..bebaa35 100644 --- a/addNewItemsToCollection.py +++ b/addNewItemsToCollection.py @@ -7,6 +7,7 @@ import urllib3 import collections import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -61,10 +62,8 @@ if file.endswith(fileExtension): fullFilePath = os.path.join(root, file).replace('\\', '/') fileList[file[:file.index('.')]] = fullFilePath -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('File list creation time: ', '%d:%02d:%02d' % (h, m, s)) + +dsFunc.elapsedTime(startTime, 'File list creation time') f = csv.writer(open(handle.replace('/', '-') + 'addedFilesList.csv', 'w')) f.writerow(['itemID']) @@ -202,7 +201,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/compareTwoKeysInCommunity.py b/compareTwoKeysInCommunity.py index cffb9c4..4255df2 100644 --- a/compareTwoKeysInCommunity.py +++ b/compareTwoKeysInCommunity.py @@ -3,6 +3,7 @@ import time import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -96,10 +97,8 @@ itemList.append(itemID) offset = offset + 200 print(offset) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Item list creation time: ', '%d:%02d:%02d' % (h, m, s)) + +dsFunc.elapsedTime(startTime, 'Item list creation time') valueList = [] for number, itemID in enumerate(itemList): @@ -123,10 +122,7 @@ print(itemTuple) print(valueList) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Value list creation time: ', '%d:%02d:%02d' % (h, m, s)) +dsFunc.elapsedTime(startTime, 'Value list creation time') f = csv.writer(open(filePath + key + '-' + key2 + 'Values.csv', 'w')) f.writerow(['itemID'] + [key] + [key2]) @@ -136,7 +132,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/countInitialedNamesByCollection.py b/countInitialedNamesByCollection.py index 1352de3..ba2bbc2 100644 --- a/countInitialedNamesByCollection.py +++ b/countInitialedNamesByCollection.py @@ -3,6 +3,7 @@ import re import time import urllib3 +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -121,7 +122,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/deleteBitstreamsFromItem.py b/deleteBitstreamsFromItem.py index 405e171..d409cd0 100644 --- a/deleteBitstreamsFromItem.py +++ b/deleteBitstreamsFromItem.py @@ -3,6 +3,7 @@ import csv from datetime import datetime import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -59,10 +60,8 @@ for k in range(0, len(bitstreams)): bitstreamID = bitstreams[k]['uuid'] bitstreamList.append(bitstreamID) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Bitstreams list creation time: ', '%d:%02d:%02d' % (h, m, s)) + +dsFunc.elapsedTime(startTime, 'Bitstream list creation time') print(bitstreamList) f = csv.writer(open(filePath + 'deletedBitstreams' @@ -80,7 +79,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/deleteKeyFromCollection.py b/deleteKeyFromCollection.py index f17e5f7..d054674 100644 --- a/deleteKeyFromCollection.py +++ b/deleteKeyFromCollection.py @@ -5,6 +5,7 @@ from datetime import datetime import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -123,7 +124,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/deleteKeyFromCommunity.py b/deleteKeyFromCommunity.py index dd6f02b..4027177 100644 --- a/deleteKeyFromCommunity.py +++ b/deleteKeyFromCommunity.py @@ -5,6 +5,7 @@ from datetime import datetime import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -129,7 +130,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/deleteKeyValuePairFromCollection.py b/deleteKeyValuePairFromCollection.py index 214e42b..5cea0ca 100644 --- a/deleteKeyValuePairFromCollection.py +++ b/deleteKeyValuePairFromCollection.py @@ -5,6 +5,7 @@ from datetime import datetime import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -132,7 +133,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/dsFunc.py b/dsFunc.py new file mode 100644 index 0000000..c5bee78 --- /dev/null +++ b/dsFunc.py @@ -0,0 +1,8 @@ +import datetime +import time + + +def elapsedTime(startTime, label): + """Generate elapsed time.""" + td = datetime.timedelta(seconds=time.time() - startTime) + print(label + ': {}'.format(td)) diff --git a/editBitstreamsNames.py b/editBitstreamsNames.py index fea9511..a606f6c 100644 --- a/editBitstreamsNames.py +++ b/editBitstreamsNames.py @@ -5,6 +5,7 @@ import csv from datetime import datetime import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -109,7 +110,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/exportCollectionMetadataToCSV.py b/exportCollectionMetadataToCSV.py index e52707b..82d9a49 100644 --- a/exportCollectionMetadataToCSV.py +++ b/exportCollectionMetadataToCSV.py @@ -3,6 +3,7 @@ import csv import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -122,7 +123,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/fileListMetadataReconcile.py b/fileListMetadataReconcile.py index 6e6edeb..98d8c42 100644 --- a/fileListMetadataReconcile.py +++ b/fileListMetadataReconcile.py @@ -3,6 +3,7 @@ import time import os import argparse +import dsFunc parser = argparse.ArgumentParser() parser.add_argument('-d', '--directory', help='the directory of the files. \ @@ -34,10 +35,7 @@ file.replace('.' + fileExtension, '') fileIdentifierList.append(file) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('File list creation time: ', '%d:%02d:%02d' % (h, m, s)) +dsFunc.elapsedTime(startTime, 'File list creation time') f = csv.writer(open('collectionfileList.csv', 'w')) f.writerow(['fileName']) @@ -107,7 +105,5 @@ csvRow.append(row[value]) f.writerow(csvRow) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/findBogusUris.py b/findBogusUris.py index 3d61c9f..3aa9f66 100644 --- a/findBogusUris.py +++ b/findBogusUris.py @@ -2,6 +2,7 @@ import csv import time import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -70,7 +71,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/findDuplicateKeys.py b/findDuplicateKeys.py index 5caeace..528e357 100644 --- a/findDuplicateKeys.py +++ b/findDuplicateKeys.py @@ -4,6 +4,7 @@ import csv import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -80,7 +81,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/getCollectionMetadataJson.py b/getCollectionMetadataJson.py index eff1fc2..7ab7d6a 100644 --- a/getCollectionMetadataJson.py +++ b/getCollectionMetadataJson.py @@ -2,6 +2,7 @@ import requests import time import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -68,7 +69,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print("%d:%02d:%02d" % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/getCompleteAndUniqueValuesForAllKeys.py b/getCompleteAndUniqueValuesForAllKeys.py index 625735c..02983ed 100644 --- a/getCompleteAndUniqueValuesForAllKeys.py +++ b/getCompleteAndUniqueValuesForAllKeys.py @@ -5,6 +5,7 @@ from collections import Counter from datetime import datetime import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -103,20 +104,11 @@ offset = offset + 20 print(offset) - setTime = time.time() - setTime - m, s = divmod(setTime, 60) - h, m = divmod(m, 60) - print('Set run time: ', '%d:%02d:%02d' % (h, m, s)) + dsFunc.elapsedTime(setTime, 'Set run time') - elapsedTime = time.time() - startTime - m, s = divmod(elapsedTime, 60) - h, m = divmod(m, 60) - print('Collection run time: ', '%d:%02d:%02d' % (h, m, s)) + dsFunc.elapsedTime(startTime, 'Collection run time') -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Complete value list creation time: ', '%d:%02d:%02d' % (h, m, s)) +dsFunc.elapsedTime(startTime, 'Complete value list creation time') # for fileName in os.listdir(filePathComplete): reader = csv.DictReader(open(filePathComplete + fileName)) @@ -133,7 +125,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/getCompleteAndUniqueValuesForAllKeysInCommunity.py b/getCompleteAndUniqueValuesForAllKeysInCommunity.py index 601ca86..648e2d2 100644 --- a/getCompleteAndUniqueValuesForAllKeysInCommunity.py +++ b/getCompleteAndUniqueValuesForAllKeysInCommunity.py @@ -5,6 +5,7 @@ from collections import Counter from datetime import datetime import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -80,10 +81,8 @@ itemID = items[k]['uuid'] itemList.append(itemID) offset = offset + 100 -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Item list creation time: ', '%d:%02d:%02d' % (h, m, s)) + +dsFunc.elapsedTime(startTime, 'Item list creation time') os.mkdir(filePathComplete) os.mkdir(filePathUnique) @@ -110,10 +109,7 @@ + 'ValuesComplete.csv', 'a')) f.writerow([itemID] + [value]) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Complete value list creation time: ', '%d:%02d:%02d' % (h, m, s)) +dsFunc.elapsedTime(startTime, 'Complete value list creation time') for fileName in os.listdir(filePathComplete): reader = csv.DictReader(open(filePathComplete + fileName)) @@ -130,7 +126,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/getFacultyNamesFromETDs.py b/getFacultyNamesFromETDs.py index 1bb463a..695312f 100644 --- a/getFacultyNamesFromETDs.py +++ b/getFacultyNamesFromETDs.py @@ -4,6 +4,7 @@ from datetime import datetime import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -102,7 +103,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/getGlobalLanguageValues.py b/getGlobalLanguageValues.py index cc01044..8866349 100644 --- a/getGlobalLanguageValues.py +++ b/getGlobalLanguageValues.py @@ -2,6 +2,7 @@ import csv import time import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -71,10 +72,8 @@ itemID = items[k]['uuid'] itemList.append(itemID) offset = offset + 100 -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Item list creation time: ', "%d:%02d:%02d" % (h, m, s)) + +dsFunc.elapsedTime(startTime, 'Item list creation time') valueList = [] for number, itemID in enumerate(itemList): @@ -96,7 +95,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/getHandlesAndBitstreamsFromCollection.py b/getHandlesAndBitstreamsFromCollection.py index dfb7550..09fbc68 100644 --- a/getHandlesAndBitstreamsFromCollection.py +++ b/getHandlesAndBitstreamsFromCollection.py @@ -2,6 +2,7 @@ import time import csv import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -100,7 +101,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/getLanguageValuesForKeys.py b/getLanguageValuesForKeys.py index 831c6ff..810ae80 100644 --- a/getLanguageValuesForKeys.py +++ b/getLanguageValuesForKeys.py @@ -2,6 +2,7 @@ import csv import time import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -71,10 +72,8 @@ itemID = items[k]['uuid'] itemList.append(itemID) offset = offset + 200 -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Item list creation time: ', "%d:%02d:%02d" % (h, m, s)) + +dsFunc.elapsedTime(startTime, 'Item list creation time') valueList = [] for number, itemID in enumerate(itemList): @@ -100,7 +99,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/getRecordsAndValuesForKey.py b/getRecordsAndValuesForKey.py index d8d2a5f..c4a60ee 100644 --- a/getRecordsAndValuesForKey.py +++ b/getRecordsAndValuesForKey.py @@ -3,6 +3,7 @@ import time import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -82,7 +83,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/getRecordsAndValuesForKeyInCollection.py b/getRecordsAndValuesForKeyInCollection.py index 3f5ad7f..732497e 100644 --- a/getRecordsAndValuesForKeyInCollection.py +++ b/getRecordsAndValuesForKeyInCollection.py @@ -3,6 +3,7 @@ import time import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -96,7 +97,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/getRecordsWithKeyAndValue.py b/getRecordsWithKeyAndValue.py index 8aeb323..d2f4a37 100644 --- a/getRecordsWithKeyAndValue.py +++ b/getRecordsWithKeyAndValue.py @@ -3,6 +3,7 @@ import time import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -89,7 +90,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print("%d:%02d:%02d" % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/identifyItemsMissingKeyInCommunity.py b/identifyItemsMissingKeyInCommunity.py index 3d42e71..42c2c5f 100644 --- a/identifyItemsMissingKeyInCommunity.py +++ b/identifyItemsMissingKeyInCommunity.py @@ -4,6 +4,7 @@ from datetime import datetime import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -101,7 +102,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/metadataCollectionsKeysMatrix.py b/metadataCollectionsKeysMatrix.py index 1de3174..cfed9fc 100644 --- a/metadataCollectionsKeysMatrix.py +++ b/metadataCollectionsKeysMatrix.py @@ -2,6 +2,7 @@ import time import csv import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -80,10 +81,8 @@ itemList.append(itemID) offset = offset + 200 print(offset) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Item list creation time: ', '%d:%02d:%02d' % (h, m, s)) + +dsFunc.elapsedTime(startTime, 'Item list creation time') # retrieve metadata from all items keyList = [] @@ -159,10 +158,8 @@ updatedCollKeyCountList = fullName + updatedCollKeyCountList f.writerow(updatedCollKeyCountList) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print("%d:%02d:%02d" % (h, m, s)) - logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) + +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/metadataOverview.py b/metadataOverview.py index 2fc1af8..d327eb2 100644 --- a/metadataOverview.py +++ b/metadataOverview.py @@ -3,6 +3,7 @@ import csv from collections import Counter import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -91,10 +92,7 @@ offset = offset + 200 print(offset) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Item list creation time: ', '%d:%02d:%02d' % (h, m, s)) +dsFunc.elapsedTime(startTime, 'Item list creation time') # retrieve metadata from all items keyList = [] @@ -157,10 +155,8 @@ fullName = communityName + ' - ' + collectionName f.writerow([fullName] + [collectionID] + [collectionHandle] + [key]) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print("%d:%02d:%02d" % (h, m, s)) - logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) + +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/overwriteExistingMetadata.py b/overwriteExistingMetadata.py index 27d1b91..3d283cc 100644 --- a/overwriteExistingMetadata.py +++ b/overwriteExistingMetadata.py @@ -5,6 +5,7 @@ from datetime import datetime import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -121,7 +122,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/postCollection.py b/postCollection.py index e96062f..4f00a0b 100644 --- a/postCollection.py +++ b/postCollection.py @@ -6,6 +6,7 @@ import csv import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -78,10 +79,8 @@ if file.endswith(fileExtension): fullFilePath = os.path.join(root, file).replace('\\', '/') fileList[file[:file.index('.')]] = fullFilePath -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('File list creation time: ', '%d:%02d:%02d' % (h, m, s)) + +dsFunc.elapsedTime(startTime, 'File list creation time') f = csv.writer(open(collectionName.replace(' ', '') + 'fileList.csv', 'w')) f.writerow(['itemID']) @@ -213,7 +212,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/removeDuplicateKeyValuePairsFromItems.py b/removeDuplicateKeyValuePairsFromItems.py index bd78fcb..4ac83a6 100644 --- a/removeDuplicateKeyValuePairsFromItems.py +++ b/removeDuplicateKeyValuePairsFromItems.py @@ -4,6 +4,7 @@ import csv from datetime import datetime import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -73,10 +74,8 @@ itemID = items[k]['uuid'] itemList.append(itemID) offset = offset + 200 -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Item list creation time: ', '%d:%02d:%02d' % (h, m, s)) + +dsFunc.elapsedTime(startTime, 'Item list creation time') f = csv.writer(open(filePath + 'DuplicateKeysRemoved' + datetime.now().strftime('%Y-%m-%d %H.%M.%S') + '.csv', 'w')) @@ -131,7 +130,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/replaceKey.py b/replaceKey.py index 77eb91b..3ccba6a 100644 --- a/replaceKey.py +++ b/replaceKey.py @@ -5,6 +5,7 @@ from datetime import datetime import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -123,7 +124,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/replaceKeyForCollection.py b/replaceKeyForCollection.py index 77a3103..192270f 100644 --- a/replaceKeyForCollection.py +++ b/replaceKeyForCollection.py @@ -5,6 +5,7 @@ from datetime import datetime import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -134,7 +135,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/replaceKeyForCommunity.py b/replaceKeyForCommunity.py index 3a7a37f..994ff2f 100644 --- a/replaceKeyForCommunity.py +++ b/replaceKeyForCommunity.py @@ -5,6 +5,7 @@ from datetime import datetime import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -141,7 +142,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/replaceKeyValuePairOnItemIdCSV.py b/replaceKeyValuePairOnItemIdCSV.py index 7c2a7bb..832fba7 100644 --- a/replaceKeyValuePairOnItemIdCSV.py +++ b/replaceKeyValuePairOnItemIdCSV.py @@ -4,6 +4,7 @@ import csv from datetime import datetime import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -96,3 +97,6 @@ print(post) f.writerow([itemID] + [replacedKey] + [replacedValue] + [replacementValue] + [delete] + [post]) + +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/replaceKeyValuePairsFromCSV.py b/replaceKeyValuePairsFromCSV.py index bdcbef1..6954a0a 100644 --- a/replaceKeyValuePairsFromCSV.py +++ b/replaceKeyValuePairsFromCSV.py @@ -5,6 +5,7 @@ from datetime import datetime import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -133,7 +134,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/replaceUnnecessarySpaces.py b/replaceUnnecessarySpaces.py index c00bde3..0eb19ac 100644 --- a/replaceUnnecessarySpaces.py +++ b/replaceUnnecessarySpaces.py @@ -4,6 +4,7 @@ import time from datetime import datetime import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -76,10 +77,8 @@ itemID = items[k]['uuid'] itemList.append(itemID) offset = offset + 200 -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Item list creation time: ', "%d:%02d:%02d" % (h, m, s)) + +dsFunc.elapsedTime(startTime, 'Item list creation time') f = csv.writer(open(filePath + 'removeUnnecessarySpaces' + datetime.now().strftime('%Y-%m-%d %H.%M.%S') + '.csv', 'w')) @@ -122,7 +121,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/replaceValueInCollection.py b/replaceValueInCollection.py index fb646a0..340cc08 100644 --- a/replaceValueInCollection.py +++ b/replaceValueInCollection.py @@ -5,6 +5,7 @@ import urllib3 import argparse from datetime import datetime +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -147,7 +148,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/replaceValueInCommunityFromCSV.py b/replaceValueInCommunityFromCSV.py index 16c0454..3d237f6 100644 --- a/replaceValueInCommunityFromCSV.py +++ b/replaceValueInCommunityFromCSV.py @@ -6,6 +6,7 @@ import urllib3 import argparse from datetime import datetime +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -161,7 +162,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/repositoryMetadataBackup.py b/repositoryMetadataBackup.py index ec16322..4fb487e 100644 --- a/repositoryMetadataBackup.py +++ b/repositoryMetadataBackup.py @@ -3,6 +3,7 @@ import time from datetime import datetime import os +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -92,7 +93,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print("%d:%02d:%02d" % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/repositoryMetadataRestore.py b/repositoryMetadataRestore.py index df8e470..a493919 100644 --- a/repositoryMetadataRestore.py +++ b/repositoryMetadataRestore.py @@ -2,6 +2,7 @@ import requests import os import time +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -72,7 +73,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/splitFieldIntoMultipleFields.py b/splitFieldIntoMultipleFields.py index 05014b8..1ab294c 100644 --- a/splitFieldIntoMultipleFields.py +++ b/splitFieldIntoMultipleFields.py @@ -7,6 +7,7 @@ from datetime import datetime import ast import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -144,7 +145,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/updateLanguageTagsForKey.py b/updateLanguageTagsForKey.py index cd4cfde..86d4c38 100644 --- a/updateLanguageTagsForKey.py +++ b/updateLanguageTagsForKey.py @@ -5,6 +5,7 @@ from datetime import datetime import urllib3 import argparse +import dsFunc secretsVersion = input('To edit production server, enter the name of the \ secrets file: ') @@ -113,7 +114,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time') diff --git a/updateLanguageTagsForKeyInCollection.py b/updateLanguageTagsForKeyInCollection.py index b92682e..b3404c5 100644 --- a/updateLanguageTagsForKeyInCollection.py +++ b/updateLanguageTagsForKeyInCollection.py @@ -4,6 +4,7 @@ import csv from datetime import datetime import urllib3 +import dsFunc urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -64,10 +65,8 @@ itemID = items[k]['uuid'] itemList.append(itemID) offset = offset + 200 -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Item list creation time: ', '%d:%02d:%02d' % (h, m, s)) + +dsFunc.elapsedTime(startTime, 'Item list creation time') f = csv.writer(open(filePath + 'languageTagUpdate' + key + datetime.now().strftime('%Y-%m-%d %H.%M.%S') + '.csv', 'w')) @@ -117,7 +116,5 @@ logout = requests.post(baseURL + '/rest/logout', headers=header, cookies=cookies, verify=verify) -elapsedTime = time.time() - startTime -m, s = divmod(elapsedTime, 60) -h, m = divmod(m, 60) -print('Total script run time: ', '%d:%02d:%02d' % (h, m, s)) +# print script run time +dsFunc.elapsedTime(startTime, 'Script run time')