Revision 0e1fce89 snf-pithos-backend/pithos/backends/lib/sqlalchemy/alembic/versions/165ba3fbfe53_update_path_account.py
b/snf-pithos-backend/pithos/backends/lib/sqlalchemy/alembic/versions/165ba3fbfe53_update_path_account.py | ||
---|---|---|
24 | 24 |
catalog = {} |
25 | 25 |
def get_uuid(account): |
26 | 26 |
global catalog |
27 |
uuid = catalog.get(account) |
|
28 |
if uuid: |
|
27 |
uuid = catalog.get(account, -1)
|
|
28 |
if uuid != -1:
|
|
29 | 29 |
return uuid |
30 | 30 |
try: |
31 |
uuid = get_user_uuid(
|
|
31 |
catalog[account] = get_user_uuid(
|
|
32 | 32 |
SERVICE_TOKEN, account, USER_CATALOG_URL, AUTHENTICATION_USERS) |
33 |
print account, catalog[account] |
|
33 | 34 |
except: |
34 | 35 |
raise |
35 | 36 |
else: |
36 |
if uuid: |
|
37 |
catalog[account] = uuid |
|
38 |
return uuid |
|
37 |
return catalog[account] |
|
39 | 38 |
|
40 | 39 |
inverse_catalog = {} |
41 | 40 |
def get_displayname(account): |
42 | 41 |
global inverse_catalog |
43 |
displayname = inverse_catalog.get(account) |
|
44 |
if displayname: |
|
42 |
displayname = inverse_catalog.get(account, -1)
|
|
43 |
if displayname != -1:
|
|
45 | 44 |
return displayname |
46 | 45 |
try: |
47 |
displayname = get_user_displayname(
|
|
46 |
inverse_catalog[account] = get_user_displayname(
|
|
48 | 47 |
SERVICE_TOKEN, account, USER_CATALOG_URL, AUTHENTICATION_USERS) |
48 |
print account, inverse_catalog[account] |
|
49 | 49 |
except: |
50 | 50 |
raise |
51 | 51 |
else: |
52 |
if displayname: |
|
53 |
catalog[account] = displayname |
|
54 |
return displayname |
|
52 |
return inverse_catalog[account] |
|
55 | 53 |
|
56 | 54 |
n = table( |
57 | 55 |
'nodes', |
Also available in: Unified diff