Minor optimizations in Packager Client

Author: muratcakir

src/Tools/SmartStore.Packager/ExtensionInfo.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+namespace SmartStore.Packager
+{
+	public class ExtensionInfo : Tuple<string, string>
+	{
+		public ExtensionInfo(string path, string name) : base(path, name)
+		{
+		}
+
+		public string Path { get { return base.Item1; } }
+		public string Name { get { return base.Item2; } }
+	}
+}

src/Tools/SmartStore.Packager/MainForm.Designer.cs

@@ -68,7 +68,7 @@ private void btnCreatePackages_Click(object sender, EventArgs e)
 			var outputPath = txtOutputPath.Text;
 
 			var erroredIds = new List<string>();
-			string currentPackage = string.Empty;
+			ExtensionInfo currentPackage = null;
 
 			try
 			{
@@ -80,22 +80,22 @@ private void btnCreatePackages_Click(object sender, EventArgs e)
 				// create plugin packages
 				foreach (var sel in lstPlugins.SelectedItems)
 				{
-					currentPackage = (string)sel;
-					var fi = creator.CreatePluginPackage((string)sel);
-					if (!LogMessage(fi, (string)sel))
+					currentPackage = (ExtensionInfo)sel;
+					var fi = creator.CreatePluginPackage(currentPackage.Path);
+					if (!LogMessage(fi, currentPackage.Name))
 					{
-						erroredIds.Add(currentPackage);
+						erroredIds.Add(currentPackage.Path);
 					}
 				}
 
 				// create theme packages
 				foreach (var sel in lstThemes.SelectedItems)
 				{
-					currentPackage = (string)sel;
-					var fi = creator.CreateThemePackage((string)sel);
-					if (!LogMessage(fi, (string)sel))
+					currentPackage = (ExtensionInfo)sel;
+					var fi = creator.CreateThemePackage(currentPackage.Path);
+					if (!LogMessage(fi, currentPackage.Name))
 					{
-						erroredIds.Add(currentPackage);
+						erroredIds.Add(currentPackage.Name);
 					}
 				}
 
@@ -151,61 +151,89 @@ private void btnReadDescriptions_Click(object sender, EventArgs e)
 
 			btnReadDescriptions.Enabled = false;
 
-			ReadPlugins(vpp);
-			ReadThemes(vpp);
+			ReadPackages(vpp);
 
 			btnReadDescriptions.Enabled = true;
 		}
 
-		private void ReadPlugins(IVirtualPathProvider vpp)
+
+		private void ReadPackages(IVirtualPathProvider vpp)
 		{
 			if (!ValidatePaths())
 				return;
 
+			lstPlugins.DisplayMember = "Name";
+			lstPlugins.ValueMember = "Path";
+			lstThemes.DisplayMember = "Name";
+			lstThemes.ValueMember = "Path";
+
 			lstPlugins.Items.Clear();
-			foreach (var dir in vpp.ListDirectories("~/Plugins"))
-			{
-				var filePath = vpp.Combine(dir, "Description.txt");
-				if (!vpp.FileExists(filePath))
-					continue;
+			lstThemes.Items.Clear();
 
-				try
+			IEnumerable<string> dirs = Enumerable.Empty<string>();
+
+			if (vpp.DirectoryExists("~/Plugins") || vpp.DirectoryExists("~/Themes"))
+			{
+				if (vpp.DirectoryExists("~/Plugins"))
 				{
-					var descriptor = PluginFileParser.ParsePluginDescriptionFile(vpp.MapPath(filePath));
-					if (descriptor != null)
-					{
-						lstPlugins.Items.Add(descriptor.FolderName);
-					}
+					dirs = dirs.Concat(vpp.ListDirectories("~/Plugins"));
 				}
-				catch
+				if (vpp.DirectoryExists("~/Themes"))
 				{
-					continue;
+					dirs = dirs.Concat(vpp.ListDirectories("~/Themes"));
 				}
 			}
-		}
-
-		private void ReadThemes(IVirtualPathProvider vpp)
-		{
-			if (!ValidatePaths())
-				return;
+			else
+			{
+				dirs = vpp.ListDirectories("~/");
+			}
 
-			lstThemes.Items.Clear();
-			foreach (var dir in vpp.ListDirectories("~/Themes"))
+			foreach (var dir in dirs)
 			{
-				var filePath = vpp.Combine(dir, "theme.config");
+				bool isTheme = false;
+
+				// is it a plugin?
+				var filePath = vpp.Combine(dir, "Description.txt");
 				if (!vpp.FileExists(filePath))
-					continue;
+				{
+					// ...no! is it a theme?
+					filePath = vpp.Combine(dir, "theme.config");
+					if (!vpp.FileExists(filePath))
+						continue;
+
+					isTheme = true;
+				}
 
 				try
 				{
-					var manifest = ThemeManifest.Create(vpp.MapPath(dir));
-					lstThemes.Items.Add(manifest.ThemeName);
+					if (isTheme)
+					{
+						var manifest = ThemeManifest.Create(vpp.MapPath(dir));
+						lstThemes.Items.Add(new ExtensionInfo(dir, manifest.ThemeName));
+					}
+					else
+					{
+						var descriptor = PluginFileParser.ParsePluginDescriptionFile(vpp.MapPath(filePath));
+						if (descriptor != null)
+						{
+							lstPlugins.Items.Add(new ExtensionInfo(dir, descriptor.FolderName));
+						}
+					}
 				}
 				catch
 				{
 					continue;
 				}
 			}
+
+			if (lstPlugins.Items.Count > 0) 
+			{
+				tabMain.SelectedIndex = 0;
+			}
+			else if (lstThemes.Items.Count > 0)
+			{
+				tabMain.SelectedIndex = 1;
+			}
 		}
 
 		private bool ValidatePaths()
@@ -217,13 +245,6 @@ private bool ValidatePaths()
 				return false;
 			}
 
-			//if (!Directory.Exists(txtOutputPath.Text))
-			//{
-			//	MessageBox.Show("Output path does not exist! Please specify an existing path", "Path error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			//	txtOutputPath.Focus();
-			//	return false;
-			//}
-
 			return true;
 		}
 

src/Tools/SmartStore.Packager/MainForm.cs

@@ -30,9 +30,9 @@ public PackageCreator(string rootPath, string outputPath)
 			_packageBuilder = new PackageBuilder(wsf, _vpp);
 		}
 
-		public FileInfo CreatePluginPackage(string folderName)
+		public FileInfo CreatePluginPackage(string path)
 		{
-			string virtualPath = "~/Plugins/{0}/Description.txt".FormatInvariant(folderName);
+			string virtualPath = _vpp.Combine(path, "Description.txt");
 
 			if (!_vpp.FileExists(virtualPath))
 			{
@@ -62,9 +62,9 @@ public FileInfo CreatePluginPackage(PluginDescriptor descriptor)
 			return SavePackageFile(result);
 		}
 
-		public FileInfo CreateThemePackage(string themeName)
+		public FileInfo CreateThemePackage(string virtualPath)
 		{
-			string virtualPath = "~/Themes/{0}".FormatInvariant(themeName);
+			//string virtualPath = "~/Themes/{0}".FormatInvariant(themeName);
 
 			var manifest = ThemeManifest.Create(_vpp.MapPath(virtualPath));
 

src/Tools/SmartStore.Packager/PackageCreator.cs

@@ -60,6 +60,7 @@
     <Compile Include="..\..\AssemblyVersionInfo.cs">
       <Link>Properties\AssemblyVersionInfo.cs</Link>
     </Compile>
+    <Compile Include="ExtensionInfo.cs" />
     <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
     </Compile>