From d070e76e1af9a50081d08392365e07fc4d58c789 Mon Sep 17 00:00:00 2001
From: Zed <zedeus@pm.me>
Date: Sun, 23 Jun 2019 02:46:46 +0200
Subject: [PATCH] Add simple file cache (no auto deletion yet)

---
 src/nitter.nim | 30 ++++++++++++++++++++----------
 src/utils.nim  |  6 +++++-
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/nitter.nim b/src/nitter.nim
index b993319..637ec90 100644
--- a/src/nitter.nim
+++ b/src/nitter.nim
@@ -1,9 +1,11 @@
-import asyncdispatch, httpclient, times, strutils, hashes, random, uri
-import jester, regex
+import asyncdispatch, asyncfile, httpclient, strutils, uri, os
+import jester
 
 import api, utils, types, cache
 import views/[user, general, conversation]
 
+const cacheDir {.strdefine.} = "/tmp/nitter"
+
 proc showTimeline(name: string; num=""): Future[string] {.async.} =
   let
     username = name.strip(chars={'/'})
@@ -28,6 +30,7 @@ routes:
 
   get "/@name/?":
     cond '.' notin @"name"
+
     let timeline = await showTimeline(@"name", @"after")
     if timeline.len == 0:
       resp Http404, showError("User \"" & @"name" & "\" not found")
@@ -36,6 +39,7 @@ routes:
 
   get "/@name/status/@id":
     cond '.' notin @"name"
+
     let conversation = await getTweet(@"id")
     if conversation.tweet.id.len == 0:
       resp Http404, showError("Tweet not found")
@@ -45,18 +49,24 @@ routes:
   get "/pic/@sig/@url":
     cond "http" in @"url"
     cond "twimg" in @"url"
-    let url = decodeUrl(@"url")
+
+    let
+      url = decodeUrl(@"url")
+      path = parseUri(url).path.split("/")[2 .. ^1].join("/")
+      filename = cacheDir / cleanFilename(path)
 
     if getHmac(url) != @"sig":
       resp showError("Failed to verify signature")
 
-    let
-      client = newAsyncHttpClient()
-      pic = await client.getContent(url)
+    if not existsDir(cacheDir):
+      createDir(cacheDir)
 
-    client.close()
+    if not existsFile(filename):
+      let client = newAsyncHttpClient()
+      await client.downloadFile(url, filename)
+      client.close()
 
-    resp pic, mimetype(url)
+    sendFile(filename)
 
   get "/video/@sig/@url":
     cond "http" in @"url"
@@ -68,9 +78,9 @@ routes:
 
     let
       client = newAsyncHttpClient()
-      pic = await client.getContent(url)
+      video = await client.getContent(url)
 
     defer: client.close()
-    resp pic, mimetype(url)
+    resp video, mimetype(url)
 
 runForever()
diff --git a/src/utils.nim b/src/utils.nim
index 13f2b60..08d96eb 100644
--- a/src/utils.nim
+++ b/src/utils.nim
@@ -1,5 +1,5 @@
 import strutils, strformat, uri
-import nimcrypto
+import nimcrypto, regex
 
 const key = "supersecretkey"
 
@@ -21,3 +21,7 @@ proc getSigUrl*(link: string; path: string): string =
     sig = getHmac(link)
     url = encodeUrl(link)
   &"/{path}/{sig}/{url}"
+
+proc cleanFilename*(filename: string): string =
+  const reg = re"[^A-Za-z0-9._-]"
+  filename.replace(reg, "_")