*
*/
-// TODO: Catch HUP and reparse config
-// TODO: Should perhaps direct all printf's through a vsprintf handler to avoid redundant "if ! g_daemon_mode"
-// TODO: During daemon mode, should perhaps syslog or log errors
-// TODO: Removing stale .desktop checks that .desktop was created by libpnd; see 'TBD' below
-
#include <stdio.h> // for stdio
#include <unistd.h> // for exit()
#include <stdlib.h> // for exit()
+#define __USE_GNU /* for strcasestr */
#include <string.h>
#include <time.h> // for time()
#include <ctype.h> // for isdigit()
#include <sys/types.h> // for umask
#include <sys/stat.h> // for umask
#include <dirent.h> // for opendir()
+#include <signal.h> // for sigaction
#include "pnd_conf.h"
#include "pnd_container.h"
#include "../lib/pnd_pathiter.h"
#include "pnd_discovery.h"
#include "pnd_locate.h"
+#include "pnd_pxml.h"
+#include "pnd_utility.h"
+#include "pnd_desktop.h"
+#include "pnd_logger.h"
+#include "pnd_dbusnotify.h"
+#include "pnd_pndfiles.h"
+
+// this piece of code was simpler once; but need to grow it a bit and in a rush
+// moving all these to globals rather than refactor the code a bit; tsk tsk..
+// op mode; emitting stdout or no?
static unsigned char g_daemon_mode = 0;
+typedef enum {
+ pndn_debug = 0,
+ pndn_rem, // will set default log level to here, so 'debug' is omitted
+ pndn_warning,
+ pndn_error,
+ pndn_none
+} pndnotify_loglevels_e;
+
+// like discotest
+char *configpath;
+char *overridespath;
+// daemon stuff
+char *searchpath = NULL;
+char *notifypath = NULL;
+time_t createtime = 0; // all 'new' .destops are created at or after this time; prev are old.
+// dotfiles; this used to be a single pai .. now two pairs, a little unwieldy; pnd_box it up?
+char *desktop_dotdesktoppath = NULL;
+char *desktop_iconpath = NULL;
+char *desktop_appspath = NULL;
+char *menu_dotdesktoppath = NULL;
+char *menu_iconpath = NULL;
+char *menu_appspath = NULL;
+char *info_dotdesktoppath = NULL;
+// pnd runscript
+char *run_searchpath; // searchpath to find pnd_run.sh
+char *run_script; // name of pnd_run.sh script from config
+char *pndrun; // full path to located pnd_run.sh
+char *pndhup = NULL; // full path to located pnd_hup.sh
+// default username
+char g_username [ 128 ]; // since we have to wait for login (!!), store username here
+// notifier handle
+pnd_notify_handle nh = 0;
+pnd_dbusnotify_handle dbh = 0;
+unsigned char g_info_p = 0; // spit out info .desktops
+
+// constants
+#define PNDNOTIFYD_LOGLEVEL "pndnotifyd.loglevel"
+
+// decl's
+void consume_configuration ( void );
+void setup_notifications ( void );
+void sigint_handler ( int n );
+void sighup_handler ( int n );
+void process_discoveries ( pnd_box_handle applist, char *emitdesktoppath, char *emiticonpath );
+unsigned char perform_discoveries ( char *appspath, char *overridespath,
+ char *emitdesktoppath, char *emiticonpath );
+
int main ( int argc, char *argv[] ) {
- pnd_notify_handle nh;
- // like discotest
- char *configpath;
- char *appspath;
- char *overridespath;
- // daemon stuff
- char *searchpath = NULL;
- char *dotdesktoppath = NULL;
// behaviour
unsigned char scanonlaunch = 1;
- unsigned int interval_secs = 20;
- // pnd runscript
- char *run_searchpath;
- char *run_script;
- char *pndrun;
+ unsigned int interval_secs = 5;
+ int logall = -1; // -1 means normal logging rules; >=0 means log all!
// misc
int i;
interval_secs = atoi ( argv [ i ] );
} else if ( argv [ i ][ 0 ] == '-' && argv [ i ][ 1 ] == 'n' ) {
scanonlaunch = 0;
+ } else if ( argv [ i ][ 0 ] == '-' && argv [ i ][ 1 ] == 'l' ) {
+
+ if ( isdigit ( argv [ i ][ 2 ] ) ) {
+ unsigned char x = atoi ( argv [ i ] + 2 );
+ if ( x >= 0 &&
+ x < pndn_none )
+ {
+ logall = x;
+ }
+ } else {
+ logall = 0;
+ }
+
} else {
- printf ( "%s [-d] [##]\n", argv [ 0 ] );
+ printf ( "%s [-d] [-l] [##]\n", argv [ 0 ] );
printf ( "-d\tDaemon mode; detach from terminal, chdir to /tmp, suppress output. Optional.\n" );
printf ( "-n\tDo not scan on launch; default is to run a scan for apps when %s is invoked.\n", argv [ 0 ] );
+ printf ( "-l#\tLog-it; -l is 0-and-up (or all), and -l2 means 2-and-up (not all); l[0-3] for now. Log goes to /tmp/pndnotifyd.log\n" );
printf ( "##\tA numeric value is interpreted as number of seconds between checking for filesystem changes. Default %u.\n",
interval_secs );
+ printf ( "Signal: HUP the process to force reload of configuration and reset the notifier watch paths\n" );
exit ( 0 );
}
- }
+ } // for
+
+ /* enable logging?
+ */
+ pnd_log_set_pretext ( "pndnotifyd" );
+ pnd_log_set_flush ( 1 );
+
+ if ( logall == -1 ) {
+ // standard logging; non-daemon versus daemon
+
+ if ( g_daemon_mode ) {
+ // nada
+ } else {
+ pnd_log_set_filter ( pndn_rem );
+ pnd_log_to_stdout();
+ }
+
+ } else {
+ FILE *f;
+
+ f = fopen ( "/tmp/pndnotifyd.log", "w" );
- if ( ! g_daemon_mode ) {
- printf ( "Interval between checks is %u seconds\n", interval_secs );
+ if ( f ) {
+ pnd_log_set_filter ( logall );
+ pnd_log_to_stream ( f );
+ pnd_log ( pndn_rem, "logall mode - logging to /tmp/pndnotifyd.log\n" );
+ }
+
+ if ( logall == pndn_debug ) {
+ pnd_log_set_buried_logging ( 1 ); // log the shit out of it
+ pnd_log ( pndn_rem, "logall mode 0 - turned on buried logging\n" );
+ }
+
+ } // logall
+
+ pnd_log ( pndn_rem, "%s built %s %s", argv [ 0 ], __DATE__, __TIME__ );
+
+ pnd_log ( pndn_rem, "log level starting as %u", pnd_log_get_filter() );
+
+ pnd_log ( pndn_rem, "Interval between checks is %u seconds\n", interval_secs );
+
+ // check if inotify is awake yet; if not, try waiting for awhile to see if it does
+ pnd_log ( pndn_rem, "Starting INOTIFY test; should be instant, but may take awhile...\n" );
+
+ if ( ! pnd_notify_wait_until_ready ( 120 /* seconds */ ) ) {
+ pnd_log ( pndn_error, "ERROR: INOTIFY refuses to be useful and quite awhile has passed. Bailing out.\n" );
+ return ( -1 );
}
+ pnd_log ( pndn_rem, "INOTIFY seems to be useful, whew.\n" );
+
// basic daemon set up
if ( g_daemon_mode ) {
// detach from terminal
if ( ( i = fork() ) < 0 ) {
- printf ( "ERROR: Couldn't fork()\n" );
+ pnd_log ( pndn_error, "ERROR: Couldn't fork()\n" );
exit ( i );
}
if ( i ) {
// umask
umask ( 022 ); // emitted files can be rwxr-xr-x
-
+
} // set up daemon
+ // wait for a user to be logged in - we should probably get hupped when a user logs in, so we can handle
+ // log-out and back in again, with SDs popping in and out between..
+ pnd_log ( pndn_rem, "Checking to see if a user is logged in\n" );
+ while ( 1 ) {
+ if ( pnd_check_login ( g_username, 127 ) ) {
+ break;
+ }
+ pnd_log ( pndn_debug, " No one logged in yet .. spinning.\n" );
+ sleep ( 2 );
+ } // spin
+ pnd_log ( pndn_rem, "Looks like user '%s' is in, continue.\n", g_username );
+
/* parse configs
*/
+ consume_configuration();
+
+ /* startup
+ */
+
+ pnd_log ( pndn_rem, "PXML overrides searchpath is '%s'\n", overridespath );
+ pnd_log ( pndn_rem, "Notify searchpath is '%s'\n", notifypath );
+
+ pnd_log ( pndn_rem, "Desktop apps ---------------------------------\n" );
+ pnd_log ( pndn_rem, "Apps searchpath is '%s'\n", desktop_appspath );
+ pnd_log ( pndn_rem, ".desktop files emit to '%s'\n", desktop_dotdesktoppath );
+ pnd_log ( pndn_rem, ".desktop icon files emit to '%s'\n", desktop_iconpath );
+
+ pnd_log ( pndn_rem, "Menu apps ---------------------------------\n" );
+ pnd_log ( pndn_rem, "Apps searchpath is '%s'\n", menu_appspath );
+ pnd_log ( pndn_rem, ".desktop files emit to '%s'\n", menu_dotdesktoppath );
+ pnd_log ( pndn_rem, ".desktop icon files emit to '%s'\n", menu_iconpath );
+ pnd_log ( pndn_rem, ".desktop info files emit to '%s'\n", info_dotdesktoppath ? info_dotdesktoppath : "n/a" );
+
+ /* set up signal handler
+ */
+ sigset_t ss;
+ sigemptyset ( &ss );
+
+ struct sigaction siggy;
+ siggy.sa_handler = sighup_handler;
+ siggy.sa_mask = ss; /* implicitly blocks the origin signal */
+ siggy.sa_flags = 0; /* don't need anything */
+
+ sigaction ( SIGHUP, &siggy, NULL );
+
+ siggy.sa_handler = sigint_handler;
+ sigaction ( SIGINT, &siggy, NULL );
+
+ /* set up notifies
+ */
+
+ // if we're gong to scan on launch, it'll set things right up and then set up notifications.
+ // if no scan on launch, we need to set the notif's up now.
+ //if ( ! scanonlaunch ) {
+ setup_notifications();
+ //}
+
+ dbh = pnd_dbusnotify_init();
+
+ /* daemon main loop
+ */
+ unsigned char watch_inotify, watch_dbus;
+ while ( 1 ) {
+
+ watch_dbus = 0;
+ watch_inotify = 0;
+
+ if ( dbh ) {
+ watch_dbus = pnd_dbusnotify_rediscover_p ( dbh );
+ }
+
+ if ( ! watch_dbus && nh ) {
+ watch_inotify = pnd_notify_rediscover_p ( nh );
+ }
+
+ // need to rediscover?
+ if ( scanonlaunch || watch_inotify || watch_dbus ) {
+
+ // by this point, the watched directories have notified us that something of relevent
+ // has occurred; we should be clever, but we're not, so just re-brute force the
+ // discovery and spit out .desktop files..
+ pnd_log ( pndn_rem, "------------------------------------------------------\n" );
+
+ pnd_log ( pndn_rem, "System changes detected in dbus or watched paths .. performing re-discover!\n" );
+
+ // if this was a forced scan, lets not do that next iteration
+ if ( scanonlaunch ) {
+ pnd_log ( pndn_rem, "scan-on-first-launch detected an event\n" );
+ scanonlaunch = 0;
+ }
+
+ if ( watch_inotify ) {
+ pnd_log ( pndn_rem, "inotify detected an event\n" );
+ }
+
+ if ( watch_dbus ) {
+ pnd_log ( pndn_rem, "dbusnotify detected an event\n" );
+ pnd_notify_shutdown ( nh );
+ nh = 0;
+ }
+
+ if ( time ( NULL ) - createtime <= 2 ) {
+ pnd_log ( pndn_rem, "Rediscovery request comes to soon after previous discovery; skipping.\n" );
+ sleep ( interval_secs );
+ continue;
+ }
+
+ pnd_log ( pndn_rem, "------------------------------------------------------\n" );
+
+ createtime = time ( NULL ); // all 'new' .destops are created at or after this time; prev are old.
+
+ /* run the discovery
+ */
+
+ pnd_log ( pndn_rem, " Scanning desktop paths----------------------------\n" );
+ if ( ! perform_discoveries ( desktop_appspath, overridespath, desktop_dotdesktoppath, desktop_iconpath ) ) {
+ pnd_log ( pndn_rem, " No applications found in desktop search path\n" );
+ }
+
+ if ( menu_appspath && menu_dotdesktoppath && menu_iconpath ) {
+ pnd_log ( pndn_rem, " Scanning menu paths----------------------------\n" );
+ if ( ! perform_discoveries ( menu_appspath, overridespath, menu_dotdesktoppath, menu_iconpath ) ) {
+ pnd_log ( pndn_rem, " No applications found in menu search path\n" );
+ }
+ }
+
+ // if we've got a hup script located, lets invoke it
+ if ( pndhup ) {
+ pnd_log ( pndn_rem, "Invoking hup script '%s'.\n", pndhup );
+ pnd_exec_no_wait_1 ( pndhup, NULL );
+ }
+
+ // since its entirely likely new directories have been found (ie: SD with a directory structure was inserted)
+ // we should re-apply watches to catch all these new directories; ie: user might use on-device browser to
+ // drop in new applications, or use the shell to juggle them around, or any number of activities.
+ if ( watch_dbus ) {
+ setup_notifications();
+ }
+
+ } // need to rediscover?
+
+ // lets not eat up all the CPU
+ // should use an alarm or select() or something -- I mean really, why aren't I putting interval_secs into
+ // the select() call above in pnd_notify_whatsitcalled()? -- but lets not break this right before release shall we
+ // NOTE: Oh right, I remember now -- inotify will spam when a card is inserted, and it will not be instantaneoous..
+ // the events will dribble in over a second. So this sleep is a lame trick that generally works. I really should
+ // do select(), and then when it returns just spin for a couple seconds slurping up events until no more and a thresh-hold
+ // time is hit, but this will do for now. I suck.
+ sleep ( interval_secs );
+
+ } // while
+
+ /* shutdown
+ */
+ pnd_notify_shutdown ( nh );
+ pnd_dbusnotify_shutdown ( dbh );
+
+ return ( 0 );
+}
+
+void consume_configuration ( void ) {
+
// attempt to fetch a sensible default searchpath for configs
configpath = pnd_conf_query_searchpath();
apph = pnd_conf_fetch_by_id ( pnd_conf_apps, configpath );
if ( apph ) {
- appspath = pnd_conf_get_as_char ( apph, PND_APPS_KEY );
-
- if ( ! appspath ) {
- appspath = PND_APPS_SEARCHPATH;
- }
overridespath = pnd_conf_get_as_char ( apph, PND_PXML_OVERRIDE_KEY );
overridespath = PND_PXML_OVERRIDE_SEARCHPATH;
}
+ notifypath = pnd_conf_get_as_char ( apph, PND_APPS_NOTIFY_KEY );
+
+ if ( ! notifypath ) {
+ notifypath = PND_APPS_NOTIFYPATH;
+ }
+
} else {
// couldn't find a useful app search path so use the default
- appspath = PND_APPS_SEARCHPATH;
overridespath = PND_PXML_OVERRIDE_SEARCHPATH;
+ notifypath = PND_APPS_NOTIFYPATH;
}
- // attempt to figure out where to drop dotfiles
+ // attempt to figure out where to drop dotfiles .. now that we're going
+ // multi-target we see the limit of my rudimentary conf-file parser; should
+ // just parse to an array of targets, rather that hardcoding two, but
+ // on the other hand, don't likely see the need for more than two? (famous
+ // last words.)
pnd_conf_handle desktoph;
desktoph = pnd_conf_fetch_by_id ( pnd_conf_desktop, configpath );
+ // for 'desktop' main applications
if ( desktoph ) {
- dotdesktoppath = pnd_conf_get_as_char ( desktoph, PND_DOTDESKTOP_KEY );
+ desktop_dotdesktoppath = pnd_conf_get_as_char ( desktoph, PND_DESKTOP_DOTDESKTOP_PATH_KEY );
+ desktop_iconpath = pnd_conf_get_as_char ( desktoph, PND_DESKTOP_ICONS_PATH_KEY );
+ desktop_appspath = pnd_conf_get_as_char ( desktoph, PND_DESKTOP_SEARCH_KEY );
+ info_dotdesktoppath = pnd_conf_get_as_char ( desktoph, "info.dotdesktoppath" );
+ }
- if ( ! dotdesktoppath ) {
- dotdesktoppath = PND_DOTDESKTOP_DEFAULT;
- }
+ if ( ! desktop_dotdesktoppath ) {
+ desktop_dotdesktoppath = PND_DESKTOP_DOTDESKTOP_PATH_DEFAULT;
+ }
- } else {
- dotdesktoppath = PND_DOTDESKTOP_DEFAULT;
+ if ( ! desktop_iconpath ) {
+ desktop_iconpath = PND_DESKTOP_ICONS_PATH_DEFAULT;
+ }
+
+ if ( ! desktop_appspath ) {
+ desktop_appspath = PND_DESKTOP_SEARCH_PATH_DEFAULT;
}
- // try to locate a runscript
+ // for 'menu' applications
+ if ( desktoph ) {
+ menu_dotdesktoppath = pnd_conf_get_as_char ( desktoph, PND_MENU_DOTDESKTOP_PATH_KEY );
+ menu_iconpath = pnd_conf_get_as_char ( desktoph, PND_MENU_ICONS_PATH_KEY );
+ menu_appspath = pnd_conf_get_as_char ( desktoph, PND_MENU_SEARCH_KEY );
+ }
+
+ // info
+ if ( desktoph ) {
+ g_info_p = pnd_conf_get_as_int_d ( desktoph, "info.emit_info", 0 );
+ }
+
+ /* try to locate a runscript and optional hupscript
+ */
if ( apph ) {
run_searchpath = pnd_conf_get_as_char ( apph, PND_PNDRUN_SEARCHPATH_KEY );
run_script = PND_PNDRUN_FILENAME;
}
+ if ( pnd_conf_get_as_int ( apph, PNDNOTIFYD_LOGLEVEL ) != PND_CONF_BADNUM ) {
+ if ( pnd_log_do_buried_logging() == 0 ) {
+ pnd_log_set_filter ( pnd_conf_get_as_int ( apph, PNDNOTIFYD_LOGLEVEL ) );
+ pnd_log ( pndn_rem, "config file causes loglevel to change to %u", pnd_log_get_filter() );
+ } else {
+ pnd_log ( pndn_rem, "-l command line suppresses log level change in config file\n" );
+ }
+ }
+
} else {
run_searchpath = NULL;
run_script = NULL;
if ( ! pndrun ) {
pndrun = pnd_locate_filename ( run_searchpath, run_script );
- if ( ! pndrun ) {
+ if ( pndrun ) {
+ pndrun = strdup ( pndrun ); // so we don't just use the built in buffer; next locate will overwrite it
+ } else {
pndrun = PND_PNDRUN_DEFAULT;
}
}
- if ( ! g_daemon_mode ) {
- if ( run_searchpath ) printf ( "Locating pnd run in %s\n", run_searchpath );
- if ( run_script ) printf ( "Locating pnd runscript as %s\n", run_script );
- if ( pndrun ) printf ( "Default pndrun is %s\n", pndrun );
+ if ( desktoph && run_searchpath ) {
+ char *t;
+
+ if ( ( t = pnd_conf_get_as_char ( desktoph, PND_PNDHUP_KEY ) ) ) {
+ pndhup = pnd_locate_filename ( run_searchpath, t );
+
+ if ( pndhup ) {
+ pndhup = strdup ( pndhup ); // so we don't just use the built in buffer; next locate will overwrite it
+ }
+
+#if 0 // don't enable this; if no key in config, we don't want to bother hupping
+ } else {
+ pndhup = pnd_locate_filename ( run_searchpath, PND_PNDHUP_FILENAME );
+#endif
+ }
+
+ }
+
+ // debug
+ if ( run_searchpath ) pnd_log ( pndn_rem, "Locating pnd run in %s\n", run_searchpath );
+ if ( run_script ) pnd_log ( pndn_rem, "Locating pnd runscript as %s\n", run_script );
+ if ( pndrun ) pnd_log ( pndn_rem, "pndrun is %s\n", pndrun );
+ if ( pndhup ) {
+ pnd_log ( pndn_rem, "pndhup is %s\n", pndhup );
+ } else {
+ pnd_log ( pndn_rem, "No pndhup found (which is fine.)\n" );
}
- /* startup
+ /* cheap hack, maybe it'll help when pndnotifyd is coming up before the rest of the system and before
+ * the user is formally logged in
*/
+ pnd_log ( pndn_rem, "Setting a default $HOME to non-root user\n" );
- if ( ! g_daemon_mode ) {
- printf ( "Apps searchpath is '%s'\n", appspath );
- printf ( "PXML overrides searchpath is '%s'\n", overridespath );
- printf ( ".desktop files emit to '%s'\n", dotdesktoppath );
- }
+ // first, try to see if known-username maps to a homedir; if so, just use that!
+ // otherwise, pick first non-root homedir and assume .. or we start blaring .desktops
+ // out to all users like idiots
+ unsigned char got_user_homedir = 0;
- /* set up notifies
+ if ( g_username [ 0 ] ) {
+ struct stat homedir;
+ char path [ PATH_MAX ];
+
+ sprintf ( path, "/home/%s", g_username );
+
+ // does this made up path exist?
+ if ( stat ( path, &homedir ) == 0 ) {
+
+ // and its a dir?
+ if ( S_ISDIR(homedir.st_mode) ) {
+ pnd_log ( pndn_rem, " User [%s] matches path [%s], going with '%s'\n", g_username, path, path );
+ setenv ( "HOME", path, 1 /* overwrite */ );
+ got_user_homedir = 1;
+ } // and its a dir?
+
+ } // guessing a homedirname..
+
+ } // got a username?
+
+ // if guessing a path was no good, just try finding one
+ if ( got_user_homedir == 0 ) {
+ DIR *dir;
+
+ if ( ( dir = opendir ( "/home" ) ) ) {
+ struct dirent *dirent;
+
+ while ( ( dirent = readdir ( dir ) ) ) {
+ pnd_log ( pndn_rem, " Scanning user homedir '%s'\n", dirent -> d_name );
+
+ // file is a .desktop?
+ if ( dirent -> d_name [ 0 ] == '.' ) {
+ continue;
+ } else if ( strcmp ( dirent -> d_name, "root" ) == 0 ) {
+ continue;
+ }
+
+ // a non-root user is found
+ char buffer [ 200 ];
+ sprintf ( buffer, "/home/%s", dirent -> d_name );
+ pnd_log ( pndn_rem, " Going with '%s'\n", buffer );
+ setenv ( "HOME", buffer, 1 /* overwrite */ );
+ break;
+
+ } // while iterating through dir listing
+
+ closedir ( dir );
+ } // opendir?
+
+ } // scope
+
+ /* handle globbing or variable substitution
*/
- searchpath = appspath;
+ desktop_dotdesktoppath = pnd_expand_tilde ( strdup ( desktop_dotdesktoppath ) );
+ desktop_iconpath = pnd_expand_tilde ( strdup ( desktop_iconpath ) );
+ mkdir ( desktop_dotdesktoppath, 0777 );
+ mkdir ( desktop_iconpath, 0777 );
+
+ if ( info_dotdesktoppath ) {
+ info_dotdesktoppath = pnd_expand_tilde ( strdup ( info_dotdesktoppath ) );
+ mkdir ( info_dotdesktoppath, 0777 );
+ }
+
+ if ( menu_dotdesktoppath ) {
+ menu_dotdesktoppath = pnd_expand_tilde ( strdup ( menu_dotdesktoppath ) );
+ mkdir ( menu_dotdesktoppath, 0777 );
+ }
+ if ( menu_iconpath ) {
+ menu_iconpath = pnd_expand_tilde ( strdup ( menu_iconpath ) );
+ mkdir ( menu_iconpath, 0777 );
+ }
- nh = pnd_notify_init();
+ // done
+ return;
+}
+
+void setup_notifications ( void ) {
+ searchpath = notifypath;
+ // if this is first time through, we can just set it up; for subsequent times
+ // through, we need to close existing fd and re-open it, since we're too lame
+ // to store the list of watches and 'rm' them
+#if 1
+ if ( nh ) {
+ pnd_notify_shutdown ( nh );
+ nh = 0;
+ }
+#endif
+
+ // set up a new set of notifies
if ( ! nh ) {
- if ( ! g_daemon_mode ) {
- printf ( "INOTIFY failed to init.\n" );
- }
- exit ( -1 );
+ nh = pnd_notify_init();
}
- if ( ! g_daemon_mode ) {
- printf ( "INOTIFY is up.\n" );
+ if ( ! nh ) {
+ pnd_log ( pndn_rem, "INOTIFY failed to init.\n" );
+ exit ( -1 );
}
+#if 0
+ pnd_log ( pndn_rem, "INOTIFY is up.\n" );
+#endif
+
SEARCHPATH_PRE
{
- if ( ! g_daemon_mode ) {
- printf ( "Watching path '%s' and its descendents.\n", buffer );
- }
-
+ pnd_log ( pndn_rem, "Watching path '%s' and its descendents.\n", buffer );
pnd_notify_watch_path ( nh, buffer, PND_NOTIFY_RECURSE );
+ //pnd_notify_watch_path ( nh, buffer, 0 /* no recurse */ );
+
}
SEARCHPATH_POST
- /* daemon main loop
- */
- while ( 1 ) {
+#if 0
+ sleep ( 1 ); // wait for events to trigger?
- // need to rediscover?
- if ( scanonlaunch ||
- pnd_notify_rediscover_p ( nh ) )
- {
- pnd_box_handle applist;
- time_t createtime = time ( NULL ); // all 'new' .destops are created at or after this time; prev are old.
+ // clear out any notifies we just created
+ while ( pnd_notify_rediscover_p ( nh ) ) {
+ usleep ( 100 ); // spin
+ } // while
+#endif
- // if this was a forced scan, lets not do that next iteration
- if ( scanonlaunch ) {
- scanonlaunch = 0;
- }
+ return;
+}
- // by this point, the watched directories have notified us that something of relevent
- // has occurred; we should be clever, but we're not, so just re-brute force the
- // discovery and spit out .desktop files..
- if ( ! g_daemon_mode ) {
- printf ( "Changes within watched paths .. performing re-discover!\n" );
- printf ( "Path to emit .desktop files to: '%s'\n", dotdesktoppath );
- }
+void sighup_handler ( int n ) {
+
+ pnd_log ( pndn_rem, "---[ SIGHUP received ]---\n" );
- // run the discovery
- applist = pnd_disco_search ( appspath, overridespath );
+ // reparse config files
+ consume_configuration();
- // list the found apps (if any)
- if ( applist ) {
- pnd_disco_t *d = pnd_box_get_head ( applist );
+ // re set up the notifier watches
+ setup_notifications();
- while ( d ) {
+ return;
+}
+
+void sigint_handler ( int n ) {
- if ( ! g_daemon_mode ) {
- printf ( "Found app: %s\n", pnd_box_get_key ( d ) );
+ pnd_log ( pndn_rem, "---[ SIGINT received ]---\n" );
+
+ if ( dbh ) {
+ pnd_dbusnotify_shutdown ( dbh );
+ }
+
+ if ( nh ) {
+ pnd_notify_shutdown ( nh );
+ }
+
+ return;
+}
+
+// This very recently was inline code; just slight refactor to functionize it so that it can be
+// reused in a couple of places. Simple code with simple design quickly became too large for
+// its simple design; should revisit a lot of these little things..
+void process_discoveries ( pnd_box_handle applist, char *emitdesktoppath, char *emiticonpath ) {
+ pnd_disco_t *d = pnd_box_get_head ( applist );
+
+ while ( d ) {
+
+ pnd_log ( pndn_rem, "Found app: %s\n", pnd_box_get_key ( d ) );
+
+ // check if icon already exists (from a previous extraction say); if so, we needn't
+ // do it again
+ char existingpath [ FILENAME_MAX ];
+ sprintf ( existingpath, "%s/%s.png", emiticonpath, d -> unique_id /*, d -> subapp_number */ );
+
+ struct stat dirs;
+ if ( stat ( existingpath, &dirs ) == 0 ) {
+ // icon seems to exist, so just crib the location into the .desktop
+
+ pnd_log ( pndn_rem, " Found icon already existed, so reusing it! %s\n", existingpath );
+
+ if ( d -> icon ) {
+ free ( d -> icon );
+ }
+ d -> icon = strdup ( existingpath );
+
+ } else {
+ // icon seems unreadable or does not exist; lets try to create it..
+
+ pnd_log ( pndn_debug, " Icon not already present, so trying to write it! %s\n", existingpath );
+
+ // handle same-path icon override for davec :)
+ char ovrfile [ PATH_MAX ];
+ char *fixpxml;
+ sprintf ( ovrfile, "%s/%s", d -> object_path, d -> object_filename );
+ fixpxml = strcasestr ( ovrfile, PND_PACKAGE_FILEEXT );
+ if ( fixpxml ) {
+ strcpy ( fixpxml, ".png" );
+ fixpxml = NULL;
+ struct stat statbuf;
+ if ( stat ( ovrfile, &statbuf ) == 0 ) {
+ d -> icon = strdup ( ovrfile );
+ fixpxml = ovrfile; // !NULL will be the trigger to skip emittinf desktop from .pnd
+ } // stat
+ } // ovr?
+
+ // attempt to create icon files; if successful, alter the disco struct to contain new
+ // path, otherwise leave it alone (since it could be a generic icon reference..)
+ if ( fixpxml == NULL ) {
+ // don't have an same-path override icon, so go fetch something from pnd file
+
+ if ( pnd_emit_icon ( emiticonpath, d ) ) {
+ // success; fix up icon path to new one..
+ if ( d -> icon ) {
+ free ( d -> icon );
}
+ d -> icon = strdup ( existingpath );
+ } else {
+ pnd_log ( pndn_debug, " WARN: Couldn't write out icon %s\n", existingpath );
+ }
+
+ } // got ovr icon already?
- // create the .desktop file
- if ( pnd_emit_dotdesktop ( dotdesktoppath, pndrun, d ) ) {
- // add a watch onto the newly created .desktop?
+ } // icon already exists?
+
+ // create the .desktop file
+ if ( pnd_emit_dotdesktop ( emitdesktoppath, pndrun, d ) ) {
+ // add a watch onto the newly created .desktop?
#if 0
- char buffer [ FILENAME_MAX ];
- sprintf ( buffer, "%s/%s", dotdesktoppath, d -> unique_id );
- pnd_notify_watch_path ( nh, buffer, PND_NOTIFY_RECURSE );
+ char buffer [ FILENAME_MAX ];
+ sprintf ( buffer, "%s/%s", emitdesktoppath, d -> unique_id );
+ pnd_notify_watch_path ( nh, buffer, PND_NOTIFY_RECURSE );
#endif
- } else {
- if ( ! g_daemon_mode ) {
- printf ( "ERROR: Error creating .desktop file for app: %s\n", pnd_box_get_key ( d ) );
- }
- }
+ } else {
+ pnd_log ( pndn_rem, "ERROR: Error creating .desktop file for app: %s\n", pnd_box_get_key ( d ) );
+ }
- // next!
- d = pnd_box_get_next ( d );
+ // info .desktop
+ if ( g_info_p && info_dotdesktoppath ) {
+ if ( pnd_emit_dotinfo ( info_dotdesktoppath, pndrun, d ) ) {
+ // nada
+ } else {
+ pnd_log ( pndn_rem, "ERROR: Error creating info .desktop file for app: %s\n", pnd_box_get_key ( d ) );
+ }
+ }
- } // while applist
+ // does this object request any mkdir's?
+ if ( d -> mkdir_sp ) {
- } else {
+ // it would appear it does! but we have to carefully validate these suckers
+ pnd_log ( pndn_rem, " App %s requests mkdir: %s\n", d -> object_path, d -> mkdir_sp );
- if ( ! g_daemon_mode ) {
- printf ( "No applications found in search path\n" );
- }
+ // for each mkdir requested path, do it...
+ char *searchpath = d -> mkdir_sp;
- } // got apps?
-
- // run a clean up, to remove any dotdesktop files that we didn't
- // just now create (that seem to have been created by pndnotifyd
- // previously.) This allows SD eject (or .pnd remove) to remove
- // an app from the launcher
- // NOTE: Could opendir and iterate across all .desktop files,
- // removing any that have Source= something else, and that the
- // app name is not in the list found in applist box above. But
- // a cheesy simple way right now is to just remove .desktop files
- // that have a last mod time prior to the time we stored above.
+ SEARCHCHUNK_PRE
{
- DIR *dir;
+ /* "buffer" now holds each chunk of the searchpath, expanded */
+
+ // WARN: This whole concept could be flawed; what if they represent '..' in some other obscure way (unicode?)
+ // and we end up allowing mkdir's all over the place? The risk really is limited -- once the pnd is here,
+ // if the user _runs it_, it can go nuts, so creating a few dirs isn't all that dangerous...
+ // HMRF :/
+ // Perhaps I should have a config setting for pndnotifyd to suppress this whole mkdir behaviour?
+
+ // if not containing ".." we allow it
+ if ( strstr ( buffer, ".." ) == NULL ) {
+
+ // determine mountpoint for the file
+ // - we could deduce this from the path (somewhat risky if we assume leading /media/mmcblk1p1 type notation .. could
+ // be other distributions entirely
+ // - better to scan through mount-list and figure it out.. *sucks*
+ char mountpoint [ PATH_MAX ];
+ if ( pnd_determine_mountpoint ( d -> object_path, mountpoint, PATH_MAX - strlen ( buffer ) - 1 ) == 1 ) {
+
+ strcat ( mountpoint, "/" );
+ strcat ( mountpoint, buffer );
+
+ struct stat t;
+ if ( stat ( mountpoint, &t ) == 0 ) {
+ pnd_log ( pndn_rem, " Skipping existing mkdir: %s\n", mountpoint );
+ } else {
+ pnd_log ( pndn_rem, " Attempting create of non-existant path: %s\n", mountpoint );
+ mkdir ( mountpoint, 0777 );
+ }
- if ( ( dir = opendir ( dotdesktoppath ) ) ) {
- struct dirent *dirent;
- struct stat dirs;
- char buffer [ FILENAME_MAX ];
+ } // if figured out the mountpoint
- while ( ( dirent = readdir ( dir ) ) ) {
+ } // if valid path
- // file is a .desktop?
- if ( strstr ( dirent -> d_name, ".desktop" ) == NULL ) {
- continue;
- }
+ }
+ SEARCHCHUNK_POST
- // file was previously created by libpnd; check Source= line
- // TBD
+ } // mkdir request
- // file is 'new'?
- sprintf ( buffer, "%s/%s", dotdesktoppath, dirent -> d_name );
- if ( stat ( buffer, &dirs ) == 0 ) {
- if ( dirs.st_mtime >= createtime ) {
- continue;
- }
- }
+ // next!
+ d = pnd_box_get_next ( d );
- // by this point, the .desktop file must be 'old' and created by pndnotifyd
- // previously, so can remove it
- if ( ! g_daemon_mode ) {
- printf ( "File '%s' seems to not belong; removing it.\n", dirent -> d_name );
- }
- unlink ( buffer );
+ } // while applist
- } // while getting filenames from dir
+ return;
+}
+
+// returns true if any applications were found
+unsigned char perform_discoveries ( char *appspath, char *overridespath, // args to do discovery
+ char *emitdesktoppath, char *emiticonpath ) // args to do emitting
+{
+ pnd_box_handle applist;
+
+ pnd_log ( pndn_rem, "perform discovery - apps: %s, overrides: %s\n", appspath, overridespath );
+ pnd_log ( pndn_rem, " - emit desktop: %s, icons: %s\n", emitdesktoppath, emiticonpath );
+
+ // attempt to auto-discover applications in the given path
+ applist = pnd_disco_search ( appspath, overridespath );
+
+ if ( applist ) {
+ process_discoveries ( applist, emitdesktoppath, emiticonpath );
+ }
+
+ // run a clean up, to remove any dotdesktop files that we didn't
+ // just now create (that seem to have been created by pndnotifyd
+ // previously.) This allows SD eject (or .pnd remove) to remove
+ // an app from the launcher
+ // NOTE: Could opendir and iterate across all .desktop files,
+ // removing any that have Source= something else, and that the
+ // app name is not in the list found in applist box above. But
+ // a cheesy simple way right now is to just remove .desktop files
+ // that have a last mod time prior to the time we stored above.
+ {
+ DIR *dir;
+
+ if ( ( dir = opendir ( emitdesktoppath ) ) ) {
+ struct dirent *dirent;
+ struct stat dirs;
+ char buffer [ FILENAME_MAX ];
+
+ while ( ( dirent = readdir ( dir ) ) ) {
+
+ // file is a .desktop?
+ if ( strstr ( dirent -> d_name, ".desktop" ) == NULL ) {
+ continue;
+ }
+
+ // figure out full path
+ sprintf ( buffer, "%s/%s", emitdesktoppath, dirent -> d_name );
+
+ // file was previously created by libpnd; check Source= line
+ // logic: default to 'yes' (in case we can't open the file for some reason)
+ // if we can open the file, default to no and look for the source flag we added; if
+ // that matches then we know its libpnd created, otherwise assume not.
+ unsigned char source_libpnd = 1;
+ {
+ char line [ 256 ];
+ FILE *grep = fopen ( buffer, "r" );
+ if ( grep ) {
+ source_libpnd = 0;
+ while ( fgets ( line, 255, grep ) ) {
+ if ( strcasestr ( line, PND_DOTDESKTOP_SOURCE ) ) {
+ source_libpnd = 2;
+ }
+ } // while
+ fclose ( grep );
+ }
+ }
+ if ( source_libpnd ) {
+#if 1
+ pnd_log ( pndn_debug,
+ "File '%s' appears to have been created by libpnd so candidate for delete: %u\n", buffer, source_libpnd );
+#endif
+ } else {
+#if 0
+ pnd_log ( pndn_debug, "File '%s' appears NOT to have been created by libpnd, so leave it alone\n", buffer );
+#endif
+ continue; // skip deleting it
+ }
- closedir ( dir );
+ // file is 'new'?
+ if ( stat ( buffer, &dirs ) == 0 ) {
+ if ( dirs.st_mtime >= createtime ) {
+#if 1
+ pnd_log ( pndn_debug, "File '%s' seems 'new', so leave it alone.\n", buffer );
+#endif
+ continue; // skip deleting it
+ }
}
- } // purge old .desktop files
+ // by this point, the .desktop file must be 'old' and created by pndnotifyd
+ // previously, so can remove it
+ pnd_log ( pndn_rem, "File '%s' seems nolonger relevent; removing it.\n", dirent -> d_name );
+ unlink ( buffer );
- } // need to rediscover?
+ } // while getting filenames from dir
- // lets not eat up all the CPU
- // should use an alarm or select() or something
- sleep ( interval_secs );
+ closedir ( dir );
+ }
- } // while
+ } // purge old .desktop files
- /* shutdown
- */
- pnd_notify_shutdown ( nh );
+ //WARN: MEMORY LEAK HERE
+ pnd_log ( pndn_debug, "pndnotifyd - memory leak here - perform_discoveries()\n" );
+ if ( applist ) {
+ pnd_box_delete ( applist ); // does not free the disco_t contents!
+ }
- return ( 0 );
+ return ( 1 );
}
git.openpandora.org / pandora-libraries.git / blobdiff