debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use midori_uri_parse in Addons to handle installation

Browse source
This commit is contained in:
Christian Dywan 2011-10-28 23:53:14 +02:00
parent 5244bda781
commit 4d872505fb
1 changed files with 62 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
extensions/addons.c
View file

@ -105,14 +105,13 @@ addons_install_response (GtkWidget* infobar,
const gchar* uri = midori_view_get_display_uri (view);
if (uri && *uri)
{
gchar** split_uri;
gchar* path, *filename, *hostname, *dest_path, *temp_uri, *folder_path;
gchar* hostname, *path;
gchar* dest_uri, *filename, *dest_path, *temp_uri, *folder_path;
const gchar* folder;
WebKitNetworkRequest* request;
WebKitDownload* download;
split_uri = g_strsplit (uri, "/", -1);
hostname = split_uri[2];
hostname = midori_uri_parse (uri, &path);
temp_uri = NULL;
filename = NULL;
folder = NULL;
@ -121,17 +120,20 @@ addons_install_response (GtkWidget* infobar,
folder = "scripts";
else if (g_str_has_suffix (uri, ".user.css"))
folder = "styles";
else if (!g_strcmp0 (hostname, "userscripts.org"))
else if (!strcmp (hostname, "userscripts.org"))
{
/* http://userscripts.org/scripts/ACTION/SCRIPT_ID/NAME */
gchar* subpage = strchr (strchr (path + 1, '/') + 1, '/');
if (subpage && subpage[0] == '/' && g_ascii_isdigit (subpage[1]))
{
gchar* script_id;
const gchar* js_script;
WebKitWebView* web_view;
WebKitWebFrame* web_frame;
js_script = "document.getElementById('heading').childNodes[3].childNodes[1].textContent";
web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view));
web_frame = webkit_web_view_get_main_frame (web_view);
js_script = "document.getElementById('heading').childNodes[3].childNodes[1].textContent";
if (WEBKIT_IS_WEB_FRAME (web_frame))
{
JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
@ -141,29 +143,27 @@ addons_install_response (GtkWidget* infobar,
g_free (value);
}
folder = "scripts";
script_id = split_uri[5];
/* rewrite uri to get source js */
temp_uri = g_strdup_printf ("http://%s/scripts/source/%s.user.js",
hostname, script_id);
hostname, subpage + 1);
uri = temp_uri;
folder = "scripts";
}
else if (!g_strcmp0 (hostname, "userstyles.org"))
}
else if (!strcmp (hostname, "userstyles.org"))
{
gchar* subpage = split_uri[4];
folder = "styles";
if ((subpage && *subpage) && g_ascii_isdigit (subpage[0]))
/* http://userstyles.org/styles/STYLE_ID/NAME */
gchar* subpage = strchr (path + 1, '/');
if (subpage && subpage[0] == '/' && g_ascii_isdigit (subpage[1]))
{
gchar* style_id;
const gchar* js_script;
WebKitWebView* web_view;
WebKitWebFrame* web_frame;
js_script = "document.getElementById('stylish-description').innerHTML;";
web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view));
web_frame = webkit_web_view_get_main_frame (web_view);
js_script = "document.getElementById('stylish-description').innerHTML;";
if (WEBKIT_IS_WEB_FRAME (web_frame))
{
JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
@ -173,9 +173,9 @@ addons_install_response (GtkWidget* infobar,
g_free (value);
}
/* rewrite uri to get css */
style_id = split_uri[4];
temp_uri = g_strdup_printf ("http://%s/styles/%s.css", hostname, style_id);
temp_uri = g_strdup_printf ("http://%s/styles/%s.css", hostname, subpage + 1);
uri = temp_uri;
folder = "styles";
}
}
@ -186,22 +186,22 @@ addons_install_response (GtkWidget* infobar,
if (!g_file_test (folder_path, G_FILE_TEST_EXISTS))
katze_mkdir_with_parents (folder_path, 0700);
path = g_build_path (G_DIR_SEPARATOR_S, folder_path, filename, NULL);
dest_path = g_build_path (G_DIR_SEPARATOR_S, folder_path, filename, NULL);
request = webkit_network_request_new (uri);
download = webkit_download_new (request);
g_object_unref (request);
dest_path = g_filename_to_uri (path, NULL, NULL);
webkit_download_set_destination_uri (download, dest_path);
dest_uri = g_filename_to_uri (dest_path, NULL, NULL);
webkit_download_set_destination_uri (download, dest_uri);
webkit_download_start (download);
g_free (filename);
g_free (path);
g_free (dest_uri);
g_free (temp_uri);
g_free (dest_path);
g_free (folder_path);
g_strfreev (split_uri);
g_free (hostname);
}
}
gtk_widget_destroy (GTK_WIDGET (infobar));
@ -255,27 +255,26 @@ addons_notify_load_status_cb (MidoriView* view,
addons_uri_install (view, ADDONS_USER_SCRIPTS);
else if (g_str_has_suffix (uri, ".user.css"))
addons_uri_install (view, ADDONS_USER_STYLES);
else if (g_str_has_prefix (uri, "http://userscripts.org/scripts/"))
else
{
gchar** split_uri = g_strsplit (uri, "/", -1);
gchar* subpage = split_uri[4];
/* userscripts.org script main (with desc) and "source view" pages */
if (!g_strcmp0 (subpage, "show") || !g_strcmp0 (subpage, "review"))
gchar* path;
gchar* hostname = midori_uri_parse (uri, &path);
if (!strcmp (hostname, "userscripts.org")
&& (g_str_has_prefix (path, "/scripts/show/")
|| g_str_has_prefix (path, "/scripts/review/")))
{
/* Main (with desc) and "source view" pages */
addons_uri_install (view, ADDONS_USER_SCRIPTS);
g_strfreev (split_uri);
}
else if (g_str_has_prefix (uri, "http://userstyles.org/styles/"))
else if (!strcmp (hostname, "userstyles.org")
&& g_str_has_prefix (path, "/styles/"))
{
gchar** split_uri = g_strsplit (uri, "/", -1);
gchar* subpage = split_uri[4];
/* userstyles.org style main page with style description */
if ((subpage && *subpage) && g_ascii_isdigit (subpage[0]))
gchar* subpage = strchr (path + 1, '/');
/* Main page with style description */
if (subpage && subpage[0] == '/' && g_ascii_isdigit (subpage[1]))
addons_uri_install (view, ADDONS_USER_STYLES);
g_strfreev (split_uri);
}
g_free (hostname);
}
}
}