Commit8afdb3f

authored

Merge pull request#205 from feipinxiang/master

fix: Improve project creation and template handling

2 parents8e8b25c +3e3bd65 commit8afdb3fCopy full SHA for 8afdb3f

File tree

+12

-3

lines changed

+12

-3

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2128,6 +2128,7 @@ void CreateNewEmptyProject(string targetFolder = null)`
`2128`	`2128`	`if(results==true)`
`2129`	`2129`	`{`
`2130`	`2130`	`// TODO check if that folder already exists (automatic naming avoids it, but manual naming could cause it)`
	`2131`	`+rootFolder=NewProject.targetFolder;`
`2131`	`2132`	`Console.WriteLine("Create project "+NewProject.newVersion+" : "+rootFolder);`
`2132`	`2133`	`if(string.IsNullOrEmpty(rootFolder))return;`
`2133`	`2134`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public partial class NewProject : Window`
`22`	`22`	`intpreviousSelectedTemplateIndex=-1;`
`23`	`23`	`intpreviousSelectedModuleIndex=-1;`
`24`	`24`
`25`		`-staticstringtargetFolder=null;`
	`25`	`+publicstaticstringtargetFolder{get;privateset;}=null;`
`26`	`26`
`27`	`27`	`publicNewProject(stringunityVersion,stringsuggestedName,stringtargetFolder,boolnameIsLocked=false)`
`28`	`28`	`{`
`@@ -355,6 +355,7 @@ private void txtNewProjectFolder_TextChanged(object sender, TextChangedEventArgs`
`355`	`355`	`{`
`356`	`356`	`txtNewProjectFolder.BorderBrush=null;`
`357`	`357`	`btnCreateNewProject.IsEnabled=true;`
	`358`	`+targetFolder=txtNewProjectFolder.Text;`
`358`	`359`	`}`
`359`	`360`	`}`
`360`	`361`	`}`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1708,11 +1708,18 @@ public static Project FastCreateProject(string version, string baseFolder, strin`
`1708`	`1708`	`// unzip or copy template`
`1709`	`1709`	`if(templateZipPath!=null)`
`1710`	`1710`	`{`
`1711`		`-//Console.WriteLine(templateZipPath);`
	`1711`	`+//Console.WriteLine(templateZipPath);`
`1712`	`1712`
`1713`	`1713`	`if(File.Exists(templateZipPath))`
`1714`	`1714`	`{`
`1715`		`-TarLib.Tar.ExtractTarGz(templateZipPath,newPath);`
	`1715`	`+try`
	`1716`	`+{`
	`1717`	`+TarLib.Tar.ExtractTarGz(templateZipPath,newPath);`
	`1718`	`+}`
	`1719`	`+catch(Exceptionex)`
	`1720`	`+{`
	`1721`	`+SetStatus("Error extract template file:"+ex.Message);`
	`1722`	`+}`
`1716`	`1723`	`}`
`1717`	`1724`	`elseif(Directory.Exists(templateZipPath))`
`1718`	`1725`	`{`

Comments

(0)