goodwolf: Added a way for certain tabs to use their own WebView while the -ng option isn't selected HEAD develop

2 files changed, 51 insertions, 42 deletions

diff --git a/goodwolf.c b/goodwolf.c
index a73ebd3..4350fd2 100644
--- a/goodwolf.c
+++ b/goodwolf.c
@@ -830,7 +830,7 @@ new_browser(struct Window *window, const gchar *target_url, struct Client *old_b
 	                                                window->content_manager,
 	                                                NULL));
 
-	if (persistent_storage) {
+	if (persistent_storage && (old_browser == NULL || no_global_webview)) {
 		char context_id_str[GOODWOLF_CTX_SIZ] = {0, 0, 0, 0, 0, 0, 0};
 		if (separated_storage) {
 			fmt_context_id(browser->context_id, context_id_str, 0);
@@ -1212,12 +1212,17 @@ Options:\n\
     -ps        Enables persistent storage, meaning non-session cookies will be stored on drive\n\
     -st        Enables separated storage, meaning cookie storage will be separated between tabs by\n\
                their context label.\n\
-               Doesn't do anything if the -sp option isn't selected.\n\
-               Doesn't work properly without the -ng option.\n\
+               Doesn't do anything without the -ps option. Without the -ng option, it only puts \n\
+               cookies.txt in the folder of the first tab that uses the global WebView.\n\
     -ng        Disables global browser WebView. This significantly increases memory usage, roughly to\n\
                200-300MB per tab, but separates each tab into it's own process.\n\
                Useful for debugging purposes and might improve security. Significantly increases page\n\
-               load speed when multiple pages need to be loaded at once.\n");
+               load speed when multiple pages need to be loaded at once.\n\
+\n\
+URL:\n\
+  Has to be a valid web or file address.\n\
+  If prefixed with a +, it will always create a seperate WebView for the corresponding tab. If you\n\
+  want to use -st without -ng, you'll need to prefix all of your URLs with this character.\n");
 		return 0;
 	}
 
@@ -1367,7 +1372,11 @@ Options:\n\
 		goodwolf_new_tab(GTK_NOTEBOOK(window->notebook), new_browser(window, NULL, global_browser), FALSE);
 	else
 		for(int i = 1; i < argc; ++i)
-			goodwolf_new_tab(GTK_NOTEBOOK(window->notebook), new_browser(window, argv[i], global_browser), TRUE);
+			goodwolf_new_tab(GTK_NOTEBOOK(window->notebook),
+			                 new_browser(window,
+			                             argv[i] + (argv[i][0] == '+'),
+			                             argv[i][0] == '+' ? NULL : global_browser),
+			                 TRUE);
 
 	gtk_notebook_set_current_page(GTK_NOTEBOOK(window->notebook), 1);
 
diff --git a/po/messages.pot b/po/messages.pot
index 8147786..4bb7846 100644
--- a/po/messages.pot
+++ b/po/messages.pot
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Badwolf Authors <https://hacktivis.me/projects/badwolf>
+# Copyright (C) YEAR Goodwolf Authors <https://hacktivis.me/projects/goodwolf>
 # This file is distributed under the same license as the Badwolf package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Badwolf 1.2.0+g6e9679c.develop\n"
-"Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n"
-"POT-Creation-Date: 2022-07-17 20:31+0300\n"
+"Project-Id-Version: Badwolf 1.2.0+g4a49f71.develop\n"
+"Report-Msgid-Bugs-To: contact+goodwolf-msgid@hacktivis.me\n"
+"POT-Creation-Date: 2022-07-21 14:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -74,23 +74,23 @@ msgstr ""
 msgid "Bookmarks: unable to parse file \"%s\"\n"
 msgstr ""
 
-#: goodwolf.c:1190
+#: goodwolf.c:1249
 #, c-format
 msgid "Buildtime WebKit version: %d.%d.%d\n"
 msgstr ""
 
-#: goodwolf.c:497
+#: goodwolf.c:502
 msgid "Continue"
 msgstr ""
 
-#: goodwolf.c:442
+#: goodwolf.c:447
 msgid ""
 "Couldn't verify the TLS certificate to ensure a better security of the "
 "connection. You might want to verify your machine and network.\n"
 "\n"
 msgstr ""
 
-#: goodwolf.c:113
+#: goodwolf.c:115
 msgid "Crashed"
 msgstr ""
 
@@ -98,31 +98,31 @@ msgstr ""
 msgid "Download starting…"
 msgstr ""
 
-#: goodwolf.c:465
+#: goodwolf.c:470
 msgid "Error: Some unknown error occurred validating the certificate.\n"
 msgstr ""
 
-#: goodwolf.c:446
+#: goodwolf.c:451
 msgid "Error: The X509 Certificate Authority is unknown.\n"
 msgstr ""
 
-#: goodwolf.c:459
+#: goodwolf.c:464
 msgid "Error: The certificate has been revoked.\n"
 msgstr ""
 
-#: goodwolf.c:456
+#: goodwolf.c:461
 msgid "Error: The certificate has expired. Check your system's clock.\n"
 msgstr ""
 
-#: goodwolf.c:462
+#: goodwolf.c:467
 msgid "Error: The certificate is considered to be insecure.\n"
 msgstr ""
 
-#: goodwolf.c:453
+#: goodwolf.c:458
 msgid "Error: The certificate isn't valid yet. Check your system's clock.\n"
 msgstr ""
 
-#: goodwolf.c:449
+#: goodwolf.c:454
 msgid "Error: The given identity doesn't match the expected one.\n"
 msgstr ""
 
@@ -133,99 +133,99 @@ msgid ""
 "Runtime WebKit version: %d.%d.%d"
 msgstr ""
 
-#: goodwolf.c:1013
+#: goodwolf.c:1049
 msgid "New tab"
 msgstr ""
 
-#: goodwolf.c:1260
+#: goodwolf.c:1319
 msgid "Open new tab"
 msgstr ""
 
-#: goodwolf.c:117
+#: goodwolf.c:119
 msgid "Out of Memory"
 msgstr ""
 
-#: goodwolf.c:1188
+#: goodwolf.c:1247
 #, c-format
 msgid "Running Badwolf version: %s\n"
 msgstr ""
 
-#: goodwolf.c:1195
+#: goodwolf.c:1254
 #, c-format
 msgid "Runtime WebKit version: %d.%d.%d\n"
 msgstr ""
 
-#: goodwolf.c:494
+#: goodwolf.c:499
 #, c-format
 msgid "TLS Error for %s."
 msgstr ""
 
-#: goodwolf.c:497
+#: goodwolf.c:502
 msgid "Temporarily Add Exception"
 msgstr ""
 
-#: goodwolf.c:731
+#: goodwolf.c:750
 msgid "Toggle javascript"
 msgstr ""
 
-#: goodwolf.c:736
+#: goodwolf.c:755
 msgid "Toggle loading images automatically"
 msgstr ""
 
-#: goodwolf.c:121
+#: goodwolf.c:123
 msgid "Unknown Crash"
 msgstr ""
 
-#: goodwolf.c:734
+#: goodwolf.c:753
 msgid "_IMG"
 msgstr ""
 
-#: goodwolf.c:729
+#: goodwolf.c:748
 msgid "_JS"
 msgstr ""
 
-#: goodwolf.c:1216
+#: goodwolf.c:1275
 #, c-format
 msgid "content-filters file set to: %s\n"
 msgstr ""
 
-#: goodwolf.c:1091
+#: goodwolf.c:1128
 #, c-format
 msgid "goodwolf: content-filter loaded, adding to content-manager…\n"
 msgstr ""
 
-#: goodwolf.c:1111 goodwolf.c:1118
+#: goodwolf.c:1148 goodwolf.c:1155
 #, c-format
 msgid "goodwolf: failed to compile content-filters.json, err: [%d] %s\n"
 msgstr ""
 
-#: goodwolf.c:1079 goodwolf.c:1084
+#: goodwolf.c:1116 goodwolf.c:1121
 #, c-format
 msgid "goodwolf: failed to load content-filter, err: [%d] %s\n"
 msgstr ""
 
-#: goodwolf.c:901
+#: goodwolf.c:930
 msgid "search in current page"
 msgstr ""
 
-#: goodwolf.c:112
+#: goodwolf.c:114
 msgid "the web process crashed.\n"
 msgstr ""
 
-#: goodwolf.c:116
+#: goodwolf.c:118
 msgid "the web process exceeded the memory limit.\n"
 msgstr ""
 
-#: goodwolf.c:120
+#: goodwolf.c:122
 msgid "the web process terminated for an unknown reason.\n"
 msgstr ""
 
-#: goodwolf.c:1202
+#: goodwolf.c:1261
 #, c-format
 msgid "webkit-web-extension directory set to: %s\n"
 msgstr ""
 
 #. TRANSLATOR Ignore this entry. Done for forcing Unicode in xgettext.
-#: goodwolf.c:1325
+#: goodwolf.c:1404
 msgid "ø"
 msgstr ""