Merge branch 'v2.2' into main

ellman12 · Feb 15, 2023 · eee091a · eee091a
2 parents 7e4d92c + aae1196
commit eee091a
Show file tree

Hide file tree

Showing 51 changed files with 2,653 additions and 1,691 deletions.
diff --git a/PSS/PSS-Init/PSS-Init.csproj b/PSS/PSS-Init/PSS-Init.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>PSS_Init</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>

diff --git a/PSS/PSS-Init/Program.cs b/PSS/PSS-Init/Program.cs
@@ -18,12 +18,12 @@
 Console.WriteLine($"Your photos and videos will be stored in \"{pss_library}\"\n");
 Directory.CreateDirectory(pss_library);
 
-Console.WriteLine("Where should uploaded items be stored before being added to your library?");
-string pss_upload = Console.ReadLine()!;
-if (!pss_upload.EndsWith("pss_upload"))
-      pss_upload = Path.Combine(pss_upload, "pss_upload");
-Console.WriteLine($"Uploaded photos and videos will be (temporarily) stored in \"{pss_upload}\"\n");
-Directory.CreateDirectory(pss_upload);
+Console.WriteLine("Where should items be stored before being imported in to your library?");
+string pss_import = Console.ReadLine()!;
+if (!pss_import.EndsWith("pss_import"))
+      pss_import = Path.Combine(pss_import, "pss_import");
+Console.WriteLine($"Uploaded photos and videos will be (temporarily) stored in \"{pss_import}\"\n");
+Directory.CreateDirectory(pss_import);
 
 Console.WriteLine("Enter folder path to where temporary items should be stored:");
 string pss_tmp = Console.ReadLine()!;
@@ -48,7 +48,7 @@
 Console.ForegroundColor = ConsoleColor.Yellow;
 Console.WriteLine("\nSaving settings...");
 Settings.serverIP = serverIP;
-Settings.uploadFolderPath = pss_upload;
+Settings.importFolderPath = pss_import;
 Settings.libFolderPath = pss_library;
 Settings.backupFolderPath = pss_backup;
 Settings.tmpFolderPath = pss_tmp;