From 379a497e6fd2b959c57b2ff4023413e2daf36232 Mon Sep 17 00:00:00 2001
From: Niki Roo <niki@nikiroo.be>
Date: Tue, 26 May 2020 21:03:01 +0200
Subject: [PATCH] update to master

---
 data/MetaData.java                            |  12 ++---
 library/WebLibrary.java                       |  18 +++----
 library/WebLibraryServer.java                 |   5 +-
 library/WebLibraryServerHtml.java             |  47 ++++++++++++-----
 library/web/fit_to_width_limited-32x32.png    | Bin 0 -> 5501 bytes
 library/web/fit_to_width_limited-64x64.png    | Bin 0 -> 8899 bytes
 library/web/index.pre.html                    |  48 ------------------
 library/web/style.css                         |  25 +++++----
 .../templates/WebLibraryServerTemplates.java  |  16 +++---
 library/web/templates/index.html              |   2 +-
 library/web/templates/index.post.html         |   2 -
 .../web/templates/viewer.image.nolink.html    |   5 ++
 supported/BasicSupport.java                   |   6 ++-
 supported/BasicSupport_Deprecated.java        |   4 +-
 14 files changed, 88 insertions(+), 102 deletions(-)
 create mode 100644 library/web/fit_to_width_limited-32x32.png
 create mode 100644 library/web/fit_to_width_limited-64x64.png
 delete mode 100644 library/web/index.pre.html
 delete mode 100644 library/web/templates/index.post.html
 create mode 100644 library/web/templates/viewer.image.nolink.html

diff --git a/data/MetaData.java b/data/MetaData.java
index 1c6ad428..5989604c 100644
--- a/data/MetaData.java
+++ b/data/MetaData.java
@@ -320,7 +320,7 @@ public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
 	 * output type this {@link Story} is in (see {@link SupportType}).
 	 * <p>
 	 * It allows you to know where the {@link Story} comes from, and is not
