Use GLib to decode/encode URIs

Author: w0rp

CMakeLists.txt

@@ -7,7 +7,6 @@ set(SRC_LIST
     src/mpris-player.c
     src/xmms2.c
     src/mpris.c
-    src/uri.c
     src/art.c
 )
 

src/art.c

@@ -1,6 +1,8 @@
 #include <string.h>
 #include <strings.h>
 #include <dirent.h>
+#include <stdlib.h>
+#include <linux/limits.h>
 
 #include "art.h"
 
@@ -18,16 +20,22 @@ static const char* ART_NAMES[] = {
 /** The length of typical album art names. */
 static const size_t ART_NAMES_LENGTH = sizeof(ART_NAMES) / sizeof(char*);
 
-bool find_album_art(char** buffer, size_t path_size) {
-    char* path = *buffer;
+char* find_album_art(const char* filename) {
+    size_t path_size = strlen(filename) + NAME_MAX;
+    char* path = calloc(path_size, sizeof(char));
+    strcpy(path, filename);
 
     // Replace the path with just the dirname.
-    char* last_slash = strrchr(path, '/');
+    char* basename_ptr = strrchr(path, '/');
 
-    if (last_slash) {
-        memset(last_slash + 1, '\0', path_size - (last_slash - path) - 1);
+    if (!basename_ptr) {
+        return NULL;
     }
 
+    // Delete the characters after slash to remove the basename.
+    ++basename_ptr;
+    memset(basename_ptr, '\0', path_size - (basename_ptr - path));
+
     bool match_found = false;
 
     for (size_t index = 0; index < ART_NAMES_LENGTH; ++index) {
@@ -47,13 +55,15 @@ bool find_album_art(char** buffer, size_t path_size) {
         }
 
         if (match_found) {
-            // Update the path to replace the basename with the match.
-            strcpy(last_slash + 1, entry->d_name);
-            break;
+            strcpy(basename_ptr, entry->d_name);
         }
 
         closedir(dir);
+
+        if (match_found) {
+            break;
+        }
     }
 
-    return match_found;
+    return match_found ? path : NULL;
 }

src/art.h

@@ -6,10 +6,7 @@
 
 /**
  * Find album art for file, given a path to an audio file.
- *
- * If album art is found, the the path will be updated to point to it
- * instead.
  */
-bool find_album_art(char** buffer, size_t path_size);
+char* find_album_art(const char* filename);
 
 #endif /* __XMMS2_MPRIS_ART_H__ */

src/uri.c

@@ -3,11 +3,11 @@
 #include <linux/limits.h>
 
 #include <gio/gio.h>
+#include <glib.h>
 
 #include "track-info.h"
 #include "xmms2.h"
 #include "mpris.h"
-#include "uri.h"
 #include "art.h"
 
 /** The global data for the app. */
@@ -134,33 +134,37 @@ void handle_status(PlaybackStatus status) {
 }
 
 void handle_track_info(XmmsTrackInfo* info) {
-    // Create a buffer with enough size to store the
-    // URI converted to a path, plus a new filename on the end.
-    size_t buffer_size = strlen(info->url) + NAME_MAX + 1;
-    char* buffer = calloc(buffer_size, sizeof(char));
-    char* out_buffer = NULL;
-
-    if (
-        uri_to_path(&buffer, info->url)
-        && find_album_art(&buffer, buffer_size)
-    ) {
-        // Create a buffer with enough size to store percent
-        // encodings of all of the characters.
-        size_t out_buffer_size = buffer_size + NAME_MAX * 2;
-        out_buffer = calloc(out_buffer_size, sizeof(char));
-
-        path_to_uri(&out_buffer, buffer);
-
-        info->art_url = out_buffer;
+    char* filename = g_filename_from_uri(info->url, NULL, NULL);
+
+    // Replace plusses with spaces.
+    // XMMS2 encodes spaces in filenames as spaces.
+    if (filename) {
+        size_t filename_length = strlen(filename);
+
+        for (size_t index = 0; index < filename_length; ++index) {
+            if (filename[index] == '+') {
+                filename[index] = ' ';
+            }
+        }
     }
 
-    display_track_info(app.player, info);
+    char* art_filename = NULL;
+    char* art_uri = NULL;
 
-    free(buffer);
+    if (filename) {
+        art_filename = find_album_art(filename);
 
-    if (out_buffer) {
-        free(out_buffer);
+        if (art_filename) {
+            art_uri = g_filename_to_uri(art_filename, NULL, NULL);
+            info->art_url = art_uri;
+        }
     }
+
+    display_track_info(app.player, info);
+
+    g_free(filename);
+    free(art_filename);
+    g_free(art_uri);
 }
 
 void handle_playlist_position_change(int32_t position, int32_t length) {