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
Merge branch 'subtree'
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
library
/
WebLibraryUrls.java
diff --git
a/src/be/nikiroo/fanfix/library/WebLibraryUrls.java
b/src/be/nikiroo/fanfix/library/WebLibraryUrls.java
index 2b757798c5aec05c044e29b4971a7043a1f59baa..5d628e023d33e47b92542ff9c4273614864c7d33 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/WebLibraryUrls.java
+++ b/
src/be/nikiroo/fanfix/library/WebLibraryUrls.java
@@
-1,5
+1,8
@@
package be.nikiroo.fanfix.library;
package be.nikiroo.fanfix.library;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
class WebLibraryUrls {
static public final String INDEX_URL = "/";
class WebLibraryUrls {
static public final String INDEX_URL = "/";
@@
-52,7
+55,7
@@
class WebLibraryUrls {
+ "author/{author}";
static private final String COVER_URL_SOURCE = COVER_URL_BASE
+ "source/{source}";
+ "author/{author}";
static private final String COVER_URL_SOURCE = COVER_URL_BASE
+ "source/{source}";
-
+
static public String getViewUrl(String luid, Integer chap, Integer para) {
return VIEWER_URL //
.replace("{luid}", luid) //
static public String getViewUrl(String luid, Integer chap, Integer para) {
return VIEWER_URL //
.replace("{luid}", luid) //
@@
-122,12
+125,12
@@
class WebLibraryUrls {
static public String getCoverUrlSource(String source) {
return COVER_URL_SOURCE //
static public String getCoverUrlSource(String source) {
return COVER_URL_SOURCE //
- .replace("{source}",
source
);
+ .replace("{source}",
url(source)
);
}
static public String getCoverUrlAuthor(String author) {
return COVER_URL_AUTHOR //
}
static public String getCoverUrlAuthor(String author) {
return COVER_URL_AUTHOR //
- .replace("{author}",
author
);
+ .replace("{author}",
url(author)
);
}
static public String getDeleteUrlStory(String luid) {
}
static public String getDeleteUrlStory(String luid) {
@@
-158,4
+161,14
@@
class WebLibraryUrls {
static public boolean isDeleteUrl(String url) {
return url != null && url.startsWith(DELETE_URL_BASE);
}
static public boolean isDeleteUrl(String url) {
return url != null && url.startsWith(DELETE_URL_BASE);
}
+
+ static private String url(String value) {
+ try {
+ return URLEncoder.encode(value, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ // UTF-8 is always supported
+ e.printStackTrace();
+ return value;
+ }
+ }
}
}