From baacec8418bd2c4be50a9276ca0cc9393880d197 Mon Sep 17 00:00:00 2001 From: StiefelJackal Date: Fri, 28 Jul 2023 13:33:14 -0400 Subject: [PATCH] chore: update solution to further separate from GuVA's --- .github/workflows/build.yml | 44 ---------- .github/workflows/prepare.yml | 48 ----------- .github/workflows/release.yml | 86 ------------------- .../packages.lock.json | 11 --- AccountDownloader.sln | 12 ++- README.md | 24 +++--- 6 files changed, 24 insertions(+), 201 deletions(-) delete mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/prepare.yml delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index d5b242a..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Build App - -on: - push: - branches: - - "**" - tags-ignore: - - '**' - pull_request: - tags-ignore: - - '**' - branches: - - "**" - -jobs: - prepare: - uses: ./.github/workflows/prepare.yml - build: - needs: [prepare] - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [windows-latest] - steps: - - uses: actions/checkout@v3 - - name: Setup .NET 7 - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 7.0.x - - name: Restore Neos DLL Cache - id: cache-neos-dlls - uses: actions/cache/restore@v3 - with: - path: | - ExternalLibraries/BaseX.dll - ExternalLibraries/CloudX.Shared.dll - ExternalLibraries/CodeX.dll - key: neos-dlls - fail-on-cache-miss: true - enableCrossOsArchive: true - - name: Install dependencies - run: dotnet restore - - name: Build - run: dotnet build --configuration Release --no-restore diff --git a/.github/workflows/prepare.yml b/.github/workflows/prepare.yml deleted file mode 100644 index f6146c7..0000000 --- a/.github/workflows/prepare.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Prepare Build - -on: - workflow_call - -jobs: - cache-dlls: - runs-on: windows-latest - steps: - - name: Restore Neos DLL Cache - id: cache-neos-dlls - uses: actions/cache/restore@v3 - with: - path: | - ExternalLibraries/BaseX.dll - ExternalLibraries/CloudX.Shared.dll - ExternalLibraries/CodeX.dll - key: neos-dlls - enableCrossOsArchive: true - - name: Download Neos - if: steps.cache-neos-dlls.outputs.cache-hit != 'true' - shell: pwsh - run: Invoke-WebRequest -Uri "https://assets.neos.com/install/Pro/Data/2022.1.28.1310_YTDLP.7z" -OutFile Neos.7z - - name: Extract Neos - if: steps.cache-neos-dlls.outputs.cache-hit != 'true' - shell: cmd - run: | - 7z x -y Neos.7z -oNeos - del Neos.7z - - name: Relocate DLLS - if: steps.cache-neos-dlls.outputs.cache-hit != 'true' - shell: cmd - run: | - mkdir ExternalLibraries - mv Neos/Neos_Data/Managed/BaseX.dll ExternalLibraries/ - mv Neos/Neos_Data/Managed/CloudX.Shared.dll ExternalLibraries/ - mv Neos/Neos_Data/Managed/CodeX.dll ExternalLibraries/ - - name: Save Needed DLLs to Cache - if: steps.cache-neos-dlls.outputs.cache-hit != 'true' - id: save-cache - uses: actions/cache/save@v3 - with: - path: | - ExternalLibraries/BaseX.dll - ExternalLibraries/CloudX.Shared.dll - ExternalLibraries/CodeX.dll - key: neos-dlls - enableCrossOsArchive: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 1f82c5b..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,86 +0,0 @@ -name: Release App - -on: - push: - tags: - - 'v*' - -jobs: - prepare: - uses: ./.github/workflows/prepare.yml - release-windows: - needs: [prepare] - runs-on: windows-latest - steps: - - uses: actions/checkout@v3 - - name: Setup .NET 7 - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 7.0.x - - name: Restore Neos DLL Cache - id: cache-neos-dlls - uses: actions/cache/restore@v3 - with: - path: | - ExternalLibraries/BaseX.dll - ExternalLibraries/CloudX.Shared.dll - ExternalLibraries/CodeX.dll - key: neos-dlls - fail-on-cache-miss: true - enableCrossOsArchive: true - - name: Build Windows App - run: | - cd AccountDownloader - dotnet publish -c Release -r win-x64 --self-contained -p:SourceRevisionId=${{github.run_id}} - - name: Archive Artifact - run: | - cd AccountDownloader/bin/Release/net7.0/win-x64/publish - powershell Compress-Archive -Path .\* -DestinationPath AccountDownloaderWindows.zip - - name: Upload Release Asset - id: upload-release-asset - uses: svenstaro/upload-release-action@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - tag: ${{ github.ref }} - file: ./AccountDownloader/bin/Release/net7.0/win-x64/publish/AccountDownloaderWindows.zip - asset_name: AccountDownloaderWindows-${{github.ref_name}}.zip - release-linux: - needs: [prepare] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Setup .NET 7 - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 7.0.x - - name: Restore Neos DLL Cache - id: cache-neos-dlls - uses: actions/cache/restore@v3 - with: - path: | - ExternalLibraries/BaseX.dll - ExternalLibraries/CloudX.Shared.dll - ExternalLibraries/CodeX.dll - key: neos-dlls - fail-on-cache-miss: true - enableCrossOsArchive: true - - name: Build Linux app - run: | - cd AccountDownloader - dotnet publish -c Release -r linux-x64 --self-contained=true -p:SourceRevisionId=${{github.run_id}} - - name: Archive Artifact - run: | - cd AccountDownloader/bin/Release/net7.0/linux-x64/publish - tar -czvf AccountDownloaderLinux.tar.gz ./* - - name: Upload Release Asset - id: upload-release-asset - uses: svenstaro/upload-release-action@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - tag: ${{ github.ref }} - file: AccountDownloader/bin/Release/net7.0/linux-x64/publish/AccountDownloaderLinux.tar.gz - asset_name: AccountDownloaderLinux-${{github.ref_name}}.tar.gz diff --git a/AccountDownloader.Generators/packages.lock.json b/AccountDownloader.Generators/packages.lock.json index 12d33c2..0a24e47 100644 --- a/AccountDownloader.Generators/packages.lock.json +++ b/AccountDownloader.Generators/packages.lock.json @@ -148,17 +148,6 @@ } } }, - ".NETStandard,Version=v2.0/win-x64": { - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - } - }, ".NETStandard,Version=v2.0/win7-x64": { "System.Text.Encoding.CodePages": { "type": "Transitive", diff --git a/AccountDownloader.sln b/AccountDownloader.sln index 0065b2f..bb63a58 100644 --- a/AccountDownloader.sln +++ b/AccountDownloader.sln @@ -13,7 +13,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccountDownloaderLibrary.Te EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccountDownloaderLibrary.Mime", "AccountDownloaderLibrary.Mime\AccountDownloaderLibrary.Mime.csproj", "{CA2712C0-FC28-46D9-94C1-665D583BDCEA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AccountDownloaderLibrary.NeosFetch", "AccountDownloaderLibrary.NeosFetch\AccountDownloaderLibrary.NeosFetch.csproj", "{DA02E9EA-238A-4316-930A-A40E669C5467}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccountDownloaderLibrary.NeosFetch", "AccountDownloaderLibrary.NeosFetch\AccountDownloaderLibrary.NeosFetch.csproj", "{DA02E9EA-238A-4316-930A-A40E669C5467}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Artifacts", "Artifacts", "{01798B17-7AA2-4AFA-96D9-5C4DFF2F2361}" + ProjectSection(SolutionItems) = preProject + .all-contributorsrc = .all-contributorsrc + .editorconfig = .editorconfig + .gitattributes = .gitattributes + .gitignore = .gitignore + LICENSE.md = LICENSE.md + README.md = README.md + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/README.md b/README.md index a358912..cb5c787 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# Neos Account Downloader +# Neos Account Downloader (Stiefel's Version) + +**This is not the same repository of the Neos Account Downloader devloped by GuVAnj8Gv3RJ. This is a forked repository that includes additional features missing from the original tool that are in high demand by Neos users and features that GuVA is still implementing. If you prefer to download the original Neos Account Downloader, you may visit GuVA's repository at https://github.com/GuVAnj8Gv3RJ/NeosAccountDownloader. All FAQs from GuVA's README will be listed here in addtion to ones that I will list.** A small tool/utility to download your Neos Account contents to your local computer. @@ -10,7 +12,7 @@ Please refer to the [License](LICENSE.md) file for additional commentary. # FAQ ## How do I download this? -Use the [releases tab](https://github.com/GuVAnj8Gv3RJ/NeosAccountDownloader/releases), grab the latest. +Use the [releases tab](https://github.com/stiefeljackal/NeosAccountDownloaderGPL/releases) and grab the latest. ## Why does this exist? Backing up Neos content given the current circumstances seemed wise. @@ -46,6 +48,13 @@ This diagram might help: - Records: Records contain a manifest of all assets that are required to represent an item or world. These are downloaded each time. - Everything Else: JSON Soup. Just JSON Files of various types. Contacts, Messages etc. These are downloaded each time. +# Additional Features + +This tool is an enhanced version of [1.7.0](https://github.com/GuVAnj8Gv3RJ/NeosAccountDownloader/releases/tag/v1.7.0) that was released by GuVA. In addition to what was released in that version, the following are present in 1.7.0-a: + +- Almost 99% of assets downloaded will have their appropriate file extension instead of no extension. +- Additional asset metadata is saved. This includes the asset's MIME type, file extension, and file size. + # Known Issues ## Localization isn't instant @@ -57,16 +66,9 @@ Localization defaults to your computer's language, so for most people this hopef Neos assets and records are stored in a way that makes it difficult for us to estimate the total number of records required for download. Due to this we sometimes discover more that need to be queued for download as we go. Causing numbers to jump around a little bit. # Contributing -Thanks for your interest in contributing, in all cases except for localization please open an issue before opening a PR. - -## Localization -We'd love help with localization, follow these directions: -1. Duplicate: https://github.com/GuVAnj8Gv3RJ/NeosAccountDownloader/blob/main/AccountDownloader/Properties/Resources.resx -1. Save it as Resources.``.resx -1. Translate -1. PR it +Please feel free to contribute to this repository if you would like. Please keep in mind that any additions made will be under the GPLv2 license. All work that was and will be performed on GuVAnj8Gv3RJ's repository will be licensed under MIT. -# Contributors +# Contributors from GuVAnj8Gv3RJ's Repository