Attachment 365138 Details for Bug 528297 – a patch

[patch] a patch

no-album.patch (text/plain), 4.49 KB, created by Matthias Clasen on 2009-10-17 19:56:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Clasen

Created: 2009-10-17 19:56:38 UTC

Size: 4.49 KB

patch

obsolete

>diff -u -r sound-juicer-2.28.0/src/sj-extracting.c hacked/src/sj-extracting.c
>--- sound-juicer-2.28.0/src/sj-extracting.c	2009-10-17 15:51:14.851905109 -0400
>+++ hacked/src/sj-extracting.c	2009-10-17 15:50:56.316666598 -0400
>@@ -138,7 +138,10 @@
> 
>   g_object_get (extractor, "profile", &profile, NULL);
> 
>-  realpath = filepath_parse_pattern (path_pattern, track);
>+  realpath = filepath_parse_pattern (path_pattern, track, error);
>+  if (*error) {
>+    return NULL;
>+  }
>   new = g_file_get_child (base_uri, realpath);
>   uri = new;
>   g_free (realpath);
>@@ -168,7 +171,7 @@
>     g_set_error_literal (error, SJ_ERROR, SJ_ERROR_INTERNAL_ERROR, _("Name too long"));
>     return NULL;
>   }
>-  realfile = filepath_parse_pattern (file_pattern, track);
>+  realfile = filepath_parse_pattern (file_pattern, track, NULL);
>   if (temp_filename) {
>     filename = g_strdup_printf (".%.*s.%s", max_realfile-1, realfile, extension);
>   } else {
>@@ -430,7 +433,7 @@
>         ((file_size > MIN_FILE_SIZE) && (*overwrite_mode == SKIP_ALL))) {
>       successful_extract = FALSE;
>       on_completion_cb (NULL, overwrite_mode);
>-      return;
>+      goto local_cleanup;
>     }
> 
>     /* What if the file already exists? */
>@@ -439,7 +442,7 @@
>         (confirm_overwrite_existing_file (file, overwrite_mode, file_size) == FALSE)) {
>       successful_extract = FALSE;
>       on_completion_cb (NULL, overwrite_mode);
>-      return;
>+      goto local_cleanup;
>     }
> 
>     /* OK, we can write/overwrite the file */
>@@ -470,8 +473,10 @@
>     on_error_cb (NULL, error, NULL);
>     g_error_free (error);
> local_cleanup:
>-    g_object_unref (file);
>-    g_object_unref (temp_file);
>+    if (file)
>+      g_object_unref (file);
>+    if (temp_file)
>+      g_object_unref (temp_file);
>   }
> }
> 
>@@ -909,7 +914,7 @@
>  * %dN -- disc number, zero padded (i.e d02t06, or 06)
>  */
> char*
>-filepath_parse_pattern (const char* pattern, const TrackDetails *track)
>+filepath_parse_pattern (const char* pattern, const TrackDetails *track, GError **error)
> {
>   /* p is the pattern iterator, i is a general purpose iterator */
>   const char *p;
>@@ -958,6 +963,12 @@
>       /*
>        * Album tag
>        */
>+      if (track->album == NULL) {
>+        g_set_error_literal (error, 0, 0, _("Can't construct path - Album information is missing"));
>+        g_free (filesystem_type);
>+        g_string_free (s, TRUE);
>+        return NULL;
>+      }
>       switch (*++p) {
>       case 't':
>         string = sanitize_path (track->album->title, filesystem_type);
>@@ -1054,7 +1065,7 @@
>       switch (*++p) {
>       case 'n':
>         /* Disc and track number */
>-        if (track->album->disc_number > 0) {
>+        if (track->album && track->album->disc_number > 0) {
>           string = g_strdup_printf ("Disc %d - %d", track->album->disc_number, track->number);
>         } else {
>           string = g_strdup_printf ("%d", track->number);
>@@ -1062,7 +1073,7 @@
>         break;
>       case 'N':
>         /* Disc and track number, zero padded */
>-        if (track->album->disc_number > 0) {
>+        if (track->album && track->album->disc_number > 0) {
>           string = g_strdup_printf ("d%dt%02d", track->album->disc_number, track->number);
>         } else {
>           string = g_strdup_printf ("%02d", track->number);
>diff -u -r sound-juicer-2.28.0/src/sj-extracting.h hacked/src/sj-extracting.h
>--- sound-juicer-2.28.0/src/sj-extracting.h	2009-09-22 14:54:39.000000000 -0400
>+++ hacked/src/sj-extracting.h	2009-10-17 15:49:58.386658951 -0400
>@@ -27,7 +27,7 @@
> #include "sj-structures.h"
> 
> void on_extract_activate (GtkWidget *button, gpointer user_data);
>-char *filepath_parse_pattern (const char* pattern, const TrackDetails *track);
>+char *filepath_parse_pattern (const char* pattern, const TrackDetails *track, GError **error);
> void on_progress_cancel_clicked (GtkWidget *button, gpointer user_data);
> 
> #endif /* SJ_EXTRACTING_H */
>diff -u -r sound-juicer-2.28.0/src/sj-prefs.c hacked/src/sj-prefs.c
>--- sound-juicer-2.28.0/src/sj-prefs.c	2009-09-22 14:54:39.000000000 -0400
>+++ hacked/src/sj-prefs.c	2009-10-17 15:50:14.726659516 -0400
>@@ -262,8 +262,8 @@
>     path_pattern = g_strdup(path_patterns[0].pattern);
>   }
> 
>-  file_value = filepath_parse_pattern (file_pattern, &sample_track);
>-  path_value = filepath_parse_pattern (path_pattern, &sample_track);
>+  file_value = filepath_parse_pattern (file_pattern, &sample_track, NULL);
>+  path_value = filepath_parse_pattern (path_pattern, &sample_track, NULL);
> 
>   example = g_build_filename (G_DIR_SEPARATOR_S, path_value, file_value, NULL);
>   g_free (file_value);

Actions: View | Diff

Attachments on bug 528297: 365138