Cleanup usage of URL/URI/MRL in the playlist parser. Note that this

2008-12-05  Philip Withnall  <philip@tecnocode.co.uk>

	* docs/reference/totem-pl-parser-sections.txt:
	* plparse/disc-test.c (main):
	* plparse/test-parser.c (test_relative_real),
	(entry_metadata_foreach), (test_parsing_real),
	(test_data_get_data), (main):
	* plparse/totem-disc.c (totem_cd_detect_type_from_dir),
	(totem_cd_detect_type_with_url):
	* plparse/totem-disc.h:
	* plparse/totem-pl-parser-lines.c (totem_pl_parser_uri_to_dos),
	(totem_pl_parser_write_m3u), (totem_pl_parser_parse_ram_uri),
	(totem_pl_parser_add_ram), (totem_pl_parser_add_m3u):
	* plparse/totem-pl-parser-media.c (totem_pl_parser_add_iso),
	(totem_pl_parser_add_cue), (totem_pl_parser_add_directory),
	(totem_pl_parser_add_block):
	* plparse/totem-pl-parser-misc.c (totem_pl_parser_add_gvp):
	* plparse/totem-pl-parser-pla.c (totem_pl_parser_add_pla):
	* plparse/totem-pl-parser-pls.c (totem_pl_parser_write_pls),
	(totem_pl_parser_add_pls_with_contents):
	* plparse/totem-pl-parser-podcast.c (parse_rss_item),
	(parse_rss_items), (totem_pl_parser_add_rss),
	(totem_pl_parser_add_itpc), (totem_pl_parser_add_zune),
	(parse_atom_entry), (parse_atom_entries),
	(totem_pl_parser_add_atom), (totem_pl_parser_get_feed_uri),
	(totem_pl_parser_get_itms_uri), (totem_pl_parser_add_itms),
	(totem_pl_parser_is_itms_feed), (parse_opml_outline),
	(parse_opml_head_body), (totem_pl_parser_add_opml):
	* plparse/totem-pl-parser-private.h:
	* plparse/totem-pl-parser-qt.c
	(totem_pl_parser_add_quicktime_rtsptext),
	(totem_pl_parser_add_quicktime_metalink),
	(totem_pl_parser_add_quicktime):
	* plparse/totem-pl-parser-smil.c (parse_smil_entry):
	* plparse/totem-pl-parser-wm.c
	(totem_pl_parser_add_asf_reference_parser),
	(totem_pl_parser_add_asf_parser), (parse_asx_entry),
	(parse_asx_entryref), (parse_asx_entries),
	(totem_pl_parser_add_asx):
	* plparse/totem-pl-parser-xspf.c (totem_pl_parser_write_xspf),
	(parse_xspf_track):
	* plparse/totem-pl-parser.c (totem_pl_parser_class_init),
	(my_g_file_info_get_mime_type_with_data),
	(totem_pl_parser_base_uri), (totem_pl_parser_num_entries),
	(totem_pl_parser_add_uri_valist), (totem_pl_parser_add_uri),
	(totem_pl_parser_add_one_uri), (totem_pl_parser_add_one_file),
	(totem_pl_parser_scheme_is_ignored), (totem_pl_parser_ignore),
	(totem_pl_parser_parse_internal),
	(totem_pl_parser_parse_with_base), (totem_pl_parser_parse):
	* plparse/totem-pl-parser.h: Cleanup usage of URL/URI/MRL in the
	playlist parser. Note that this doesn't break API. (Closes: #536107)


svn path=/trunk/; revision=263

1 files changed, 27 insertions, 27 deletions

