Added site-specific configuration; default Titan port

When using the upload shortcut, enable configuring a specific port for Titan via site-specific parameters.

19 files changed, 266 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b5fa9cd..b4b3a9c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,6 +150,8 @@ set (SOURCES
     src/periodic.h
     src/prefs.c
     src/prefs.h
+    src/sitespec.c
+    src/sitespec.h
     src/stb_image.h
     src/stb_image_resize.h
     src/stb_truetype.h
@@ -193,7 +195,7 @@ set (SOURCES
     src/ui/scrollwidget.c
     src/ui/scrollwidget.h
     src/ui/sidebarwidget.c
-    src/ui/sidebarwidget.h
+    src/ui/sidebarwidget.h    
     src/ui/text.c
     src/ui/text.h
     src/ui/touch.c
diff --git a/po/en.po b/po/en.po
index 31a2946e..a3306f27 100644
--- a/po/en.po
+++ b/po/en.po
@@ -897,6 +897,18 @@ msgstr "see server's instructions"
 msgid "dlg.upload.send"
 msgstr "Upload"
 
+msgid "upload.port"
+msgstr "Port…"
+
+msgid "heading.uploadport"
+msgstr "TITAN UPLOAD PORT"
+
+msgid "dlg.uploadport.msg"
+msgstr "Set the Titan server port to use for this URL.\nThe port is saved in the site-specific configuration."
+
+msgid "dlg.uploadport.set"
+msgstr "Set Port"
+
 msgid "heading.translate"
 msgstr "TRANSLATE PAGE"
 
diff --git a/res/lang/de.bin b/res/lang/de.bin
index 512061a1..ab7b90e2 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index 766e74d6..ae50e06a 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index c0d45889..96c14f46 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index a5c8b35d..010282fd 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index 8fc6a8ac..b27c62fb 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index df4123aa..fe067931 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index 54fcadd6..8444c31a 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index 1eebe588..a1fe6e16 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index 4a4a99f6..41e57935 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 1a8843de..d84accda 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index b459962a..b7dd34ab 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 19d3ce5f..279a5503 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index 86be599d..82cdb583 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/app.c b/src/app.c
index e5c47a17..abfd584a 100644
--- a/src/app.c
+++ b/src/app.c
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "history.h"
 #include "ipc.h"
 #include "periodic.h"
+#include "sitespec.h"
 #include "ui/certimportwidget.h"
 #include "ui/color.h"
 #include "ui/command.h"
@@ -752,6 +753,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     }
 #endif
     init_Prefs(&d->prefs);
+    init_SiteSpec(dataDir_App_());
     setCStr_String(&d->prefs.downloadDir, downloadDir_App_());
     set_Atomic(&d->pendingRefresh, iFalse);
     d->isRunning = iFalse;
@@ -832,6 +834,7 @@ static void deinit_App(iApp *d) {
     deinit_Feeds();
     save_Keys(dataDir_App_());
     deinit_Keys();
+    deinit_SiteSpec();
     savePrefs_App_(d);
     deinit_Prefs(&d->prefs);
     save_Bookmarks(d->bookmarks, dataDir_App_());
diff --git a/src/sitespec.c b/src/sitespec.c
new file mode 100644
index 00000000..4df62a9f
--- /dev/null
+++ b/src/sitespec.c
@@ -0,0 +1,158 @@
+/* Copyright 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#include "sitespec.h"
+
+#include <the_Foundation/file.h>
+#include <the_Foundation/path.h>
+#include <the_Foundation/stringhash.h>
+
+iDeclareClass(SiteParams)
+iDeclareObjectConstruction(SiteParams)
+    
+struct Impl_SiteParams {
+    iObject  object;
+    uint16_t titanPort;
+    /* TODO: theme seed, style settings */
+};
+
+void init_SiteParams(iSiteParams *d) {
+    d->titanPort = 0; /* undefined */
+}
+
+void deinit_SiteParams(iSiteParams *d) {
+    iUnused(d);
+}
+
+iDefineClass(SiteParams)
+iDefineObjectConstruction(SiteParams)
+    
+/*----------------------------------------------------------------------------------------------*/
+    
+struct Impl_SiteSpec {
+    iString     savePath;
+    iStringHash sites;
+};
+
+static iSiteSpec siteSpec_;
+
+static void load_SiteSpec_(iSiteSpec *d) {
+    iFile *f = iClob(new_File(&d->savePath));
+    if (open_File(f, readOnly_FileMode | text_FileMode)) {
+        iString *src = collect_String(readString_File(f));
+        iRangecc split = iNullRange;
+        iString *key = collectNew_String();
+        iSiteParams *params = NULL;
+        while (nextSplit_Rangecc(range_String(src), "\n", &split)) {
+            iRangecc line = split;
+            trim_Rangecc(&line);
+            if (isEmpty_Range(&line)) {
+                continue;
+            }
+            if (startsWith_Rangecc(line, "# ")) {
+                if (params && !isEmpty_String(key)) {
+                    insert_StringHash(&d->sites, key, params);
+                    iReleasePtr(&params);
+                }
+                line.start += 2;
+                setRange_String(key, line);
+                params = new_SiteParams();
+                continue;
+            }
+            if (startsWith_Rangecc(line, "titanPort: ")) {
+                line.start += 11;
+                if (params) {
+                    params->titanPort = atoi(cstr_Rangecc(line));
+                }
+                continue;                
+            }
+        }
+        if (params && !isEmpty_String(key)) {
+            insert_StringHash(&d->sites, key, params);
+            iReleasePtr(&params);
+        }
+    }
+}
+
+static void save_SiteSpec_(iSiteSpec *d) {
+    iFile *f = new_File(&d->savePath);
+    if (open_File(f, writeOnly_FileMode | text_FileMode)) {
+        iString *buf = new_String();
+        iConstForEach(StringHash, i, &d->sites) {
+            const iBlock *     key    = &i.value->keyBlock;
+            const iSiteParams *params = i.value->object;
+            format_String(buf, "# %s\n", cstr_Block(key));
+            appendFormat_String(buf, "titanPort: %u\n", params->titanPort);
+            write_File(f, utf8_String(buf));
+        }
+        delete_String(buf);
+    }
+    iRelease(f);
+}
+
+void init_SiteSpec(const char *saveDir) {
+    iSiteSpec *d = &siteSpec_;
+    initCStr_String(&d->savePath, concatPath_CStr(saveDir, "sitespec.txt"));
+    init_StringHash(&d->sites);
+    load_SiteSpec_(d);
+}
+
+void deinit_SiteSpec(void) {
+    iSiteSpec *d = &siteSpec_;
+    deinit_StringHash(&d->sites);
+    deinit_String(&d->savePath);
+}
+
+void setValue_SiteSpec(const iString *site, enum iSiteSpecKey key, int value) {
+    iSiteSpec *d = &siteSpec_;
+    const iString *hashKey = collect_String(lower_String(site));
+    iSiteParams *params = value_StringHash(&d->sites, hashKey);
+    if (!params) {
+        params = new_SiteParams();
+        insert_StringHash(&d->sites, hashKey, params);
+    }
+    iBool needSave = iFalse;
+    switch (key) {
+        case titanPort_SiteSpecKey:
+            params->titanPort = iClamp(value, 0, 0xffff);
+            needSave = iTrue;
+        default:
+            break;
+    }
+    if (needSave) {
+        save_SiteSpec_(d);
+    }
+}
+
+int value_SiteSpec(const iString *site, enum iSiteSpecKey key) {
+    iSiteSpec *d = &siteSpec_;
+    const iSiteParams *params = constValue_StringHash(&d->sites, collect_String(lower_String(site)));
+    if (!params) {
+        return 0;
+    }
+    switch (key) {
+        case titanPort_SiteSpecKey:
+            return params->titanPort;
+        default:
+            return 0;
+    }    
+}
diff --git a/src/sitespec.h b/src/sitespec.h
new file mode 100644
index 00000000..ee08f81f
--- /dev/null
+++ b/src/sitespec.h
@@ -0,0 +1,37 @@
+/* Copyright 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#pragma once
+
+#include <the_Foundation/string.h>
+
+iDeclareType(SiteSpec)
+    
+enum iSiteSpecKey {
+    titanPort_SiteSpecKey,
+};
+    
+void    init_SiteSpec       (const char *saveDir);
+void    deinit_SiteSpec     (void);
+
+void    setValue_SiteSpec   (const iString *site, enum iSiteSpecKey key, int value); /* changes saved immediately */
+int     value_SiteSpec      (const iString *site, enum iSiteSpecKey key);
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index eb8039c3..22c3adf6 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -27,6 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "color.h"
 #include "command.h"
 #include "gmrequest.h"
+#include "sitespec.h"
 #include "app.h"
 
 #include <the_Foundation/file.h>
@@ -36,6 +37,7 @@ iDefineObjectConstruction(UploadWidget)
 
 struct Impl_UploadWidget {
     iWidget          widget;
+    iString          originalUrl;
     iString          url;
     iDocumentWidget *viewer;
     iGmRequest *     request;
@@ -65,6 +67,7 @@ void init_UploadWidget(iUploadWidget *d) {
     init_Widget(w);
     setId_Widget(w, "upload");
     useSheetStyle_Widget(w);
+    init_String(&d->originalUrl);
     init_String(&d->url);
     d->viewer = NULL;
     d->request = NULL;
@@ -126,15 +129,17 @@ void init_UploadWidget(iUploadWidget *d) {
     /* Buttons. */ {
         addChild_Widget(w, iClob(makePadding_Widget(gap_UI)));
         iWidget *buttons =
-            makeDialogButtons_Widget((iMenuItem[]){ { "${cancel}", SDLK_ESCAPE, 0, "upload.cancel" },
+            makeDialogButtons_Widget((iMenuItem[]){ { "${upload.port}", 0, 0, "upload.setport" },
+                                                    { "---", 0, 0, NULL },
+                                                    { "${cancel}", SDLK_ESCAPE, 0, "upload.cancel" },
                                                     { uiTextAction_ColorEscape "${dlg.upload.send}",
                                                       SDLK_RETURN,
                                                       KMOD_PRIMARY,
                                                       "upload.accept" } },
-                                     2);
-        setId_Widget(addChildPosFlags_Widget(buttons,
+                                     4);
+        setId_Widget(insertChildAfterFlags_Widget(buttons,
                                              iClob(d->counter = new_LabelWidget("", NULL)),
-                                             front_WidgetAddPos, frameless_WidgetFlag),
+                                             0, frameless_WidgetFlag),
                      "upload.counter");
         addChild_Widget(w, iClob(buttons));
     }
@@ -146,20 +151,44 @@ void init_UploadWidget(iUploadWidget *d) {
     setBackupFileName_InputWidget(d->input, "uploadbackup.txt");
 }
 
-void deinit_UploadWidget(iUploadWidget *d) {
+void deinit_UploadWidget(iUploadWidget *d) {    
     deinit_String(&d->filePath);
     deinit_String(&d->url);
+    deinit_String(&d->originalUrl);
     iRelease(d->request);
 }
 
-void setUrl_UploadWidget(iUploadWidget *d, const iString *url) {
+static uint16_t titanPortForUrl_(const iString *url) {
+    uint16_t port = 0;
+    const iString *root = collectNewRange_String(urlRoot_String(url));
     iUrl parts;
     init_Url(&parts, url);
+    /* If the port is not specified, use the site-specific configuration. */
+    if (isEmpty_Range(&parts.port) || equalCase_Rangecc(parts.scheme, "gemini")) {
+        port = value_SiteSpec(root, titanPort_SiteSpecKey);
+    }
+    else {
+        port = atoi(cstr_Rangecc(parts.port));
+    }
+    return port ? port : GEMINI_DEFAULT_PORT;
+}
+
+static void setUrlPort_UploadWidget_(iUploadWidget *d, const iString *url, uint16_t overridePort) {
+    set_String(&d->originalUrl, url);
+    iUrl parts;
+    const iString *root = collectNewRange_String(urlRoot_String(url));
+    init_Url(&parts, url);
     setCStr_String(&d->url, "titan");
-    appendRange_String(&d->url, (iRangecc){ parts.scheme.end, constEnd_String(url) });
+    appendRange_String(&d->url, (iRangecc){ parts.scheme.end, parts.host.end });
+    appendFormat_String(&d->url, ":%u", overridePort ? overridePort : titanPortForUrl_(url));
+    appendRange_String(&d->url, (iRangecc){ parts.path.start, constEnd_String(url) });
     setText_LabelWidget(d->info, &d->url);
 }
 
+void setUrl_UploadWidget(iUploadWidget *d, const iString *url) {
+    setUrlPort_UploadWidget_(d, url, 0);
+}
+
 void setResponseViewer_UploadWidget(iUploadWidget *d, iDocumentWidget *doc) {
     d->viewer = doc;
 }
@@ -182,13 +211,29 @@ static void requestFinished_UploadWidget_(iUploadWidget *d, iGmRequest *req) {
 
 static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
+    const char *cmd = command_UserEvent(ev);
     if (isCommand_Widget(w, ev, "upload.cancel")) {
         /* TODO: If text has been entered, ask for confirmation. */
         setupSheetTransition_Mobile(w, iFalse);
         destroy_Widget(w);
         return iTrue;
     }
-    const char *cmd = command_UserEvent(ev);
+    if (isCommand_Widget(w, ev, "upload.setport")) {
+        if (hasLabel_Command(cmd, "value")) {
+            setValue_SiteSpec(collectNewRange_String(urlRoot_String(&d->originalUrl)),
+                              titanPort_SiteSpecKey, arg_Command(cmd));
+            setUrlPort_UploadWidget_(d, &d->originalUrl, arg_Command(cmd));
+        }
+        else {
+            makeValueInput_Widget(w,
+                                  collectNewFormat_String("%u", titanPortForUrl_(&d->originalUrl)),
+                                  uiHeading_ColorEscape "${heading.uploadport}",
+                                  "${dlg.uploadport.msg}",
+                                  "${dlg.uploadport.set}",
+                                  format_CStr("upload.setport ptr:%p", d));
+        }
+        return iTrue;
+    }
     if (isCommand_Widget(w, ev, "upload.accept")) {
         iWidget * tabs     = findChild_Widget(w, "upload.tabs");
         const int tabIndex = tabPageIndex_Widget(tabs, currentTabPage_Widget(tabs));