From 0e7db8fc1af3ba53526be551a54e3815fe7a9160 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Mon, 9 Sep 2024 01:26:40 +0200 Subject: [PATCH] Autofetch asset-packs submoduke on reindex --- .gitmodules | 1 + indexer/src/parsers.py | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/.gitmodules b/.gitmodules index ebdd3ea..f2ce3bc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "files/asset-packs"] path = files/asset-packs url = https://github.com/Next-Flip/Asset-Packs.git + ignore = all diff --git a/indexer/src/parsers.py b/indexer/src/parsers.py index c36a7d2..071f691 100644 --- a/indexer/src/parsers.py +++ b/indexer/src/parsers.py @@ -1,6 +1,7 @@ import os import logging import copy +import subprocess from .models import * from .channels import * @@ -174,6 +175,10 @@ def parse_asset_packs(directory: str, pack_parser: PackParser) -> dict: logging.exception(exception_msg) raise Exception(exception_msg) + # Update git submodule + subprocess.check_call(["git", "fetch"], cwd=directory_path) + subprocess.check_call(["git", "checkout", "origin/dev"], cwd=directory_path) + for cur in sorted(os.listdir(directory_path)): pack_path = os.path.join(directory_path, cur) # skip .DS_store files