-	 * supposed to change.
+	 * supposed to change, even when re-imported.
 	 * <p>
 	 * It's the user representation of the enum
 	 * ({@link SupportType#getSourceName()}, not
@@ -337,7 +337,7 @@ public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
 	 * output type this {@link Story} is in (see {@link SupportType}).
 	 * <p>
 	 * It allows you to know where the {@link Story} comes from, and is not
-	 * supposed to change.
+	 * supposed to change, even when re-imported.
 	 * <p>
 	 * It's the user representation of the enum
 	 * ({@link SupportType#getSourceName()}, not
@@ -353,8 +353,8 @@ public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
 	/**
 	 * The output type this {@link Story} is in (see {@link SupportType}).
 	 * <p>
-	 * It allows you to know where the {@link Story} comes from, and is not
-	 * supposed to change.
+	 * It allows you to know where the {@link Story} comes from, and is supposed
+	 * to only change when it is imported anew.
 	 * <p>
 	 * It's the direct representation of the enum
 	 * ({@link SupportType#toString()}, not
@@ -369,8 +369,8 @@ public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
 	/**
 	 * The output type this {@link Story} is in (see {@link SupportType}).
 	 * <p>
-	 * It allows you to know where the {@link Story} comes from, and is not
-	 * supposed to change.
+	 * It allows you to know where the {@link Story} comes from, and is supposed
+	 * to only change when it is imported anew.
 	 * <p>
 	 * It's the direct representation of the enum
 	 * ({@link SupportType#toString()}, not
diff --git a/library/WebLibrary.java b/library/WebLibrary.java
index 9af38e2b..7381ae36 100644
--- a/library/WebLibrary.java
+++ b/library/WebLibrary.java
@@ -173,12 +173,12 @@ public class WebLibrary extends BasicLibrary {
 		InputStream in = post(WebLibraryUrls.getStoryUrlCover(luid));
 		try {
 			Image img = new Image(in);
-			if (img.getSize() > 0) {
+			if (img.getSize() == 0) {
 				img.close();
-				return img;
+				img = null;
 			}
 
-			return null;
+			return img;
 		} finally {
 			in.close();
 		}
@@ -189,12 +189,12 @@ public class WebLibrary extends BasicLibrary {
 		InputStream in = post(WebLibraryUrls.getCoverUrlSource(source));
 		try {
 			Image img = new Image(in);
-			if (img.getSize() > 0) {
+			if (img.getSize() == 0) {
 				img.close();
-				return img;
+				img = null;
 			}
 
-			return null;
+			return img;
 		} finally {
 			in.close();
 		}
@@ -205,12 +205,12 @@ public class WebLibrary extends BasicLibrary {
 		InputStream in = post(WebLibraryUrls.getCoverUrlAuthor(author));
 		try {
 			Image img = new Image(in);
-			if (img.getSize() > 0) {
+			if (img.getSize() == 0) {
 				img.close();
-				return img;
+				img = null;
 			}
 
-			return null;
+			return img;
 		} finally {
 			in.close();
 		}
diff --git a/library/WebLibraryServer.java b/library/WebLibraryServer.java
index 22f36e91..56d78ed4 100644
--- a/library/WebLibraryServer.java
+++ b/library/WebLibraryServer.java
@@ -217,9 +217,8 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 				jsons.add(JsonIO.toJson(meta));
 			}
 
-			return newInputStreamResponse("application/json",
-					new ByteArrayInputStream(
-							new JSONArray(jsons).toString().getBytes()));
+			return NanoHTTPD.newFixedLengthResponse(Status.OK,
+					"application/json", new JSONArray(jsons).toString());
 		}
 
 		return NanoHTTPD.newFixedLengthResponse(Status.BAD_REQUEST,
diff --git a/library/WebLibraryServerHtml.java b/library/WebLibraryServerHtml.java
index d5ba533f..63c50c54 100644
--- a/library/WebLibraryServerHtml.java
+++ b/library/WebLibraryServerHtml.java
@@ -247,6 +247,12 @@ abstract class WebLibraryServerHtml implements Runnable {
 									mimeType = "text/html";
 								} else if (uri.endsWith(".js")) {
 									mimeType = "text/javascript";
+								} else if (uri.endsWith(".png")) {
+									mimeType = "image/png";
+								} else if (uri.endsWith(".ico")) {
+									mimeType = "image/x-icon";
+								} else if (uri.endsWith(".java")) {
+									mimeType = "text/plain";
 								}
 								rep = newChunkedResponse(Status.OK, mimeType,
 										in);
@@ -326,7 +332,8 @@ abstract class WebLibraryServerHtml implements Runnable {
 		content.add(templates.login(uri));
 
 		return NanoHTTPD.newChunkedResponse(Status.FORBIDDEN,
-				NanoHTTPD.MIME_HTML, templates.index(true, content).read());
+				NanoHTTPD.MIME_HTML,
+				templates.index(true, false, content).read());
 	}
 
 	private Response root(IHTTPSession session, Map<String, String> cookies,
@@ -469,7 +476,7 @@ abstract class WebLibraryServerHtml implements Runnable {
 		booklines.add(0, templates.browser(browser, filter, selects));
 
 		return newInputStreamResponse(NanoHTTPD.MIME_HTML,
-				templates.index(true, booklines).read());
+				templates.index(true, false, booklines).read());
 	}
 
 	private Response getViewer(Map<String, String> cookies, String uri,
@@ -546,6 +553,7 @@ abstract class WebLibraryServerHtml implements Runnable {
 			boolean disabledRight = false;
 			boolean disabledZoomReal = false;
 			boolean disabledZoomWidth = false;
+			boolean disabledZoomWidthLimited = false;
 			boolean disabledZoomHeight = false;
 
 			Template viewerItem = null;
@@ -623,27 +631,36 @@ abstract class WebLibraryServerHtml implements Runnable {
 				}
 
 				if (para.getType() == ParagraphType.IMAGE) {
-					String zoomStyle = "max-width: 100%;";
-					disabledZoomWidth = true;
+					// default values:
+					String zoomStyle = "max-width: 800px;";
+					disabledZoomWidthLimited = true;
+
 					String zoomOption = cookies.get("zoom");
 					if (zoomOption != null && !zoomOption.isEmpty()) {
 						if (zoomOption.equals("real")) {
 							zoomStyle = "";
-							disabledZoomWidth = false;
+							disabledZoomWidthLimited = false;
 							disabledZoomReal = true;
+						} else if (zoomOption.equals("widthlimited")) {
+							// default
 						} else if (zoomOption.equals("width")) {
 							zoomStyle = "max-width: 100%;";
+							disabledZoomWidthLimited = false;
+							disabledZoomWidth = true;
 						} else if (zoomOption.equals("height")) {
 							// see height of navbar + optionbar
 							zoomStyle = "max-height: calc(100% - 128px);";
-							disabledZoomWidth = false;
+							disabledZoomWidthLimited = false;
 							disabledZoomHeight = true;
 						}
 					}
 
-					viewerItem = templates.viewerImage(WebLibraryUrls
-							.getStoryUrl(luid, chapter, paragraph), next,
-							zoomStyle);
+					viewerItem = templates.viewerImage(
+							WebLibraryUrls.getStoryUrl(luid, chapter,
+									paragraph), //
+							disabledRight ? null : next, //
+							zoomStyle //
+					);
 				} else {
 					viewerItem = templates.viewerText(null,
 							new TextOutput(false).convert(para));
@@ -708,25 +725,29 @@ abstract class WebLibraryServerHtml implements Runnable {
 				buttons.add(templates.viewerOptionbarButton( //
 						"1:1", uri + "?optionName=zoom&optionValue=real",
 						"zoomreal", disabledZoomReal));
+				buttons.add(templates.viewerOptionbarButton( //
+						"]width[",
+						uri + "?optionName=zoom&optionValue=widthlimited",
+						"zoomwidthlimited", disabledZoomWidthLimited));
 				buttons.add(templates.viewerOptionbarButton( //
 						"Width", uri + "?optionName=zoom&optionValue=width",
 						"zoomwidth", disabledZoomWidth));
 				buttons.add(templates.viewerOptionbarButton( //
 						"Height", uri + "?optionName=zoom&optionValue=height",
-						"zoomHeight", disabledZoomHeight));
+						"zoomheight", disabledZoomHeight));
 			}
 
 			// Optionbar
 
 			Template optionbar = templates.viewerOptionbar( //
-					(paragraph > 0) ? 4 : 1, //
+					(paragraph > 0) ? 5 : 1, //
 					buttons //
 			);
 
 			// Full content
 
 			return newInputStreamResponse(NanoHTTPD.MIME_HTML, //
-					templates.index(false, Arrays.asList( //
+					templates.index(false, (paragraph > 0), Arrays.asList( //
 							navbar, //
 							viewerItem, //
 							optionbar //
@@ -738,7 +759,7 @@ abstract class WebLibraryServerHtml implements Runnable {
 					NanoHTTPD.MIME_PLAINTEXT, "Error when processing request");
 		}
 	}
-
+	
 	protected Response newInputStreamResponse(String mimeType, InputStream in) {
 		if (in == null) {
 			return NanoHTTPD.newFixedLengthResponse(Status.NO_CONTENT, "",
diff --git a/library/web/fit_to_width_limited-32x32.png b/library/web/fit_to_width_limited-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..49710461e7d07bc986dca901078481b6f1672cc6
GIT binary patch
literal 5501
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
KSL3sM!@mH&VEae_

literal 0
HcmV?d00001

diff --git a/library/web/fit_to_width_limited-64x64.png b/library/web/fit_to_width_limited-64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd979421032713d91df576fadbfd334284dff059
GIT binary patch
literal 8899
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

literal 0
HcmV?d00001

diff --git a/library/web/index.pre.html b/library/web/index.pre.html
deleted file mode 100644
index 1e626aba..00000000
--- a/library/web/index.pre.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<!--
-	Copyright 2020 David ROULET
-	
-	This file is part of fanfix.
-	
-	fanfix is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Affero General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	
-	fanfix is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Affero General Public License for more details.
-	
-	You should have received a copy of the GNU Affero General Public License
-	along with fanfix.  If not, see <https://www.gnu.org/licenses/>.
-	___________________________________________________________________________
-
-       This website was coded by:
-       		A kangaroo.
-                                                  _  _
-                                                 (\\( \
-                                                  `.\-.)
-                              _...._            _,-"   `-.
-\                           ,"      `-._.- -.,-"       .  \
- \`.                      ,"                               `.
-  \ `-...__              /                           .   .:  y
-   `._     ``-...__     /                           ,"```-._/
-      `-._         ```-"                      |    /_          //
-          `.._                   _            ;   <_ \        //
-              ``-.___             `.           `-._ \ \      //
-                     `- <           `.     (\ _/)/ `.\/     //
-                         \            \     `       ^^^^^^^^^
-	___________________________________________________________________________
-	
-	-->
-	<meta http-equiv="content-type" content="text/html; charset=utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title>${title}</title>
-	<link rel="stylesheet" type="text/css" href="/style.css" />
-	<link rel="icon" type="image/x-icon" href="/${favicon}" />
-</head>
-<body>
-	<div class='main'>
diff --git a/library/web/style.css b/library/web/style.css
index bb910029..5a4c51ff 100644
--- a/library/web/style.css
+++ b/library/web/style.css
@@ -227,6 +227,7 @@ h3 {
 
 .bar.optionbar.s1 { padding-left: calc(50% - (1 * (64px + 5px) / 2)); }
 .bar.optionbar.s4 { padding-left: calc(50% - (4 * (64px + 5px) / 2)); }
+.bar.optionbar.s5 { padding-left: calc(50% - (5 * (64px + 5px) / 2)); }
 
 .bar.optionbar {
 	bottom: 0;
@@ -258,10 +259,11 @@ h3 {
 .bar .button.next     { color: transparent; background-image: url('/arrow_right-32x32.png');        }
 .bar .button.last     { color: transparent; background-image: url('/arrow_double_right-32x32.png'); }
 
-.bar .button.back       { color: transparent; background-image: url('/back-32x32.png');          }
-.bar .button.zoomreal   { color: transparent; background-image: url('/actual_size-32x32.png');   }
-.bar .button.zoomwidth  { color: transparent; background-image: url('/fit_to_width-32x32.png');  }
-.bar .button.zoomheight { color: transparent; background-image: url('/fit_to_height-32x32.png'); }
+.bar .button.back             { color: transparent; background-image: url('/back-32x32.png');                 }
+.bar .button.zoomreal         { color: transparent; background-image: url('/actual_size-32x32.png');          }
+.bar .button.zoomwidth        { color: transparent; background-image: url('/fit_to_width-32x32.png');         }
+.bar .button.zoomwidthlimited { color: transparent; background-image: url('/fit_to_width_limited-32x32.png'); }
+.bar .button.zoomheight       { color: transparent; background-image: url('/fit_to_height-32x32.png');        }
 
 .viewer {
 	padding-top: 64px;
@@ -316,18 +318,19 @@ a.viewer.link:hover {
 	color: #AAA391;
 }
 
-@media(min-width: 800px) {
-	 .main {
+@media(min-width: 800px) { 
+	 .main:not(.fullscreen) {
 	 	max-width: 800px;
 	 }
 	 
-	.bar.navbar       { padding-left: calc(400px - (5 * (64px + 5px) / 2)); }
+	.main:not(.fullscreen) .bar.navbar       { padding-left: calc(400px - (5 * (64px + 5px) / 2)); }
 	
-	.bar.optionbar.s1 { padding-left: calc(400px - (1 * (64px + 5px) / 2)); }
-	.bar.optionbar.s4 { padding-left: calc(400px - (4 * (64px + 5px) / 2)); }
+	.main:not(.fullscreen) .bar.optionbar.s1 { padding-left: calc(400px - (1 * (64px + 5px) / 2)); }
+	.main:not(.fullscreen) .bar.optionbar.s4 { padding-left: calc(400px - (4 * (64px + 5px) / 2)); }
+	.main:not(.fullscreen) .bar.optionbar.s5 { padding-left: calc(400px - (5 * (64px + 5px) / 2)); }
 	
-	.desc { flex-direction: row; }
-	.desc .cover img {
+	.main:not(.fullscreen) .desc { flex-direction: row; }
+	.main:not(.fullscreen) .desc .cover img {
 		width: 200px;
 		padding-right: 10px;
 	}
diff --git a/library/web/templates/WebLibraryServerTemplates.java b/library/web/templates/WebLibraryServerTemplates.java
index 59e7020c..25644446 100644
--- a/library/web/templates/WebLibraryServerTemplates.java
+++ b/library/web/templates/WebLibraryServerTemplates.java
@@ -44,7 +44,8 @@ public class WebLibraryServerTemplates {
 		;
 	}
 
-	public Template index(boolean banner, List<Template> content) {
+	public Template index(boolean banner, boolean fullscreen,
+			List<Template> content) {
 		String favicon = "favicon.ico";
 		String icon = Instance.getInstance().getUiConfig()
 				.getString(UiConfig.PROGRAM_ICON);
@@ -55,6 +56,7 @@ public class WebLibraryServerTemplates {
 		Template index = new Template(getClass(), "index.html") //
 				.set("title", "Fanfix") //
 				.set("favicon", favicon) //
+				.set("mainClass", fullscreen ? "fullscreen" : "") //
 				.set("content", content) //
 		;
 
@@ -137,11 +139,13 @@ public class WebLibraryServerTemplates {
 		;
 	}
 
+	// href NULL means no forward link
 	public Template viewerImage(String src, String href, String zoomStyle) {
-		return new Template(getClass(), "viewer.image.html") //
-				.set("src", src) //
-				.set("href", href) //
-				.set("zoomStyle", zoomStyle) //
+		return new Template(getClass(),
+				href == null ? "viewer.image.nolink.html" : "viewer.image.html") //
+						.set("src", src) //
+						.set("href", href) //
+						.set("zoomStyle", zoomStyle) //
 		;
 	}
 
@@ -180,7 +184,7 @@ public class WebLibraryServerTemplates {
 		;
 	}
 
-	// supported numberOfButtons = 4 or 1 or the moment
+	// supported numberOfButtons = 5 or 4 or 1 or the moment
 	public Template viewerOptionbar(int numberOfButtons,
 			List<Template> buttons) {
 		return new Template(getClass(), "viewer.optionbar.html") //
diff --git a/library/web/templates/index.html b/library/web/templates/index.html
index 6f3934e2..4edc0b0a 100644
--- a/library/web/templates/index.html
+++ b/library/web/templates/index.html
@@ -45,6 +45,6 @@
 	<link rel='icon' type='image/x-icon' href='/${favicon}' />
 </head>
 <body>
-	<div class='main'>
+	<div class='main ${mainClass}'>
 ${banner}${content}	</div>
 </body>
diff --git a/library/web/templates/index.post.html b/library/web/templates/index.post.html
deleted file mode 100644
index 52ba19e7..00000000
--- a/library/web/templates/index.post.html
+++ /dev/null
@@ -1,2 +0,0 @@
-	</div>
-</body>
\ No newline at end of file
diff --git a/library/web/templates/viewer.image.nolink.html b/library/web/templates/viewer.image.nolink.html
new file mode 100644
index 00000000..64483c99
--- /dev/null
+++ b/library/web/templates/viewer.image.nolink.html
@@ -0,0 +1,5 @@
+		<div 
+		  class='viewer' 
+		  oncontextmenu='document.getElementById("previous").click(); return false;'>
+			<img class='viewer img' style='${zoomStyle}' src='${src}'/>
+		</div>
diff --git a/supported/BasicSupport.java b/supported/BasicSupport.java
index bcfcca1b..ff9ecaf9 100644
--- a/supported/BasicSupport.java
+++ b/supported/BasicSupport.java
@@ -276,8 +276,10 @@ public abstract class BasicSupport {
 		MetaData meta = getMeta();
 		meta.setType(getType().toString());
 		meta.setSource(getType().getSourceName());
-		meta.setPublisher(getType().getSourceName());
-		
+		if (meta.getPublisher() == null) {
+			meta.setPublisher(getType().getSourceName());
+		}
+
 		if (meta.getCreationDate() == null
 				|| meta.getCreationDate().trim().isEmpty()) {
 			meta.setCreationDate(bsHelper
diff --git a/supported/BasicSupport_Deprecated.java b/supported/BasicSupport_Deprecated.java
index 9aac6d5c..512aabf3 100644
--- a/supported/BasicSupport_Deprecated.java
+++ b/supported/BasicSupport_Deprecated.java
@@ -207,7 +207,9 @@ public abstract class BasicSupport_Deprecated extends BasicSupport {
 			MetaData meta = getMeta(url, getInput());
 			meta.setType(getType().toString());
 			meta.setSource(getType().getSourceName());
-			meta.setPublisher(getType().getSourceName());
+			if (meta.getPublisher() == null) {
+				meta.setPublisher(getType().getSourceName());
+			}
 			
 			if (meta.getCreationDate() == null
 					|| meta.getCreationDate().trim().isEmpty()) {
-- 
2.27.0