X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-libraries.git;a=blobdiff_plain;f=lib%2Fpnd_discovery.c;h=7d89475aceea9d5a682c5d2c7794c2bdd9c0ce42;hp=1822c0f52d3f3b677718430949c6fddfc37ddb54;hb=b2aaaf39eef7bcc2bfa000fbdb9f72e6d0f656c8;hpb=d894ebf8ebdbd1b9e1d92b3278697db5971b7de6 diff --git a/lib/pnd_discovery.c b/lib/pnd_discovery.c index 1822c0f..7d89475 100644 --- a/lib/pnd_discovery.c +++ b/lib/pnd_discovery.c @@ -2,12 +2,16 @@ #include /* for FILE etc */ #include /* for malloc */ #include /* for unlink */ +#include /* for PATH_MAX */ +#include +#include #define __USE_GNU /* for strcasestr */ #include /* for making ftw.h happy */ #define _XOPEN_SOURCE 500 #define __USE_XOPEN_EXTENDED +#define _GNU_SOURCE #include /* for nftw, tree walker */ #include "pnd_container.h" @@ -16,36 +20,34 @@ #include "pnd_pathiter.h" #include "pnd_apps.h" #include "pnd_pndfiles.h" +#include "pnd_logger.h" +#include "pnd_conf.h" // need these 'globals' due to the way nftw and ftw work :/ static pnd_box_handle disco_box; static char *disco_overrides = NULL; void pnd_disco_destroy ( pnd_disco_t *p ) { - - if ( p -> title_en ) { - free ( p -> title_en ); - } - - if ( p -> icon ) { - free ( p -> icon ); - } - - if ( p -> exec ) { - free ( p -> exec ); - } - - if ( p -> unique_id ) { - free ( p -> unique_id ); - } - - if ( p -> main_category ) { - free ( p -> main_category ); - } - - if ( p -> clockspeed ) { - free ( p -> clockspeed ); - } + if ( p -> package_id ) { free ( p -> package_id); } + if ( p -> title_en ) { free ( p -> title_en ); } + if ( p -> unique_id ) { free ( p -> unique_id ); } + if ( p -> appdata_dirname ) { free ( p -> appdata_dirname ); } + if ( p -> icon ) { free ( p -> icon ); } + if ( p -> exec ) { free ( p -> exec ); } + if ( p -> execargs ) { free ( p -> execargs ); } + if ( p -> clockspeed ) { free ( p -> clockspeed ); } + if ( p -> startdir ) { free ( p -> startdir ); } + if ( p -> option_no_x11 ) { free ( p -> option_no_x11 ); } + if ( p -> main_category ) { free ( p -> main_category ); } + if ( p -> main_category1 ) { free ( p -> main_category1 ); } + if ( p -> main_category2 ) { free ( p -> main_category2 ); } + if ( p -> alt_category ) { free ( p -> alt_category ); } + if ( p -> alt_category1 ) { free ( p -> alt_category1 ); } + if ( p -> alt_category2 ) { free ( p -> alt_category2 ); } + if ( p -> mkdir_sp ) { free ( p -> mkdir_sp ); } + if ( p -> info_name ) { free ( p -> info_name ); } + if ( p -> info_type ) { free ( p -> info_type ); } + if ( p -> info_filename ) { free ( p -> info_filename ); } return; } @@ -55,14 +57,24 @@ static int pnd_disco_callback ( const char *fpath, const struct stat *sb, { unsigned char valid = pnd_object_type_unknown; pnd_pxml_handle pxmlh = 0; + pnd_pxml_handle *pxmlapps = NULL; + pnd_pxml_handle *pxmlappiter; unsigned int pxml_close_pos = 0; + unsigned char logit = pnd_log_do_buried_logging(); - //printf ( "disco root callback encountered '%s'\n", fpath ); + if ( logit ) { + pnd_log ( PND_LOG_DEFAULT, "disco callback encountered '%s'\n", fpath ); + } // PXML.xml is a possible application candidate (and not a dir named PXML.xml :) if ( typeflag & FTW_D ) { - //printf ( " .. is dir, skipping\n" ); - return ( 0 ); // skip directories and other non-regular files + if ( logit ) { + pnd_log ( PND_LOG_DEFAULT, " .. is dir, skipping\n" ); + } + if ( ftwbuf -> level >= pathiter_depthlimit ) { + return ( FTW_SKIP_SUBTREE ); + } + return ( FTW_CONTINUE ); // skip directories and other non-regular files } // PND/PNZ file and others may be valid as well .. but lets leave that for now @@ -75,8 +87,10 @@ static int pnd_disco_callback ( const char *fpath, const struct stat *sb, // if not a file of interest, just keep looking until we run out if ( ! valid ) { - //printf ( " .. bad filename, skipping\n" ); - return ( 0 ); + if ( logit ) { + pnd_log ( PND_LOG_DEFAULT, " .. bad filename, skipping\n" ); + } + return ( FTW_CONTINUE ); } // potentially a valid application @@ -85,7 +99,7 @@ static int pnd_disco_callback ( const char *fpath, const struct stat *sb, //printf ( "PXML: disco callback encountered '%s'\n", fpath ); // pick up the PXML if we can - pxmlh = pnd_pxml_fetch ( (char*) fpath ); + pxmlapps = pnd_pxml_fetch ( (char*) fpath ); } else if ( valid == pnd_object_type_pnd ) { // PND ... ?? @@ -104,13 +118,13 @@ static int pnd_disco_callback ( const char *fpath, const struct stat *sb, // try to locate the PXML portion if ( ! pnd_pnd_seek_pxml ( f ) ) { fclose ( f ); - return ( 0 ); // pnd or not, but not to spec. Pwn'd the pnd? + return ( FTW_CONTINUE ); // pnd or not, but not to spec. Pwn'd the pnd? } // accrue it into a buffer if ( ! pnd_pnd_accrue_pxml ( f, pxmlbuf, 32 * 1024 ) ) { fclose ( f ); - return ( 0 ); + return ( FTW_CONTINUE ); } //printf ( "buffer is %s\n", pxmlbuf ); @@ -119,20 +133,39 @@ static int pnd_disco_callback ( const char *fpath, const struct stat *sb, #if 1 // icon // for convenience, lets skip along past trailing newlines/CR's in hopes of finding icon data? { - unsigned int pos = ftell ( f ); char pngbuffer [ 16 ]; // \211 P N G \r \n \032 \n pngbuffer [ 0 ] = 137; pngbuffer [ 1 ] = 80; pngbuffer [ 2 ] = 78; pngbuffer [ 3 ] = 71; pngbuffer [ 4 ] = 13; pngbuffer [ 5 ] = 10; pngbuffer [ 6 ] = 26; pngbuffer [ 7 ] = 10; - if ( fread ( pngbuffer + 8, 8, 1, f ) == 1 ) { - if ( memcmp ( pngbuffer, pngbuffer + 8, 8 ) == 0 ) { - pxml_close_pos = pos; - } + + unsigned char padtests = 20; + unsigned int padstart = ftell ( f ); + + // seek back 10 (should be back into the /PXML> part) to catch any appending-icon-no-line-endings funny business + fseek ( f, -10, SEEK_CUR ); + + while ( padtests ) { + + if ( fread ( pngbuffer + 8, 8, 1, f ) == 1 ) { + if ( memcmp ( pngbuffer, pngbuffer + 8, 8 ) == 0 ) { + pxml_close_pos = ftell ( f ) - 8; + break; + } // if + fseek ( f, -7, SEEK_CUR ); // seek back 7 (so we're 1 further than we started, since PNG header is 8b) + } // if read + + padtests --; + } // while + + if ( ! padtests ) { + // no icon found, so back to where we started looking + fseek ( f, padstart, SEEK_SET ); } + } // icon #endif // by now, we have .. , try to parse.. - pxmlh = pnd_pxml_fetch_buffer ( (char*) fpath, pxmlbuf ); + pxmlapps = pnd_pxml_fetch_buffer ( (char*) fpath, pxmlbuf ); // done with file fclose ( f ); @@ -140,15 +173,31 @@ static int pnd_disco_callback ( const char *fpath, const struct stat *sb, } // pxmlh is useful? - if ( pxmlh ) { + if ( ! pxmlapps ) { + return ( FTW_CONTINUE ); // continue tree walk + } + + // for ovr-file + char ovrfile [ PATH_MAX ]; + pnd_box_handle ovrh = 0; // 0 didn't try, -1 tried and failed, >0 tried and got - // look for any overrides, if requested - pnd_pxml_merge_override ( pxmlh, disco_overrides ); + // iterate across apps in the PXML + pxmlappiter = pxmlapps; + while ( 1 ) { + pxmlh = *pxmlappiter; + pxmlappiter++; + + if ( ! pxmlh ) { + break; // all done + } // check for validity and add to resultset if it looks executable if ( pnd_is_pxml_valid_app ( pxmlh ) ) { pnd_disco_t *p; char *fixpxml; + char *z; + + //pnd_log ( PND_LOG_DEFAULT, "Setting up discovered app %u\n", ((pnd_pxml_t*) pxmlh) -> subapp_number ); p = pnd_box_allocinsert ( disco_box, (char*) fpath, sizeof(pnd_disco_t) ); @@ -165,6 +214,9 @@ static int pnd_disco_callback ( const char *fpath, const struct stat *sb, p -> object_filename = strdup ( fixpxml + 1 ); } + // subapp-number + p -> subapp_number = ((pnd_pxml_t*) pxmlh) -> subapp_number; + // png icon path p -> pnd_icon_pos = pxml_close_pos; @@ -172,20 +224,32 @@ static int pnd_disco_callback ( const char *fpath, const struct stat *sb, p -> object_type = valid; // PXML fields + if ( pnd_pxml_get_package_id ( pxmlh ) ) { + p -> package_id = strdup ( pnd_pxml_get_package_id ( pxmlh ) ); + } if ( pnd_pxml_get_app_name_en ( pxmlh ) ) { p -> title_en = strdup ( pnd_pxml_get_app_name_en ( pxmlh ) ); } + if ( pnd_pxml_get_description_en ( pxmlh ) ) { + p -> desc_en = strdup ( pnd_pxml_get_description_en ( pxmlh ) ); + } if ( pnd_pxml_get_icon ( pxmlh ) ) { p -> icon = strdup ( pnd_pxml_get_icon ( pxmlh ) ); } if ( pnd_pxml_get_exec ( pxmlh ) ) { p -> exec = strdup ( pnd_pxml_get_exec ( pxmlh ) ); } + if ( pnd_pxml_get_execargs ( pxmlh ) ) { + p -> execargs = strdup ( pnd_pxml_get_execargs ( pxmlh ) ); + } + if ( pnd_pxml_get_exec_option_no_x11 ( pxmlh ) ) { + p -> option_no_x11 = strdup ( pnd_pxml_get_exec_option_no_x11 ( pxmlh ) ); + } if ( pnd_pxml_get_unique_id ( pxmlh ) ) { p -> unique_id = strdup ( pnd_pxml_get_unique_id ( pxmlh ) ); } - if ( pnd_pxml_get_main_category ( pxmlh ) ) { - p -> main_category = strdup ( pnd_pxml_get_main_category ( pxmlh ) ); + if ( pnd_pxml_get_appdata_dirname ( pxmlh ) ) { + p -> appdata_dirname = strdup ( pnd_pxml_get_appdata_dirname ( pxmlh ) ); } if ( pnd_pxml_get_clockspeed ( pxmlh ) ) { p -> clockspeed = strdup ( pnd_pxml_get_clockspeed ( pxmlh ) ); @@ -193,6 +257,130 @@ static int pnd_disco_callback ( const char *fpath, const struct stat *sb, if ( pnd_pxml_get_startdir ( pxmlh ) ) { p -> startdir = strdup ( pnd_pxml_get_startdir ( pxmlh ) ); } + // category kruft + if ( pnd_pxml_get_main_category ( pxmlh ) ) { + p -> main_category = strdup ( pnd_pxml_get_main_category ( pxmlh ) ); + } + if ( pnd_pxml_get_subcategory1 ( pxmlh ) ) { + p -> main_category1 = strdup ( pnd_pxml_get_subcategory1 ( pxmlh ) ); + } + if ( pnd_pxml_get_subcategory2 ( pxmlh ) ) { + p -> main_category2 = strdup ( pnd_pxml_get_subcategory2 ( pxmlh ) ); + } + if ( pnd_pxml_get_altcategory ( pxmlh ) ) { + p -> alt_category = strdup ( pnd_pxml_get_altcategory ( pxmlh ) ); + } + if ( pnd_pxml_get_altsubcategory1 ( pxmlh ) ) { + p -> alt_category1 = strdup ( pnd_pxml_get_altsubcategory1 ( pxmlh ) ); + } + if ( pnd_pxml_get_altsubcategory2 ( pxmlh ) ) { + p -> alt_category2 = strdup ( pnd_pxml_get_altsubcategory2 ( pxmlh ) ); + } + // preview pics + if ( ( z = pnd_pxml_get_previewpic1 ( pxmlh ) ) ) { + p -> preview_pic1 = strdup ( z ); + } + if ( ( z = pnd_pxml_get_previewpic2 ( pxmlh ) ) ) { + p -> preview_pic2 = strdup ( z ); + } + // mkdirs + if ( pnd_pxml_get_mkdir ( pxmlh ) ) { + p -> mkdir_sp = strdup ( pnd_pxml_get_mkdir ( pxmlh ) ); + } + // info + if ( pnd_pxml_get_info_src ( pxmlh ) ) { + p -> info_filename = strdup ( pnd_pxml_get_info_src ( pxmlh ) ); + } + if ( pnd_pxml_get_info_name ( pxmlh ) ) { + p -> info_name = strdup ( pnd_pxml_get_info_name ( pxmlh ) ); + } + if ( pnd_pxml_get_info_type ( pxmlh ) ) { + p -> info_type = strdup ( pnd_pxml_get_info_type ( pxmlh ) ); + } + + // look for any PXML overrides, if requested + if ( disco_overrides ) { + pnd_pxml_merge_override ( pxmlh, disco_overrides ); + } + + // handle ovr overrides + // try to load a same-path-as-pnd override file + if ( ovrh == 0 ) { + sprintf ( ovrfile, "%s/%s", p -> object_path, p -> object_filename ); + fixpxml = strcasestr ( ovrfile, PND_PACKAGE_FILEEXT ); + if ( fixpxml ) { + strcpy ( fixpxml, PXML_SAMEPATH_OVERRIDE_FILEEXT ); + struct stat statbuf; + if ( stat ( ovrfile, &statbuf ) == 0 ) { + ovrh = pnd_conf_fetch_by_path ( ovrfile ); + + if ( ! ovrh ) { + // couldn't pull conf out of file, so don't try again + ovrh = (void*)(-1); + } + + } else { + ovrh = (void*)(-1); // not found, don't try again + } // stat + } // can find .pnd + } // tried ovr yet? + + // is ovr file open? + if ( ovrh != 0 && ovrh != (void*)(-1) ) { + // pull in appropriate values + char key [ 100 ]; + char *v; + + // set the flag regardless, so its for all subapps + p -> object_flags |= PND_DISCO_FLAG_OVR; + + // title + snprintf ( key, 100, "Application-%u.title", p -> subapp_number ); + if ( ( v = pnd_conf_get_as_char ( ovrh, key ) ) ) { + if ( p -> title_en ) { + free ( p -> title_en ); + } + p -> title_en = strdup ( v ); + } + + // clockspeed + snprintf ( key, 100, "Application-%u.clockspeed", p -> subapp_number ); + if ( ( v = pnd_conf_get_as_char ( ovrh, key ) ) ) { + if ( p -> clockspeed ) { + free ( p -> clockspeed ); + } + p -> clockspeed = strdup ( v ); + } + + // appdata dirname + snprintf ( key, 100, "Application-%u.appdata", p -> subapp_number ); + if ( ( v = pnd_conf_get_as_char ( ovrh, key ) ) ) { + if ( p -> appdata_dirname ) { + free ( p -> appdata_dirname ); + } + p -> appdata_dirname = strdup ( v ); + } + + // categories + snprintf ( key, 100, "Application-%u.maincategory", p -> subapp_number ); + if ( ( v = pnd_conf_get_as_char ( ovrh, key ) ) ) { + if ( p -> main_category ) { + free ( p -> main_category ); + } + p -> main_category = strdup ( v ); + } + snprintf ( key, 100, "Application-%u.maincategorysub1", p -> subapp_number ); + if ( ( v = pnd_conf_get_as_char ( ovrh, key ) ) ) { + if ( p -> main_category1 ) { + free ( p -> main_category1 ); + p -> main_category1 = NULL; + } + if ( strcasecmp ( v, "NoSubcategory" ) != 0 ) { + p -> main_category1 = strdup ( v ); + } + } + + } // got ovr conf loaded? } else { //printf ( "Invalid PXML; skipping.\n" ); @@ -201,9 +389,17 @@ static int pnd_disco_callback ( const char *fpath, const struct stat *sb, // ditch pxml pnd_pxml_delete ( pxmlh ); - } // got a pxmlh + } // while pxmlh is good + + // free up ovr + if ( ovrh != 0 && ovrh != (void*)(-1) ) { + pnd_box_delete ( ovrh ); + } + + // free up the applist + free ( pxmlapps ); - return ( 0 ); // continue the tree walk + return ( FTW_CONTINUE ); // continue the tree walk } pnd_box_handle pnd_disco_search ( char *searchpath, char *overridespath ) { @@ -224,7 +420,7 @@ pnd_box_handle pnd_disco_search ( char *searchpath, char *overridespath ) { nftw ( buffer, // path to descend pnd_disco_callback, // callback to do processing 10, // no more than X open fd's at once - FTW_PHYS ); // do not follow symlinks + FTW_PHYS | FTW_ACTIONRETVAL ); // do not follow symlinks } SEARCHPATH_POST @@ -238,172 +434,33 @@ pnd_box_handle pnd_disco_search ( char *searchpath, char *overridespath ) { return ( disco_box ); } -unsigned char pnd_emit_dotdesktop ( char *targetpath, char *pndrun, pnd_disco_t *p ) { - char filename [ FILENAME_MAX ]; - char buffer [ 1024 ]; - FILE *f; +pnd_box_handle pnd_disco_file ( char *path, char *filename ) { + struct stat statbuf; - // specification - // http://standards.freedesktop.org/desktop-entry-spec - - // validation - - if ( ! p -> unique_id ) { - return ( 0 ); - } - - if ( ! p -> exec ) { - return ( 0 ); - } - - // set up - - sprintf ( filename, "%s/%s.desktop", targetpath, p -> unique_id ); - - // emit - - //printf ( "EMIT DOTDESKTOP '%s'\n", filename ); - - f = fopen ( filename, "w" ); - - if ( ! f ) { - return ( 0 ); - } - - if ( p -> title_en ) { - snprintf ( buffer, 1020, "Name=%s\n", p -> title_en ); - fprintf ( f, "%s", buffer ); - } - - fprintf ( f, "Type=Application\n" ); - fprintf ( f, "Version=1.0\n" ); - - if ( p -> icon ) { - snprintf ( buffer, 1020, "Icon=%s\n", p -> icon ); - fprintf ( f, "%s", buffer ); - } - -#if 0 - if ( p -> description_en ) { - snprintf ( buffer, 1020, "Comment=%s\n", p -> description_en ); - fprintf ( f, "%s", buffer ); - } -#endif - -#if 0 // we let pnd_run.sh handle this - if ( p -> startdir ) { - snprintf ( buffer, 1020, "Path=%s\n", p -> startdir ); - fprintf ( f, "%s", buffer ); - } else { - fprintf ( f, "Path=%s\n", PND_DEFAULT_WORKDIR ); - } -#endif - - if ( p -> exec ) { - - // basics - if ( p -> object_type == pnd_object_type_directory ) { - snprintf ( buffer, 1020, "Exec=%s -p %s -e %s -u", pndrun, p -> object_path, p -> exec ); - } else if ( p -> object_type == pnd_object_type_pnd ) { - snprintf ( buffer, 1020, "Exec=%s -p %s/%s -e %s -u", pndrun, p -> object_path, p -> object_filename, p -> exec ); - } - - // start dir - if ( p -> startdir ) { - strncat ( buffer, " -s ", 1020 ); - strncat ( buffer, p -> startdir, 1020 ); - } - - // newline - strncat ( buffer, "\n", 1020 ); - - // emit - fprintf ( f, "%s", buffer ); - } - - fprintf ( f, "%s\n", PND_DOTDESKTOP_SOURCE ); // should we need to know 'who' created the file during trimming - - fclose ( f ); - - return ( 1 ); -} - -unsigned char pnd_emit_icon ( char *targetpath, pnd_disco_t *p ) { - char buffer [ FILENAME_MAX ]; // target filename - char from [ FILENAME_MAX ]; // source filename - char bits [ 8 * 1024 ]; - unsigned int bitlen; - FILE *pnd, *target; - - // prelim .. if a pnd file, and no offset found, discovery code didn't locate icon.. so bail. - if ( ( p -> object_type == pnd_object_type_pnd ) && - ( ! p -> pnd_icon_pos ) ) - { - return ( 0 ); // discover code didn't find it, so FAIL - } - - // determine filename for target - sprintf ( buffer, "%s/%s.png", targetpath, p -> unique_id ); // target - - /* first.. open the source file, by type of application: - * are we looking through a pnd file or a dir? - */ - if ( p -> object_type == pnd_object_type_directory ) { - sprintf ( from, "%s/%s", p -> object_path, p -> icon ); - } else if ( p -> object_type == pnd_object_type_pnd ) { - sprintf ( from, "%s/%s", p -> object_path, p -> object_filename ); - } + // set up container + disco_overrides = NULL; + disco_box = pnd_box_new ( "discovery" ); - pnd = fopen ( from, "r" ); + // path + char fullpath [ PATH_MAX ]; + sprintf ( fullpath, "%s/%s", path, filename ); - if ( ! pnd ) { + // fake it + if ( stat ( fullpath, &statbuf ) < 0 ) { return ( 0 ); } - unsigned int len; + struct FTW ftw; + ftw.base = strlen ( path ); + ftw.level = 0; - target = fopen ( buffer, "wb" ); + pnd_disco_callback ( fullpath, &statbuf, FTW_F, &ftw ); - if ( ! target ) { - fclose ( pnd ); - return ( 0 ); + // return whatever we found, or NULL if nada + if ( ! pnd_box_get_head ( disco_box ) ) { + pnd_box_delete ( disco_box ); + disco_box = NULL; } - fseek ( pnd, 0, SEEK_END ); - len = ftell ( pnd ); - //fseek ( pnd, 0, SEEK_SET ); - - fseek ( pnd, p -> pnd_icon_pos, SEEK_SET ); - - len -= p -> pnd_icon_pos; - - while ( len ) { - - if ( len > (8*1024) ) { - bitlen = (8*1024); - } else { - bitlen = len; - } - - if ( fread ( bits, bitlen, 1, pnd ) != 1 ) { - fclose ( pnd ); - fclose ( target ); - unlink ( buffer ); - return ( 0 ); - } - - if ( fwrite ( bits, bitlen, 1, target ) != 1 ) { - fclose ( pnd ); - fclose ( target ); - unlink ( buffer ); - return ( 0 ); - } - - len -= bitlen; - } // while - - fclose ( pnd ); - fclose ( target ); - - return ( 1 ); + return ( disco_box ); }