Merge branch 'dev'

Author: ImSejin

README.md

@@ -1,8 +1,10 @@
-<p align="center" width="40%">
-	<img alt="Lezhin Comics Downloader" src="./src/main/resources/assets/main-image.png">
+<p align="center">
+    <img alt="Lezhin Comics Downloader" src="./src/main/resources/assets/lezhin-comics-downloader-logo.png" width="20%">
 </p>
 
+<h1 align="center">Lezhin Comics Downloader</h1>
 
+<p align="center">Downloader for lezhin comics</p>
 
 <p align="center">
     <a href="https://lgtm.com/projects/g/ImSejin/lezhin-comics-downloader/context:java"><img alt="Language grade: Java" src="https://img.shields.io/lgtm/grade/java/g/ImSejin/lezhin-comics-downloader.svg?logo=lgtm&logoWidth=18"/></a>
@@ -12,21 +14,17 @@
 
 <p align="center">
     <img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/imsejin/lezhin-comics-downloader/total">
-	<img alt="GitHub Releases" src="https://img.shields.io/github/downloads/imsejin/lezhin-comics-downloader/latest/total">
+    <img alt="GitHub Releases" src="https://img.shields.io/github/downloads/imsejin/lezhin-comics-downloader/latest/total">
     <img alt="jdk8" src="https://img.shields.io/badge/jdk-8-orange">
-	<img alt="GitHub" src="https://img.shields.io/github/license/imsejin/lezhin-comics-downloader">
+    <img alt="GitHub" src="https://img.shields.io/github/license/imsejin/lezhin-comics-downloader">
 </p>
 
-This is downloader that helps you to login and downloads the specified comic for all lezhin-comics even adults.
-
-※ *The user is responsible for everything that happens using this program.*
-
-<br><br>
-
 # Preview
 
 <img alt="preview" src="./src/main/resources/assets/preview.gif">
 
+<p align="center">This is downloader that helps you to login and downloads the specified comic for all lezhin-comics even adults.</p>
+<p align="center">※ <i>The user is responsible for everything that happens using this program.</i></p>
 <br><br>
 
 # Getting started
@@ -56,7 +54,7 @@ This is downloader that helps you to login and downloads the specified comic for
 ## Usage
 
 ```cmd
-java -jar {JAR filename} -l=<language> -n=<comic name> [-r=<episode range> -d]
+java -jar {JAR filename} -l=<language> -n=<comic name> [-r=<episode range> -j -d]
 ```
 
 - *<ins>language</ins> (required)*: language of lezhin platform you want to see.
@@ -76,6 +74,7 @@ java -jar {JAR filename} -l=<language> -n=<comic name> [-r=<episode range> -d]
   - __n~__ : from ep.N to the last episode
   - __~n__ : from the first episode to ep.N
   - __m~n__ : from ep.M to ep.N
+- <ins>jpg</ins> (optional): save images as JPEG format (default: WEBP format).
 - <ins>debug</ins> (optional): enables debugging mode.
 
 <br><br>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.imsejin</groupId>
     <artifactId>lezhin-comics-downloader</artifactId>
-    <version>2.7.1</version>
+    <version>2.8.0</version>
     <packaging>jar</packaging>
 
     <name>Lezhin Comics Downloader</name>
@@ -40,7 +40,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <common.utils.version>0.3.4</common.utils.version>
+        <common.utils.version>0.4.7</common.utils.version>
         <lombok.version>1.18.20</lombok.version>
     </properties>
 

src/main/java/io/github/imsejin/lzcodl/Application.java

