Skip to content

Commit c91ff4f

Browse files
authored
Merge pull request #2 from MITLibraries/elapsedTime
create elapsed time function
2 parents 7f2c25f + a3891d4 commit c91ff4f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+177
-250
lines changed

addKeyValuePairOnHandleCSV.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import csv
55
from datetime import datetime
66
import urllib3
7+
import dsFunc
78

89
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
910

@@ -88,3 +89,6 @@
8889
print(post)
8990
f.writerow([itemID] + [addedMetadataElement['key']]
9091
+ [addedMetadataElement['value']] + [delete] + [post])
92+
93+
# print script run time
94+
dsFunc.elapsedTime(startTime, 'Script run time')

addKeyValuePairToCollection.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from datetime import datetime
66
import urllib3
77
import argparse
8+
import dsFunc
89

910
secretsVersion = input('To edit production server, enter the name of the \
1011
secrets file: ')
@@ -90,10 +91,8 @@
9091
itemID = items[k]['uuid']
9192
itemList.append(itemID)
9293
offset = offset + 200
93-
elapsedTime = time.time() - startTime
94-
m, s = divmod(elapsedTime, 60)
95-
h, m = divmod(m, 60)
96-
print('Item list creation time: ', '%d:%02d:%02d' % (h, m, s))
94+
95+
dsFunc.elapsedTime(startTime, 'Item list creation time')
9796

9897
recordsEdited = 0
9998
f = csv.writer(open(filePath + 'addKeyValuePair'
@@ -139,7 +138,5 @@
139138
logout = requests.post(baseURL + '/rest/logout', headers=header,
140139
cookies=cookies, verify=verify)
141140

142-
elapsedTime = time.time() - startTime
143-
m, s = divmod(elapsedTime, 60)
144-
h, m = divmod(m, 60)
145-
print('Total script run time: ', '%d:%02d:%02d' % (h, m, s))
141+
# print script run time
142+
dsFunc.elapsedTime(startTime, 'Script run time')

addKeyValuePairToCommunity.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from datetime import datetime
66
import urllib3
77
import argparse
8+
import dsFunc
89

910
secretsVersion = input('To edit production server, enter the name of the \
1011
secrets file: ')
@@ -101,10 +102,8 @@
101102
itemID = items[k]['uuid']
102103
itemList.append(itemID)
103104
offset = offset + 200
104-
elapsedTime = time.time() - startTime
105-
m, s = divmod(elapsedTime, 60)
106-
h, m = divmod(m, 60)
107-
print('Item list creation time: ', '%d:%02d:%02d' % (h, m, s))
105+
106+
dsFunc.elapsedTime(startTime, 'Item list creation time')
108107

109108
recordsEdited = 0
110109
f = csv.writer(open(filePath + 'addKeyValuePair'
@@ -157,7 +156,5 @@
157156
logout = requests.post(baseURL + '/rest/logout', headers=header,
158157
cookies=cookies, verify=verify)
159158

160-
elapsedTime = time.time() - startTime
161-
m, s = divmod(elapsedTime, 60)
162-
h, m = divmod(m, 60)
163-
print('Total script run time: ', '%d:%02d:%02d' % (h, m, s))
159+
# print script run time
160+
dsFunc.elapsedTime(startTime, 'Script run time')

addNewItemsToCollection.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import urllib3
88
import collections
99
import argparse
10+
import dsFunc
1011

1112
secretsVersion = input('To edit production server, enter the name of the \
1213
secrets file: ')
@@ -61,10 +62,8 @@
6162
if file.endswith(fileExtension):
6263
fullFilePath = os.path.join(root, file).replace('\\', '/')
6364
fileList[file[:file.index('.')]] = fullFilePath
64-
elapsedTime = time.time() - startTime
65-
m, s = divmod(elapsedTime, 60)
66-
h, m = divmod(m, 60)
67-
print('File list creation time: ', '%d:%02d:%02d' % (h, m, s))
65+
66+
dsFunc.elapsedTime(startTime, 'File list creation time')
6867

6968
f = csv.writer(open(handle.replace('/', '-') + 'addedFilesList.csv', 'w'))
7069
f.writerow(['itemID'])
@@ -202,7 +201,5 @@
202201
logout = requests.post(baseURL + '/rest/logout', headers=header,
203202
cookies=cookies, verify=verify)
204203

205-
elapsedTime = time.time() - startTime
206-
m, s = divmod(elapsedTime, 60)
207-
h, m = divmod(m, 60)
208-
print('Total script run time: ', '%d:%02d:%02d' % (h, m, s))
204+
# print script run time
205+
dsFunc.elapsedTime(startTime, 'Script run time')

compareTwoKeysInCommunity.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import time
44
import urllib3
55
import argparse
6+
import dsFunc
67

78
secretsVersion = input('To edit production server, enter the name of the \
89
secrets file: ')
@@ -96,10 +97,8 @@
9697
itemList.append(itemID)
9798
offset = offset + 200
9899
print(offset)
99-
elapsedTime = time.time() - startTime
100-
m, s = divmod(elapsedTime, 60)
101-
h, m = divmod(m, 60)
102-
print('Item list creation time: ', '%d:%02d:%02d' % (h, m, s))
100+
101+
dsFunc.elapsedTime(startTime, 'Item list creation time')
103102

104103
valueList = []
105104
for number, itemID in enumerate(itemList):
@@ -123,10 +122,7 @@
123122
print(itemTuple)
124123
print(valueList)
125124

126-
elapsedTime = time.time() - startTime
127-
m, s = divmod(elapsedTime, 60)
128-
h, m = divmod(m, 60)
129-
print('Value list creation time: ', '%d:%02d:%02d' % (h, m, s))
125+
dsFunc.elapsedTime(startTime, 'Value list creation time')
130126

131127
f = csv.writer(open(filePath + key + '-' + key2 + 'Values.csv', 'w'))
132128
f.writerow(['itemID'] + [key] + [key2])
@@ -136,7 +132,5 @@
136132
logout = requests.post(baseURL + '/rest/logout', headers=header,
137133
cookies=cookies, verify=verify)
138134

139-
elapsedTime = time.time() - startTime
140-
m, s = divmod(elapsedTime, 60)
141-
h, m = divmod(m, 60)
142-
print('Total script run time: ', '%d:%02d:%02d' % (h, m, s))
135+
# print script run time
136+
dsFunc.elapsedTime(startTime, 'Script run time')

countInitialedNamesByCollection.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import re
44
import time
55
import urllib3
6+
import dsFunc
67

78
secretsVersion = input('To edit production server, enter the name of the \
89
secrets file: ')
@@ -121,7 +122,5 @@
121122
logout = requests.post(baseURL + '/rest/logout', headers=header,
122123
cookies=cookies, verify=verify)
123124

124-
elapsedTime = time.time() - startTime
125-
m, s = divmod(elapsedTime, 60)
126-
h, m = divmod(m, 60)
127-
print('Total script run time: ', '%d:%02d:%02d' % (h, m, s))
125+
# print script run time
126+
dsFunc.elapsedTime(startTime, 'Script run time')

deleteBitstreamsFromItem.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import csv
44
from datetime import datetime
55
import urllib3
6+
import dsFunc
67

78
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
89

@@ -59,10 +60,8 @@
5960
for k in range(0, len(bitstreams)):
6061
bitstreamID = bitstreams[k]['uuid']
6162
bitstreamList.append(bitstreamID)
62-
elapsedTime = time.time() - startTime
63-
m, s = divmod(elapsedTime, 60)
64-
h, m = divmod(m, 60)
65-
print('Bitstreams list creation time: ', '%d:%02d:%02d' % (h, m, s))
63+
64+
dsFunc.elapsedTime(startTime, 'Bitstream list creation time')
6665
print(bitstreamList)
6766

6867
f = csv.writer(open(filePath + 'deletedBitstreams'
@@ -80,7 +79,5 @@
8079
logout = requests.post(baseURL + '/rest/logout', headers=header,
8180
cookies=cookies, verify=verify)
8281

83-
elapsedTime = time.time() - startTime
84-
m, s = divmod(elapsedTime, 60)
85-
h, m = divmod(m, 60)
86-
print('Total script run time: ', '%d:%02d:%02d' % (h, m, s))
82+
# print script run time
83+
dsFunc.elapsedTime(startTime, 'Script run time')

deleteKeyFromCollection.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from datetime import datetime
66
import urllib3
77
import argparse
8+
import dsFunc
89

910
secretsVersion = input('To edit production server, enter the name of the \
1011
secrets file: ')
@@ -123,7 +124,5 @@
123124
logout = requests.post(baseURL + '/rest/logout', headers=header,
124125
cookies=cookies, verify=verify)
125126

126-
elapsedTime = time.time() - startTime
127-
m, s = divmod(elapsedTime, 60)
128-
h, m = divmod(m, 60)
129-
print('Total script run time: ', '%d:%02d:%02d' % (h, m, s))
127+
# print script run time
128+
dsFunc.elapsedTime(startTime, 'Script run time')

deleteKeyFromCommunity.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from datetime import datetime
66
import urllib3
77
import argparse
8+
import dsFunc
89

910
secretsVersion = input('To edit production server, enter the name of the \
1011
secrets file: ')
@@ -129,7 +130,5 @@
129130
logout = requests.post(baseURL + '/rest/logout', headers=header,
130131
cookies=cookies, verify=verify)
131132

132-
elapsedTime = time.time() - startTime
133-
m, s = divmod(elapsedTime, 60)
134-
h, m = divmod(m, 60)
135-
print('Total script run time: ', '%d:%02d:%02d' % (h, m, s))
133+
# print script run time
134+
dsFunc.elapsedTime(startTime, 'Script run time')

deleteKeyValuePairFromCollection.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from datetime import datetime
66
import urllib3
77
import argparse
8+
import dsFunc
89

910
secretsVersion = input('To edit production server, enter the name of the \
1011
secrets file: ')
@@ -132,7 +133,5 @@
132133
logout = requests.post(baseURL + '/rest/logout', headers=header,
133134
cookies=cookies, verify=verify)
134135

135-
elapsedTime = time.time() - startTime
136-
m, s = divmod(elapsedTime, 60)
137-
h, m = divmod(m, 60)
138-
print('Total script run time: ', '%d:%02d:%02d' % (h, m, s))
136+
# print script run time
137+
dsFunc.elapsedTime(startTime, 'Script run time')

0 commit comments

Comments
 (0)