Merge pull request #472 from 4sval/dev

Dev

.github/workflows/main.yml

@@ -21,16 +21,16 @@ jobs:
       - name: Fetch Submodules Recursively
         run: git submodule update --init --recursive
 
-      - name: .NET 6 Setup
+      - name: .NET 8 Setup
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
 
       - name: .NET Restore
         run: dotnet restore FModel
 
       - name: .NET Publish
-        run: dotnet publish FModel -c Release --no-self-contained -r win-x64 -f net6.0-windows -o "./FModel/bin/Publish/" -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:DebugType=None -p:GenerateDocumentationFile=false -p:DebugSymbols=false -p:AssemblyVersion=${{ github.event.inputs.appVersion }} -p:FileVersion=${{ github.event.inputs.appVersion }}
+        run: dotnet publish FModel -c Release --no-self-contained -r win-x64 -f net8.0-windows -o "./FModel/bin/Publish/" -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:DebugType=None -p:GenerateDocumentationFile=false -p:DebugSymbols=false -p:AssemblyVersion=${{ github.event.inputs.appVersion }} -p:FileVersion=${{ github.event.inputs.appVersion }}
 
       - name: ZIP File
         uses: papeloto/action-zip@v1

.github/workflows/qa.yml

@@ -0,0 +1,65 @@
+name: FModel QA Builder
+
+on:
+  push:
+    branches: [ dev ]
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - name: GIT Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+
+      - name: .NET 8 Setup
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: .NET Restore
+        run: dotnet restore FModel
+
+      - name: .NET Publish
+        run: dotnet publish "./FModel/FModel.csproj" -c Release --no-restore --no-self-contained -r win-x64 -f net8.0-windows -o "./FModel/bin/Publish/" -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:DebugType=None -p:GenerateDocumentationFile=false -p:DebugSymbols=false
+
+      - name: ZIP File
+        uses: thedoctor0/[email protected]
+        with:
+          type: zip
+          filename: ${{ github.sha }}.zip # will end up in working directory not the Publish folder
+          path: ./FModel/bin/Publish/FModel.exe
+
+      - name: Edit QA Artifact
+        uses: ncipollo/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          name: 'FModel QA Testing'
+          body: 'Dev builds'
+          tag: 'qa'
+          artifacts: ${{ github.sha }}.zip
+          prerelease: true
+          allowUpdates: true
+
+      - name: Get Version
+        id: package_version
+        uses: kzrnm/get-net-sdk-project-versions-action@v2
+        with:
+          proj-path: ./FModel/FModel.csproj
+
+      - name: FModel Auth
+        id: fmodel_auth
+        uses: fjogeleit/[email protected]
+        with:
+          url: "https://api.fmodel.app/v1/oauth/token"
+          data: '{"username": "${{ secrets.API_USERNAME }}", "password": "${{ secrets.API_PASSWORD }}"}'
+
+      - name: FModel Deploy Build
+        uses: fjogeleit/[email protected]
+        with:
+          url: "https://api.fmodel.app/v1/infos/${{ secrets.QA_ID }}"
+          method: "PATCH"
+          bearerToken: ${{ fromJson(steps.fmodel_auth.outputs.response).accessToken }}
+          data: '{"version": "${{ steps.package_version.outputs.version }}-dev+${{ github.sha }}", "downloadUrl": "https://github.com/4sval/FModel/releases/download/qa/${{ github.sha }}.zip"}'

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "CUE4Parse"]
 	path = CUE4Parse
 	url = https://github.com/FabianFG/CUE4Parse
-[submodule "EpicManifestParser"]
-	path = EpicManifestParser
-	url = https://github.com/FModel/EpicManifestParser

FModel/App.xaml.cs

