diff --git a/scripts/update-file-progress.py b/.github/scripts/update-file-progress.py similarity index 70% rename from scripts/update-file-progress.py rename to .github/scripts/update-file-progress.py index b4492c773f..cbdb3b15f7 100644 --- a/scripts/update-file-progress.py +++ b/.github/scripts/update-file-progress.py @@ -1,7 +1,6 @@ import glob src_files = glob.glob("./goal_src/**/*.g[cs]", recursive=True) -data_files = glob.glob("./goal_src/**/*.gd", recursive=True) # Find how many of each have been started @@ -20,12 +19,6 @@ for f in src_files: else: src_files_started = src_files_started + 1 -for f in data_files: - with open(f, "r") as temp_file: - line_count = len(temp_file.readlines()) - if line_count > 7: - data_files_started = data_files_started + 1 - import json with open('./docs/gh-pages-proj/src/config/progress.json', 'r+', encoding='utf-8') as f: data = { @@ -33,9 +26,7 @@ with open('./docs/gh-pages-proj/src/config/progress.json', 'r+', encoding='utf-8 'fileProgress': { 'src_files_total': len(src_files), 'src_files_finished': src_files_finished, - 'src_files_started': src_files_started, - 'data_files_total': len(data_files), - 'data_files_started': data_files_started + 'src_files_started': src_files_started } } } diff --git a/.github/scripts/update-gallery.py b/.github/scripts/update-gallery.py new file mode 100644 index 0000000000..a74f2bc546 --- /dev/null +++ b/.github/scripts/update-gallery.py @@ -0,0 +1,34 @@ +import glob +import os +from pathlib import Path +import datetime + +galleryLinks = { + 'jak1': [], + 'jak2': [], + 'jak3': [], + 'jakx': [], + 'misc': [] +} + +def get_links(key, folder_to_search): + if os.path.isdir(folder_to_search): + files = [f for f in glob.glob(folder_to_search + "/*.*", recursive=True)] + for f in files: + galleryLinks[key].append({ + 'fileName': os.path.basename(f), + 'lastModified': datetime.datetime.fromtimestamp(os.path.getmtime(f)).isoformat(), + 'caption': Path(f).stem.replace("-", " ").title() + }) + +get_links('jak1', './docs/gh-pages-proj/src/assets/gallery/jak1') +get_links('jak2', './docs/gh-pages-proj/src/assets/gallery/jak2') +get_links('jak3', './docs/gh-pages-proj/src/assets/gallery/jak3') +get_links('jakx', './docs/gh-pages-proj/src/assets/gallery/jakx') +get_links('misc', './docs/gh-pages-proj/src/assets/gallery/misc') + +import json +with open('./docs/gh-pages-proj/src/config/gallery.json', 'r+', encoding='utf-8') as f: + f.seek(0) + json.dump(galleryLinks, f, ensure_ascii=False, indent=2) + f.truncate() diff --git a/.github/workflows/build-doc-app.yaml b/.github/workflows/build-doc-app.yaml index 5e33b79828..f361a44259 100644 --- a/.github/workflows/build-doc-app.yaml +++ b/.github/workflows/build-doc-app.yaml @@ -21,7 +21,10 @@ jobs: uses: actions/checkout@v2 - name: Update Line Count - run: python ./scripts/update-file-progress.py + run: python ./.github/scripts/update-file-progress.py + + - name: Update Gallery Links + run: python ./.github/scripts/update-gallery.py - name: Update Site run: | diff --git a/.gitignore b/.gitignore index c5ce8c560b..76c0d4785f 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ gfx_dumps/* # game stuff game_config/* imgui.ini + +# website stuff +node_modules/ diff --git a/docs/gh-pages-proj/public/favicon.png b/docs/gh-pages-proj/public/favicon.png index d6d299d9db..95ced95f5d 100644 Binary files a/docs/gh-pages-proj/public/favicon.png and b/docs/gh-pages-proj/public/favicon.png differ diff --git a/docs/gh-pages-proj/public/index.html b/docs/gh-pages-proj/public/index.html index 822fae1a52..a52f86ff68 100644 --- a/docs/gh-pages-proj/public/index.html +++ b/docs/gh-pages-proj/public/index.html @@ -5,10 +5,23 @@ - OpenGOAL Tooling - + OpenGOAL - The Jak and Daxter Project + + + +