goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix minutes-to-milliseconds conversion of feed update interval in desktop gui. Make default feed update interval one hour

pull/53/head
Zlatin Balevsky 2020-09-16 14:37:08 +01:00
parent 9c6f6bf266
commit 4cdb383b9f
No known key found for this signature in database
GPG Key ID: A72832072D525E41
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/groovy/com/muwire/core/MuWireSettings.groovy
View File

@ -37,7 +37,7 @@ class MuWireSettings {
boolean advertiseFeed
boolean autoPublishSharedFiles
boolean defaultFeedAutoDownload
int defaultFeedUpdateInterval
long defaultFeedUpdateInterval
int defaultFeedItemsToKeep
boolean defaultFeedSequential
@ -104,7 +104,7 @@ class MuWireSettings {
defaultFeedAutoDownload = Boolean.valueOf(props.getProperty("defaultFeedAutoDownload", "false"))
defaultFeedItemsToKeep = Integer.valueOf(props.getProperty("defaultFeedItemsToKeep", "1000"))
defaultFeedSequential = Boolean.valueOf(props.getProperty("defaultFeedSequential", "false"))
defaultFeedUpdateInterval = Integer.valueOf(props.getProperty("defaultFeedUpdateInterval", "60000"))
defaultFeedUpdateInterval = Long.valueOf(props.getProperty("defaultFeedUpdateInterval", "3600000"))
// ultrapeer connection settings
leafConnections = Integer.valueOf(props.getProperty("leafConnections","512"))

6
core/src/main/java/com/muwire/core/filefeeds/Feed.java
View File

@ -6,7 +6,7 @@ public class Feed {
private final Persona publisher;
private int updateInterval;
private long updateInterval;
private long lastUpdated;
private volatile long lastUpdateAttempt;
private int itemsToKeep;
@ -19,11 +19,11 @@ public class Feed {
this.status = FeedFetchStatus.IDLE;
}
public int getUpdateInterval() {
public long getUpdateInterval() {
return updateInterval;
}
public void setUpdateInterval(int updateInterval) {
public void setUpdateInterval(long updateInterval) {
this.updateInterval = updateInterval;
}

2
gui/griffon-app/controllers/com/muwire/gui/FeedConfigurationController.groovy
View File

@ -21,7 +21,7 @@ class FeedConfigurationController {
model.feed.setAutoDownload(view.autoDownloadCheckbox.model.isSelected())
model.feed.setSequential(view.sequentialCheckbox.model.isSelected())
model.feed.setItemsToKeep(Integer.parseInt(view.itemsToKeepField.text))
model.feed.setUpdateInterval(Integer.parseInt(view.updateIntervalField.text) * 60000)
model.feed.setUpdateInterval(Long.parseLong(view.updateIntervalField.text) * 60000)
model.core.eventBus.publish(new UIFeedConfigurationEvent(feed : model.feed))

2
gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy
View File

@ -148,7 +148,7 @@ class OptionsController {
String defaultFeedUpdateInterval = view.defaultFeedUpdateIntervalField.text
model.defaultFeedUpdateInterval = defaultFeedUpdateInterval
settings.defaultFeedUpdateInterval = Integer.parseInt(defaultFeedUpdateInterval)
settings.defaultFeedUpdateInterval = Integer.parseInt(defaultFeedUpdateInterval) * 60000L
// trust saving

2
gui/griffon-app/controllers/com/muwire/gui/SearchTabController.groovy
View File

@ -119,7 +119,7 @@ class SearchTabController {
feed.setAutoDownload(core.muOptions.defaultFeedAutoDownload)
feed.setSequential(core.muOptions.defaultFeedSequential)
feed.setItemsToKeep(core.muOptions.defaultFeedItemsToKeep)
feed.setUpdateInterval(core.muOptions.defaultFeedUpdateInterval * 60 * 1000)
feed.setUpdateInterval(core.muOptions.defaultFeedUpdateInterval)
core.eventBus.publish(new UIFeedConfigurationEvent(feed : feed, newFeed: true))
mvcGroup.parentGroup.view.showFeedsWindow.call()

2
gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy
View File

@ -125,7 +125,7 @@ class OptionsModel {
defaultFeedAutoDownload = settings.defaultFeedAutoDownload
defaultFeedItemsToKeep = String.valueOf(settings.defaultFeedItemsToKeep)
defaultFeedSequential = settings.defaultFeedSequential
defaultFeedUpdateInterval = String.valueOf(settings.defaultFeedUpdateInterval)
defaultFeedUpdateInterval = String.valueOf(Math.max(1, settings.defaultFeedUpdateInterval / 60000))
onlyTrusted = !settings.allowUntrusted()
searchExtraHop = settings.searchExtraHop

2
webui/src/main/java/com/muwire/webui/ConfigurationServlet.java
View File

@ -111,7 +111,7 @@ public class ConfigurationServlet extends HttpServlet {
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 * Integer.parseInt(value)); break;
case "defaultFeedUpdateInterval" : core.getMuOptions().setDefaultFeedUpdateInterval(60000 * Long.parseLong(value)); break;
case "defaultFeedItemsToKeep" : core.getMuOptions().setDefaultFeedItemsToKeep(Integer.parseInt(value)); break;
// TODO: ui settings

2
webui/src/main/java/com/muwire/webui/FeedManager.java
View File

@ -104,7 +104,7 @@ public class FeedManager {
}
void configure(Persona publisher, boolean autoDownload, boolean sequential,
int updateInterval, int itemsToKeep) {
long updateInterval, int itemsToKeep) {
RemoteFeed rf = remoteFeeds.get(publisher);
if (rf == null)
return;

2
webui/src/main/java/com/muwire/webui/FeedServlet.java
View File

@ -219,7 +219,7 @@ public class FeedServlet extends HttpServlet {
}
boolean autoDownload = Boolean.valueOf(req.getParameter("autoDownload"));
boolean sequential = Boolean.valueOf(req.getParameter("sequential"));
int updateInterval = Integer.valueOf(req.getParameter("updateInterval")) * 60000;
long updateInterval = Long.valueOf(req.getParameter("updateInterval")) * 60000;
int itemsToKeep = Integer.valueOf(req.getParameter("itemsToKeep"));
feedManager.configure(host, autoDownload, sequential, updateInterval, itemsToKeep);