Add some common new util methods and url methods

Author: rubengees

library/src/main/java/me/proxer/library/api/AdaptionInfoAdapter.java

@@ -13,7 +13,7 @@ class AdaptionInfoAdapter {
 
     @FromJson
     AdaptionInfo fromJson(final IntermediateAdaptionInfo json) {
-        return new AdaptionInfo(json.id, json.name, ProxerUtils.toApiEnum(Medium.class, json.medium));
+        return new AdaptionInfo(json.id, json.name, ProxerUtils.toSafeApiEnum(Medium.class, json.medium));
     }
 
     static class IntermediateAdaptionInfo {

library/src/main/java/me/proxer/library/api/DelimitedEnumSetAdapterFactory.java

@@ -81,7 +81,7 @@ public void toJson(final JsonWriter writer, @Nullable final Set<T> value) throws
             StringBuilder result = new StringBuilder();
 
             for (final T item : value) {
-                result.append(ProxerUtils.getApiEnumName(item));
+                result.append(ProxerUtils.getSafeApiEnumName(item));
                 result.append(delimiter);
             }
 

library/src/main/java/me/proxer/library/api/EnumRetrofitConverterFactory.java

@@ -16,7 +16,7 @@ final class EnumRetrofitConverterFactory extends Converter.Factory {
     public Converter<?, String> stringConverter(final Type type, final Annotation[] annotations,
                                                 final Retrofit retrofit) {
         if (((Class<?>) type).isEnum()) {
-            return (Converter<Enum<?>, String>) ProxerUtils::getApiEnumName;
+            return (Converter<Enum<?>, String>) ProxerUtils::getSafeApiEnumName;
         }
 
         return null;

library/src/main/java/me/proxer/library/api/LoggingInterceptor.java

@@ -16,7 +16,7 @@
 import java.util.logging.Logger;
 
 /**
- * @author Ruben Gees.
+ * @author Ruben Gees
  */
 @AllArgsConstructor
 class LoggingInterceptor implements Interceptor {

library/src/main/java/me/proxer/library/api/messenger/MessengerApi.java

@@ -121,6 +121,6 @@ private String constructMessageFromAction(final MessageAction action, final Stri
             throw new IllegalArgumentException("Invalid action: " + action);
         }
 
-        return "/" + ProxerUtils.getApiEnumName(action) + " " + subject;
+        return "/" + ProxerUtils.getSafeApiEnumName(action) + " " + subject;
     }
 }

library/src/main/java/me/proxer/library/entity/info/AnimeEpisode.java

@@ -11,7 +11,7 @@
 /**
  * Entity holding the data of a single anime episode.
  *
- * @author Ruben Gees.
+ * @author Ruben Gees
  */
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)

library/src/main/java/me/proxer/library/entity/info/EpisodeInfo.java

@@ -13,7 +13,7 @@
 /**
  * Entity containing information about the available episodes or chapters of an media entry.
  *
- * @author Ruben Gees.
+ * @author Ruben Gees
  */
 @Value
 @EqualsAndHashCode(onParam = @__({@Nullable}))

library/src/main/java/me/proxer/library/entity/info/MangaEpisode.java

@@ -11,7 +11,7 @@
 /**
  * Entity holding the data of a single anime chapter.
  *
- * @author Ruben Gees.
+ * @author Ruben Gees
  */
 @Getter
 @ToString(callSuper = true)

library/src/main/java/me/proxer/library/entity/info/Relation.java

@@ -20,7 +20,7 @@
 /**
  * Entity representing a single relation of an {@link Entry}.
  *
- * @author Ruben Gees.
+ * @author Ruben Gees
  */
 @Value
 @EqualsAndHashCode(onParam = @__({@Nullable}))

library/src/main/java/me/proxer/library/util/ProxerUrls.java

@@ -4,7 +4,9 @@
 import lombok.experimental.Accessors;
 import lombok.experimental.UtilityClass;
 import me.proxer.library.entity.notifications.NewsArticle;
+import me.proxer.library.enums.AnimeLanguage;
 import me.proxer.library.enums.Device;
+import me.proxer.library.enums.Language;
 import okhttp3.HttpUrl;
 
 import java.util.regex.Pattern;
@@ -62,6 +64,16 @@ public final class ProxerUrls {
             .addPathSegment("")
             .build();
 
+    /**
+     * Returns the base url for all proxy links.
+     */
+    private final HttpUrl proxyBase = new HttpUrl.Builder()
+            .scheme("https")
+            .host("prxr.me")
+            .addPathSegment("img")
+            .addPathSegment("")
+            .build();
+
     /**
      * Returns the image link of a {@link NewsArticle}, based on its
      * {@code id} and {@code image}.
@@ -95,6 +107,24 @@ public HttpUrl entryImage(final String id) {
                 .build();
     }
 
+    /**
+     * Returns the link to the image behind the proxy.
+     */
+    public HttpUrl proxyImage(final HttpUrl url) {
+        return proxyBase.newBuilder()
+                .addQueryParameter("url", url.toString())
+                .build();
+    }
+
+    /**
+     * Returns the link to the image behind the proxy.
+     */
+    public HttpUrl proxyImage(final String url) {
+        return proxyBase.newBuilder()
+                .addQueryParameter("url", url)
+                .build();
+    }
+
     /**
      * Returns the image link of the translator group.
      */
@@ -118,7 +148,7 @@ public HttpUrl industryImage(final String id) {
     /**
      * Returns the image link of the hoster.
      */
-    public static HttpUrl hosterImage(final String id) {
+    public HttpUrl hosterImage(final String id) {
         return webBase.newBuilder()
                 .addPathSegment("images")
                 .addPathSegment("hoster")
@@ -130,8 +160,7 @@ public static HttpUrl hosterImage(final String id) {
      * Returns the image link of the page, based on the {@code server} number, the {@code entryId}, the {@code id} of
      * the chapter and the file{@code name} of the page.
      */
-    public static HttpUrl mangaPageImage(final String server, final String entryId, final String id,
-                                         final String name) {
+    public HttpUrl mangaPageImage(final String server, final String entryId, final String id, final String name) {
         return new HttpUrl.Builder()
                 .scheme("https")
                 .host(String.format("manga%s.proxer.me", server))
@@ -145,105 +174,182 @@ public static HttpUrl mangaPageImage(final String server, final String entryId,
     /**
      * Returns the link for the donation web page.
      */
-    public HttpUrl donateWeb() {
+    public HttpUrl donateWeb(final Device device) {
         return webBase.newBuilder()
                 .addPathSegment("donate")
+                .addQueryParameter("device", ProxerUtils.getSafeApiEnumName(device))
                 .build();
     }
 
     /**
      * Returns the link for the donation web page.
      */
-    public HttpUrl donateWeb(final Device device) {
-        return donateWeb().newBuilder()
-                .addQueryParameter("device", ProxerUtils.getApiEnumName(device))
-                .build();
+    public HttpUrl donateWeb() {
+        return donateWeb(Device.DEFAULT);
     }
 
     /**
      * Returns the link for the wiki web page, based on the {@code topic}.
      */
-    public static HttpUrl wikiWeb(final String topic) {
+    public HttpUrl wikiWeb(final String topic) {
         return webBase.newBuilder()
                 .addPathSegment("wiki")
                 .addPathSegment(topic)
+                .addQueryParameter("device", ProxerUtils.getSafeApiEnumName(Device.DEFAULT))
                 .build();
     }
 
     /**
      * Returns the link for the user's web page.
      */
-    public HttpUrl userWeb(final String id) {
+    public HttpUrl userWeb(final String id, final Device device) {
         return webBase.newBuilder()
                 .addPathSegment("user")
                 .addPathSegment(id)
+                .addQueryParameter("device", ProxerUtils.getSafeApiEnumName(device))
                 .build();
     }
 
     /**
      * Returns the link for the user's web page.
      */
-    public HttpUrl userWeb(final String id, final Device device) {
-        return userWeb(id).newBuilder()
-                .addQueryParameter("device", ProxerUtils.getApiEnumName(device))
-                .build();
+    public HttpUrl userWeb(final String id) {
+        return userWeb(id, Device.DEFAULT);
     }
 
     /**
      * Returns the link for the web page of the requested forum thread, residing in the category, specified by the
      * {@code categoryId}.
      */
-    public HttpUrl forumWeb(final String categoryId, final String threadId) {
+    public HttpUrl forumWeb(final String categoryId, final String threadId, final Device device) {
         return webBase.newBuilder()
                 .addPathSegment("forum")
                 .addPathSegment(categoryId)
                 .addPathSegment(threadId)
+                .addQueryParameter("device", ProxerUtils.getSafeApiEnumName(device))
                 .build();
     }
 
     /**
      * Returns the link for the web page of the requested forum thread, residing in the category, specified by the
      * {@code categoryId}.
      */
-    public HttpUrl forumWeb(final String categoryId, final String threadId, final Device device) {
-        return forumWeb(categoryId, threadId).newBuilder()
-                .addQueryParameter("device", ProxerUtils.getApiEnumName(device))
-                .build();
+    public HttpUrl forumWeb(final String categoryId, final String threadId) {
+        return forumWeb(categoryId, threadId, Device.DEFAULT);
     }
 
     /**
      * Returns the link for the web page of the requested news article, residing in the category, specified by the
      * {@code categoryId}.
      */
-    public HttpUrl newsWeb(final String categoryId, final String threadId) {
-        return forumWeb(categoryId, threadId);
+    public HttpUrl newsWeb(final String categoryId, final String threadId, final Device device) {
+        return forumWeb(categoryId, threadId, device);
     }
 
     /**
      * Returns the link for the web page of the requested news article, residing in the category, specified by the
      * {@code categoryId}.
      */
-    public HttpUrl newsWeb(final String categoryId, final String threadId, final Device device) {
-        return forumWeb(categoryId, threadId, device);
+    public HttpUrl newsWeb(final String categoryId, final String threadId) {
+        return forumWeb(categoryId, threadId);
+    }
+
+    /**
+     * Returns the link for the web page of the requested info page.
+     */
+    public HttpUrl infoWeb(final String id, final Device device) {
+        return webBase.newBuilder()
+                .addPathSegment("info")
+                .addPathSegment(id)
+                .addQueryParameter("device", ProxerUtils.getSafeApiEnumName(device))
+                .build();
+    }
+
+    /**
+     * Returns the link for the web page of the requested industry.
+     */
+    public HttpUrl infoWeb(final String id) {
+        return infoWeb(id, Device.DEFAULT);
+    }
+
+    /**
+     * Returns the link for the web page of the requested industry.
+     */
+    public HttpUrl industryWeb(final String id) {
+        return webBase.newBuilder()
+                .addPathSegment("industry")
+                .addPathSegment(id)
+                .addQueryParameter("device", ProxerUtils.getSafeApiEnumName(Device.DEFAULT))
+                .build();
+    }
+
+    /**
+     * Returns the link for the web page of the requested translator group.
+     */
+    public HttpUrl translatorGroupWeb(final String id) {
+        return webBase.newBuilder()
+                .addPathSegment("translatorgroups")
+                .addPathSegment(id)
+                .addQueryParameter("device", ProxerUtils.getSafeApiEnumName(Device.DEFAULT))
+                .build();
+    }
+
+    /**
+     * Returns the link for the watch page of an anime.
+     */
+    public HttpUrl animeWeb(final String id, final int episode, final AnimeLanguage language, final Device device) {
+        return webBase.newBuilder()
+                .addPathSegment("watch")
+                .addPathSegment(id)
+                .addPathSegment(String.valueOf(episode))
+                .addPathSegment(ProxerUtils.getSafeApiEnumName(language))
+                .addQueryParameter("device", ProxerUtils.getSafeApiEnumName(device))
+                .build();
+    }
+
+    /**
+     * Returns the link for the watch page of an anime.
+     */
+    public HttpUrl animeWeb(final String id, final int episode, final AnimeLanguage language) {
+        return animeWeb(id, episode, language, Device.DEFAULT);
+    }
+
+    /**
+     * Returns the link for the read page of a manga.
+     */
+    public HttpUrl mangaWeb(final String id, final int episode, final Language language, final Device device) {
+        return webBase.newBuilder()
+                .addPathSegment("chapter")
+                .addPathSegment(id)
+                .addPathSegment(String.valueOf(episode))
+                .addPathSegment(ProxerUtils.getSafeApiEnumName(language))
+                .addQueryParameter("device", ProxerUtils.getSafeApiEnumName(device))
+                .build();
+    }
+
+    /**
+     * Returns the link for the read page of a manga.
+     */
+    public HttpUrl mangaWeb(final String id, final int episode, final Language language) {
+        return mangaWeb(id, episode, language, Device.DEFAULT);
     }
 
     /**
      * Returns the link for the web page to solve the captcha.
      */
-    public HttpUrl captchaWeb() {
+    public HttpUrl captchaWeb(final Device device) {
         return webBase.newBuilder()
                 .addPathSegment("misc")
                 .addPathSegment("captcha")
+                .addQueryParameter("device", ProxerUtils.getSafeApiEnumName(device))
                 .build();
     }
 
     /**
      * Returns the link for the web page to solve the captcha.
      */
-    public HttpUrl captchaWeb(final Device device) {
-        return captchaWeb().newBuilder()
-                .addQueryParameter("device", device == Device.DEFAULT ? "default" : "mobile")
-                .build();
+    public HttpUrl captchaWeb() {
+        return captchaWeb(Device.DEFAULT);
     }
 
     /**
@@ -258,7 +364,7 @@ public boolean hasProxerHost(final HttpUrl url) {
      */
     public boolean hasProxerWebOrCdnOrStreamHost(final HttpUrl url) {
         return url.host().equals(webBase.host()) || url.host().equals(cdnBase.host())
-                || url.host().equals(streamBase.host());
+                || url.host().equals(proxyBase.host()) || url.host().equals(streamBase.host());
     }
 
     /**