Be a little bit more careful about the handling of the "Exec=" field codes in *.desktop files. This seems to fix the occasional issue with KDE *.desktop shotcuts (okular in particular).

2 files changed, 28 insertions, 7 deletions

diff --git a/libLumina/LuminaXDG.cpp b/libLumina/LuminaXDG.cpp
index b58f4326..3940da11 100644
--- a/libLumina/LuminaXDG.cpp
+++ b/libLumina/LuminaXDG.cpp
@@ -254,9 +254,12 @@ QString LXDG::getDesktopExec(XDGDesktop app){
     out = app.exec;
   }
   //Now perform any of the XDG flag substitutions as appropriate (9/2014 standards)
-  if(out.contains(" %i ")){ out.replace(" %i ", " --icon "+app.icon+" "); }
-  if(out.contains(" %c ")){ out.replace(" %c ", " "+app.name+" "); }
-  if(out.contains(" %k ")){ out.replace(" %k ", " "+app.filePath+" "); }
+  if(out.contains("%i")){ out.replace("%i", "--icon \'"+app.icon+"\'"); }
+  if(out.contains("%c")){ 
+    if(!app.name.isEmpty()){ out.replace("%c", ""+app.name+""); }
+    else if(!app.genericName.isEmpty()){ out.replace(" %c ", ""+app.genericName+""); }
+  }
+  if(out.contains("%k")){ out.replace("%k", "\'"+app.filePath+"\'"); }
   return out;
 }
 
diff --git a/lumina-open/main.cpp b/lumina-open/main.cpp
index f87317e4..36d6c1ec 100644
--- a/lumina-open/main.cpp
+++ b/lumina-open/main.cpp
@@ -250,11 +250,29 @@ void getCMD(int argc, char ** argv, QString& binary, QString& args, QString& pat
     cmd = cmdFromUser(argc, argv, inFile, extension, path, showDLG);
     }
   }
+  //Now assemble the exec string (replace file/url field codes as necessary)
+  if(useInputFile){ 
+    args = inFile; //just to keep them distinct internally
+    // NOTE: lumina-open is only designed for a single input file,
+    //    so no need to distinguish between the list codes (uppercase) 
+    //    and the single-file codes (lowercase)
+    if(isFile && (cmd.contains("%f") || cmd.contains("%F") ) ){
+      cmd.replace("%f","\""+inFile+"\"");
+      cmd.replace("%F","\""+inFile+"\"");
+    }else if(isUrl && (cmd.contains("%U") || cmd.contains("%u")) ){
+      cmd.replace("%u","\""+inFile+"\"");
+      cmd.replace("%U","\""+inFile+"\"");
+    }else{
+      //No field codes (or improper field codes given - which is quite common)
+      // - Just tack the input file on the end and let the app handle it as necessary
+      cmd.append(" \""+inFile+"\"");
+    }
+  }
   //qDebug() << "Found Command:" << cmd << "Extension:" << extension;
-  //Clean up the command appropriately for output
+  //Clean up any leftover "Exec" field codes (should have already been replaced earlier)
   if(cmd.contains("%")){cmd = cmd.remove("%U").remove("%u").remove("%F").remove("%f").remove("%i").remove("%c").remove("%k").simplified(); }
-  binary = cmd;
-  if(useInputFile){ args = inFile; }
+  binary = cmd; //pass this string to the calling function
+
 }
 
 int main(int argc, char **argv){
@@ -269,7 +287,7 @@ int main(int argc, char **argv){
   //qDebug() << "Run CMD:" << cmd << args;
   //Now run the command (move to execvp() later?)
   if(cmd.isEmpty()){ return 0; } //no command to run (handled internally)
-  if(!args.isEmpty()){ cmd.append(" \""+args+"\""); }
+  //if(!args.isEmpty()){ cmd.append(" "+args+""); }
   //int retcode = system( cmd.toUtf8() );
   qDebug() << "[lumina-open] Running Cmd:" << cmd;
   QProcess *p = new QProcess();