Added progress bar

Author: felipeucelli

README.md

@@ -48,23 +48,22 @@ You must only get one stream to be able to download it. You can use the methods:
 
 You can also manually select the stream using `.get("index")`.
 
-The download() method must receive the path that the stream will be downloaded.
-
 ```java
 public static void main(String[] args) throws Exception {
     Youtube yt = new Youtube("https://www.youtube.com/watch?v=2lAe1cqCOXo");
-    yt.streams().getHighestResolution().download("./");
+    yt.streams().getHighestResolution().download();
 }
 ```
 
 or
 
 ```java
 public static void main(String[] args) throws Exception {
-        new Youtube("https://www.youtube.com/watch?v=2lAe1cqCOXo").streams().get(1).download("./");
+        new Youtube("https://www.youtube.com/watch?v=2lAe1cqCOXo").streams().get(1).download();
     }
 }
 ```
+You can define the path where the file will be saved with the `.download("YOUR/PATH")` method
 
 ### Downloading videos with multiple audio tracks
 Videos with multiple progressive audio tracks come with the original audio, which is why we must choose the adaptive types.
@@ -102,22 +101,27 @@ public static void main(String[] args) throws Exception {
     filters.put("progressive", "true");
     filters.put("subType", "mp4");
 
-    yt.streams().filter(filters).getFirst().download("./");
+    yt.streams().filter(filters).getFirst().download();
 
 }
 ```
 
 ### Download with callback function
 
-If no parameter is passed, a download percentage string will be printed to the terminal
+If no parameters are passed, a progress bar will be printed to the terminal.
+
+```
+-|############################################| 100,0%
+```
+
 ```java
