update from master

[fanfix.git] / library / WebLibraryUrls.java

diff --git a/library/WebLibraryUrls.java b/library/WebLibraryUrls.java
index 176b4ebce368e31ebce00f04d8b27f07a69f83c3..5d628e023d33e47b92542ff9c4273614864c7d33 100644 (file)
--- a/library/WebLibraryUrls.java
+++ b/library/WebLibraryUrls.java
@@ -1,5 +1,8 @@
 package be.nikiroo.fanfix.library;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
 class WebLibraryUrls {
        static public final String INDEX_URL = "/";
 
@@ -7,6 +10,8 @@ class WebLibraryUrls {
 
        static public final String LOGOUT_URL = "/logout";
 
+       static public final String EXIT_URL = "/exit";
+
        static private final String VIEWER_URL_BASE = "/view/story/";
        static private final String VIEWER_URL = VIEWER_URL_BASE
                        + "{luid}/{chap}/{para}";
@@ -50,7 +55,7 @@ class WebLibraryUrls {
                        + "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) //
@@ -101,10 +106,16 @@ class WebLibraryUrls {
                                .replace("{luid}", luid);
        }
 
-       static public boolean isSupportedUrl(String url) {
-               return INDEX_URL.equals(url) || VERSION_URL.equals(url)
-                               || LOGOUT_URL.equals(url) || isViewUrl(url) || isStoryUrl(url)
-                               || isListUrl(url) || isCoverUrl(url) || isImprtUrl(url);
+       static public boolean isSupportedUrl(String url,
+                       boolean requiresLoginOnly) {
+               if (requiresLoginOnly) {
+                       return INDEX_URL.equals(url) || LOGOUT_URL.equals(url)
+                                       || EXIT_URL.equals(url) || isViewUrl(url) || isStoryUrl(url)
+                                       || isListUrl(url) || isCoverUrl(url) || isImprtUrl(url)
+                                       || isDeleteUrl(url);
+               }
+
+               return isSupportedUrl(url, true) || VERSION_URL.equals(url);
        }
 
        static public String getCoverUrlStory(String luid) {
@@ -114,12 +125,12 @@ class WebLibraryUrls {
 
        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 //
-                               .replace("{author}", author);
+                               .replace("{author}", url(author));
        }
 
        static public String getDeleteUrlStory(String luid) {
@@ -150,4 +161,14 @@ class WebLibraryUrls {
        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;
+               }
+       }
 }