oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

don't exit after --create-db

Browse Source 
Start the daemon after --create-db.  This makes --create-db a flag
which discards the old database and starts with a fresh one.
This commit is contained in:
Max Kellermann 2009-01-04 20:31:23 +01:00
parent 6fb8c54939
commit e4a53df7db
5 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -13,6 +13,7 @@ ver 0.15 - (200?/??/??)
* fix minor memory leak in decoder_tag() * fix minor memory leak in decoder_tag()
* added Icy-Metadata support * added Icy-Metadata support
* fix cross-fading bug: it used to play some chunks of the new song twice * fix cross-fading bug: it used to play some chunks of the new song twice
* --create-db starts the MPD daemon instead of exiting
ver 0.14 (2008/12/25) ver 0.14 (2008/12/25)
* audio outputs: * audio outputs:

2
doc/mpd.1
View File

@ -26,7 +26,7 @@ Kill the currently running mpd session. The pid_file parameter must be
specified in the config file for this to work. specified in the config file for this to work.
.TP .TP
.BI --create-db .BI --create-db
Force (re)creation of database and exit. Force (re)creation of database.
.TP .TP
.BI --no-create-db .BI --no-create-db
Do not create database, even if it doesn't exist. Do not create database, even if it doesn't exist.

2
src/cmdline.c
View File

@ -86,7 +86,7 @@ void parseOptions(int argc, char **argv, Options *options)
{ "kill", 0, 0, G_OPTION_ARG_NONE, &options->kill, { "kill", 0, 0, G_OPTION_ARG_NONE, &options->kill,
"kill the currently running mpd session", NULL }, "kill the currently running mpd session", NULL },
{ "create-db", 0, 0, G_OPTION_ARG_NONE, &option_create_db, { "create-db", 0, 0, G_OPTION_ARG_NONE, &option_create_db,
"force (re)creation of database and exit", NULL }, "force (re)creation of database", NULL },
{ "no-create-db", 0, 0, G_OPTION_ARG_NONE, &option_no_create_db, { "no-create-db", 0, 0, G_OPTION_ARG_NONE, &option_no_create_db,
"don't create database, even if it doesn't exist", NULL }, "don't create database, even if it doesn't exist", NULL },
{ "no-daemon", 0, 0, G_OPTION_ARG_NONE, &option_no_daemon, { "no-daemon", 0, 0, G_OPTION_ARG_NONE, &option_no_daemon,

7
src/database.c
View File

@ -57,13 +57,6 @@ db_init(void)
ret = directory_update_init(NULL); ret = directory_update_init(NULL);
if (ret == 0) if (ret == 0)
g_error("directory update failed"); g_error("directory update failed");
do {
event_pipe_wait();
} while (isUpdatingDB());
stats.numberOfSongs = countSongsIn(NULL);
stats.dbPlayTime = sumSongTimesIn(NULL);
} }
void void

7
src/main.c
View File

@ -135,10 +135,6 @@ static void openDB(Options * options, char *argv0)
if (db_check() < 0) if (db_check() < 0)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
db_init(); db_init();
if (db_save() < 0)
exit(EXIT_FAILURE);
if (options->createDB)
exit(EXIT_SUCCESS);
} }
} }
@ -238,8 +234,7 @@ int main(int argc, char *argv[])
tag_lib_init(); tag_lib_init();
log_init(options.verbose, options.stdOutput); log_init(options.verbose, options.stdOutput);
if (options.createDB <= 0) listenOnPort();
listenOnPort();
changeToUser(); changeToUser();