11280852752

Committed 10 Oct 2024 07:39PM UTC coverage: 89.75% (-6.0%) from 95.771%

Build # 11280852752

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #178 from samsmithnz/UpgradingForV1

Upgrading for v1

Run Details

197 of 287 branches covered (68.64%)

Branch coverage included in aggregate %.

110 of 116 new or added lines in 5 files covered. (94.83%)

164 existing lines in 3 files now uncovered.

2745 of 2991 relevant lines covered (91.78%)

1294.27 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

91.49

/src/SatisfactoryTree.ContentExtractor/JsonExtraction.cs

﻿using System.Diagnostics;
using System.Linq;
using System.Text.Json;

namespace SatisfactoryTree.ContentExtractor
{

    public class ProcessedResult
    {
        public List<Item> Items = new();
        public List<string> ItemList = new();
        public List<Recipe> Recipes = new();
        public List<string> RecipeList = new();
    }

    public class JsonExtraction
    {
        public static ProcessedResult ExtractJsonFile()
        {
            // Load the content file
            string contentPath = @"C:\Program Files (x86)\Steam\steamapps\common\Satisfactory\CommunityResources\Docs\en-US.json";
            DirectoryInfo currentDir = new DirectoryInfo(Directory.GetCurrentDirectory());
            string projectContentPath = Path.Combine(currentDir.Parent.Parent.Parent.Parent.Parent.FullName, "content");
            string projectContentFile = Path.Combine(projectContentPath, "en-US.json");

            // If the file exists, copy it to the content folder, that is located in the content folder in the root of the project
            if (System.IO.File.Exists(contentPath) && 
                System.IO.Directory.Exists(projectContentPath))
            {
                //Get the current directory
                Debug.WriteLine("Copying file to " + projectContentPath);
                System.IO.File.Copy(contentPath, projectContentFile, true);
            }
            string jsonString = File.ReadAllText(projectContentFile);
            List<RawNativeClass>? rawJSONDoc = JsonSerializer.Deserialize<List<RawNativeClass>>(jsonString);
            if (rawJSONDoc == null)
            {
                throw new Exception("Failed to deserialize JSON file");
            }

            // Process the content into an object list
            ProcessedResult processedResult = new();
            List<RawItem> rawItems = new();
            foreach (RawNativeClass nativeClass in rawJSONDoc)
            {
                if (nativeClass != null && nativeClass.Classes != null)
                {
                    rawItems.AddRange(nativeClass.Classes);
                }
            }

            //Get all recipes that are not Christmas or BuildGun or WorkshopComponent
            List<string> itemList = new();
            List<Item> items = new();
            List<RawItem> rawRecipes = new();
            foreach (RawItem rawItem in rawItems)
            {
                if (rawItem != null && rawItem.ClassName != null &&
                    rawItem.ClassName.StartsWith("Recipe_") &&
                    !string.IsNullOrEmpty(rawItem.Ingredients) &&
                    !rawItem.Ingredients.Contains("Christmas") &&
                    rawItem.ProducedIn != null &&
                    !rawItem.ProducedIn.Contains("BP_BuildGun_C") &&
                    !rawItem.ProducedIn.Contains("BP_WorkshopComponent_C"))
                {
                    //string recipe = ($"ClassName: {item.ClassName}, DisplayName: {item.DisplayName}, Ingredients: {item.Ingredients}");
                    rawRecipes.Add(rawItem);
                }

            }

            //Now loop through the items checking if they have a recipe
            foreach (RawItem rawItem in rawItems)
            {
                if (rawItem != null && rawItem.ClassName != null &&
                    rawItem.ClassName.StartsWith("Desc_"))
                {
                    foreach (RawItem recipe in rawRecipes)
                    {
                        string result2 = ($"DisplayName: {rawItem.DisplayName}, ClassName: {rawItem.ClassName}, StackSize: {rawItem.StackSize}");
                        if (rawItem.DisplayName != "" &&
                            rawItem.StackSize != null &&
                            recipe.Products != null &&
                            recipe.Products.Contains(rawItem.ClassName) &&
                            itemList.Contains(result2) == false &&
                            recipe.ProducedIn != null &&
                            !recipe.ProducedIn.Contains("BP_BuildGun_C") &&
                            !recipe.ProducedIn.Contains("BP_WorkshopComponent_C"))
                        {
                            items.Add(new Item(rawItem.ClassName, rawItem.DisplayName, rawItem.Description, rawItem.StackSize, rawItem.FluidColor, rawItem.ResourceSinkPoints));
                            itemList.Add(result2);
                        }
                    }
                }
            }

            //Order the list alphabetically
            itemList.Sort();

            processedResult.ItemList = itemList;
            processedResult.Items = items;
            foreach (RawItem recipe in rawRecipes)
            {
                if (recipe != null)
                {
                    processedResult.RecipeList.Add($"ClassName: {recipe.ClassName}, DisplayName: {recipe.DisplayName}, IsAlt: {recipe.IsAlternateRecipe}, Ingredients: {recipe.Ingredients}");
                    processedResult.Recipes.Add(new Recipe(recipe.ClassName, recipe.DisplayName, recipe.Description, recipe.Ingredients, recipe.Products, recipe.ProducedIn, recipe.ManufactoringDuration, recipe.IsAlternateRecipe));
                }
            }

            return processedResult;


        }
    }

}