-public static void progress(Long value){
-    System.out.println(value);
+public static void progress(long bytesReceived, long fileSize){
+    System.out.println((bytesReceived * 100) / fileSize);
 }
 
 public static void main(String[] args) throws Exception {
     Youtube yt = new Youtube("https://www.youtube.com/watch?v=2lAe1cqCOXo");
-    yt.streams().getHighestResolution().download("./", Download::progress);
+    yt.streams().getHighestResolution().download(Download::progress);
 }
 ```
 
@@ -128,7 +132,7 @@ The `getVideos()` method will return an ArrayList with the links extracted from
 ```java
  public static void main(String[] args) throws Exception {
     for(String pl : new Playlist("https://www.youtube.com/playlist?list=PLS1QulWo1RIbfTjQvTdj8Y6yyq4R7g-Al").getVideos()){
-        new Youtube(pl).streams().getHighestResolution().download("./");
+        new Youtube(pl).streams().getHighestResolution().download();
     }
 }
 ```
@@ -239,7 +243,7 @@ Download it in .srt format (if the .srt format is not informed, the xml will be
 
 ```java
 public static void main(String[] args) throws Exception {
-        new Youtube("https://www.youtube.com/watch?v=2lAe1cqCOXo&t=1s").getCaptions().getByCode("en").download("caption.srt", "./")
+        new Youtube("https://www.youtube.com/watch?v=2lAe1cqCOXo&t=1s").getCaptions().getByCode("en").download("caption.srt", "./");
     }
 ```
 
@@ -266,7 +270,7 @@ This process involves manually obtaining a PO token generated from YouTube in a
 ```java
 public static void main(String[] args) throws Exception {
     Youtube yt = new Youtube("https://www.youtube.com/watch?v=2lAe1cqCOXo", true);
-    yt.streams().getHighestResolution().download("./");
+    yt.streams().getHighestResolution().download();
 }
 ```
 The terminal will ask you to insert the tokens.

src/main/java/com/github/felipeucelli/javatube/Stream.java

@@ -7,7 +7,7 @@
 import java.io.*;
 import java.net.*;
 import java.util.*;
-import java.util.function.Consumer;
+import java.util.function.BiConsumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import static java.lang.Math.min;
@@ -171,29 +171,61 @@ private void checkFile(String filePath) throws IOException {
         }
     }
 
-    public static void onProgress(long value){
-        System.out.println(value + "%");
+    private static void displayProgressBar(long bytesReceived, long fileSize, char ch, double scale) {
+        int columns = getTerminalWidth();
+        int maxWidth = (int) (columns * scale);
+
+        int filled = (int) Math.round(maxWidth * ((double) bytesReceived / fileSize));
+        int remaining = maxWidth - filled;
+
+        String bar = String.valueOf(ch).repeat(Math.max(0, filled)) +
+                " ".repeat(Math.max(0, remaining));
+
+        double percent = 100.0 * bytesReceived / fileSize;
+
+        PrintStream out = System.out;
+        out.printf("-|%s| %.1f%%\r", bar, percent);
+        out.flush();
+    }
+
+    private static void displayProgressBar(long bytesReceived, long fileSize) {
+        displayProgressBar(bytesReceived, fileSize, '#', 0.55);
+    }
+
+    private static int getTerminalWidth() {
+        return 80;
+    }
+
+    public void download() throws Exception {
+        download("./", title, Stream::displayProgressBar);
     }
+
     public void download(String path) throws Exception {
-        startDownload(path, title, Stream::onProgress);
+        download(path, title, Stream::displayProgressBar);
     }
-    public void download(String path, Consumer<Long> progress) throws Exception {
-        startDownload(path, title, progress);
+
+    public void download(BiConsumer<Long, Long> progress) throws Exception {
+        download("./", title, progress);
+    }
+
+    public void download(String path, BiConsumer<Long, Long> progress) throws Exception {
+        download(path, title, progress);
     }
+
     public void download(String path, String fileName) throws Exception {
-        startDownload(path, fileName, Stream::onProgress);
+        download(path, fileName, Stream::displayProgressBar);
     }
-    public void download(String path, String fileName, Consumer<Long> progress) throws Exception {
+
+    public void download(String path, String fileName, BiConsumer<Long, Long> progress) throws Exception {
         startDownload(path, fileName, progress);
     }
-    private void startDownload(String path, String fileName, Consumer<Long> progress) throws Exception {
+
+    private void startDownload(String path, String fileName, BiConsumer<Long, Long> progress) throws Exception {
         String savePath = path + safeFileName(fileName) + "." + subType;
         if(!isOtf){
             long startSize = 0;
             long stopPos;
             int defaultRange = 1048576;
-            long progressPercentage;
-            long lastPrintedProgress = 0;
             byte[] chunkReceived;
 
             checkFile(savePath);
@@ -205,12 +237,8 @@ private void startDownload(String path, String fileName, Consumer<Long> progress
                 String chunk = url + "&range=" + startSize + "-" + stopPos;
                 chunkReceived = Request.get(chunk).toByteArray();
 
-                progressPercentage = (stopPos * 100L) / (fileSize);
+                progress.accept(stopPos, fileSize);
 
-                if (progressPercentage != lastPrintedProgress) {
-                    lastPrintedProgress = progressPercentage;
-                    progress.accept(progressPercentage);
-                }
                 startSize = startSize + chunkReceived.length;
                 try (FileOutputStream fos = new FileOutputStream(savePath, true)) {
                     fos.write(chunkReceived);
@@ -221,7 +249,7 @@ private void startDownload(String path, String fileName, Consumer<Long> progress
         }
     }
 
-    private void downloadOtf(String savePath, Consumer<Long> progress) throws Exception {
+    private void downloadOtf(String savePath, BiConsumer<Long, Long> progress) throws Exception {
         int countChunk = 0;
         byte[] chunkReceived;
         int lastChunk = 0;
@@ -241,7 +269,7 @@ private void downloadOtf(String savePath, Consumer<Long> progress) throws Except
                     throw new RegexMatchError("downloadOtf: " + pattern);
                 }
             }
-            progress.accept((countChunk * 100L) / (lastChunk));
+            progress.accept(Long.parseLong(String.valueOf(countChunk)), Long.parseLong(String.valueOf(lastChunk)));
             countChunk = countChunk + 1;
             try (FileOutputStream fos = new FileOutputStream(savePath, true)) {
                 fos.write(chunkReceived);