[scripts/copy-crosscode-emoji-url] add an option for reading the emote registry dump from a file, make the config file optional

This commit is contained in:
Dmytro Meleshko 2020-10-14 21:38:41 +03:00
parent 9f13090771
commit 07d4c018aa
2 changed files with 34 additions and 6 deletions

View file

@ -1,6 +1,12 @@
import sys import sys
import os import os
import subprocess import subprocess
from pathlib import Path
if os.name == "posix":
DOTFILES_CONFIG_DIR = Path.home() / ".config" / "dotfiles"
DOTFILES_CACHE_DIR = Path.home() / ".cache" / "dotfiles"
def platform_not_supported_error(): def platform_not_supported_error():

View file

@ -2,9 +2,9 @@
import sys import sys
import os import os
from pathlib import Path
from configparser import ConfigParser from configparser import ConfigParser
import requests import requests
import json
sys.path.insert( sys.path.insert(
1, os.path.join(os.path.dirname(os.path.dirname(__file__)), "script-resources") 1, os.path.join(os.path.dirname(os.path.dirname(__file__)), "script-resources")
@ -13,8 +13,16 @@ sys.path.insert(
import common_script_utils # noqa F401 import common_script_utils # noqa F401
DEFAULT_REGISTRY_DUMP_URL = (
"https://stronghold.crosscode.ru/~crosscodebot/emote-registry-tmp-export.json"
)
if os.name == "posix": if os.name == "posix":
config_path = Path.home() / ".config" / "dotfiles" / "copy-crosscode-emoji-url.ini" config_path = (
common_script_utils.DOTFILES_CONFIG_DIR / "copy-crosscode-emoji-url.ini"
)
default_registry_dump_file = common_script_utils.DOTFILES_CACHE_DIR / "dotfiles"
else: else:
common_script_utils.platform_not_supported_error() common_script_utils.platform_not_supported_error()
config = ConfigParser(interpolation=None) config = ConfigParser(interpolation=None)
@ -27,12 +35,26 @@ data = []
def emote_downloader_and_iterator(): def emote_downloader_and_iterator():
global data global data
response = requests.get( registry_dump_file = config.get(
config["default"]["ccbot_emote_registry_dump_url"], timeout=3 "default", "ccbot_emote_registry_dump_file", fallback=None
) )
response.raise_for_status() if registry_dump_file is not None:
registry_dump_file = os.path.expanduser(registry_dump_file)
else:
registry_dump_file = default_registry_dump_file
registry_dump_url = config.get(
"default", "ccbot_emote_registry_dump_url", fallback=DEFAULT_REGISTRY_DUMP_URL
)
try:
with open(registry_dump_file, "r") as f:
data = json.load(f)
except FileNotFoundError:
response = requests.get(registry_dump_url, timeout=10)
response.raise_for_status()
data = response.json() data = response.json()
assert data["version"] == 1 assert data["version"] == 1
for emote in data["list"]: for emote in data["list"]: