#26 상대 경로 기능이 정상 동작하지 않는 문제 수정

Author: daramkun

DaramRenamer.Commands/Commands/FilePath/RelativeGoToCommand.cs

@@ -7,6 +7,9 @@ namespace DaramRenamer.Commands.FilePath
 	[Serializable, LocalizationKey("Command_Name_RelativeGoTo")]
 	public class RelativeGoToCommand : ICommand
 	{
+		private const string CurrentDirectory = ".";
+		private const string PreviousDirectory = "..";
+
 		public bool ParallelProcessable => true;
 		public CommandCategory Category => CommandCategory.Path;
 
@@ -15,7 +18,19 @@ public class RelativeGoToCommand : ICommand
 
 		public bool DoCommand(FileInfo file)
 		{
-			file.ChangedPath = System.IO.Path.Combine(file.ChangedPath, Path);
+			var temp = new List<string>(System.IO.Path.Combine(file.ChangedPath, Path).Split('/', '\\'));
+			temp.RemoveAll(dir => dir == CurrentDirectory || string.IsNullOrEmpty(dir));
+
+			var indexOf = -1;
+			while ((indexOf = temp.IndexOf(PreviousDirectory)) >= 0)
+			{
+				if (indexOf == 0 || indexOf == 1)
+					return false;
+				temp.RemoveAt(indexOf);
+				temp.RemoveAt(indexOf - 1);
+			}
+
+			file.ChangedPath = string.Join(System.IO.Path.DirectorySeparatorChar, temp);
 			return true;
 		}
 	}

DaramRenamer.Windows/DaramRenamer.Windows.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net5.0-windows</TargetFramework>
-		<PublishTrimmed>true</PublishTrimmed>
+		<TargetFramework>net6.0-windows</TargetFramework>
 		<TrimMode>Link</TrimMode>
 		<UseWPF>true</UseWPF>
 		<RootNamespace>DaramRenamer</RootNamespace>
@@ -13,7 +12,7 @@
 		<ApplicationIcon>Resources\ProgramIcon.ico</ApplicationIcon>
 		<AssemblyName>DaramRenamer</AssemblyName>
 		<Copyright>Copyright ⓒ 2013-2021 Jin Jae-yeon</Copyright>
-		<Version>2021.7.2</Version>
+		<Version>2021.11.1</Version>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>../Modules/StrongNameKey/Daelumgi.snk</AssemblyOriginatorKeyFile>
 		<ApplicationManifest>DaramRenamer.manifest</ApplicationManifest>