rhythmbox r5901 - in trunk: . podcast

[jmatthew svn gnome org]

Author: jmatthew
Date: Wed Sep 10 10:17:21 2008
New Revision: 5901
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5901&view=rev

Log:
2008-09-10  Jonathan Matthew  <jonathan d14n org>

	* podcast/rb-podcast-manager.c: (download_file_info_cb):
	If we get a generic 'failed' error here, continue with the download
	anyway.  Things like 'file not found' and 'permission denied' will
	still be reported correctly.  If the file info query fails, use the
	basename from the original URI for the downloaded file.

	(download_progress):
	Make the debug output a bit less obnoxious.
	
	(podcast_download_thread):
	If we didn't get it from the file info query, try to get the download
	size from the stream.  This doesn't actually work yet.

	Fixes #551540.


Modified:
   trunk/ChangeLog
   trunk/podcast/rb-podcast-manager.c

Modified: trunk/podcast/rb-podcast-manager.c
==============================================================================
--- trunk/podcast/rb-podcast-manager.c	(original)
+++ trunk/podcast/rb-podcast-manager.c	Wed Sep 10 10:17:21 2008
@@ -669,7 +669,7 @@
 {
 	GError *error = NULL;
 	GFileInfo *src_info;
-	char *local_file_name;
+	char *local_file_name = NULL;
 	char *feed_folder;
 	char *esc_local_file_name;
 	char *local_file_uri;
@@ -682,7 +682,12 @@
 		  rhythmdb_entry_get_string (data->entry, RHYTHMDB_PROP_LOCATION));
 
 	src_info = g_file_query_info_finish (source, result, &error);
-	if (error != NULL) {
+
+	/* ignore G_IO_ERROR_FAILED here, as it probably just means that the server is lame.
+	 * actual problems (not found, permission denied, etc.) have specific errors codes,
+	 * so they'll still be reported.
+	 */
+	if (error != NULL && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED) == FALSE) {
 		GValue val = {0,};
 
 		rb_debug ("file info query failed: %s", error->message);
@@ -702,21 +707,28 @@
 		g_error_free (error);
 		rb_podcast_manager_abort_download (data);
 		return;
+	} else {
+		g_clear_error (&error);
 	}
 
-	data->download_size = g_file_info_get_attribute_uint64 (src_info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+	if (src_info != NULL) {
+		data->download_size = g_file_info_get_attribute_uint64 (src_info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
 
-	/* this should probably be the target of any redirects.  hmm. */
-	local_file_name = g_file_info_get_attribute_as_string (src_info, G_FILE_ATTRIBUTE_STANDARD_COPY_NAME);
-	if (local_file_name == NULL) {
-		/* probably shouldn't be using this, but the gvfs http backend doesn't
-		 * set the copy name (yet)
-		 */
-		local_file_name = g_strdup (g_file_info_get_edit_name (src_info));
+		local_file_name = g_file_info_get_attribute_as_string (src_info, G_FILE_ATTRIBUTE_STANDARD_COPY_NAME);
 		if (local_file_name == NULL) {
-			/* um, grab the original filename? */
-			local_file_name = g_strdup ("mysterious podcast download.mp3");
+			/* probably shouldn't be using this, but the gvfs http backend doesn't
+			 * set the copy name (yet)
+			 */
+			local_file_name = g_strdup (g_file_info_get_edit_name (src_info));
 		}
+
+		g_object_unref (src_info);
+	}
+
+	if (local_file_name == NULL) {
+		/* fall back to the basename from the original URI */
+		local_file_name = g_file_get_basename (source);
+		rb_debug ("didn't get a filename from the file info request; using basename %s", local_file_name);
 	}
 
 	/* if the filename ends with the query string from the original URI,
@@ -741,6 +753,7 @@
 					   feed_folder,
 					   local_file_name,
 					   NULL);
+
 	g_free (local_file_name);
 	g_free (feed_folder);
 	g_free (esc_local_file_name);
@@ -1285,9 +1298,6 @@
 {
 	guint local_progress = 0;
 
-	rb_debug ("%s: %" G_GUINT64_FORMAT "/ %" G_GUINT64_FORMAT,
-		  rhythmdb_entry_get_string (data->entry, RHYTHMDB_PROP_LOCATION),
-		  downloaded, total);
 
 	if (downloaded > 0 && total > 0)
 		local_progress = (100 * downloaded) / total;
@@ -1295,6 +1305,10 @@
 	if (local_progress != data->progress) {
 		GValue val = {0,};
 
+		rb_debug ("%s: %" G_GUINT64_FORMAT "/ %" G_GUINT64_FORMAT,
+			  rhythmdb_entry_get_string (data->entry, RHYTHMDB_PROP_LOCATION),
+			  downloaded, total);
+
 		GDK_THREADS_ENTER ();
 
 		g_value_init (&val, G_TYPE_ULONG);
@@ -1384,6 +1398,26 @@
 		return NULL;
 	}
 
+	/* gvfs doesn't do file info queries from streams, so this doesn't help, but
+	 * maybe some day it will..
+	 */
+	if (data->download_size == 0) {
+		GFileInfo *info;
+
+		info = g_file_input_stream_query_info (data->in_stream,
+						       G_FILE_ATTRIBUTE_STANDARD_SIZE,
+						       NULL,
+						       &error);
+		if (error != NULL) {
+			rb_debug ("stream info query failed: %s", error->message);
+			g_clear_error (&error);
+		} else {
+			data->download_size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+			rb_debug ("got file size from stream: %" G_GINT64_FORMAT, data->download_size);
+			g_object_unref (info);
+		}
+	}
+
 	/* open local file */
 	if (data->out_stream == NULL) {
 		data->out_stream = g_file_create (data->destination,