- with open(
- conf.get("opencellid", "downloadtoken"), encoding="ascii"
- ) as fl:
- token = fl.read().strip()
- except FileNotFoundError:
- log.warning("Opencellid access token not configured, cannot download")
- return
-
- mcc = conf.get("opencellid", "downloadmcc")
- url = RURL.format(token=token, type="mcc", mcc=mcc)
- # url = "http://localhost:8000/262.csv.gz" # TESTING
+ url = conf.get("opencellid", "downloadurl")
+ mcc = "<unspecified>"
+ except NoOptionError:
+ try:
+ with open(
+ conf.get("opencellid", "downloadtoken"), encoding="ascii"
+ ) as fl:
+ token = fl.read().strip()
+ except FileNotFoundError:
+ log.warning(
+ "Opencellid access token not configured, cannot download"
+ )
+ return
+ mcc = conf.get("opencellid", "downloadmcc")
+ if mcc == "full":
+ dltype = "full"
+ fname = "cell_towers"
+ else:
+ dltype = "mcc"
+ fname = mcc
+ url = RURL.format(token=token, dltype="mcc", fname=mcc)