Add actions support

.gitignore

@@ -11,3 +11,4 @@ __dummy.html
 bin/
 lib/
 docs/
+*.lst

README.md

@@ -36,10 +36,14 @@ This will start vlc with the first parameter set to $HOME/Music:
 
     dub run desktopfile:desktoputil -- exec /usr/share/applications/vlc.desktop $HOME/Music
 
-Should start command line application in terminal emulator:
+Should start command line application in terminal emulator (will be detected automatically):
 
     dub run desktopfile:desktoputil -- exec /usr/share/applications/python2.7.desktop
 
+Run in specific terminal emulator:
+
+    dub run desktopfile:desktoputil -- exec /usr/share/applications/python2.7.desktop --term=xterm
+
 Open link with preferred application:
 
     dub run desktopfile:desktoputil -- link /usr/share/desktop-base/debian-homepage.desktop
@@ -48,7 +52,7 @@ Starts .desktop file defined executable or opens link:
 
     dub run desktopfile:desktoputil -- start /path/to/file.desktop
 
-Parse and write .desktop file to new location:
+Parse and write .desktop file to new location (to testing purposes):
 
     dub run desktopfile:desktoputil -- write /usr/share/applications/vlc.desktop $HOME/Desktop/vlc.desktop
 

dub.json

@@ -5,7 +5,7 @@
     "copyright": "Copyright © 2015, Roman Chistokhodov",
     "authors": ["Roman Chistokhodov"],
     "dependencies": {
-        "inilike": "~>0.2.0",
+        "inilike": "~>0.2.1",
         "standardpaths": "~>0.2.0"
     },
     "targetName" : "desktopfile",

dub.selections.json

@@ -2,6 +2,6 @@
 	"fileVersion": 1,
 	"versions": {
 		"standardpaths": "0.2.0",
-		"inilike": "0.2.0"
+		"inilike": "0.2.1"
 	}
 }

examples/desktoptest/dub.selections.json

@@ -2,6 +2,6 @@
 	"fileVersion": 1,
 	"versions": {
 		"standardpaths": "0.2.0",
-		"inilike": "0.2.0"
+		"inilike": "0.2.1"
 	}
 }

examples/desktoputil/dub.selections.json

@@ -2,6 +2,6 @@
 	"fileVersion": 1,
 	"versions": {
 		"standardpaths": "0.2.0",
-		"inilike": "0.2.0"
+		"inilike": "0.2.1"
 	}
 }

examples/desktoputil/source/app.d

@@ -1,5 +1,6 @@
 import std.stdio;
 import desktopfile;
+import std.getopt;
 
 void main(string[] args)
 {
@@ -10,17 +11,20 @@ void main(string[] args)
 
     string command = args[1];
     string inFile = args[2];
-
+    string locale = currentLocale();
 
     if (command == "read") {
         auto df = new DesktopFile(inFile, DesktopFile.ReadOptions.preserveComments | DesktopFile.ReadOptions.firstGroupOnly);
 
-        writeln("Name: ", df.name());
-        writeln("GenericName: ", df.genericName());
-        writeln("Comment: ", df.comment());
+        writefln("Name: %s. Localized: %s", df.name(), df.localizedName(locale));
+        writefln("GenericName: %s. Localized: %s", df.genericName(), df.localizedGenericName(locale));
+        writefln("Comment: %s. Localized: %s", df.comment(), df.localizedComment(locale));
         writeln("Type: ", df.value("Type"));
         writeln("Icon: ", df.iconName());
         writeln("Desktop ID: ", df.id());
+        writefln("Actions: %(%s %)", df.actions());
+        writefln("Categories: %(%s %)", df.categories());
+        writefln("MimeTypes: %(%s %)", df.mimeTypes());
 
         if (df.type() == DesktopFile.Type.Application) {
             writeln("Exec: ", df.execString());
@@ -30,10 +34,29 @@ void main(string[] args)
             writeln("URL: ", df.url());
         }
     } else if (command == "exec") {
-        auto df = new DesktopFile(inFile, DesktopFile.ReadOptions.firstGroupOnly);
-        string[] urls = args[3..$];
-        writeln("Exec:", df.expandExecString(urls));
-        df.startApplication(urls);
+        auto df = new DesktopFile(inFile);
+        string action;
+        string term;
+        getopt(args, "action", "Action to run", &action, 
+               "term", "Preferred terminal emulator to run console applications", &term);
+        if (action.length) {
+            auto desktopAction = df.action(action);
+            if (desktopAction.group() is null) {
+                stderr.writefln("No such action %s", action);
+            } else {
+                desktopAction.start();
+            }
+        } else {
+            string[] urls = args[3..$];
+            writeln("Exec:", df.expandExecString(urls));
+            if (term.length) {
+                df.startApplication(urls, locale, term);
+            } else {
+                df.startApplication(urls, locale);
+            }
+        }
+
+
     } else if (command == "link") {
         auto df = new DesktopFile(inFile, DesktopFile.ReadOptions.firstGroupOnly);
         writeln("Link:", df.url());
@@ -50,6 +73,6 @@ void main(string[] args)
             writeln(df.saveToString());
         }
     } else {
-        writefln("unknown command '%s'", command);
+        stderr.writefln("unknown command '%s'", command);
     }
 }