Close session after use

merge-requests/30/head
Bob Mottram 2024-10-16 11:16:52 +01:00
parent b90f0ae3ea
commit 3d17826a0f
1 changed files with 43 additions and 0 deletions

View File

@ -940,6 +940,7 @@ def _command_options() -> None:
print('Importing custom emoji from ' + import_filename) print('Importing custom emoji from ' + import_filename)
session = create_session(None) session = create_session(None)
import_emoji(base_dir, import_filename, session) import_emoji(base_dir, import_filename, session)
session.close()
sys.exit() sys.exit()
# automatic translations # automatic translations
@ -1305,6 +1306,7 @@ def _command_options() -> None:
http_prefix, domain) http_prefix, domain)
if get_json_valid(test_json): if get_json_valid(test_json):
pprint(test_json) pprint(test_json)
session.close()
sys.exit() sys.exit()
if argb.conversation: if argb.conversation:
@ -1337,6 +1339,7 @@ def _command_options() -> None:
post_id, argb.debug) post_id, argb.debug)
if conv_json: if conv_json:
pprint(conv_json) pprint(conv_json)
session.close()
sys.exit() sys.exit()
if argb.ssml: if argb.ssml:
@ -1362,6 +1365,7 @@ def _command_options() -> None:
http_prefix, domain) http_prefix, domain)
if test_ssml: if test_ssml:
print(str(test_ssml)) print(str(test_ssml))
session.close()
sys.exit() sys.exit()
if argb.vcard: if argb.vcard:
@ -1375,6 +1379,7 @@ def _command_options() -> None:
None, debug, __version__, http_prefix, domain) None, debug, __version__, http_prefix, domain)
if test_vcard: if test_vcard:
print(test_vcard) print(test_vcard)
session.close()
sys.exit() sys.exit()
if argb.xmlvcard: if argb.xmlvcard:
@ -1388,6 +1393,7 @@ def _command_options() -> None:
None, debug, __version__, http_prefix, domain) None, debug, __version__, http_prefix, domain)
if test_vcard: if test_vcard:
print(test_vcard) print(test_vcard)
session.close()
sys.exit() sys.exit()
if argb.htmlpost: if argb.htmlpost:
@ -1413,6 +1419,7 @@ def _command_options() -> None:
http_prefix, domain) http_prefix, domain)
if test_html: if test_html:
print(test_html) print(test_html)
session.close()
sys.exit() sys.exit()
if argb.verifyurl: if argb.verifyurl:
@ -1439,6 +1446,7 @@ def _command_options() -> None:
verified = \ verified = \
verify_html(session, argb.verifyurl, debug, __version__, verify_html(session, argb.verifyurl, debug, __version__,
http_prefix, argb.nickname, domain) http_prefix, argb.nickname, domain)
session.close()
if verified: if verified:
print('Verified') print('Verified')
sys.exit() sys.exit()
@ -1539,6 +1547,7 @@ def _command_options() -> None:
preferred_podcast_formats, timeout_sec, preferred_podcast_formats, timeout_sec,
argb.language) argb.language)
pprint(test_rss) pprint(test_rss)
session.close()
sys.exit() sys.exit()
if argb.onion: if argb.onion:
@ -1714,6 +1723,7 @@ def _command_options() -> None:
signing_priv_key_pem, proxy_type, signing_priv_key_pem, proxy_type,
followers_sync_cache, followers_sync_cache,
sites_unavailable, system_language) sites_unavailable, system_language)
session.close()
sys.exit() sys.exit()
if argb.deny: if argb.deny:
@ -1761,6 +1771,7 @@ def _command_options() -> None:
followers_sync_cache, followers_sync_cache,
sites_unavailable, sites_unavailable,
system_language) system_language)
session.close()
sys.exit() sys.exit()
if argb.followerspending: if argb.followerspending:
@ -1894,6 +1905,7 @@ def _command_options() -> None:
for _ in range(10): for _ in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.expiryDays is not None and argb.nickname and argb.domain: if argb.expiryDays is not None and argb.nickname and argb.domain:
@ -1950,6 +1962,7 @@ def _command_options() -> None:
argb.password) argb.password)
if result: if result:
print(str(result)) print(str(result))
session.close()
sys.exit() sys.exit()
if argb.announce: if argb.announce:
@ -1985,6 +1998,7 @@ def _command_options() -> None:
for _ in range(10): for _ in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.box: if argb.box:
@ -2029,6 +2043,7 @@ def _command_options() -> None:
pprint(box_json) pprint(box_json)
else: else:
print('Box not found: ' + argb.box) print('Box not found: ' + argb.box)
session.close()
sys.exit() sys.exit()
if argb.itemName: if argb.itemName:
@ -2103,6 +2118,7 @@ def _command_options() -> None:
for _ in range(10): for _ in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.undoItemName: if argb.undoItemName:
@ -2139,6 +2155,7 @@ def _command_options() -> None:
for _ in range(10): for _ in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.wantedItemName: if argb.wantedItemName:
@ -2213,6 +2230,7 @@ def _command_options() -> None:
for _ in range(10): for _ in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.undoWantedItemName: if argb.undoWantedItemName:
@ -2249,6 +2267,7 @@ def _command_options() -> None:
for _ in range(10): for _ in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.like: if argb.like:
@ -2284,6 +2303,7 @@ def _command_options() -> None:
for _ in range(10): for _ in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.react: if argb.react:
@ -2325,6 +2345,7 @@ def _command_options() -> None:
for _ in range(10): for _ in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.undolike: if argb.undolike:
@ -2361,6 +2382,7 @@ def _command_options() -> None:
for _ in range(10): for _ in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.undoreact: if argb.undoreact:
@ -2404,6 +2426,7 @@ def _command_options() -> None:
for _ in range(10): for _ in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.bookmark: if argb.bookmark:
@ -2440,6 +2463,7 @@ def _command_options() -> None:
for _ in range(10): for _ in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.unbookmark: if argb.unbookmark:
@ -2475,6 +2499,7 @@ def _command_options() -> None:
for _ in range(10): for _ in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.delete: if argb.delete:
@ -2510,6 +2535,7 @@ def _command_options() -> None:
for _ in range(10): for _ in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.follow: if argb.follow:
@ -2562,6 +2588,7 @@ def _command_options() -> None:
time.sleep(1) time.sleep(1)
# TODO some method to know if it worked # TODO some method to know if it worked
print('Ok') print('Ok')
session.close()
sys.exit() sys.exit()
if argb.unfollow: if argb.unfollow:
@ -2614,6 +2641,7 @@ def _command_options() -> None:
time.sleep(1) time.sleep(1)
# TODO some method to know if it worked # TODO some method to know if it worked
print('Ok') print('Ok')
session.close()
sys.exit() sys.exit()
if argb.followingList: if argb.followingList:
@ -2647,6 +2675,7 @@ def _command_options() -> None:
debug, __version__, signing_priv_key_pem) debug, __version__, signing_priv_key_pem)
if following_json: if following_json:
pprint(following_json) pprint(following_json)
session.close()
sys.exit() sys.exit()
if argb.blocked: if argb.blocked:
@ -2681,6 +2710,7 @@ def _command_options() -> None:
signing_priv_key_pem) signing_priv_key_pem)
if blocked_json: if blocked_json:
pprint(blocked_json) pprint(blocked_json)
session.close()
sys.exit() sys.exit()
if argb.followersList: if argb.followersList:
@ -2715,6 +2745,7 @@ def _command_options() -> None:
signing_priv_key_pem) signing_priv_key_pem)
if followers_json: if followers_json:
pprint(followers_json) pprint(followers_json)
session.close()
sys.exit() sys.exit()
if argb.followRequestsList: if argb.followRequestsList:
@ -2749,6 +2780,7 @@ def _command_options() -> None:
signing_priv_key_pem) signing_priv_key_pem)
if follow_requests_json: if follow_requests_json:
pprint(follow_requests_json) pprint(follow_requests_json)
session.close()
sys.exit() sys.exit()
nickname = 'admin' nickname = 'admin'
@ -2812,6 +2844,7 @@ def _command_options() -> None:
print('No followed accounts have moved') print('No followed accounts have moved')
else: else:
print(str(ctr) + ' followed accounts were migrated') print(str(ctr) + ' followed accounts were migrated')
session.close()
sys.exit() sys.exit()
if argb.actor: if argb.actor:
@ -2937,10 +2970,12 @@ def _command_options() -> None:
signing_priv_key_pem) signing_priv_key_pem)
if not wf_request: if not wf_request:
print('Unable to webfinger ' + handle) print('Unable to webfinger ' + handle)
session.close()
sys.exit() sys.exit()
if not isinstance(wf_request, dict): if not isinstance(wf_request, dict):
print('Webfinger for ' + handle + ' did not return a dict. ' + print('Webfinger for ' + handle + ' did not return a dict. ' +
str(wf_request)) str(wf_request))
session.close()
sys.exit() sys.exit()
person_url = None person_url = None
@ -2949,6 +2984,7 @@ def _command_options() -> None:
if has_users_path(argb.followers): if has_users_path(argb.followers):
person_url = original_actor person_url = original_actor
else: else:
session.close()
sys.exit() sys.exit()
profile_str = 'https://www.w3.org/ns/activitystreams' profile_str = 'https://www.w3.org/ns/activitystreams'
@ -2995,6 +3031,7 @@ def _command_options() -> None:
if followers_list: if followers_list:
for actor in followers_list: for actor in followers_list:
print(actor) print(actor)
session.close()
sys.exit() sys.exit()
if argb.addaccount: if argb.addaccount:
@ -3291,6 +3328,7 @@ def _command_options() -> None:
for i in range(10): for i in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.availability: if argb.availability:
@ -3327,6 +3365,7 @@ def _command_options() -> None:
for i in range(10): for i in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.desktop: if argb.desktop:
@ -3442,6 +3481,7 @@ def _command_options() -> None:
for i in range(10): for i in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.mute: if argb.mute:
@ -3476,6 +3516,7 @@ def _command_options() -> None:
for i in range(10): for i in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.unmute: if argb.unmute:
@ -3510,6 +3551,7 @@ def _command_options() -> None:
for i in range(10): for i in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.unblock: if argb.unblock:
@ -3556,6 +3598,7 @@ def _command_options() -> None:
for i in range(10): for i in range(10):
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
session.close()
sys.exit() sys.exit()
if argb.filterStr: if argb.filterStr: