feat: add User-Agent header

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

6 files changed, 24 insertions, 32 deletions

diff --git a/meta/common/__init__.py b/meta/common/__init__.py
index e3080ea819..10b35da50d 100644
--- a/meta/common/__init__.py
+++ b/meta/common/__init__.py
@@ -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
+
diff --git a/updateFabric.py b/updateFabric.py
index d61c1730aa..1656e16057 100755
--- a/updateFabric.py
+++ b/updateFabric.py
@@ -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):
diff --git a/updateForge.py b/updateForge.py
index 736e3dd9ea..64ccb6a0c6 100755
--- a/updateForge.py
+++ b/updateForge.py
@@ -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):
diff --git a/updateLiteloader.py b/updateLiteloader.py
index 39e7c65861..ebdfaefa24 100755
--- a/updateLiteloader.py
+++ b/updateLiteloader.py
@@ -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():
diff --git a/updateMojang.py b/updateMojang.py
index c2a5aa4b1b..315cac395d 100755
--- a/updateMojang.py
+++ b/updateMojang.py
@@ -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):
diff --git a/updateQuilt.py b/updateQuilt.py
index 4ffc8e510f..244d0b0d78 100755
--- a/updateQuilt.py
+++ b/updateQuilt.py
@@ -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):