[feature/ISSUE-28] Use Cache in app.d

azihassan · Oct 15, 2023 · 6ff138c · 6ff138c
1 parent 965948e
commit 6ff138c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/source/app.d b/source/app.d
@@ -9,9 +9,10 @@ import std.range : iota;
 import std.logger;
 import std.getopt;
 
-import parsers;
 import downloaders;
 import helpers;
+import parsers : YoutubeFormat, YoutubeVideoURLExtractor;
+import cache : Cache;
 
 void main(string[] args)
 {
@@ -74,10 +75,10 @@ void main(string[] args)
 
 void handleURL(string url, int itag, StdoutLogger logger, bool displayFormats, bool outputURL, bool parallel, bool noProgress)
 {
+    auto cache = Cache(logger);
     logger.display(formatTitle("Handling " ~ url));
-    string html = url.get().idup;
     logger.displayVerbose("Downloaded video HTML");
-    YoutubeVideoURLExtractor parser = makeParser(html, logger);
+    YoutubeVideoURLExtractor parser = cache.makeParser(url, itag);
 
     if(displayFormats)
     {

diff --git a/source/cache.d b/source/cache.d
@@ -30,7 +30,7 @@ struct Cache
         this.downloadAsString = downloadAsString;
     }
 
-    YoutubeVideoURLExtractor makeParser(string url, int itag, StdoutLogger logger)
+    YoutubeVideoURLExtractor makeParser(string url, int itag)
     {
         string html = getHTML(url, itag);
         if(html.indexOf("signatureCipher") == -1)
@@ -59,15 +59,19 @@ struct Cache
 
     private void updateCache(string url, string htmlCachePath, string baseJSCachePath, int itag)
     {
-        string cachedHTML = htmlCachePath.readText();
-        bool shouldRedownload = !htmlCachePath.exists() || isStale(cachedHTML, itag);
+        bool shouldRedownload = !htmlCachePath.exists() || isStale(htmlCachePath.readText(), itag);
         if(shouldRedownload)
         {
+            logger.display("Cache miss, downloading HTML...");
             string html = this.downloadAsString(url);
             htmlCachePath.write(html);
             string baseJS = html.parseBaseJSURL();
             baseJSCachePath.write(html);
         }
+        else
+        {
+            logger.display("Cache hit, skipping HTML download...");
+        }
     }
 
     private bool isStale(string html, int itag)
@@ -102,7 +106,7 @@ unittest
     auto cache = Cache(new StdoutLogger(), downloadAsString);
     cache.cacheDirectory = getcwd();
 
-    auto parser = cache.makeParser("https://youtu.be/zoz", 18, new StdoutLogger());
+    auto parser = cache.makeParser("https://youtu.be/zoz", 18);
     assert(downloadAttempted);
 }
 
@@ -120,7 +124,7 @@ unittest
 
     "zoz-fresh.html".write("zoz.html".readText().dup.replace("expire=1638935038", "expire=" ~ tomorrow.toUnixTime().to!string));
 
-    auto parser = cache.makeParser("https://youtu.be/zoz-fresh", 18, new StdoutLogger());
+    auto parser = cache.makeParser("https://youtu.be/zoz-fresh", 18);
     assert(!downloadAttempted);
 }
 
@@ -135,7 +139,7 @@ unittest
     auto cache = Cache(new StdoutLogger(), downloadAsString);
     cache.cacheDirectory = getcwd();
 
-    auto parser = cache.makeParser("https://youtu.be/dQw4w9WgXcQ", 18, new StdoutLogger());
+    auto parser = cache.makeParser("https://youtu.be/dQw4w9WgXcQ", 18);
     assert(downloadAttempted);
 }
 
@@ -158,6 +162,6 @@ unittest
     );
 
 
-    auto parser = cache.makeParser("https://youtu.be/dQw4w9WgXcQ-fresh", 18, new StdoutLogger());
+    auto parser = cache.makeParser("https://youtu.be/dQw4w9WgXcQ-fresh", 18);
     assert(!downloadAttempted);
 }