amber
/
amber-ebooks-archived
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

easier to understand logging

This commit is contained in:
Lynne 2019-01-11 22:08:10 +10:00
parent 4004104766
commit 480c425b82
No known key found for this signature in database
GPG Key ID: FB7B970303ACE499
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.py
View File

@ -33,7 +33,7 @@ if os.path.exists("clientcred.secret"):
if "client" not in cfg: if "client" not in cfg:
print("No client credentials, registering application") print("No application info -- registering application with {}".format(cfg['site']))
client_id, client_secret = Mastodon.create_app("mstdn-ebooks", client_id, client_secret = Mastodon.create_app("mstdn-ebooks",
api_base_url=cfg['site'], api_base_url=cfg['site'],
scopes=scopes, scopes=scopes,
@ -45,12 +45,12 @@ if "client" not in cfg:
} }
if "secret" not in cfg: if "secret" not in cfg:
print("No user credentials, logging in") print("No user credentials -- logging in to {}".format(cfg['site']))
client = Mastodon(client_id = cfg['client']['id'], client = Mastodon(client_id = cfg['client']['id'],
client_secret = cfg['client']['secret'], client_secret = cfg['client']['secret'],
api_base_url=cfg['site']) api_base_url=cfg['site'])
print("Open this URL: {}".format(client.auth_request_url(scopes=scopes))) print("Open this URL and authenticate to give mstdn-ebooks access to your bot's account: {}".format(client.auth_request_url(scopes=scopes)))
cfg['secret'] = client.log_in(code=input("Secret: "), scopes=scopes) cfg['secret'] = client.log_in(code=input("Secret: "), scopes=scopes)
json.dump(cfg, open("config.json", "w+")) json.dump(cfg, open("config.json", "w+"))
@ -180,7 +180,7 @@ for f in following:
r = requests.get(uri) r = requests.get(uri)
j = r.json() j = r.json()
print("Downloading and parsing toots", end='', flush=True) print("Downloading and saving toots", end='', flush=True)
done = False done = False
try: try:
while not done and len(j['orderedItems']) > 0: while not done and len(j['orderedItems']) > 0:
@ -222,7 +222,7 @@ for f in following:
print(" Done!") print(" Done!")
db.commit() db.commit()
except: except:
print("Encountered an error! Saving toots to database and continuing.") print("Encountered an error! Saving toots to database and moving to next followed account.")
db.commit() db.commit()
# db.close() # db.close()