diff --git a/plparse/totem-pl-parser-wm.c b/plparse/totem-pl-parser-wm.c
index 5b605bd..d177396 100644
--- a/plparse/totem-pl-parser-wm.c
+++ b/plparse/totem-pl-parser-wm.c
@@ -110,7 +110,7 @@ totem_pl_parser_add_asf_reference_parser (TotemPlParser *parser,
 	if (g_str_has_prefix (ref, "http") != FALSE)
 		memcpy(ref, "mmsh", 4);
 
-	totem_pl_parser_add_one_url (parser, ref, NULL);
+	totem_pl_parser_add_one_uri (parser, ref, NULL);
 	g_free (ref);
 
 	/* Don't try to get Ref2, as it's only ever
@@ -151,7 +151,7 @@ totem_pl_parser_add_asf_parser (TotemPlParser *parser,
 	ref = contents + 4;
 	if (g_str_has_prefix (ref, "http") != FALSE) {
 		memcpy(ref, "mmsh", 4);
-		totem_pl_parser_add_one_url (parser, ref, NULL);
+		totem_pl_parser_add_one_uri (parser, ref, NULL);
 		retval = TOTEM_PL_PARSER_RESULT_SUCCESS;
 	}
 
@@ -166,12 +166,12 @@ parse_asx_entry (TotemPlParser *parser, GFile *base_file, xml_node_t *parent)
 	xml_node_t *node;
 	TotemPlParserResult retval = TOTEM_PL_PARSER_RESULT_SUCCESS;
 	GFile *resolved;
-	const char *url;
+	const char *uri;
 	const char *title, *duration, *starttime, *author;
 	const char *moreinfo, *abstract, *copyright;
 
 	title = NULL;
-	url = NULL;
+	uri = NULL;
 	duration = NULL;
 	starttime = NULL;
 	moreinfo = NULL;
@@ -192,8 +192,8 @@ parse_asx_entry (TotemPlParser *parser, GFile *base_file, xml_node_t *parent)
 				continue;
 			/* FIXME, should we prefer mms streams, or non-mms?
 			 * See bug #352559 */
-			if (url == NULL)
-				url = tmp;
+			if (uri == NULL)
+				uri = tmp;
 
 			continue;
 		}
@@ -253,19 +253,19 @@ parse_asx_entry (TotemPlParser *parser, GFile *base_file, xml_node_t *parent)
 		}
 	}
 
-	if (url == NULL)
+	if (uri == NULL)
 		return TOTEM_PL_PARSER_RESULT_ERROR;
 
 
-	if (base_file != NULL && strstr (url, "://") == NULL)
-		resolved = g_file_resolve_relative_path (base_file, url);
+	if (base_file != NULL && strstr (uri, "://") == NULL)
+		resolved = g_file_resolve_relative_path (base_file, uri);
 	else