@@ -62,6 +62,7 @@ public static void main(String[] arguments) {
                     .language(cmd.getOptionValue('l'))
                     .comicName(cmd.getOptionValue('n'))
                     .episodeRange(cmd.getOptionValue('r', null))
+                    .jpg(cmd.hasOption('j'))
                     .debugging(cmd.hasOption('d'))
                     .build();
 
@@ -76,6 +77,7 @@ public static void main(String[] arguments) {
             Model pom = mavenReader.read(reader);
             Loggers.getLogger().info("{} v{}", pom.getName(), pom.getVersion());
             Loggers.getLogger().info("If you have any questions, contact me by '{}/issues'", pom.getUrl());
+            Loggers.getLogger().debug("Argument: {}", args);
 
             // Login with username and password and gets a token.
             args.setAccessToken(LoginHelper.login(args));
@@ -93,7 +95,7 @@ public static void main(String[] arguments) {
             args.setComicPath(comicDir);
 
             // Downloads images.
-            Downloader.download(args);
+            new Downloader(args).download();
 
             // Terminates the application.
             ChromeBrowser.getDriver().quit();

src/main/java/io/github/imsejin/lzcodl/common/CommandParser.java

@@ -25,40 +25,44 @@
  */
 public final class CommandParser {
 
-    private static final Options options;
+    private static final Option lang = Option.builder("l")
+            .longOpt("lang")
+            .desc("language of lezhin platform you want to see")
+            .valueSeparator()
+            .hasArg()
+            .required()
+            .build();
 
-    static {
-        // Option: language
-        Option lang = Option.builder("l")
-                .longOpt("lang")
-                .desc("language of lezhin platform you want to see")
-                .valueSeparator()
-                .hasArg()
-                .required()
-                .build();
-        // Option: comicName
-        Option name = Option.builder("n")
-                .longOpt("name")
-                .desc("webtoon name you want to download")
-                .valueSeparator()
-                .hasArg()
-                .required()
-                .build();
-        // Option: episodeRange
-        Option range = Option.builder("r")
-                .longOpt("range")
-                .desc("range of episodes you want to download")
-                .hasArg()
-                .valueSeparator()
-                .build();
-        // Option: debugging
-        Option debug = Option.builder("d")
-                .longOpt("debug")
-                .desc("debug mode")
-                .build();
+    private static final Option name = Option.builder("n")
+            .longOpt("name")
+            .desc("webtoon name you want to download")
+            .valueSeparator()
+            .hasArg()
+            .required()
+            .build();
 
-        options = new Options().addOption(lang).addOption(name).addOption(range).addOption(debug);
-    }
+    private static final Option range = Option.builder("r")
+            .longOpt("range")
+            .desc("range of episodes you want to download")
+            .hasArg()
+            .valueSeparator()
+            .build();
+
+    /**
+     * @since 2.8.0
+     */
+    private static final Option jpg = Option.builder("j")
+            .longOpt("jpg")
+            .desc("save as JPEG format")
+            .build();
+
+    private static final Option debug = Option.builder("d")
+            .longOpt("debug")
+            .desc("debug mode")
+            .build();
+
+    private static final Options options = new Options()
+            .addOption(lang).addOption(name).addOption(range).addOption(jpg).addOption(debug);
 
     private CommandParser() {
     }

src/main/java/io/github/imsejin/lzcodl/common/URLFactory.java

@@ -31,42 +31,42 @@ public final class URLFactory {
     /**
      * CDN 서버의 origin URL
      *
-     * <pre>{@code
-     *     http://cdn.lezhin.com
-     * }</pre>
+     * @see <a href="http://cdn.lezhin.com">CDN URL</a>
      */
     private static final String cdnUrl = "http://cdn.lezhin.com";
 
     /**
      * 각 회차의 정보를 얻을 수 있는 URI의 접두사<br>
      * The prefix of URI to obtain information for each episode
      *
-     * <pre>{@code
-     *     http://cdn.lezhin.com/episodes/
-     * }</pre>
+     * @see <a href="http://cdn.lezhin.com/episodes/">Episode Info URL</a>
      */
     private static final String episodeInfoUrl = cdnUrl + "/episodes/";
 
     /**
      * 이미지 URI의 접두사<br>
      * The prefix of image URI
      *
-     * <pre>{@code
-     *     http://cdn.lezhin.com/v2/comics/
-     * }</pre>
+     * @see <a href="http://cdn.lezhin.com/v2/comics/">Image Prefix URL</a>
      */
     private static final String imgUrl = cdnUrl + "/v2/comics/";
 
-    private URLFactory() {
+    /**
+     * @since 2.8.0
+     */
+    private final Arguments args;
+
+    public URLFactory(Arguments args) {
+        this.args = args;
     }
 
     /**
-     * <pre>{@code
-     *     https://cdn.lezhin.com/v2/comics/5651768999542784/episodes/6393378955722752/contents/scrolls/1.webp?access_token=5be30a25-a044-410c-88b0-19a1da968a64&purchased=false
-     * }</pre>
+     * @see <a href="https://cdn.lezhin.com/v2/comics/5651768999542784/episodes/6393378955722752/contents/scrolls/1.webp?access_token=5be30a25-a044-410c-88b0-19a1da968a64&purchased=false">
+     * Image URL
+     * </a>
      */
     @SneakyThrows(MalformedURLException.class)
-    public static synchronized URL image(long comicId, long episodeId, int filename, String accessToken, boolean purchased) {
+    public static URL image(long comicId, long episodeId, int filename, String imageFormat, String accessToken, boolean purchased) {
         StringBuilder sb = new StringBuilder();
 
         sb.append(imgUrl);
@@ -75,7 +75,9 @@ public static synchronized URL image(long comicId, long episodeId, int filename,
         sb.append(episodeId);
         sb.append("/contents/scrolls/");
         sb.append(filename);
-        sb.append(".webp?access_token=");
+        sb.append('.');
+        sb.append(imageFormat);
+        sb.append("?access_token=");
         sb.append(accessToken);
         sb.append("&purchased=").append(purchased); // If not append though you paid this episode, width of image decreases. (1080px => 720px)
         sb.append("&q=30"); // I don't know what this means, but if not append, width of image decreases. (1080px => 1024px)
@@ -84,16 +86,40 @@ public static synchronized URL image(long comicId, long episodeId, int filename,
     }
 
     /**
-     * @since 2.6.2
+     * @see <a href="https://cdn.lezhin.com/v2/comics/5651768999542784/episodes/6393378955722752/contents/scrolls/1.webp?access_token=5be30a25-a044-410c-88b0-19a1da968a64&purchased=false">
+     * Image URL
+     * </a>
+     * @since 2.8.0
+     */
+    @SneakyThrows(MalformedURLException.class)
+    public URL image(long episodeId, int filename, boolean purchased) {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append(imgUrl);
+        sb.append(this.args.getProduct().getId());
+        sb.append("/episodes/");
+        sb.append(episodeId);
+        sb.append("/contents/scrolls/");
+        sb.append(filename);
+        sb.append('.');
+        sb.append(this.args.getImageFormat());
+        sb.append("?access_token=");
+        sb.append(this.args.getAccessToken());
+        sb.append("&purchased=").append(purchased); // If not append though you paid this episode, width of image decreases. (1080px => 720px)
+        sb.append("&q=30"); // I don't know what this means, but if not append, width of image decreases. (1080px => 1024px)
+
+        return new URL(sb.toString());
+    }
+
+    /**
+     * @since 2.8.0
      */
-    public static URL image(Arguments args, Episode episode, int filename, boolean purchased) {
-        return image(args.getProduct().getId(), episode.getId(), filename, args.getAccessToken(), purchased);
+    public URL image(Episode episode, int filename, boolean purchased) {
+        return image(episode.getId(), filename, purchased);
     }
 
     /**
-     * <pre>{@code
-     *     http://cdn.lezhin.com/episodes/snail/1.json?access_token=5be30a25-a044-410c-88b0-19a1da968a64
-     * }</pre>
+     * @see <a href="http://cdn.lezhin.com/episodes/snail/1.json?access_token=5be30a25-a044-410c-88b0-19a1da968a64">A episode API</a>
      */
     @SneakyThrows(MalformedURLException.class)
     public static URL oneEpisodeAPI(String comicName, String episodeName, String accessToken) {
@@ -117,9 +143,7 @@ public static URL oneEpisodeAPI(Arguments args, Episode episode) {
     }
 
     /**
-     * <pre>{@code
-     *     http://cdn.lezhin.com/episodes/snail?access_token=5be30a25-a044-410c-88b0-19a1da968a64
-     * }</pre>
+     * @see <a href="http://cdn.lezhin.com/episodes/snail?access_token=5be30a25-a044-410c-88b0-19a1da968a64">All episode API</a>
      */
     @SneakyThrows(MalformedURLException.class)
     public static URL allEpisodeAPI(String comicName, String accessToken) {

src/main/java/io/github/imsejin/lzcodl/core/Downloader.java

@@ -45,22 +45,32 @@
  */
 public final class Downloader {
 
-    private static final String IMG_FORMAT_EXTENSION = "webp"; // or jpg
+    /**
+     * @since 2.8.0
+     */
+    private final Arguments args;
+
+    /**
+     * @since 2.8.0
+     */
+    private final URLFactory urlFactory;
 
-    private Downloader() {
+    public Downloader(Arguments args) {
+        this.args = args;
+        this.urlFactory = new URLFactory(args);
     }
 
-    public static void download(Arguments args) throws IOException {
-        EpisodeRange episodeRange = EpisodeRange.of(args.getEpisodeRange());
+    public void download() throws IOException {
+        EpisodeRange episodeRange = EpisodeRange.of(this.args.getEpisodeRange());
 
-        List<Episode> episodes = args.getProduct().getEpisodes();
-        for (int i : episodeRange.getArray(args)) {
+        List<Episode> episodes = this.args.getProduct().getEpisodes();
+        for (int i : episodeRange.getArray(this.args)) {
             Episode episode = episodes.get(i);
-            downloadEpisode(args, episode, i + 1);
+            downloadEpisode(this.args, episode, i + 1);
         }
     }
 
-    private static void downloadEpisode(Arguments arguments, Episode episode, int num) throws IOException {
+    private void downloadEpisode(Arguments arguments, Episode episode, int num) throws IOException {
         // Cannot download paid episode.
         if (!episode.isFree()) return;
 
@@ -80,16 +90,16 @@ private static void downloadEpisode(Arguments arguments, Episode episode, int nu
         try (ProgressBar progressBar = getDefaultProgressBar(arguments.getProduct().getAlias(), num, numOfImages)) {
             // Downloads all images of the episode.
             IntStream.rangeClosed(1, numOfImages).parallel().forEach(i -> {
-                String filename = String.format("%03d.%s", i, IMG_FORMAT_EXTENSION);
+                String filename = String.format("%03d.%s", i, this.args.getImageFormat());
                 File file = new File(episodeDir.toFile(), filename);
 
                 // Tries to download high-resolution image for only paid users.
-                URL url = URLFactory.image(arguments, episode, i, true);
+                URL url = this.urlFactory.image(episode, i, true);
                 boolean success = downloadImage(url, file);
 
                 // Try to download low-resolution image for all users.
                 if (!success) {
-                    url = URLFactory.image(arguments, episode, i, false);
+                    url = this.urlFactory.image(episode, i, false);
                     success = downloadImage(url, file);
 
                     // If failed to download, skips this image.