@@ -41,8 +41,6 @@ protected override void OnStartup(StartupEventArgs e)
         {
             UserSettings.Default = JsonConvert.DeserializeObject<UserSettings>(
                 File.ReadAllText(UserSettings.FilePath), JsonNetSerializer.SerializerSettings);
-
-            /*if (UserSettings.Default.ShowChangelog) */MigrateV1Games();
         }
         catch
         {
@@ -52,7 +50,14 @@ protected override void OnStartup(StartupEventArgs e)
         var createMe = false;
         if (!Directory.Exists(UserSettings.Default.OutputDirectory))
         {
-            UserSettings.Default.OutputDirectory = Path.Combine(Directory.GetCurrentDirectory(), "Output");
+            var currentDir = Directory.GetCurrentDirectory();
+            var dirInfo = new DirectoryInfo(currentDir);
+            if (dirInfo.Attributes.HasFlag(FileAttributes.Archive))
+                throw new Exception("FModel cannot be run from an archive file. Please extract it and try again.");
+            if (dirInfo.Attributes.HasFlag(FileAttributes.ReadOnly))
+                throw new Exception("FModel cannot be run from a read-only directory. Please move it to a writable location.");
+
+            UserSettings.Default.OutputDirectory = Path.Combine(currentDir, "Output");
         }
 
         if (!Directory.Exists(UserSettings.Default.RawDataDirectory))
@@ -143,17 +148,6 @@ private void OnUnhandledException(object sender, DispatcherUnhandledExceptionEve
         e.Handled = true;
     }
 
-    private void MigrateV1Games()
-    {
-        foreach ((var gameDir, var setting) in UserSettings.Default.ManualGames)
-        {
-            if (!Directory.Exists(gameDir)) continue;
-            UserSettings.Default.PerDirectory[gameDir] =
-                DirectorySettings.Default(setting.GameName, setting.GameDirectory, true, setting.OverridedGame, setting.AesKeys?.MainKey);
-        }
-        UserSettings.Default.ManualGames.Clear();
-    }
-
     private string GetOperatingSystemProductName()
     {
         var productName = string.Empty;

FModel/Creator/Bases/FN/BaseBundle.cs

@@ -26,7 +26,7 @@ public override void ParseForInfo()
     {
         _quests = new List<BaseQuest>();
 
-        if (Object.TryGetValue(out FText displayName, "DisplayName"))
+        if (Object.TryGetValue(out FText displayName, "DisplayName", "ItemName"))
             DisplayName = displayName.Text.ToUpperInvariant();
 
         if (Object.TryGetValue(out FStructFallback[] quests, "QuestInfos")) // prout :)

FModel/Creator/Bases/FN/BaseCommunity.cs

@@ -1,5 +1,7 @@
+using System.Linq;
 using CUE4Parse.GameTypes.FN.Enums;
 using CUE4Parse.UE4.Assets.Exports;
+using CUE4Parse.UE4.Assets.Objects;
 using CUE4Parse.UE4.Objects.GameplayTags;
 using CUE4Parse.UE4.Objects.UObject;
 using CUE4Parse.UE4.Versions;
@@ -32,10 +34,27 @@ public override void ParseForInfo()
     {
         ParseForReward(UserSettings.Default.CosmeticDisplayAsset);
 
-        if (Object.TryGetValue(out FPackageIndex series, "Series") && Utils.TryGetPackageIndexExport(series, out UObject export))
-            _rarityName = export.Name;
+        if (Object.TryGetValue(out FPackageIndex series, "Series"))
+        {
+            _rarityName = series.Name;
+        }
+        else if (Object.TryGetValue(out FInstancedStruct[] dataList, "DataList") &&
+                 dataList.FirstOrDefault(d => d.NonConstStruct?.TryGetValue(out FPackageIndex _, "Series") == true) is { } dl)
+        {
+            _rarityName = dl.NonConstStruct?.Get<FPackageIndex>("Series").Name;
+        }
+        else if (Object.TryGetValue(out FStructFallback componentContainer, "ComponentContainer") &&
+                 componentContainer.TryGetValue(out FPackageIndex[] components, "Components") &&
+                 components.FirstOrDefault(c => c.Name.Contains("Series")) is { } seriesDef &&
+                 seriesDef.TryLoad(out var seriesDefObj) && seriesDefObj is not null &&
+                 seriesDefObj.TryGetValue(out series, "Series"))
+        {
+            _rarityName = series.Name;
+        }
         else
+        {
             _rarityName = Object.GetOrDefault("Rarity", EFortRarity.Uncommon).GetDescription();
+        }
 
         if (Object.TryGetValue(out FGameplayTagContainer gameplayTags, "GameplayTags"))
             CheckGameplayTags(gameplayTags);