git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
chapter url handling fixes
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
library
/
WebLibraryServer.java
diff --git
a/src/be/nikiroo/fanfix/library/WebLibraryServer.java
b/src/be/nikiroo/fanfix/library/WebLibraryServer.java
index 982d224d03cc7f12c1415dbf4b0dd3324210139d..8a874010257072cc93018f92583c1d82620fedfd 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/WebLibraryServer.java
+++ b/
src/be/nikiroo/fanfix/library/WebLibraryServer.java
@@
-626,7
+626,7
@@
public class WebLibraryServer implements Runnable {
builder.append("<div class='book_line'>");
builder.append("<a href='");
builder.append("<div class='book_line'>");
builder.append("<a href='");
- builder.append(getViewUrl(meta.getLuid(),
0
, null));
+ builder.append(getViewUrl(meta.getLuid(),
null
, null));
builder.append("'");
builder.append(" class='link'>");
builder.append("'");
builder.append(" class='link'>");
@@
-713,6
+713,8
@@
public class WebLibraryServer implements Runnable {
if (img != null) {
in = img.newInputStream();
}
if (img != null) {
in = img.newInputStream();
}
+ // TODO: get correct image type
+ mimeType = "image/png";
} else if ("metadata".equals(chapterStr)) {
MetaData meta = meta(luid, whitelist);
JSONObject json = JsonIO.toJson(meta);
} else if ("metadata".equals(chapterStr)) {
MetaData meta = meta(luid, whitelist);
JSONObject json = JsonIO.toJson(meta);
@@
-782,7
+784,7
@@
public class WebLibraryServer implements Runnable {
String paragraphStr = cover.length < off + 4 ? null : cover[off + 3];
// 1-based (0 = desc)
String paragraphStr = cover.length < off + 4 ? null : cover[off + 3];
// 1-based (0 = desc)
- int chapter =
-1
;
+ int chapter =
0
;
if (chapterStr != null) {
try {
chapter = Integer.parseInt(chapterStr);
if (chapterStr != null) {
try {
chapter = Integer.parseInt(chapterStr);
@@
-858,10
+860,13
@@
public class WebLibraryServer implements Runnable {
StringBuilder desc = new StringBuilder();
if (chapter <= 0) {
StringBuilder desc = new StringBuilder();
if (chapter <= 0) {
+ desc.append("<h1 class='title'>");
+ desc.append(story.getMeta().getTitle());
+ desc.append("</h1>\n");
desc.append("<div class='desc'>\n");
desc.append("<div class='desc'>\n");
- desc.append("\t<
div
class='cover'>\n");
+ desc.append("\t<
a href='" + next + "'
class='cover'>\n");
desc.append("\t\t<img src='/story/" + luid + "/cover'/>\n");
desc.append("\t\t<img src='/story/" + luid + "/cover'/>\n");
- desc.append("\t</
div
>\n");
+ desc.append("\t</
a
>\n");
desc.append("\t<table class='details'>\n");
Map<String, String> details = BasicLibrary
.getMetaDesc(story.getMeta());
desc.append("\t<table class='details'>\n");
Map<String, String> details = BasicLibrary
.getMetaDesc(story.getMeta());
@@
-877,9
+882,9
@@
public class WebLibraryServer implements Runnable {
content.append(desc);
String description = new TextOutput(false).convert(chap,
chapter > 0);
content.append(desc);
String description = new TextOutput(false).convert(chap,
chapter > 0);
- content.append(
-
description.isEmpty() ? "No description
provided."
-
: description);
+ content.append(
chap.getParagraphs().size() <= 0
+
? "No content
provided."
+ : description);
content.append("</div>\n");
if (chapter <= 0)
content.append("</div>\n");
if (chapter <= 0)
@@
-935,10
+940,12
@@
public class WebLibraryServer implements Runnable {
}
}
}
}
+ String javascript = "document.getElementById(\"previous\").click(); return false;";
content.append(String.format("" //
content.append(String.format("" //
- + "<a class='viewer link' href='%s'>"
+ + "<a class='viewer link'
oncontextmenu='%s'
href='%s'>"
+ "<img class='viewer img' style='%s' src='%s'/>"
+ "</a>", //
+ "<img class='viewer img' style='%s' src='%s'/>"
+ "</a>", //
+ javascript, //
next, //
zoomStyle, //
getStoryUrl(luid, chapter, paragraph)));
next, //
zoomStyle, //
getStoryUrl(luid, chapter, paragraph)));
@@
-952,7
+959,7
@@
public class WebLibraryServer implements Runnable {
builder.append(String.format("" //
+ "<div class='bar navbar'>\n" //
+ "\t<a%s class='button first' href='%s'><<</a>\n"//
builder.append(String.format("" //
+ "<div class='bar navbar'>\n" //
+ "\t<a%s class='button first' href='%s'><<</a>\n"//
- + "\t<a%s class='button previous' href='%s'><</a>\n" //
+ + "\t<a%s
id='previous'
class='button previous' href='%s'><</a>\n" //
+ "\t<div class='gotobox itemsbox'>\n" //
+ "\t\t<div class='button goto'>%d</div>\n" //
+ "\t\t<div class='items goto'>\n", //
+ "\t<div class='gotobox itemsbox'>\n" //
+ "\t\t<div class='button goto'>%d</div>\n" //
+ "\t\t<div class='items goto'>\n", //
@@
-963,15
+970,12
@@
public class WebLibraryServer implements Runnable {
// List of chap/para links
// List of chap/para links
- String blink = "/view/story/" + luid + "/";
- appendItemA(builder, 3, blink + "0", "Description",
+ appendItemA(builder, 3, getViewUrl(luid, 0, null), "Description",
paragraph == 0 && chapter == 0);
paragraph == 0 && chapter == 0);
-
if (paragraph > 0) {
if (paragraph > 0) {
- blink = blink + chapter + "/";
for (int i = 1; i <= chap.getParagraphs().size(); i++) {
for (int i = 1; i <= chap.getParagraphs().size(); i++) {
- appendItemA(builder, 3,
blink + i, "Image " + i
,
- paragraph == i);
+ appendItemA(builder, 3,
getViewUrl(luid, chapter, i)
,
+
"Image " + i,
paragraph == i);
}
} else {
int i = 1;
}
} else {
int i = 1;
@@
-981,7
+985,8
@@
public class WebLibraryServer implements Runnable {
chapName += ": " + c.getName();
}
chapName += ": " + c.getName();
}
- appendItemA(builder, 3, blink + i, chapName, chapter == i);
+ appendItemA(builder, 3, getViewUrl(luid, i, null), chapName,
+ chapter == i);
i++;
}
i++;
}
@@
-1057,12
+1062,12
@@
public class WebLibraryServer implements Runnable {
return "";
}
return "";
}
- private String getViewUrl(String luid,
int
chap, Integer para) {
+ private String getViewUrl(String luid,
Integer
chap, Integer para) {
return VIEWER_URL //
.replace("{luid}", luid) //
return VIEWER_URL //
.replace("{luid}", luid) //
- .replace("
{chap}", Integer.toString(chap)
) //
+ .replace("
/{chap}", chap == null ? "" : "/" + chap
) //
.replace("/{para}",
.replace("/{para}",
-
para == null ? "" : "/" + Integer.toString(para)
);
+
(chap == null || para == null) ? "" : "/" + para
);
}
private String getStoryUrl(String luid, int chap, Integer para) {
}
private String getStoryUrl(String luid, int chap, Integer para) {