libpnd; fix for docs ("info") in pnds, being emitted into .desktops for mmenu sake

[pandora-libraries.git] / lib / pnd_desktop.c

diff --git a/lib/pnd_desktop.c b/lib/pnd_desktop.c
index 77d363a..3fffa36 100644 (file)
--- a/lib/pnd_desktop.c
+++ b/lib/pnd_desktop.c
@@ -84,6 +84,44 @@ unsigned char pnd_emit_dotdesktop ( char *targetpath, char *pndrun, pnd_disco_t
   }
 #endif
 
+  if ( p -> preview_pic1 ) {
+    fprintf ( f, "X-Pandora-Preview-Pic-1=%s\n", p -> preview_pic1 );
+  }
+
+  if ( p -> clockspeed ) {
+    fprintf ( f, "X-Pandora-Clockspeed=%s\n", p -> clockspeed );
+  }
+
+  if ( p -> startdir ) {
+    fprintf ( f, "X-Pandora-Startdir=%s\n", p -> startdir );
+  }
+
+  if ( p -> main_category ) {
+    fprintf ( f, "X-Pandora-MainCategory=%s\n", p -> main_category );
+  }
+  if ( p -> main_category1 ) {
+    fprintf ( f, "X-Pandora-MainCategory1=%s\n", p -> main_category1 );
+  }
+  if ( p -> main_category2 ) {
+    fprintf ( f, "X-Pandora-MainCategory2=%s\n", p -> main_category2 );
+  }
+
+  if ( p -> alt_category ) {
+    fprintf ( f, "X-Pandora-AltCategory=%s\n", p -> alt_category );
+  }
+  if ( p -> alt_category1 ) {
+    fprintf ( f, "X-Pandora-AltCategory1=%s\n", p -> alt_category1 );
+  }
+  if ( p -> alt_category2 ) {
+    fprintf ( f, "X-Pandora-AltCategory2=%s\n", p -> alt_category2 );
+  }
+  if ( p -> info_filename ) {
+    fprintf ( f, "X-Pandora-Info-Filename=%s\n", p -> info_filename );
+  }
+  if ( p -> info_name ) {
+    fprintf ( f, "X-Pandora-Info-Name=%s\n", p -> info_name );
+  }
+
 #if 0 // we let pnd_run.sh command line handle this instead of in .desktop
   if ( p -> startdir ) {
     snprintf ( buffer, 1020, "Path=%s\n", p -> startdir );
@@ -142,6 +180,17 @@ unsigned char pnd_emit_dotdesktop ( char *targetpath, char *pndrun, pnd_disco_t
 
     // emit
     fprintf ( f, "%s", buffer );
+
+    // and lets copy in some stuff in case it makes .desktop consumers life easier
+    if ( p -> exec ) { fprintf ( f, "X-Pandora-Exec=%s\n", p -> exec ); }
+    if ( p -> appdata_dirname ) { fprintf ( f, "X-Pandora-Appdata-Dirname=%s\n", p -> appdata_dirname ); }
+    if ( p -> execargs ) { fprintf ( f, "X-Pandora-ExecArgs=%s\n", p -> execargs ); }
+    if ( p -> object_flags & PND_DISCO_FLAG_OVR ) { fprintf ( f, "X-Pandora-Object-Flag-OVR=%s\n", "Yes" ); }
+    if ( p -> object_type == pnd_object_type_pnd ) {
+      fprintf ( f, "X-Pandora-Object-Path=%s\n", p -> object_path );
+      fprintf ( f, "X-Pandora-Object-Filename=%s\n", p -> object_filename );
+    }
+
   }
 
   // categories
@@ -761,6 +810,13 @@ pnd_disco_t *pnd_parse_dotdesktop ( char *ddpath, unsigned int flags ) {
   }
 
   if ( strstr ( ddpath, ".desktop" ) == NULL ) {
+    return ( NULL ); // no .desktop in filename, must be something else... skip!
+  }
+
+  if ( strstr ( ddpath, "info.desktop" ) != NULL ) {
+    // ".....info.desktop" is the 'document help' (README) emitted from a pnd, not an actual app; minimenu rather
+    // expects the doc-info as part of the main app, not a separate app.. so lets drop it here, to avoid doubling up
+    // the number of applications, needlessly..
     return ( NULL );
   }
 
@@ -808,6 +864,44 @@ pnd_disco_t *pnd_parse_dotdesktop ( char *ddpath, unsigned int flags ) {
       libpnd_origin = 1;
     } else if ( strncmp ( dd, "X-Pandora-UID=", 14 ) == 0 ) {
       p -> unique_id = strdup ( dd + 14 );
+    } else if ( strncmp ( dd, "X-Pandora-Preview-Pic-1=", 24 ) == 0 ) {
+      p -> preview_pic1 = strdup ( dd + 24 );
+    } else if ( strncmp ( dd, "X-Pandora-Clockspeed=", 21 ) == 0 ) {
+      p -> clockspeed = strdup ( dd + 21 );
+    } else if ( strncmp ( dd, "X-Pandora-Startdir=", 19 ) == 0 ) {
+      p -> startdir = strdup ( dd + 19 );
+    } else if ( strncmp ( dd, "X-Pandora-Appdata-Dirname=", 26 ) == 0 ) {
+      p -> appdata_dirname = strdup ( dd + 26 );
+    } else if ( strncmp ( dd, "X-Pandora-ExecArgs=", 19 ) == 0 ) {
+      p -> execargs = strdup ( dd + 19 );
+    } else if ( strncmp ( dd, "X-Pandora-Exec=", 15 ) == 0 ) {
+      p -> exec = strdup ( dd + 15 );
+    } else if ( strncmp ( dd, "X-Pandora-Object-Path=", 22 ) == 0 ) {
+      p -> object_path = strdup ( dd + 22 );
+    } else if ( strncmp ( dd, "X-Pandora-Object-Filename=", 26 ) == 0 ) {
+      p -> object_filename = strdup ( dd + 26 );
+    } else if ( strncmp ( dd, "X-Pandora-Object-Flag-OVR=", 26 ) == 0 ) {
+      p -> object_flags |= PND_DISCO_FLAG_OVR;
+
+    } else if ( strncmp ( dd, "X-Pandora-MainCategory=", 23 ) == 0 ) {
+      p -> main_category = strdup ( dd + 23 );
+    } else if ( strncmp ( dd, "X-Pandora-MainCategory1=", 24 ) == 0 ) {
+      p -> main_category1 = strdup ( dd + 24 );
+    } else if ( strncmp ( dd, "X-Pandora-MainCategory2=", 24 ) == 0 ) {
+      p -> main_category2 = strdup ( dd + 24 );
+
+    } else if ( strncmp ( dd, "X-Pandora-AltCategory=", 22 ) == 0 ) {
+      p -> alt_category = strdup ( dd + 22 );
+    } else if ( strncmp ( dd, "X-Pandora-AltCategory1=", 23 ) == 0 ) {
+      p -> alt_category1 = strdup ( dd + 23 );
+    } else if ( strncmp ( dd, "X-Pandora-AltCategory2=", 23 ) == 0 ) {
+      p -> alt_category2 = strdup ( dd + 23 );
+
+    } else if ( strncmp ( dd, "X-Pandora-Info-Filename=", 24 ) == 0 ) {
+      p -> info_filename = strdup ( dd + 24 );
+    } else if ( strncmp ( dd, "X-Pandora-Info-Name=", 20 ) == 0 ) {
+      p -> info_name = strdup ( dd + 20 );
+
     } else if ( strncmp ( dd, "Comment=", 8 ) == 0 ) {
       p -> desc_en = strdup ( dd + 8 );
     } else if ( strncmp ( dd, "Comment[en]=", 12 ) == 0 ) {
@@ -818,6 +912,7 @@ pnd_disco_t *pnd_parse_dotdesktop ( char *ddpath, unsigned int flags ) {
 
       if ( e ) {
        // probably libpnd app
+#if 0 // no needed due to above X-Pandora attributes
 
        if ( e ) {
          e += 5;
@@ -839,12 +934,14 @@ pnd_disco_t *pnd_parse_dotdesktop ( char *ddpath, unsigned int flags ) {
          char *space = strchr ( p, ' ' );
          strncpy ( pndpath, p, space - p - 1 );
        }
+#endif
 
       } else {
        // probably not libpnd app
        p -> exec = strdup ( dd + 5 );
       }
 
+#if 0 // ignore; using X- categories now
     } else if ( strncmp ( dd, "Categories=", 11 ) == 0 ) {
       // HACK; only honours first category
       char *semi = strchr ( dd, ';' );
@@ -857,6 +954,8 @@ pnd_disco_t *pnd_parse_dotdesktop ( char *ddpath, unsigned int flags ) {
       if ( semi ) {
        *semi = '\0';
       }
+#endif
+
     }
 
     //
@@ -877,7 +976,7 @@ pnd_disco_t *pnd_parse_dotdesktop ( char *ddpath, unsigned int flags ) {
     }
 
   } else {
-    p -> object_flags |= PND_DISCO_CUSTOM1; // so caller can do something if it wishes
+    p -> object_flags |= PND_DISCO_LIBPND_DD; // so caller can do something if it wishes
   }
 
   // filter on content
@@ -905,6 +1004,7 @@ pnd_disco_t *pnd_parse_dotdesktop ( char *ddpath, unsigned int flags ) {
   // additional
   p -> object_type = pnd_object_type_pnd;
 
+#if 0 // nolonger needed due to above X-Pandora attributes
   char *source;
   if ( pndpath [ 0 ] ) {
     source = pndpath;
@@ -920,8 +1020,15 @@ pnd_disco_t *pnd_parse_dotdesktop ( char *ddpath, unsigned int flags ) {
     p -> object_path = "./";
     p -> object_filename = strdup ( source );
   }
+#endif
 
-  fprintf ( stderr, "object %s /// src %s /// %s /// %s\n", ddpath, source, p -> object_path, p -> object_filename );
+  // lame guards, in case of lazy consumers and broken .desktop files
+  if ( p -> object_path == NULL ) {
+    p -> object_path = strdup ( "/tmp" );
+  }
+  if ( p -> object_filename == NULL ) {
+    p -> object_filename = strdup ( "" ); // force bad filename
+  }
 
   // return disco-t
   return ( p );