-		resolved = g_file_new_for_uri (url);
+		resolved = g_file_new_for_uri (uri);
 
 	/* .asx files can contain references to other .asx files */
 	retval = totem_pl_parser_parse_internal (parser, resolved, NULL);
 	if (retval != TOTEM_PL_PARSER_RESULT_SUCCESS) {
-		totem_pl_parser_add_url (parser,
+		totem_pl_parser_add_uri (parser,
 					 TOTEM_PL_PARSER_FIELD_FILE, resolved,
 					 TOTEM_PL_PARSER_FIELD_TITLE, title,
 					 TOTEM_PL_PARSER_FIELD_ABSTRACT, abstract,
@@ -287,23 +287,23 @@ static gboolean
 parse_asx_entryref (TotemPlParser *parser, GFile *base_file, xml_node_t *node)
 {
 	TotemPlParserResult retval = TOTEM_PL_PARSER_RESULT_SUCCESS;
-	const char *url;
+	const char *uri;
 	GFile *resolved;
 
-	url = xml_parser_get_property (node, "href");
+	uri = xml_parser_get_property (node, "href");
 
-	if (url == NULL)
+	if (uri == NULL)
 		return TOTEM_PL_PARSER_RESULT_ERROR;
 
-	if (base_file != NULL && strstr (url, "://") == NULL)
-		resolved = g_file_resolve_relative_path (base_file, url);
+	if (base_file != NULL && strstr (uri, "://") == NULL)
+		resolved = g_file_resolve_relative_path (base_file, uri);
 	else
-		resolved = g_file_new_for_uri (url);
+		resolved = g_file_new_for_uri (uri);
 
 	/* .asx files can contain references to other .asx files */
 	retval = totem_pl_parser_parse_internal (parser, resolved, NULL);
 	if (retval != TOTEM_PL_PARSER_RESULT_SUCCESS) {
-		totem_pl_parser_add_url (parser,
+		totem_pl_parser_add_uri (parser,
 					 TOTEM_PL_PARSER_FIELD_FILE, resolved,
 					 NULL);
 		retval = TOTEM_PL_PARSER_RESULT_SUCCESS;
@@ -315,7 +315,7 @@ parse_asx_entryref (TotemPlParser *parser, GFile *base_file, xml_node_t *node)
 
 //FIXME the retval is completely wrong
 static gboolean
-parse_asx_entries (TotemPlParser *parser, const char *url, GFile *base_file, xml_node_t *parent)
+parse_asx_entries (TotemPlParser *parser, const char *uri, GFile *base_file, xml_node_t *parent)
 {
 	char *title = NULL;
 	GFile *new_base;
@@ -331,9 +331,9 @@ parse_asx_entries (TotemPlParser *parser, const char *url, GFile *base_file, xml
 		if (g_ascii_strcasecmp (node->name, "title") == 0) {
 			g_free (title);
 			title = g_strdup (node->data);
-			totem_pl_parser_add_url (parser,
+			totem_pl_parser_add_uri (parser,
 						 TOTEM_PL_PARSER_FIELD_IS_PLAYLIST, TRUE,
-						 TOTEM_PL_PARSER_FIELD_URL, url,
+						 TOTEM_PL_PARSER_FIELD_URI, uri,
 						 TOTEM_PL_PARSER_FIELD_TITLE, title,
 						 NULL);
 		}
@@ -358,7 +358,7 @@ parse_asx_entries (TotemPlParser *parser, const char *url, GFile *base_file, xml
 		}
 		if (g_ascii_strcasecmp (node->name, "repeat") == 0) {
 			/* Repeat at the top-level */
-			if (parse_asx_entries (parser, url, new_base ? new_base : base_file, node) != FALSE)
+			if (parse_asx_entries (parser, uri, new_base ? new_base : base_file, node) != FALSE)
 				retval = TOTEM_PL_PARSER_RESULT_SUCCESS;
 		}
 	}
@@ -366,7 +366,7 @@ parse_asx_entries (TotemPlParser *parser, const char *url, GFile *base_file, xml
 	if (new_base != NULL)
 		g_object_unref (new_base);
 	if (title != NULL)
-		totem_pl_parser_playlist_end (parser, url);
+		totem_pl_parser_playlist_end (parser, uri);
 	g_free (title);
 
 	return retval;
@@ -379,7 +379,7 @@ totem_pl_parser_add_asx (TotemPlParser *parser,
 			 gpointer data)
 {
 	xml_node_t* doc;
-	char *contents, *url;
+	char *contents, *uri;
 	gsize size;
 	TotemPlParserResult retval = TOTEM_PL_PARSER_RESULT_UNHANDLED;
 
@@ -403,12 +403,12 @@ totem_pl_parser_add_asx (TotemPlParser *parser,
 		return TOTEM_PL_PARSER_RESULT_ERROR;
 	}
 
-	url = g_file_get_uri (file);
+	uri = g_file_get_uri (file);
 
-	if (parse_asx_entries (parser, url, base_file, doc) != FALSE)
+	if (parse_asx_entries (parser, uri, base_file, doc) != FALSE)
 		retval = TOTEM_PL_PARSER_RESULT_SUCCESS;
 
-	g_free (url);
+	g_free (uri);
 	g_free (contents);
 	xml_parser_free_tree (doc);