Version 0.7.3.1

Libter · Libter · commit 50ca5aba8aee · 2015-11-11T16:29:38.000+01:00
diff --git a/Controls/ServersTreeNodes/DirectoryNode.cs b/Controls/ServersTreeNodes/DirectoryNode.cs
@@ -10,14 +10,15 @@ namespace MinecraftServerManager.Controls.ServersTreeNodes
     public class DirectoryNode : TreeNode
     {
         public bool Delete = false;
-        private DirectoryInfo Directory;
+        private DirectoryInfo directory;
+        protected List<string> IgnoredFiles = new List<string>();
         protected List<string> names = new List<string>();
         protected Timer timer = new Timer();
 
         public DirectoryNode(DirectoryNode parent, DirectoryInfo directoryInfo)
             : base(directoryInfo.Name)
         {
-            Directory = directoryInfo;
+            directory = directoryInfo;
 
             ImageIndex = ServersTreeView.FolderCloseIcon;
             SelectedImageIndex = ImageIndex;
@@ -34,7 +35,7 @@ public DirectoryNode(DirectoryNode parent, DirectoryInfo directoryInfo)
         public DirectoryNode(ServersTreeView treeView, DirectoryInfo directoryInfo, string name)
             : base(name)
         {
-            Directory = directoryInfo;
+            directory = directoryInfo;
 
             timer.Tick += new EventHandler(timer_tick);
             timer.Interval = 100;
@@ -49,7 +50,8 @@ private void timer_tick(object sender, EventArgs e)
         {
             try
             {
-                 Refresh();
+                 if (IsExpanded || Delete)
+                    Refresh();
             }
             catch (Exception) { }
         }
@@ -60,49 +62,49 @@ public virtual void Refresh()
             {
                 try
                 {
-                    if (Directory.Exists)
-                        new Computer().FileSystem.DeleteDirectory(Directory.FullName, UIOption.AllDialogs, RecycleOption.SendToRecycleBin);
+                    if (directory.Exists)
+                        new Computer().FileSystem.DeleteDirectory(directory.FullName, UIOption.AllDialogs, RecycleOption.SendToRecycleBin);
                     if (this is ServerNode && ((ServerNode)this).GetServerData().isImported)
                         File.Delete(((ServerNode)this).GetServerData().GetFile());
                     Destroy();
                 }
                 catch (OperationCanceledException) { }
                 return;
             }
+
             List<string> newNames = new List<string>();
-            foreach (DirectoryInfo directoryInfo in Directory.GetDirectories())
+            foreach (DirectoryInfo directoryInfo in directory.GetDirectories())
                 newNames.Add(directoryInfo.FullName);
-            foreach (FileInfo fileInfo in Directory.GetFiles())
+            foreach (FileInfo fileInfo in directory.GetFiles())
+            {
+                if (IgnoredFiles.Contains(fileInfo.Name)) continue;
                 newNames.Add(fileInfo.FullName);
+            }
+
             bool equals = true;
             if (newNames.Count != names.Count)
-            {
                 equals = false;
-            }
             else
-            {
                 for (int i = 0; i < newNames.Count; i++)
-                {
                     if (newNames[i] != names[i])
                     {
                         equals = false;
                         break;
                     }
-                }
-            }
+
             if (!equals)
             {
-                names.Clear();
+                names = newNames;
                 Nodes.Clear();
-                foreach (DirectoryInfo directoryInfo in Directory.GetDirectories())
-                {
-                    new DirectoryNode(this, directoryInfo);
-                    names.Add(directoryInfo.FullName);
-                }
-                foreach (FileInfo fileInfo in Directory.GetFiles())
+
+                if (this is ServerNode) new ConsoleNode((ServerNode)this);
+
+                foreach (string path in names)
                 {
-                    new FileNode(this, fileInfo);
-                    names.Add(fileInfo.FullName);
+                    if (Directory.Exists(path))
+                        new DirectoryNode(this, new DirectoryInfo(path));
+                    if (File.Exists(path))
+                        new FileNode(this, new FileInfo(path));
                 }
             }
         }
@@ -111,14 +113,14 @@ private void Virtualize()
         {
             int fileCount = 0;
 
-            fileCount = Directory.GetFiles().Length;
-            if ((fileCount + Directory.GetDirectories().Length) > 0)
+            fileCount = directory.GetFiles().Length;
+            if ((fileCount + directory.GetDirectories().Length) > 0)
                 new FakeChildNode(this);
         }
 
         public DirectoryInfo GetDirectory()
         {
-            return Directory;
+            return directory;
         }
 
         public new ServersTreeView TreeView
diff --git a/Controls/ServersTreeNodes/ServerNode.cs b/Controls/ServersTreeNodes/ServerNode.cs
@@ -16,58 +16,13 @@ public Data.Server GetServerData()
         public ServerNode(ServersTreeView treeView, DirectoryInfo directoryInfo, Data.Server _serverData)
             : base(treeView, directoryInfo, _serverData.ToString())
         {
-            this.serverData = _serverData;
-            this.directory = directoryInfo;
-            this.ImageIndex = ServersTreeView.LocalServerIcon;
-            this.SelectedImageIndex = this.ImageIndex;
-        }
-
-        public override void Refresh()
-        {
-            List<string> newNames = new List<string>();
-            foreach (DirectoryInfo directoryInfo in directory.GetDirectories())
-                newNames.Add(directoryInfo.FullName);
-            foreach (FileInfo fileInfo in directory.GetFiles())
-            {
-                if (fileInfo.Name == "eula.txt" || fileInfo.Name == "ServerManagerData.xml" || fileInfo.Name == "server.jar")
-                    continue;
-                newNames.Add(fileInfo.FullName);
-            }
-            bool equals = true;
-            if (newNames.Count != names.Count)
-                equals = false;
-            else
-            {
-                for (int i = 0; i < newNames.Count; i++)
-                {
-                    if (newNames[i] != names[i])
-                    {
-                        equals = false;
-                        break;
-                    }
-                }
-            }
-            if (this.Nodes.Count == 1 && this.Nodes[0] is FakeChildNode)
-                equals = false;
-            if (!equals)
-            {
-                this.names.Clear();
-                this.Nodes.Clear();
-                new ConsoleNode(this);
-                //new PropertiesNode(this);
-                foreach (DirectoryInfo directoryInfo in directory.GetDirectories())
-                {
-                    new DirectoryNode(this, directoryInfo);
-                    this.names.Add(directoryInfo.FullName);
-                }
-                foreach (FileInfo fileInfo in directory.GetFiles())
-                {
-                    if (fileInfo.Name == "eula.txt" || fileInfo.Name == "ServerManagerData.xml" || fileInfo.Name == "server.jar")
-                        continue;
-                    new FileNode(this, fileInfo);
-                    this.names.Add(fileInfo.FullName);
-                }
-            }
+            IgnoredFiles.Add("ServerManagerData.xml");
+            IgnoredFiles.Add("eula.txt");
+            IgnoredFiles.Add("server.jar");
+            serverData = _serverData;
+            directory = directoryInfo;
+            ImageIndex = ServersTreeView.LocalServerIcon;
+            SelectedImageIndex = ImageIndex;
         }
 
     }
diff --git a/Controls/ServersTreeView.cs b/Controls/ServersTreeView.cs
@@ -635,9 +635,9 @@ private void removeMenu_Click(object sender, EventArgs e)
                 DirectoryInfo directory = node.GetDirectory();
                 string message;
                 if (SelectedNode is ServerNode)
-                    message = String.Format(Language.GetString("DialogDirectoryRemove"), directory.Name);
-                else
                     message = String.Format(Language.GetString("DialogServerRemove"), directory.Name);
+                else
+                    message = String.Format(Language.GetString("DialogDirectoryRemove"), directory.Name);
                 DialogResult result = MessageBox.Show(message, Language.GetString("Warning"), 
                     MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
                 if (result == DialogResult.Yes)
diff --git a/Controls/Tabs/FileEditor.cs b/Controls/Tabs/FileEditor.cs
@@ -102,6 +102,18 @@ public FileEditor()
                         Error.Show("ErrorFileTooBig");
                         return;
                     }
+
+                    if (file.Extension == ".properties")
+                        text.TextChanged += new EventHandler<TextChangedEventArgs>(PropertiesParser);
+                    else if (file.Extension == ".yml")
+                        text.TextChanged += new EventHandler<TextChangedEventArgs>(YamlParser);
+                    else if (file.Extension == ".json")
+                        text.TextChanged += new EventHandler<TextChangedEventArgs>(JsonParser);
+                    else if (file.Extension == ".log")
+                        text.TextChanged += new EventHandler<TextChangedEventArgs>(Log.Parse);
+                    else if (file.Extension == ".sk")
+                        text.TextChanged += new EventHandler<TextChangedEventArgs>(SkriptParser);
+
                     try
                     {
                         StreamReader sr = new StreamReader(file.FullName);
@@ -115,20 +127,10 @@ public FileEditor()
                         return;
                     }
 
+                    text.TextChanged += new EventHandler<TextChangedEventArgs>(Parser);
+
                     text.Visible = true;
                     saveButton.Visible = true;
-
-                    if (file.Extension == ".properties")
-                        text.TextChanged += new EventHandler<TextChangedEventArgs>(PropertiesParser);
-                    else if (file.Extension == ".yml")
-                        text.TextChanged += new EventHandler<TextChangedEventArgs>(YamlParser);
-                    else if (file.Extension == ".json")
-                        text.TextChanged += new EventHandler<TextChangedEventArgs>(JsonParser);
-                    else if (file.Extension == ".log")
-                        text.TextChanged += new EventHandler<TextChangedEventArgs>(Log.Parse);
-                    else if (file.Extension == ".sk")
-                        text.TextChanged += new EventHandler<TextChangedEventArgs>(SkriptParser);
-                    text.TextChanged += new EventHandler<TextChangedEventArgs>(Parser);
                     break;
                 case FileType.Image:
                     picturePanel.Visible = true;
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -7,4 +7,4 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("0.7.3")]
+[assembly: AssemblyVersion("0.7.3.1")]

Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,15 @@ namespace MinecraftServerManager.Controls.ServersTreeNodes`
`10`	`10`	`public class DirectoryNode : TreeNode`
`11`	`11`	`{`
`12`	`12`	`public bool Delete = false;`
`13`		`- private DirectoryInfo Directory;`
	`13`	`+ private DirectoryInfo directory;`
	`14`	`+ protected List<string> IgnoredFiles = new List<string>();`
`14`	`15`	`protected List<string> names = new List<string>();`
`15`	`16`	`protected Timer timer = new Timer();`
`16`	`17`
`17`	`18`	`public DirectoryNode(DirectoryNode parent, DirectoryInfo directoryInfo)`
`18`	`19`	`: base(directoryInfo.Name)`
`19`	`20`	`{`
`20`		`- Directory = directoryInfo;`
	`21`	`+ directory = directoryInfo;`
`21`	`22`
`22`	`23`	`ImageIndex = ServersTreeView.FolderCloseIcon;`
`23`	`24`	`SelectedImageIndex = ImageIndex;`
`@@ -34,7 +35,7 @@ public DirectoryNode(DirectoryNode parent, DirectoryInfo directoryInfo)`
`34`	`35`	`public DirectoryNode(ServersTreeView treeView, DirectoryInfo directoryInfo, string name)`
`35`	`36`	`: base(name)`
`36`	`37`	`{`
`37`		`- Directory = directoryInfo;`
	`38`	`+ directory = directoryInfo;`
`38`	`39`
`39`	`40`	`timer.Tick += new EventHandler(timer_tick);`
`40`	`41`	`timer.Interval = 100;`
`@@ -49,7 +50,8 @@ private void timer_tick(object sender, EventArgs e)`
`49`	`50`	`{`
`50`	`51`	`try`
`51`	`52`	`{`
`52`		`- Refresh();`
	`53`	`+ if (IsExpanded \|\| Delete)`
	`54`	`+ Refresh();`
`53`	`55`	`}`
`54`	`56`	`catch (Exception) { }`
`55`	`57`	`}`
`@@ -60,49 +62,49 @@ public virtual void Refresh()`
`60`	`62`	`{`
`61`	`63`	`try`
`62`	`64`	`{`
`63`		`- if (Directory.Exists)`
`64`		`- new Computer().FileSystem.DeleteDirectory(Directory.FullName, UIOption.AllDialogs, RecycleOption.SendToRecycleBin);`
	`65`	`+ if (directory.Exists)`
	`66`	`+ new Computer().FileSystem.DeleteDirectory(directory.FullName, UIOption.AllDialogs, RecycleOption.SendToRecycleBin);`
`65`	`67`	`if (this is ServerNode && ((ServerNode)this).GetServerData().isImported)`
`66`	`68`	`File.Delete(((ServerNode)this).GetServerData().GetFile());`
`67`	`69`	`Destroy();`
`68`	`70`	`}`
`69`	`71`	`catch (OperationCanceledException) { }`
`70`	`72`	`return;`
`71`	`73`	`}`
	`74`	`+`
`72`	`75`	`List<string> newNames = new List<string>();`
`73`		`- foreach (DirectoryInfo directoryInfo in Directory.GetDirectories())`
	`76`	`+ foreach (DirectoryInfo directoryInfo in directory.GetDirectories())`
`74`	`77`	`newNames.Add(directoryInfo.FullName);`
`75`		`- foreach (FileInfo fileInfo in Directory.GetFiles())`
	`78`	`+ foreach (FileInfo fileInfo in directory.GetFiles())`
	`79`	`+ {`
	`80`	`+ if (IgnoredFiles.Contains(fileInfo.Name)) continue;`
`76`	`81`	`newNames.Add(fileInfo.FullName);`
	`82`	`+ }`
	`83`	`+`
`77`	`84`	`bool equals = true;`
`78`	`85`	`if (newNames.Count != names.Count)`
`79`		`- {`
`80`	`86`	`equals = false;`
`81`		`- }`
`82`	`87`	`else`
`83`		`- {`
`84`	`88`	`for (int i = 0; i < newNames.Count; i++)`
`85`		`- {`
`86`	`89`	`if (newNames[i] != names[i])`
`87`	`90`	`{`
`88`	`91`	`equals = false;`
`89`	`92`	`break;`
`90`	`93`	`}`
`91`		`- }`
`92`		`- }`
	`94`	`+`
`93`	`95`	`if (!equals)`
`94`	`96`	`{`
`95`		`- names.Clear();`
	`97`	`+ names = newNames;`
`96`	`98`	`Nodes.Clear();`
`97`		`- foreach (DirectoryInfo directoryInfo in Directory.GetDirectories())`
`98`		`- {`
`99`		`- new DirectoryNode(this, directoryInfo);`
`100`		`- names.Add(directoryInfo.FullName);`
`101`		`- }`
`102`		`- foreach (FileInfo fileInfo in Directory.GetFiles())`
	`99`	`+`
	`100`	`+ if (this is ServerNode) new ConsoleNode((ServerNode)this);`
	`101`	`+`
	`102`	`+ foreach (string path in names)`
`103`	`103`	`{`
`104`		`- new FileNode(this, fileInfo);`
`105`		`- names.Add(fileInfo.FullName);`
	`104`	`+ if (Directory.Exists(path))`
	`105`	`+ new DirectoryNode(this, new DirectoryInfo(path));`
	`106`	`+ if (File.Exists(path))`
	`107`	`+ new FileNode(this, new FileInfo(path));`
`106`	`108`	`}`
`107`	`109`	`}`
`108`	`110`	`}`
`@@ -111,14 +113,14 @@ private void Virtualize()`
`111`	`113`	`{`
`112`	`114`	`int fileCount = 0;`
`113`	`115`
`114`		`- fileCount = Directory.GetFiles().Length;`
`115`		`- if ((fileCount + Directory.GetDirectories().Length) > 0)`
	`116`	`+ fileCount = directory.GetFiles().Length;`
	`117`	`+ if ((fileCount + directory.GetDirectories().Length) > 0)`
`116`	`118`	`new FakeChildNode(this);`
`117`	`119`	`}`
`118`	`120`
`119`	`121`	`public DirectoryInfo GetDirectory()`
`120`	`122`	`{`
`121`		`- return Directory;`
	`123`	`+ return directory;`
`122`	`124`	`}`
`123`	`125`
`124`	`126`	`public new ServersTreeView TreeView`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,4 @@`
`7`	`7`
`8`	`8`	`[assembly: ComVisible(false)]`
`9`	`9`
`10`		`-[assembly: AssemblyVersion("0.7.3")]`
	`10`	`+[assembly: AssemblyVersion("0.7.3.1")]`