From 455b0ea48ef1759d2eda95d5d6efc2c2bfc20a47 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Fri, 13 Mar 2020 11:50:45 +0000 Subject: [PATCH] config options for feeds --- .../muwire/webui/ConfigurationServlet.java | 13 +++++++ .../src/main/java/com/muwire/webui/Util.java | 4 ++ webui/src/main/webapp/ConfigurationPage.jsp | 38 +++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/webui/src/main/java/com/muwire/webui/ConfigurationServlet.java b/webui/src/main/java/com/muwire/webui/ConfigurationServlet.java index 9ae7c608..e7d523fd 100644 --- a/webui/src/main/java/com/muwire/webui/ConfigurationServlet.java +++ b/webui/src/main/java/com/muwire/webui/ConfigurationServlet.java @@ -49,6 +49,11 @@ public class ConfigurationServlet extends HttpServlet { core.getMuOptions().setShareHiddenFiles(false); core.getMuOptions().setSearchComments(false); core.getMuOptions().setBrowseFiles(false); + core.getMuOptions().setFileFeed(true); + core.getMuOptions().setAdvertiseFeed(true); + core.getMuOptions().setAutoPublishSharedFiles(false); + core.getMuOptions().setDefaultFeedAutoDownload(false); + core.getMuOptions().setDefaultFeedSequential(false); } private void update(String name, String value) throws Exception { @@ -71,6 +76,14 @@ public class ConfigurationServlet extends HttpServlet { case "inbound.quantity" : core.getI2pOptions().setProperty(name, String.valueOf(getPositiveInteger(value,"Inbound tunnel quantity"))); break; case "outbound.length" : core.getI2pOptions().setProperty(name, String.valueOf(getPositiveInteger(value,"Outbound tunnel length"))); break; case "outbound.quantity" : core.getI2pOptions().setProperty(name, String.valueOf(getPositiveInteger(value,"Outbound tunnel quantity"))); break; + case "fileFeed" : core.getMuOptions().setFileFeed(true); break; + case "advertiseFeed" : core.getMuOptions().setAdvertiseFeed(true); break; + case "autoPublishSharedFiles" : core.getMuOptions().setAutoPublishSharedFiles(true); break; + case "defaultFeedAutoDownload" : core.getMuOptions().setDefaultFeedAutoDownload(true); break; + case "defaultFeedSequential" : core.getMuOptions().setDefaultFeedSequential(true); break; + case "defaultFeedUpdateInterval" : core.getMuOptions().setDefaultFeedUpdateInterval(60000 * getPositiveInteger(value,"Feed update frequency (minutes")); break; + case "defaultFeedItemsToKeep" : core.getMuOptions().setDefaultFeedItemsToKeep(getInteger(value, "Number of items to keep on disk (-1 means unlimited)")); break; + // TODO: ui settings } } diff --git a/webui/src/main/java/com/muwire/webui/Util.java b/webui/src/main/java/com/muwire/webui/Util.java index 8959ac64..8fe31a60 100644 --- a/webui/src/main/java/com/muwire/webui/Util.java +++ b/webui/src/main/java/com/muwire/webui/Util.java @@ -39,6 +39,7 @@ public class Util { _x("Certify"), _x("Clear Finished"), _x("Comment"), + _x("Default settings for new feeds"), _x("Details for {0}"), _x("Distrusted"), _x("Distrusted User"), @@ -77,8 +78,11 @@ public class Util { _x("Pause"), _x("Piece Size"), _x("Progress"), + _x("Publish"), + _x("Publish shared files automatically"), _x("Published"), _x("Publisher"), + _x("Publishing"), _x("Query"), // noun _x("Reason"), diff --git a/webui/src/main/webapp/ConfigurationPage.jsp b/webui/src/main/webapp/ConfigurationPage.jsp index 5734bdd9..2f331f0f 100644 --- a/webui/src/main/webapp/ConfigurationPage.jsp +++ b/webui/src/main/webapp/ConfigurationPage.jsp @@ -94,6 +94,44 @@ Exception error = (Exception) application.getAttribute("MWConfigError"); +
+

<%=Util._t("Publishing")%>

+ + + + + + + + + + + + + +
<%=Util._t("Enable my feed")%>

name="fileFeed" value="true">

<%=Util._t("Advertise my feed in search results")%>

name="advertiseFeed" value="true">

<%=Util._t("Publish shared files automatically")%>

name="autoPublishSharedFiles" value="true">

+
+
+

<%=Util._t("Default settings for new feeds")%>

+ + + + + + + + + + + + + + + + + +
<%=Util._t("Download published files automatically")%>

name="defaultFeedAutoDownload" value="true">

<%=Util._t("Download each file sequentially")%>

name="defaultFeedAutoDownload" value="true">

<%=Util._t("Feed update frequency (minutes)")%>

<%=Util._t("Number of items to keep on disk (-1 means unlimited)")%>

+

<%=Util._t("Trust")%>