idk/muwire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plumbing for /Feeds page

Browse Source
This commit is contained in:
Zlatin Balevsky
2020-03-12 23:33:04 +00:00
parent ca33535630
commit 7183f15c5c
6 changed files with 86 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,6 +122,7 @@ public class FeedServlet extends HttpServlet {
}
feedManager.subscribe(host);
Util.pause();
resp.sendRedirect("/MuWire/Feeds");
} else if (action.equals("unsubscribe")) {
String personaB64 = req.getParameter("host");
if (personaB64 == null) {
@@ -173,7 +174,7 @@ public class FeedServlet extends HttpServlet {
Optional<FeedItem> itemOptional = core.getFeedManager().getFeedItems(host).
stream().filter(item -> item.getInfoHash().equals(infoHash)).findFirst();
if (itemOptional.isEmpty())
if (!itemOptional.isPresent())
return;
FeedItem item = itemOptional.get();

1
webui/src/main/java/com/muwire/webui/Util.java
View File

@@ -51,6 +51,7 @@ public class Util {
_x("Downloading"),
_x("Enter Reason (Optional)"),
_x("ETA"),
_x("Feeds"),
_x("Fetching Certificates"),
_x("File"),
_x("Hashing"),

10
webui/src/main/js/feeds.js Normal file
View File

@@ -0,0 +1,10 @@
function initFeeds() {
setTimeout(refreshActive, 1)
setInterval(refreshActive, 3000)
}
function refreshActive() {
// TODO: write
}

53
webui/src/main/webapp/Feeds.jsp Normal file
View File

@@ -0,0 +1,53 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<%@ page import="com.muwire.webui.*" %>
<%@include file="initcode.jsi"%>
<%
String pagetitle=Util._t("Feeds");
%>
<html>
<head>
<%@ include file="css.jsi"%>
<script src="js/util.js?<%=version%>" type="text/javascript"></script>
<script src="js/certificates.js?<%=version%> type="text/javascript"></script>
<script src="js/tables.js?<%=version%> type="text/javascript"></script>
<script src="js/feeds.js?<%=version%>" type="text/javascript"></script>
</head>
<body onload="initTranslate(jsTranslations); initConnectionsCount(); initFeeds(); initCertificates();">
<%@ include file="header.jsi"%>
<aside>
<div class="menubox-divider"></div>
<div class="menubox">
<h2>Browse</h2>
<form action="/MuWire/Feed" method="post">
<input type="text" name="host">
<input type="hidden" name="action" value="subscribe">
<div class="menuitem shared">
<div class="menu-icon"></div>
<input type="submit" value=<%=Util._t("Subscribe")%>>
</div>
</form>
</div>
<div class="menubox-divider"></div>
<%@include file="sidebar.jsi"%>
</aside>
<section class="main foldermain">
<div id="table-wrapper">
<div id="table-scroll">
<div id="feedsTable"></div>
</div>
</div>
<hr/>
<div id="table-wrapper">
<div id="table-scroll">
<div id="itemsTable"></div>
</div>
</div>
</section>
</body>
</html>

6
webui/src/main/webapp/sidebar.jsi
View File

@@ -43,6 +43,12 @@
<%=Util._t("Browse")%>
</div>
</a>
<a class="menuitem shared" href="Feeds">
<div class="menu-icon"></div>
<div class="menu-text">
<%=Util._t("Feeds")%>
</div>
</a>
</div>
<div class="menubox-divider"></div>
<div class="menubox">

14
webui/templates/web.xml.template
View File

@@ -66,6 +66,11 @@
<servlet-class>com.muwire.webui.UploadServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>com.muwire.webui.FeedServlet</servlet-name>
<servlet-class>com.muwire.webui.FeedServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>com.muwire.webui.MuWireServlet</servlet-name>
<url-pattern>/index.jsp</url-pattern>
@@ -121,6 +126,10 @@
<url-pattern>/Upload</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>com.muwire.webui.FeedServlet</servlet-name>
<url-pattern>/Feed</url-pattern>
</servlet-mapping>
__JASPER__
@@ -184,4 +193,9 @@ Mappings without the .jsp suffix
<url-pattern>/Uploads</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>com.muwire.webui.Feeds_jsp</servlet-name>
<url-pattern>/Feeds</url-pattern>
</servlet-mapping>
</web-app>