From d125887b58d5f8730480340873ef63cae5b9d2e8 Mon Sep 17 00:00:00 2001 From: tech234a <46801700+tech234a@users.noreply.github.com> Date: Tue, 22 Sep 2020 21:41:04 -0400 Subject: [PATCH] Allow specifying TRACKER_USERNAME in config.json --- config.json | 3 ++- tracker.py | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config.json b/config.json index 0e3741c..e010b85 100644 --- a/config.json +++ b/config.json @@ -1,5 +1,6 @@ { "HSID": "", "SSID": "", - "SID" : "" + "SID" : "", + "TRACKER_USERNAME": "" } \ No newline at end of file diff --git a/tracker.py b/tracker.py index 0523c3e..5441cb7 100644 --- a/tracker.py +++ b/tracker.py @@ -5,6 +5,9 @@ import requests from requests.adapters import HTTPAdapter from requests.packages.urllib3.util.retry import Retry +from os.path import isfile +from json import loads + # https://github.com/ArchiveTeam/tencent-weibo-grab/blob/9bae5f9747e014db9227821a9c11557267967023/pipeline.py VERSION = "20200921.01" @@ -19,6 +22,11 @@ TRACKER_ENDPOINT = f"http://{TRACKER_HOST}/{TRACKER_ID}" from os import environ if "TRACKER_USERNAME" in environ.keys(): TRACKER_USERNAME = environ["TRACKER_USERNAME"] +elif isfile("config.json"): + try: + TRACKER_USERNAME = loads(open("config.json").read())["TRACKER_USERNAME"] + except: + TRACKER_USERNAME = "Unnamed" else: TRACKER_USERNAME = "Unnamed"