From ecaed29fa05b7c4e31396f8ccda89fae387bb8cc Mon Sep 17 00:00:00 2001
From: Mikachu2333 <mikachu.23333@zohomail.com>
Date: Mon, 8 Jan 2024 10:42:43 +0800
Subject: [PATCH] Add files via upload

---
 default.aproj |  4 ++--
 main.aardio   | 33 ++++++++++++++++++---------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/default.aproj b/default.aproj
index d80bed5..51e0bac 100644
--- a/default.aproj
+++ b/default.aproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project ver="10" name="name_exchanger" libEmbed="true" icon="123.ico" ui="win" output="name_exchanger.exe" CompanyName="None" FileDescription="Exchange the name of two files." LegalCopyright="Copyright (C) Mika 2023 MIT License" ProductName="name_exchanger" InternalName="name_exchanger" FileVersion="2.3.0.52" ProductVersion="2.3.0.52" publishDir="/dist/" dstrip="true">
+<project ver="10" name="name_exchanger" libEmbed="true" icon="123.ico" ui="win" output="name_exchanger.exe" CompanyName="None" FileDescription="Exchange the name of two files." LegalCopyright="Copyright (C) Mika 2023 MIT License" ProductName="name_exchanger" InternalName="name_exchanger" FileVersion="2.3.0.53" ProductVersion="2.3.0.53" publishDir="/dist/" dstrip="true" local="false" ignored="false">
 	<file name="main.aardio" path="main.aardio" comment="main.aardio"/>
-	<folder name="资源文件" path="res" embed="true"/>
+	<folder name="资源文件" path="res" embed="true" local="false" ignored="false"/>
 	<folder name="窗体文件" path="dlg" comment="目录" embed="true" local="false" ignored="false"/>
 </project>
diff --git a/main.aardio b/main.aardio
index d04f220..5271649 100644
--- a/main.aardio
+++ b/main.aardio
@@ -28,19 +28,17 @@ change_main = function(path1,path2){
 	
 	var temp1_dir = temp1.dir
 	var temp1_name = temp1.name
+	var temp1_ext = temp1.ext
 	var temp2_dir = temp2.dir
 	var temp2_name = temp2.name
+	var temp2_ext = temp2.ext
 	if(path1_dir){
 		temp1_name = temp1.name + temp1.ext
-		var temp1_ext = ""
-	}else{
-		var temp1_ext = temp1.ext
+		temp1_ext = ""
 	}
 	if(path2_dir){
 		temp2_name = temp2.name + temp2.ext
-		var temp2_ext = ""
-	}else{
-		var temp2_ext = temp2.ext
+		temp2_ext = ""
 	}
 	
 	var original_path_len_judge = (string.len(path1) > 255) or (string.len(path2) > 255)
@@ -51,22 +49,27 @@ change_main = function(path1,path2){
 		win.msgbox("Name is too long to set. Please Remove the Limit.","Error",,mainForm.hwnd)
 	}
 	
-	
-	if(temp1_dir == path2 + "\"){
-		::judge_enum = 1
-	}elseif(temp2_dir == path1 + "\"){
-		::judge_enum = 2
+	var temp1_isenum,temp_null1 = string.indexOf(temp1_dir,path2 + "\")
+	var temp2_isenum,temp_null2 = string.indexOf(temp2_dir,path1 + "\")
+	if(temp1_isenum){
+		judge_enum = 1
+	}elseif(temp2_isenum){
+		judge_enum = 2
 	}else{
-		::judge_enum = false
+		judge_enum = false
 	}
-
+	io.open()
+	io.print(judge_enum)
+	
 	if(judge_enum) and (path1 != temp1_dir + temp2_name){
 		if((judge_enum == 1)){
-			io.rename(path1,temp1_dir + temp2_name)
+			io.rename(path1,temp1_dir + temp2_name + temp1_ext)
 			io.rename(path2,temp2_dir + temp1_name)
+			io.print("1",path1,temp1_dir + temp2_name,temp2_dir + temp1_name)
 		}else{
-			io.rename(path2,temp2_dir + temp1_name)
+			io.rename(path2,temp2_dir + temp1_name + temp2_ext)
 			io.rename(path1,temp1_dir + temp2_name)
+			io.print("2",path2,temp2_dir + temp1_name,temp1_dir + temp2_name)
 		}
 	}else{
 		io.rename(path1,temp1_dir + "FB4715869C140FF1256EB2")