README.rst: reformat the "Links" section

[ncmpc.git] / src / screen_client.c

diff --git a/src/screen_client.c b/src/screen_client.c
index 397a7cb474658b958b9a7abc9004f2cfdadff21c..c70257fe7020891658a4f727d65b74c7a5e267da 100644 (file)
--- a/src/screen_client.c
+++ b/src/screen_client.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,36 +18,36 @@
  */
 
 #include "screen_client.h"
-#include "screen_utils.h"
+#include "screen_status.h"
 #include "mpdclient.h"
+#include "i18n.h"
+#include "charset.h"
 
-static gint
-_screen_auth(struct mpdclient *c, gint recursion)
+void
+screen_database_update(struct mpdclient *c, const char *path)
 {
-       char *password;
-
-       mpd_connection_clear_error(c->connection);
-       if (recursion > 2)
-               return 1;
-
-       password = screen_read_password(NULL, NULL);
-       if (password == NULL)
-               return 1;
-
-       mpd_send_password(c->connection, password);
-       g_free(password);
-
-       mpd_response_finish(c->connection);
-       mpdclient_update(c);
-
-       if (mpd_connection_get_error(c->connection) == MPD_ERROR_SERVER &&
-           mpd_connection_get_server_error(c->connection) == MPD_SERVER_ERROR_PASSWORD)
-               return  _screen_auth(c, ++recursion);
-       return 0;
-}
-
-gint
-screen_auth(struct mpdclient *c)
-{
-       return _screen_auth(c, 0);
+       assert(c != NULL);
+       assert(mpdclient_is_connected(c));
+
+       struct mpd_connection *connection = mpdclient_get_connection(c);
+       if (connection == NULL)
+               return;
+
+       unsigned id = mpd_run_update(connection, path);
+       if (id == 0) {
+               if (mpd_connection_get_error(connection) == MPD_ERROR_SERVER &&
+                   mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_UPDATE_ALREADY &&
+                   mpd_connection_clear_error(connection))
+                       screen_status_printf(_("Database update running..."));
+               else
+                       mpdclient_handle_error(c);
+               return;
+       }
+
+       if (path != NULL && *path != 0) {
+               char *path_locale = utf8_to_locale(path);
+               screen_status_printf(_("Database update of %s started"), path);
+               g_free(path_locale);
+       } else
+               screen_status_message(_("Database update started"));
 }