Merge lp:~alexlauni/do/xdg-appitemsource into lp:do

[Alex Launi]

[Jason Smith (jassmith)]

looks good

review: Approve

=== modified file 'Do.Platform.Linux/src/Do.Universe/ApplicationItemSource.cs'
--- Do.Platform.Linux/src/Do.Universe/ApplicationItemSource.cs	2009-01-15 19:25:06 +0000
+++ Do.Platform.Linux/src/Do.Universe/ApplicationItemSource.cs	2009-03-12 21:04:48 +0000
@@ -33,26 +33,13 @@
 	public class ApplicationItemSource : ItemSource {
 
 		const bool show_hidden = false;
-
-		private IEnumerable<Item> app_items;
-
-		/// <summary>
-		/// Locations to search for .desktop files.
-		/// </summary>
-		static IEnumerable<String> DesktopFilesDirectories {
-			get {
-				return new [] {
-					Environment.GetFolderPath (Environment.SpecialFolder.Desktop),
-					"~/.local/share/applications",
-					"~/.local/share/applications/wine",
-					"~/.local/share/applications/wine/Programs",
-					"/usr/share/applications",
-					"/usr/share/applications/kde",
-					"/usr/share/applications/kde4",
-					"/usr/share/gdm/applications",
-					"/usr/local/share/applications",
-				};
-			}
+		static IEnumerable<string> desktop_file_directories;
+		
+		IEnumerable<Item> app_items;
+		
+		static ApplicationItemSource ()
+		{
+			desktop_file_directories = ReadXdgDataDirs ();
 		}
 		
 		public ApplicationItemSource ()
@@ -87,21 +74,36 @@
 		/// directory
 		/// where .desktop files can be found.
 		/// </param>
-		private static IEnumerable<ApplicationItem> LoadDesktopFiles (string dir)
+		static IEnumerable<ApplicationItem> LoadDesktopFiles (string dir)
 		{
+			Queue<string> queue;
+			List<ApplicationItem> apps;
+			
 			if (!Directory.Exists (dir))
 				return Enumerable.Empty<ApplicationItem> ();
-
-			return Directory.GetFiles (dir, "*.desktop")
-				.Select (file => ApplicationItem.MaybeCreateFromDesktopItem (file))
-				.Where (app => app != null &&
-								app.IsAppropriateForCurrentDesktop &&
-								(show_hidden || !app.NoDisplay));
+			
+			queue = new Queue<string> ();
+			queue.Enqueue (dir);
+			
+			apps = new List<ApplicationItem> ();
+				
+			while (queue.Count > 0) {
+				dir = queue.Dequeue ();
+				foreach (string d in Directory.GetDirectories (dir))
+					queue.Enqueue (d);
+				
+				apps.AddRange (Directory.GetFiles (dir, "*.desktop")
+					.Select (file => ApplicationItem.MaybeCreateFromDesktopItem (file))
+					.Where (app => app != null && app.IsAppropriateForCurrentDesktop && (show_hidden || !app.NoDisplay))
+				);
+			}
+			
+			return apps;
 		}
-
+		
 		public override void UpdateItems ()
 		{
-			app_items = DesktopFilesDirectories
+			app_items = desktop_file_directories
 				.Select (dir => dir.Replace ("~", Environment.GetFolderPath (Environment.SpecialFolder.Personal)))
 				.SelectMany (dir => LoadDesktopFiles (dir))
 				.Cast<Item> ()
@@ -111,6 +113,31 @@
 		public override IEnumerable<Item> Items {
 			get { return app_items; }
 		}
-
+		
+		static IEnumerable<string> ReadXdgDataDirs ()
+		{
+			string home, envPath;
+			
+			const string appDirSuffix = "applications";
+			string [] xdgVars = new [] {"XDG_DATA_HOME", "XDG_DATA_DIRS"};
+			
+			home = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
+				
+			foreach (string xdgVar in xdgVars) {
+				envPath = Environment.GetEnvironmentVariable (xdgVar);
+						
+				if (string.IsNullOrEmpty (envPath)) {
+					if (xdgVar == "XDG_DATA_HOME") {
+						yield return (new [] {home, ".local/share", appDirSuffix}.Aggregate (Path.Combine));
+					} else if (xdgVar == "XDG_DATA_DIRS") {
+						yield return Path.Combine ("/usr/local/share/", appDirSuffix);
+						yield return Path.Combine ("/usr/share/applications", appDirSuffix);
+					}
+				} else {
+					foreach (string dir in envPath.Split (':'))
+						yield return Path.Combine (dir, appDirSuffix);
+				}
+			}
+		}
 	}
 }