1	using System.Diagnostics;
2	using System.Linq;
3	using System.Text.Json;
4
5	namespace SatisfactoryTree.ContentExtractor
6	{
7
8	public class ProcessedResult
9	{
10	public List<Item> Items = new();	1✔
11	public List<string> ItemList = new();	1✔
12	public List<Recipe> Recipes = new();	1✔
13	public List<string> RecipeList = new();	1✔
14	}
15
16	public class JsonExtraction
17	{
18	public static ProcessedResult ExtractJsonFile()
19	{	1✔
20	// Load the content file
21	string contentPath = @"C:\Program Files (x86)\Steam\steamapps\common\Satisfactory\CommunityResources\Docs\en-US.json";	1✔
22	DirectoryInfo currentDir = new DirectoryInfo(Directory.GetCurrentDirectory());	1✔
23	string projectContentPath = Path.Combine(currentDir.Parent.Parent.Parent.Parent.Parent.FullName, "content");	1✔
24	string projectContentFile = Path.Combine(projectContentPath, "en-US.json");	1✔
25
26	// If the file exists, copy it to the content folder, that is located in the content folder in the root of the project
27	if (System.IO.File.Exists(contentPath) &&	1!
28	System.IO.Directory.Exists(projectContentPath))	1✔
NEW 29	{	×
30	//Get the current directory
NEW 31	Debug.WriteLine("Copying file to " + projectContentPath);	×
NEW 32	System.IO.File.Copy(contentPath, projectContentFile, true);	×
NEW 33	}	×
34	string jsonString = File.ReadAllText(projectContentFile);	1✔
35	List<RawNativeClass>? rawJSONDoc = JsonSerializer.Deserialize<List<RawNativeClass>>(jsonString);	1✔
36	if (rawJSONDoc == null)	1!
NEW 37	{	×
NEW 38	throw new Exception("Failed to deserialize JSON file");	×
39	}
40
41	// Process the content into an object list
42	ProcessedResult processedResult = new();	1✔
43	List<RawItem> rawItems = new();	1✔
44	foreach (RawNativeClass nativeClass in rawJSONDoc)	211✔
45	{	104✔
46	if (nativeClass != null && nativeClass.Classes != null)	104!
47	{	104✔
48	rawItems.AddRange(nativeClass.Classes);	104✔
49	}	104✔
50	}	104✔
51
52	//Get all recipes that are not Christmas or BuildGun or WorkshopComponent
53	List<string> itemList = new();	1✔
54	List<Item> items = new();	1✔
55	List<RawItem> rawRecipes = new();	1✔
56	foreach (RawItem rawItem in rawItems)	5,479✔
57	{	2,738✔
58	if (rawItem != null && rawItem.ClassName != null &&	2,738✔
59	rawItem.ClassName.StartsWith("Recipe_") &&	2,738✔
60	!string.IsNullOrEmpty(rawItem.Ingredients) &&	2,738✔
61	!rawItem.Ingredients.Contains("Christmas") &&	2,738✔
62	rawItem.ProducedIn != null &&	2,738✔
63	!rawItem.ProducedIn.Contains("BP_BuildGun_C") &&	2,738✔
64	!rawItem.ProducedIn.Contains("BP_WorkshopComponent_C"))	2,738✔
65	{	266✔
66	//string recipe = ($"ClassName: {item.ClassName}, DisplayName: {item.DisplayName}, Ingredients: {item.Ingredients}");
67	rawRecipes.Add(rawItem);	266✔
68	}	266✔
69
70	}	2,738✔
71
72	//Now loop through the items checking if they have a recipe
73	foreach (RawItem rawItem in rawItems)	5,479✔
74	{	2,738✔
75	if (rawItem != null && rawItem.ClassName != null &&	2,738!
76	rawItem.ClassName.StartsWith("Desc_"))	2,738✔
77	{	698✔
78	foreach (RawItem recipe in rawRecipes)	373,430✔
79	{	185,668✔
80	string result2 = ($"DisplayName: {rawItem.DisplayName}, ClassName: {rawItem.ClassName}, StackSize: {rawItem.StackSize}");	185,668✔
81	if (rawItem.DisplayName != "" &&	185,668✔
82	rawItem.StackSize != null &&	185,668✔
83	recipe.Products != null &&	185,668✔
84	recipe.Products.Contains(rawItem.ClassName) &&	185,668✔
85	itemList.Contains(result2) == false &&	185,668✔
86	recipe.ProducedIn != null &&	185,668✔
87	!recipe.ProducedIn.Contains("BP_BuildGun_C") &&	185,668✔
88	!recipe.ProducedIn.Contains("BP_WorkshopComponent_C"))	185,668✔
89	{	124✔
90	items.Add(new Item(rawItem.ClassName, rawItem.DisplayName, rawItem.Description, rawItem.StackSize, rawItem.FluidColor, rawItem.ResourceSinkPoints));	124✔
91	itemList.Add(result2);	124✔
92	}	124✔
93	}	185,668✔
94	}	698✔
95	}	2,738✔
96
97	//Order the list alphabetically
98	itemList.Sort();	1✔
99
100	processedResult.ItemList = itemList;	1✔
101	processedResult.Items = items;	1✔
102	foreach (RawItem recipe in rawRecipes)	535✔
103	{	266✔
104	if (recipe != null)	266✔
105	{	266✔
106	processedResult.RecipeList.Add($"ClassName: {recipe.ClassName}, DisplayName: {recipe.DisplayName}, IsAlt: {recipe.IsAlternateRecipe}, Ingredients: {recipe.Ingredients}");	266✔
107	processedResult.Recipes.Add(new Recipe(recipe.ClassName, recipe.DisplayName, recipe.Description, recipe.Ingredients, recipe.Products, recipe.ProducedIn, recipe.ManufactoringDuration, recipe.IsAlternateRecipe));	266✔
108	}	266✔
109	}	266✔
110
111	return processedResult;	1✔
112
113
114	}	1✔
115	}
116
117	}

samsmithnz / SatisfactoryTree / 11280852752

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous