mirror of
https://github.com/unmojang/meta.git
synced 2025-09-23 11:10:53 -04:00
feat: add User-Agent header
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
parent
c1e6b2cabd
commit
5e4c32a0b5
@ -2,6 +2,10 @@ import os
|
||||
import datetime
|
||||
from urllib.parse import urlparse
|
||||
|
||||
import requests
|
||||
from cachecontrol import CacheControl
|
||||
from cachecontrol.caches import FileCache
|
||||
|
||||
|
||||
def serialize_datetime(dt: datetime.datetime):
|
||||
if dt.tzinfo is None:
|
||||
@ -69,3 +73,13 @@ def merge_dict(base: dict, overlay: dict):
|
||||
overlay[k] = v
|
||||
|
||||
return overlay
|
||||
|
||||
|
||||
def default_session():
|
||||
forever_cache = FileCache('caches/http_cache', forever=True)
|
||||
sess = CacheControl(requests.Session(), forever_cache)
|
||||
|
||||
sess.headers.update({"User-Agent": "PrismLauncherMeta/1.0"})
|
||||
|
||||
return sess
|
||||
|
||||
|
@ -3,11 +3,7 @@ import os
|
||||
import zipfile
|
||||
from datetime import datetime
|
||||
|
||||
import requests
|
||||
from cachecontrol import CacheControl
|
||||
from cachecontrol.caches import FileCache
|
||||
|
||||
from meta.common import upstream_path, ensure_upstream_dir, transform_maven_key
|
||||
from meta.common import upstream_path, ensure_upstream_dir, transform_maven_key, default_session
|
||||
from meta.common.fabric import JARS_DIR, INSTALLER_INFO_DIR, META_DIR, DATETIME_FORMAT_HTTP
|
||||
from meta.model.fabric import FabricJarInfo
|
||||
|
||||
@ -17,8 +13,7 @@ ensure_upstream_dir(JARS_DIR)
|
||||
ensure_upstream_dir(INSTALLER_INFO_DIR)
|
||||
ensure_upstream_dir(META_DIR)
|
||||
|
||||
forever_cache = FileCache('caches/http_cache', forever=True)
|
||||
sess = CacheControl(requests.Session(), forever_cache)
|
||||
sess = default_session()
|
||||
|
||||
|
||||
def filehash(filename, hashtype, blocksize=65536):
|
||||
|
@ -13,12 +13,9 @@ from datetime import datetime
|
||||
from pathlib import Path
|
||||
from pprint import pprint
|
||||
|
||||
import requests
|
||||
from cachecontrol import CacheControl
|
||||
from cachecontrol.caches import FileCache
|
||||
from pydantic import ValidationError
|
||||
|
||||
from meta.common import upstream_path, ensure_upstream_dir, static_path
|
||||
from meta.common import upstream_path, ensure_upstream_dir, static_path, default_session
|
||||
from meta.common.forge import JARS_DIR, INSTALLER_INFO_DIR, INSTALLER_MANIFEST_DIR, VERSION_MANIFEST_DIR, \
|
||||
FILE_MANIFEST_DIR, BAD_VERSIONS, STATIC_LEGACYINFO_FILE
|
||||
from meta.model.forge import ForgeFile, ForgeEntry, ForgeMCVersionInfo, ForgeLegacyInfoList, DerivedForgeIndex, \
|
||||
@ -37,8 +34,7 @@ ensure_upstream_dir(FILE_MANIFEST_DIR)
|
||||
|
||||
LEGACYINFO_PATH = os.path.join(STATIC_DIR, STATIC_LEGACYINFO_FILE)
|
||||
|
||||
forever_cache = FileCache('caches/http_cache', forever=True)
|
||||
sess = CacheControl(requests.Session(), forever_cache)
|
||||
sess = default_session()
|
||||
|
||||
|
||||
def eprint(*args, **kwargs):
|
||||
|
@ -1,11 +1,7 @@
|
||||
import json
|
||||
import os
|
||||
|
||||
import requests
|
||||
from cachecontrol import CacheControl
|
||||
from cachecontrol.caches import FileCache
|
||||
|
||||
from meta.common import upstream_path, ensure_upstream_dir
|
||||
from meta.common import upstream_path, ensure_upstream_dir, default_session
|
||||
from meta.common.liteloader import VERSIONS_FILE, BASE_DIR
|
||||
from meta.model.liteloader import LiteloaderIndex
|
||||
|
||||
@ -13,8 +9,7 @@ UPSTREAM_DIR = upstream_path()
|
||||
|
||||
ensure_upstream_dir(BASE_DIR)
|
||||
|
||||
forever_cache = FileCache('caches/http_cache', forever=True)
|
||||
sess = CacheControl(requests.Session(), forever_cache)
|
||||
sess = default_session()
|
||||
|
||||
|
||||
def main():
|
||||
|
@ -2,11 +2,7 @@ import json
|
||||
import os
|
||||
import zipfile
|
||||
|
||||
import requests
|
||||
from cachecontrol import CacheControl
|
||||
from cachecontrol.caches import FileCache
|
||||
|
||||
from meta.common import upstream_path, ensure_upstream_dir, static_path
|
||||
from meta.common import upstream_path, ensure_upstream_dir, static_path, default_session
|
||||
from meta.common.http import download_binary_file
|
||||
from meta.common.mojang import BASE_DIR, VERSION_MANIFEST_FILE, VERSIONS_DIR, ASSETS_DIR, STATIC_EXPERIMENTS_FILE, \
|
||||
STATIC_OLD_SNAPSHOTS_FILE
|
||||
@ -20,8 +16,7 @@ ensure_upstream_dir(BASE_DIR)
|
||||
ensure_upstream_dir(VERSIONS_DIR)
|
||||
ensure_upstream_dir(ASSETS_DIR)
|
||||
|
||||
forever_cache = FileCache('caches/http_cache', forever=True)
|
||||
sess = CacheControl(requests.Session(), forever_cache)
|
||||
sess = default_session()
|
||||
|
||||
|
||||
def fetch_zipped_version(path, url):
|
||||
|
@ -4,10 +4,8 @@ import zipfile
|
||||
from datetime import datetime
|
||||
|
||||
import requests
|
||||
from cachecontrol import CacheControl
|
||||
from cachecontrol.caches import FileCache
|
||||
|
||||
from meta.common import upstream_path, ensure_upstream_dir, transform_maven_key
|
||||
from meta.common import upstream_path, ensure_upstream_dir, transform_maven_key, default_session
|
||||
from meta.common.quilt import JARS_DIR, INSTALLER_INFO_DIR, META_DIR, USE_QUILT_MAPPINGS
|
||||
from meta.common.fabric import DATETIME_FORMAT_HTTP
|
||||
from meta.model.fabric import FabricJarInfo
|
||||
@ -18,8 +16,7 @@ ensure_upstream_dir(JARS_DIR)
|
||||
ensure_upstream_dir(INSTALLER_INFO_DIR)
|
||||
ensure_upstream_dir(META_DIR)
|
||||
|
||||
forever_cache = FileCache('caches/http_cache', forever=True)
|
||||
sess = CacheControl(requests.Session(), forever_cache)
|
||||
sess = default_session()
|
||||
|
||||
|
||||
def filehash(filename, hashtype, blocksize=65536):
|
||||
|
Loading…
x
Reference in New Issue
Block a user