regression: fix player sort order for commands

Sort player names correctly before applying commands fixes #112
altdesktop · Mar 23, 2019 · 77b3175 · 77b3175
1 parent 7d7d133
commit 77b3175
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 27 deletions.
diff --git a/playerctl/playerctl-cli.c b/playerctl/playerctl-cli.c
@@ -1011,41 +1011,46 @@ static void player_vanished_callback(PlayerctlPlayerManager *manager,
     }
 }
 
-gint player_compare_func(gconstpointer a, gconstpointer b, gpointer *user_data) {
-    PlayerctlPlayer *player_a = PLAYERCTL_PLAYER(a);
-    PlayerctlPlayer *player_b = PLAYERCTL_PLAYER(b);
-    gchar *name_a = NULL;
-    gchar *name_b = NULL;
-    g_object_get(player_a, "player-name", &name_a, NULL);
-    g_object_get(player_b, "player-name", &name_b, NULL);
-    gboolean compared = FALSE;
-    gint result = 1;
+gint player_name_string_compare_func(gconstpointer a, gconstpointer b) {
+    const gchar *name_a = a;
+    const gchar *name_b = b;
 
     if (g_strcmp0(name_a, name_b) == 0) {
-        compared = TRUE;
-        result = 0;
-        goto end;
+        return 0;
     }
 
     GList *l = NULL;
     for (l = player_names; l != NULL; l = l->next) {
         gchar *name = l->data;
-        if (pctl_player_name_string_instance_compare(name_a, name) == 0) {
-            compared = TRUE;
-            result = -1;
-            goto end;
-        }
-        if (pctl_player_name_string_instance_compare(name_b, name) == 0) {
-            compared = TRUE;
-            result = 1;
-            goto end;
+
+        if (g_strcmp0(name_a, name) == 0) {
+            return -1;
+        } else if (g_strcmp0(name_b, name) == 0) {
+            return 1;
+        } else if (pctl_player_name_string_instance_compare(name, name_a) == 0) {
+            return -1;
+        } else if (pctl_player_name_string_instance_compare(name, name_b) == 0) {
+            return 1;
         }
     }
 
-end:
-    if (!compared) {
-        g_warning("could not put players %s and %s in sorted order", name_a, name_b);
-    }
+    return 0;
+}
+
+gint player_name_compare_func(gconstpointer a, gconstpointer b) {
+    const PlayerctlPlayerName *name_a = a;
+    const PlayerctlPlayerName *name_b = b;
+    return player_name_string_compare_func(name_a->instance, name_b->instance);
+}
+
+gint player_compare_func(gconstpointer a, gconstpointer b) {
+    PlayerctlPlayer *player_a = PLAYERCTL_PLAYER(a);
+    PlayerctlPlayer *player_b = PLAYERCTL_PLAYER(b);
+    gchar *name_a = NULL;
+    gchar *name_b = NULL;
+    g_object_get(player_a, "player-name", &name_a, NULL);
+    g_object_get(player_b, "player-name", &name_b, NULL);
+    gint result = player_name_string_compare_func(name_a, name_b);
     g_free(name_a);
     g_free(name_b);
     return result;
@@ -1111,6 +1116,9 @@ int main(int argc, char *argv[]) {
 
     GList *available_players = NULL;
     g_object_get(manager, "player-names", &available_players, NULL);
+    available_players = g_list_copy(available_players);
+    available_players = g_list_sort(available_players, (GCompareFunc)player_name_compare_func);
+
 
     gboolean has_selected = FALSE;
     GList *l = NULL;
@@ -1192,6 +1200,9 @@ int main(int argc, char *argv[]) {
     }
 
 end:
+    if (available_players != NULL) {
+        g_list_free(available_players);
+    }
     playercmd_args_destroy(playercmd_args);
     if (manager != NULL) {
         g_object_unref(manager);

diff --git a/playerctl/playerctl-common.c b/playerctl/playerctl-common.c
@@ -160,7 +160,7 @@ gint pctl_player_name_instance_compare(PlayerctlPlayerName *name,
     return pctl_player_name_string_instance_compare(name->instance, instance->instance);
 }
 
-gint pctl_player_name_string_instance_compare(gchar *name, gchar *instance) {
+gint pctl_player_name_string_instance_compare(const gchar *name, const gchar *instance) {
     gboolean exact_match = (g_strcmp0(name, instance) == 0);
     gboolean instance_match = !exact_match && (g_str_has_prefix(instance, name) &&
             g_str_has_prefix(instance + strlen(name), ".instance"));

diff --git a/playerctl/playerctl-common.h b/playerctl/playerctl-common.h
@@ -48,7 +48,7 @@ gint pctl_player_name_compare(PlayerctlPlayerName *name_a,
 
 gint pctl_player_name_instance_compare(PlayerctlPlayerName *name, PlayerctlPlayerName *instance);
 
-gint pctl_player_name_string_instance_compare(gchar *name, gchar *instance);
+gint pctl_player_name_string_instance_compare(const gchar *name, const gchar *instance);
 
 GList *pctl_player_name_find(GList *list, gchar *player_id, PlayerctlSource source);