Skip to content

Commit 84330f1

Browse files
ehanson8ehanson8
committed
PEP8 formatting
1 parent 40d9b58 commit 84330f1

File tree

49 files changed

+2102
-1186
lines changed

Some content is hidden

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

49 files changed

+2102
-1186
lines changed

‎addKeyValuePairOnHandleCSV.py‎

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
import json
22
import requests
3-
import secrets
43
import time
54
import csv
65
from datetime import datetime
76
import urllib3
87

98
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
109

11-
secretsVersion = input('To edit production server, enter the name of the secrets file: ')
10+
secretsVersion = input('To edit production server, enter the name of the \
11+
secrets file: ')
1212
if secretsVersion != '':
1313
try:
1414
secrets = __import__(secretsVersion)
1515
print('Editing Production')
1616
except ImportError:
17+
secrets = __import__(secrets)
1718
print('Editing Stage')
1819
else:
1920
print('Editing Stage')
@@ -26,21 +27,24 @@
2627
skippedCollections = secrets.skippedCollections
2728

2829
startTime = time.time()
29-
data = {'email':email,'password':password}
30-
header = {'content-type':'application/json','accept':'application/json'}
31-
session = requests.post(baseURL+'/rest/login', headers=header, verify=verify, params=data).cookies['JSESSIONID']
30+
data = {'email': email, 'password': password}
31+
header = {'content-type': 'application/json', 'accept': 'application/json'}
32+
session = requests.post(baseURL + '/rest/login', headers=header,
33+
verify=verify, params=data).cookies['JSESSIONID']
3234
cookies = {'JSESSIONID': session}
33-
headerFileUpload = {'accept':'application/json'}
35+
headerFileUpload = {'accept': 'application/json'}
3436

35-
status = requests.get(baseURL+'/rest/status', headers=header, cookies=cookies, verify=verify).json()
37+
status = requests.get(baseURL + '/rest/status', headers=header,
38+
cookies=cookies, verify=verify).json()
3639
print('authenticated')
3740

38-
fileName = filePath+input('Enter fileName (including \'.csv\'): ')
41+
fileName = filePath + input('Enter fileName (including \'.csv\'): ')
3942
addedKey = input('Enter key: ')
4043
startTime = time.time()
4144

42-
f=csv.writer(open(filePath+'addKeyValuePair'+datetime.now().strftime('%Y-%m-%d %H.%M.%S')+'.csv', 'w'))
43-
f.writerow(['itemID']+['addedKey']+['addedValue']+['delete']+['post'])
45+
date = datetime.now().strftime('%Y-%m-%d %H.%M.%S')
46+
f = csv.writer(open(filePath + 'addKeyValuePair' + date + '.csv', 'w'))
47+
f.writerow(['itemID'] + ['addedKey'] + ['addedValue'] + ['delete'] + ['post'])
4448

4549
with open(fileName) as csvfile:
4650
reader = csv.DictReader(csvfile)
@@ -51,23 +55,34 @@
5155
addedMetadataElement['key'] = addedKey
5256
addedMetadataElement['value'] = addedValue
5357
addedMetadataElement['language'] = 'en_us'
54-
endpoint = baseURL+'/rest/handle/'+handle
55-
item = requests.get(endpoint, headers=header, cookies=cookies, verify=verify).json()
58+
endpoint = baseURL + '/rest/handle/' + handle
59+
item = requests.get(endpoint, headers=header, cookies=cookies,
60+
verify=verify).json()
5661
itemID = item['uuid']
57-
itemMetadata = requests.get(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify).json()
62+
itemMetadata = requests.get(baseURL + '/rest/items/' + str(itemID)
63+
+ '/metadata', headers=header,
64+
cookies=cookies, verify=verify).json()
5865
itemMetadata.append(addedMetadataElement)
5966
itemMetadataProcessed = itemMetadata
6067

61-
provNote = '\''+addedKey+': '+addedValue+'\' was added through a batch process on '+datetime.now().strftime('%Y-%m-%d %H:%M:%S')+'.'
68+
date = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
69+
provNote = '\'' + addedKey + ': ' + addedValue
70+
provNote += '\' was added through a batch process on '
71+
provNote += date + '.'
6272
provNoteElement = {}
6373
provNoteElement['key'] = 'dc.description.provenance'
6474
provNoteElement['value'] = provNote
6575
provNoteElement['language'] = 'en_US'
6676
itemMetadataProcessed.append(provNoteElement)
6777

6878
itemMetadataProcessed = json.dumps(itemMetadataProcessed)
69-
delete = requests.delete(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify)
79+
delete = requests.delete(baseURL + '/rest/items/' + str(itemID)
80+
+ '/metadata', headers=header,
81+
cookies=cookies, verify=verify)
7082
print(delete)
71-
post = requests.put(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify, data=itemMetadataProcessed)
83+
post = requests.put(baseURL + '/rest/items/' + str(itemID)
84+
+ '/metadata', headers=header, cookies=cookies,
85+
verify=verify, data=itemMetadataProcessed)
7286
print(post)
73-
f.writerow([itemID]+[addedMetadataElement['key']]+[addedMetadataElement['value']]+[delete]+[post])
87+
f.writerow([itemID] + [addedMetadataElement['key']]
88+
+ [addedMetadataElement['value']] + [delete] + [post])

‎addKeyValuePairToCollection.py‎

Lines changed: 47 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
11
import json
22
import requests
3-
import secrets
43
import time
54
import csv
65
from datetime import datetime
76
import urllib3
87
import argparse
98

10-
secretsVersion = input('To edit production server, enter the name of the secrets file: ')
9+
secretsVersion = input('To edit production server, enter the name of the \
10+
secrets file: ')
1111
if secretsVersion != '':
1212
try:
1313
secrets = __import__(secretsVersion)
1414
print('Editing Production')
1515
except ImportError:
16+
secrets = __import__(secrets)
1617
print('Editing Stage')
1718
else:
1819
print('Editing Stage')
1920

2021
parser = argparse.ArgumentParser()
21-
parser.add_argument('-k', '--key', help='the key to be added. optional - if not provided, the script will ask for input')
22-
parser.add_argument('-v', '--value', help='the value to be added. optional - if not provided, the script will ask for input')
23-
parser.add_argument('-l', '--language', help='the language tag to be added. optional - if not provided, the script will ask for input')
24-
parser.add_argument('-i', '--handle', help='handle of the collection. optional - if not provided, the script will ask for input')
22+
parser.add_argument('-k', '--key', help='the key to be added. optional - if \
23+
not provided, the script will ask for input')
24+
parser.add_argument('-v', '--value', help='the value to be added. optional - \
25+
if not provided, the script will ask for input')
26+
parser.add_argument('-l', '--language', help='the language tag to be added. \
27+
optional - if not provided, the script will ask for input')
28+
parser.add_argument('-i', '--handle', help='handle of the collection. optional \
29+
- if not provided, the script will ask for input')
2530
args = parser.parse_args()
2631

2732
if args.key:
@@ -51,45 +56,55 @@
5156
skippedCollections = secrets.skippedCollections
5257

5358
startTime = time.time()
54-
data = {'email':email,'password':password}
55-
header = {'content-type':'application/json','accept':'application/json'}
56-
session = requests.post(baseURL+'/rest/login', headers=header, verify=verify, params=data).cookies['JSESSIONID']
59+
data = {'email': email, 'password': password}
60+
header = {'content-type': 'application/json', 'accept': 'application/json'}
61+
session = requests.post(baseURL + '/rest/login', headers=header,
62+
verify=verify, params=data).cookies['JSESSIONID']
5763
cookies = {'JSESSIONID': session}
58-
headerFileUpload = {'accept':'application/json'}
64+
headerFileUpload = {'accept': 'application/json'}
5965

60-
status = requests.get(baseURL+'/rest/status', headers=header, cookies=cookies, verify=verify).json()
66+
status = requests.get(baseURL + '/rest/status', headers=header,
67+
cookies=cookies, verify=verify).json()
6168
print('authenticated')
6269

6370
itemList = []
64-
endpoint = baseURL+'/rest/handle/'+collectionHandle
65-
collection = requests.get(endpoint, headers=header, cookies=cookies, verify=verify).json()
71+
endpoint = baseURL + '/rest/handle/' + handle
72+
collection = requests.get(endpoint, headers=header, cookies=cookies,
73+
verify=verify).json()
6674
collectionID = collection['uuid']
6775
offset = 0
6876
items = ''
6977
while items != []:
70-
items = requests.get(baseURL+'/rest/collections/'+str(collectionID)+'/items?limit=200&offset='+str(offset), headers=header, cookies=cookies, verify=verify)
78+
items = requests.get(baseURL + '/rest/collections/' + str(collectionID)
79+
+ '/items?limit=200&offset=' + str(offset),
80+
headers=header, cookies=cookies, verify=verify)
7181
while items.status_code != 200:
7282
time.sleep(5)
73-
items = requests.get(baseURL+'/rest/collections/'+str(collectionID)+'/items?limit=200&offset='+str(offset), headers=header, cookies=cookies, verify=verify)
83+
items = requests.get(baseURL + '/rest/collections/' + str(collectionID)
84+
+ '/items?limit=200&offset=' + str(offset),
85+
headers=header, cookies=cookies, verify=verify)
7486
items = items.json()
75-
for k in range (0, len (items)):
87+
for k in range(0, len(items)):
7688
itemID = items[k]['uuid']
7789
itemList.append(itemID)
7890
offset = offset + 200
7991
elapsedTime = time.time() - startTime
8092
m, s = divmod(elapsedTime, 60)
8193
h, m = divmod(m, 60)
82-
print('Item list creation time: ','%d:%02d:%02d' % (h, m, s))
94+
print('Item list creation time: ', '%d:%02d:%02d' % (h, m, s))
8395

8496
recordsEdited = 0
85-
f=csv.writer(open(filePath+'addKeyValuePair'+datetime.now().strftime('%Y-%m-%d %H.%M.%S')+'.csv', 'w'))
86-
f.writerow(['itemID']+['addedKey']+['addedValue']+['delete']+['post'])
97+
f = csv.writer(open(filePath + 'addKeyValuePair'
98+
+ datetime.now().strftime('%Y-%m-%d %H.%M.%S') + '.csv', 'w'))
99+
f.writerow(['itemID'] + ['addedKey'] + ['addedValue'] + ['delete'] + ['post'])
87100
for number, itemID in enumerate(itemList):
88101
itemsRemaining = len(itemList) - number
89102
print('Items remaining: ', itemsRemaining, 'ItemID: ', itemID)
90-
metadata = requests.get(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify).json()
103+
metadata = requests.get(baseURL + '/rest/items/' + str(itemID)
104+
+ '/metadata', headers=header, cookies=cookies,
105+
verify=verify).json()
91106
itemMetadataProcessed = []
92-
for l in range (0, len (metadata)):
107+
for l in range(0, len(metadata)):
93108
metadata[l].pop('schema', None)
94109
metadata[l].pop('element', None)
95110
metadata[l].pop('qualifier', None)
@@ -99,7 +114,8 @@
99114
addedMetadataElement['value'] = addedValue
100115
addedMetadataElement['language'] = addedLanguage
101116
itemMetadataProcessed.append(addedMetadataElement)
102-
provNote = '\''+addedKey+': '+addedValue+'\' was added through a batch process on '+datetime.now().strftime('%Y-%m-%d %H:%M:%S')+'.'
117+
provNote = '\'' + addedKey + ': ' + addedValue + '\' was added through a \
118+
batch process on ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S') + '.'
103119
provNoteElement = {}
104120
provNoteElement['key'] = 'dc.description.provenance'
105121
provNoteElement['value'] = provNote
@@ -108,13 +124,18 @@
108124
recordsEdited = recordsEdited + 1
109125
itemMetadataProcessed = json.dumps(itemMetadataProcessed)
110126
print('updated', itemID, recordsEdited)
111-
delete = requests.delete(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify)
127+
delete = requests.delete(baseURL + '/rest/items/' + str(itemID)
128+
+ '/metadata', headers=header, cookies=cookies,
129+
verify=verify)
112130
print(delete)
113-
post = requests.put(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify, data=itemMetadataProcessed)
131+
post = requests.put(baseURL + '/rest/items/' + str(itemID) + '/metadata',
132+
headers=header, cookies=cookies, verify=verify,
133+
data=itemMetadataProcessed)
114134
print(post)
115-
f.writerow([itemID]+[addedKey]+[addedValue]+[delete]+[post])
135+
f.writerow([itemID] + [addedKey] + [addedValue] + [delete] + [post])
116136

117-
logout = requests.post(baseURL+'/rest/logout', headers=header, cookies=cookies, verify=verify)
137+
logout = requests.post(baseURL + '/rest/logout', headers=header,
138+
cookies=cookies, verify=verify)
118139

119140
elapsedTime = time.time() - startTime
120141
m, s = divmod(elapsedTime, 60)

0 commit comments

Comments
 (0)