Refactor project structure

hhhxiao · Jul 25, 2024 · 7e75528 · 7e75528
1 parent 48a4efb
commit 7e75528
Show file tree

Hide file tree

Showing 30 changed files with 69 additions and 34 deletions.
diff --git a/SMT.Console/Program.cs b/SMT.Console/Program.cs
@@ -0,0 +1,2 @@
+// See https://aka.ms/new-console-template for more information
+Console.WriteLine("Hello, World!");
diff --git a/SMT.Console/SMT.Console.csproj b/SMT.Console/SMT.Console.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/core/Configuration.cs → SMT.Core/Configuration.cs b/core/Configuration.cs → SMT.Core/Configuration.cs
@@ -1,4 +1,4 @@
-namespace SoulsModTranslator.core;
+namespace SMT.core;
 
 public static class Configuration
 {

diff --git a/core/DB.cs → SMT.Core/DB.cs b/core/DB.cs → SMT.Core/DB.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace SoulsModTranslator.core;
+namespace SMT.core;
 
 public class DB
 {

diff --git a/core/DBTool.cs → SMT.Core/DBTool.cs b/core/DBTool.cs → SMT.Core/DBTool.cs
@@ -5,7 +5,7 @@
 using System.Text.Json.Serialization;
 using NLog;
 
-namespace SoulsModTranslator.core;
+namespace SMT.core;
 
 public static class DbTool
 {

diff --git a/core/Glossary.cs → SMT.Core/Glossary.cs b/core/Glossary.cs → SMT.Core/Glossary.cs
@@ -2,11 +2,9 @@
 using System.IO;
 using System.Text.Json;
 using System.Text.RegularExpressions;
-using System.Windows.Documents;
-using System.Windows.Shapes;
 using NLog;
 
-namespace SoulsModTranslator.core;
+namespace SMT.core;
 
 public class Glossary
 {

diff --git a/core/LangFile.cs → SMT.Core/LangFile.cs b/core/LangFile.cs → SMT.Core/LangFile.cs
@@ -3,7 +3,7 @@
 using NLog;
 using SoulsFormats;
 
-namespace SoulsModTranslator.core;
+namespace SMT.core;
 
 public class LangFile
 {

diff --git a/SMT.Core/SMT.Core.csproj b/SMT.Core/SMT.Core.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <TargetFramework>net7.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="SoulsFormats">
+      <HintPath>SoulsFormats.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NPOI" Version="2.7.0" />
+    <PackageReference Include="NLog" Version="5.2.8" />
+    <PackageReference Include="NLog.Config" Version="4.7.15" />
+  </ItemGroup>
+
+</Project>
diff --git a/SoulsFormats.dll → SMT.Core/SoulsFormats.dll b/SoulsFormats.dll → SMT.Core/SoulsFormats.dll
diff --git a/core/TextExporter.cs → SMT.Core/TextExporter.cs b/core/TextExporter.cs → SMT.Core/TextExporter.cs
@@ -2,7 +2,7 @@
 using NLog;
 using NPOI.XSSF.UserModel;
 
-namespace SoulsModTranslator.core;
+namespace SMT.core;
 
 public static class TextExporter
 {

diff --git a/core/TextImporter.cs → SMT.Core/TextImporter.cs b/core/TextImporter.cs → SMT.Core/TextImporter.cs
@@ -1,8 +1,6 @@
-using System.IO;
-using Microsoft.VisualBasic.Logging;
-using NPOI.XSSF.UserModel;
+using NPOI.XSSF.UserModel;
 
-namespace SoulsModTranslator.core;
+namespace SMT.core;
 
 public class TextImporter
 {

diff --git a/core/Translator.cs → SMT.Core/Translator.cs b/core/Translator.cs → SMT.Core/Translator.cs
@@ -1,12 +1,11 @@
 using System.Diagnostics;
 using System.IO;
-using System.Windows.Forms.Design;
 using NLog;
 using NPOI.SS.Formula;
 using NPOI.SS.Formula.Functions;
 using SoulsFormats;
 
-namespace SoulsModTranslator.core;
+namespace SMT.core;
 
 public class ExportResult
 {

diff --git a/core/Utils.cs → SMT.Core/Utils.cs b/core/Utils.cs → SMT.Core/Utils.cs
@@ -3,7 +3,7 @@
 using System.Text.Json;
 using System.Text.RegularExpressions;
 
-namespace SoulsModTranslator.core;
+namespace SMT.core;
 
 public static class Utils
 {

diff --git a/App.xaml → SMT.WPF/App.xaml b/App.xaml → SMT.WPF/App.xaml
diff --git a/App.xaml.cs → SMT.WPF/App.xaml.cs b/App.xaml.cs → SMT.WPF/App.xaml.cs
diff --git a/AssemblyInfo.cs → SMT.WPF/AssemblyInfo.cs b/AssemblyInfo.cs → SMT.WPF/AssemblyInfo.cs
diff --git a/MainWindow.xaml → SMT.WPF/MainWindow.xaml b/MainWindow.xaml → SMT.WPF/MainWindow.xaml
@@ -1,4 +1,4 @@
-<adonisControls:AdonisWindow x:Class="SoulsModTranslator.MainWindow"
+<adonisControls:AdonisWindow x:Class="SMT.WPF.MainWindow"
                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                              xmlns:adonisUi="clr-namespace:AdonisUI;assembly=AdonisUI"

diff --git a/MainWindow.xaml.cs → SMT.WPF/MainWindow.xaml.cs b/MainWindow.xaml.cs → SMT.WPF/MainWindow.xaml.cs
@@ -1,16 +1,16 @@
 using System.Windows;
 using System.Collections.ObjectModel;
 using NLog;
-using SoulsModTranslator.core;
 using System.IO;
 using AdonisUI.Controls;
 using Button = System.Windows.Controls.Button;
 using MessageBoxImage = AdonisUI.Controls.MessageBoxImage;
 using System.Diagnostics;
 using System.Windows.Navigation;
 using NLog.Targets;
+using SMT.core;
 
-namespace SoulsModTranslator
+namespace SMT.WPF
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
@@ -65,6 +65,7 @@ private static void ShowTaskResult(bool success, string succMsg, string failMsg)
 
                     System.Windows.Clipboard.SetText(prompt + text);
                     Utils.OpenURL("https://www.bilibili.com/video/BV17p421Q7qJ/");
+
                 }
             }
 

diff --git a/SoulsModTranslator.csproj → SMT.WPF/SMT.WPF.csproj b/SoulsModTranslator.csproj → SMT.WPF/SMT.WPF.csproj
@@ -13,13 +13,12 @@
   <ItemGroup>
     <Content Include="icon.ico" />
   </ItemGroup>
-
+  
   <ItemGroup>
-    <Reference Include="SoulsFormats">
-      <HintPath>SoulsFormats.dll</HintPath>
-    </Reference>
+  <ProjectReference Include="..\SMT.Core\SMT.Core.csproj" />
   </ItemGroup>
-
+
+
   <ItemGroup>
     <PackageReference Include="AdonisUI" Version="1.17.1" />
     <PackageReference Include="AdonisUI.ClassicTheme" Version="1.17.1" />

diff --git a/SoulsModTranslator.csproj.user → SMT.WPF/SMT.WPF.csproj.user b/SoulsModTranslator.csproj.user → SMT.WPF/SMT.WPF.csproj.user
diff --git a/db/darksouls3.json → SMT.WPF/db/darksouls3.json b/db/darksouls3.json → SMT.WPF/db/darksouls3.json
diff --git a/db/eldenring.json → SMT.WPF/db/eldenring.json b/db/eldenring.json → SMT.WPF/db/eldenring.json
diff --git a/db/eldenring_with_dlc.json → SMT.WPF/db/eldenring_with_dlc.json b/db/eldenring_with_dlc.json → SMT.WPF/db/eldenring_with_dlc.json
diff --git a/db/sekiro.json → SMT.WPF/db/sekiro.json b/db/sekiro.json → SMT.WPF/db/sekiro.json
diff --git a/glossaries/eldenring.json → SMT.WPF/glossaries/eldenring.json b/glossaries/eldenring.json → SMT.WPF/glossaries/eldenring.json
diff --git a/icon.ico → SMT.WPF/icon.ico b/icon.ico → SMT.WPF/icon.ico
diff --git a/oo2core_6_win64.dll → SMT.WPF/oo2core_6_win64.dll b/oo2core_6_win64.dll → SMT.WPF/oo2core_6_win64.dll
diff --git a/publish.py → SMT.WPF/publish.py b/publish.py → SMT.WPF/publish.py
diff --git a/SoulsModTranslator.sln b/SoulsModTranslator.sln
@@ -3,18 +3,30 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.9.34622.214
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoulsModTranslator", "SoulsModTranslator.csproj", "{D379C4A1-B6A7-4285-8B54-264ED790B32E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SMT.Core", "SMT.Core\SMT.Core.csproj", "{8FA1EB8C-6B7C-4297-B0D0-33369DADBBBF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SMT.Console", "SMT.Console\SMT.Console.csproj", "{1A22A8F0-87AE-46B3-8A43-E09EDE1C7B0E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SMT.WPF", "SMT.WPF\SMT.WPF.csproj", "{36BEFF02-74CD-4A7A-A008-B53EC51D9719}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D379C4A1-B6A7-4285-8B54-264ED790B32E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D379C4A1-B6A7-4285-8B54-264ED790B32E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D379C4A1-B6A7-4285-8B54-264ED790B32E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D379C4A1-B6A7-4285-8B54-264ED790B32E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FA1EB8C-6B7C-4297-B0D0-33369DADBBBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FA1EB8C-6B7C-4297-B0D0-33369DADBBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FA1EB8C-6B7C-4297-B0D0-33369DADBBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FA1EB8C-6B7C-4297-B0D0-33369DADBBBF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A22A8F0-87AE-46B3-8A43-E09EDE1C7B0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A22A8F0-87AE-46B3-8A43-E09EDE1C7B0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A22A8F0-87AE-46B3-8A43-E09EDE1C7B0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A22A8F0-87AE-46B3-8A43-E09EDE1C7B0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36BEFF02-74CD-4A7A-A008-B53EC51D9719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36BEFF02-74CD-4A7A-A008-B53EC51D9719}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36BEFF02-74CD-4A7A-A008-B53EC51D9719}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36BEFF02-74CD-4A7A-A008-B53EC51D9719}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/SoulsModTranslator.sln.DotSettings.user b/SoulsModTranslator.sln.DotSettings.user
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// See https://aka.ms/new-console-template for more information
		Console.WriteLine("Hello, World!");