8 Commits

Author SHA1 Message Date
aronwk-aaron
f403d7dcb0 cleanup 2022-12-31 19:28:04 -06:00
aronwk-aaron
ceed592342 no 2022-12-31 19:24:47 -06:00
aronwk-aaron
bf7fb3d159 dolla bills? 2022-12-31 19:24:02 -06:00
aronwk-aaron
ef55b8f9f2 update to ci 2022-12-31 19:20:16 -06:00
aronwk-aaron
3d47b265c9 add workflow 2022-12-31 18:24:19 -06:00
Aaron Kimbrell
3f7a382dbc Merge pull request #58 from DarkflameUniverse/configuration-cleanup
Configuration Cleanup and Additions
2022-12-31 00:16:48 -06:00
aronwk-aaron
760936a01f f 2022-12-30 22:26:06 -06:00
aronwk-aaron
c96174fcbe fix ldddb location 2022-12-30 22:24:04 -06:00
3 changed files with 61 additions and 7 deletions

54
.github/workflows/ci.yml vendored Normal file
View File

@@ -0,0 +1,54 @@
name: ci
on:
push:
branches:
- "**"
tags:
- "v*.*.*"
pull_request:
branches:
- "main"
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
jobs:
build-and-push-image:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
# generate Docker tags based on the following events/attributes
tags: |
type=ref,event=pr
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

View File

@@ -85,7 +85,7 @@ docker run -d \
# you can include other optional Environment Variables from below like this
-e REQUIRE_PLAY_KEY=True
-p 8000:8000/tcp
-v /path/to/unpacked/client:/app/luclient:rw \
-v /path/to/unpacked/client:/app/luclient:r \
-v /path/to/cachedir:/app/cache:rw \
aronwk/nexus-dashboard:latest
```
@@ -248,12 +248,12 @@ Run the following command to clone the repository `git clone https://github.com/
You should now have a directory called `NexusDashboard` present on your desktop.
### Setting up
### Setting up
Now that we have the repository cloned you need to rename the example settings file, you can perform this manually in the GUI or you can use the command line, to do the latter run the following commands
* `cd NexusDashboard\app`
* `copy settings_example.py settings.py`
Now let's open the settings file we just created and configure some of the settings with the Windows default notepad.
Now let's open the settings file we just created and configure some of the settings with the Windows default notepad.
* `notepad settings.py`
Inside this file is where you can change certain settings like user registration, email support and other things. In this tutorial we will only be focusing on the bare minimum to get up and running, but feel free to adjust what you would like to fit your needs.

View File

@@ -138,14 +138,14 @@ def brick_list():
brick_list = []
if len(brick_list) == 0:
suffixes = [".g", ".g1", ".g2", ".g3", ".xml"]
res = pathlib.Path(f"{current_app.config['CLIENT_LOCATION']}res/")
cache = pathlib.Path(f"{current_app.config['CACHE_LOCATION']}")
# Load g files
for path in res.rglob("*.*"):
for path in cache.rglob("*.*"):
if str(path.suffix) in suffixes:
brick_list.append(
{
"type": "file",
"name": str(path.as_posix()).replace("{current_app.config['CLIENT_LOCATION']}res/", "")
"name": str(path.as_posix()).replace(f"{current_app.config['CACHE_LOCATION']}", "")
}
)
response = make_response(json.dumps(brick_list))
@@ -157,7 +157,7 @@ def brick_list():
@luclient_blueprint.route('/ldddb/<path:req_path>')
def dir_listing(req_path):
# Joining the base and the requested path
rel_path = pathlib.Path(str(pathlib.Path(f"{current_app.config['CLIENT_LOCATION']}res/{req_path}").resolve()))
rel_path = pathlib.Path(str(pathlib.Path(f"{current_app.config['CACHE_LOCATION']}/{req_path}").resolve()))
# Return 404 if path doesn't exist
if not rel_path.exists():
return abort(404)