Disobedience checks server version and expects rights-changed

[disorder] / disobedience / disobedience.c

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index 80fd389299f26fff9e15535c3ab7b3fb24b270df..53aea5683021110bff1af0b3a5d3185122b5eacf 100644 (file)
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -96,7 +96,15 @@ int rtp_supported;
 /** @brief True if RTP play is enabled */
 int rtp_is_running;
 
-static void check_rtp_address(void);
+/** @brief Server version */
+const char *server_version;
+
+/** @brief Parsed server version */
+long server_version_bytes;
+
+static void check_rtp_address(const char *event,
+                              void *eventdata,
+                              void *callbackdata);
 
 /* Window creation --------------------------------------------------------- */
 
@@ -195,12 +203,12 @@ static void make_toplevel_window(void) {
 }
 
 static void userinfo_rights_completed(void attribute((unused)) *v,
-                                      const char *error,
+                                      const char *err,
                                       const char *value) {
   rights_type r;
 
-  if(error) {
-    popup_protocol_error(0, error);
+  if(err) {
+    popup_protocol_error(0, err);
     r = 0;
   } else {
     if(parse_rights(value, &r, 0))
@@ -216,6 +224,16 @@ static void userinfo_rights_completed(void attribute((unused)) *v,
   rights_lookup_in_flight = 0;
 }
 
+static void check_rights(void) {
+  if(!rights_lookup_in_flight) {
+    rights_lookup_in_flight = 1;
+    disorder_eclient_userinfo(client,
+                              userinfo_rights_completed,
+                              config->username, "rights",
+                              0);
+  }
+}
+
 /** @brief Called occasionally */
 static gboolean periodic_slow(gpointer attribute((unused)) data) {
   D(("periodic_slow"));
@@ -224,16 +242,8 @@ static gboolean periodic_slow(gpointer attribute((unused)) data) {
   /* Update everything to be sure that the connection to the server hasn't
    * mysteriously gone stale on us. */
   all_update();
-  /* Periodically check what our rights are */
-  if(!rights_lookup_in_flight) {
-    rights_lookup_in_flight = 1;
-    disorder_eclient_userinfo(client,
-                              userinfo_rights_completed,
-                              config->username, "rights",
-                              0);
-  }
   /* Recheck RTP status too */
-  check_rtp_address();
+  check_rtp_address(0, 0, 0);
   return TRUE;                          /* don't remove me */
 }
 
@@ -264,12 +274,22 @@ static gboolean periodic_fast(gpointer attribute((unused)) data) {
       event_raise("volume-changed", 0);
     }
   }
+  /* Periodically check what our rights are */
+  int recheck_rights = 1;
+  if(server_version_bytes >= 0x04010000)
+    /* Server versions after 4.1 will send updates */
+    recheck_rights = 0;
+  if((server_version_bytes & 0xFF) == 0x01)
+    /* Development servers might do regardless of their version number */
+    recheck_rights = 0;
+  if(recheck_rights)
+    check_rights();
   return TRUE;
 }
 
 /** @brief Called when a NOP completes */
 static void nop_completed(void attribute((unused)) *v,
-                          const char attribute((unused)) *error) {
+                          const char attribute((unused)) *err) {
   /* TODO report the error somewhere */
   nop_in_flight = 0;
 }
@@ -295,7 +315,7 @@ static gboolean maybe_send_nop(gpointer attribute((unused)) data) {
 
 /** @brief Called when a rtp-address command succeeds */
 static void got_rtp_address(void attribute((unused)) *v,
-                            const char *error,
+                            const char *err,
                             int attribute((unused)) nvec,
                             char attribute((unused)) **vec) {
   const int rtp_was_supported = rtp_supported;
@@ -303,7 +323,7 @@ static void got_rtp_address(void attribute((unused)) *v,
 
   ++suppress_actions;
   rtp_address_in_flight = 0;
-  if(error) {
+  if(err) {
     /* An error just means that we're not using network play */
     rtp_supported = 0;
     rtp_is_running = 0;
@@ -311,6 +331,8 @@ static void got_rtp_address(void attribute((unused)) *v,
     rtp_supported = 1;
     rtp_is_running = rtp_running();
   }
+  /*fprintf(stderr, "rtp supported->%d, running->%d\n",
+          rtp_supported, rtp_is_running);*/
   if(rtp_supported != rtp_was_supported
      || rtp_is_running != rtp_was_running)
     event_raise("rtp-changed", 0);
@@ -318,9 +340,13 @@ static void got_rtp_address(void attribute((unused)) *v,
 }
 
 /** @brief Called to check whether RTP play is available */
-static void check_rtp_address(void) {
-  if(!rtp_address_in_flight)
+static void check_rtp_address(const char attribute((unused)) *event,
+                              void attribute((unused)) *eventdata,
+                              void attribute((unused)) *callbackdata) {
+  if(!rtp_address_in_flight) {
+    //fprintf(stderr, "checking rtp\n");
     disorder_eclient_rtp_address(client, got_rtp_address, NULL);
+  }
 }
 
 /* main -------------------------------------------------------------------- */
@@ -351,6 +377,40 @@ static void help(void) {
   exit(0);
 }
 
+static void version_completed(void attribute((unused)) *v,
+                              const char attribute((unused)) *err,
+                              const char *version) {
+  long major, minor, patch, dev;
+
+  if(!version) {
+    server_version = 0;
+    server_version_bytes = 0;
+    return;
+  }
+  server_version = version;
+  server_version_bytes = 0;
+  major = strtol(version, (char **)&version, 10);
+  if(*version != '.')
+    return;
+  ++version;
+  minor = strtol(version, (char **)&version, 10);
+  if(*version == '.') {
+    ++version;
+    patch = strtol(version, (char **)&version, 10);
+  } else
+    patch = 0;
+  if(*version) {
+    if(*version == '+') {
+      dev = 1;
+      ++version;
+    }
+    if(*version)
+      dev = 2;
+  } else
+    dev = 0;
+  server_version_bytes = (major << 24) + (minor << 16) + (patch << 8) + dev;
+}
+
 void logged_in(void) {
   /* reset the clients */
   disorder_eclient_close(client);
@@ -360,6 +420,8 @@ void logged_in(void) {
   /* Force the periodic checks */
   periodic_slow(0);
   periodic_fast(0);
+  /* Recheck server version */
+  disorder_eclient_version(client, version_completed, 0);
 }
 
 int main(int argc, char **argv) {
@@ -396,7 +458,7 @@ int main(int argc, char **argv) {
      || !(logclient = gtkclient()))
     return 1;                           /* already reported an error */
   /* periodic operations (e.g. expiring the cache, checking local volume) */
-  g_timeout_add(10000/*milliseconds*/, periodic_slow, 0);
+  g_timeout_add(600000/*milliseconds*/, periodic_slow, 0);
   g_timeout_add(1000/*milliseconds*/, periodic_fast, 0);
   /* global tooltips */
   tips = gtk_tooltips_new();
@@ -413,8 +475,9 @@ int main(int argc, char **argv) {
   /* Start monitoring the log */
   disorder_eclient_log(logclient, &log_callbacks, 0);
   /* Initiate all the checks */
-  periodic_slow(0);
   periodic_fast(0);
+  disorder_eclient_version(client, version_completed, 0);
+  event_register("log-connected", check_rtp_address, 0);
   suppress_actions = 0;
   /* If no password is set yet pop up a login box */
   if(!config->password)