From 7badbc50dcebad62c8d72358f189f678fb2dd747 Mon Sep 17 00:00:00 2001
From: Ben Sarmiento <ben.sarmiento@forto.com>
Date: Wed, 29 Nov 2023 00:44:57 +0100
Subject: [PATCH] Small modifications

---
 bench.py                    | 15 ++++++++-------
 internal/dav/listing.go     |  2 +-
 internal/torrent/manager.go | 10 +++++++---
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/bench.py b/bench.py
index c8bc227..3b08c08 100644
--- a/bench.py
+++ b/bench.py
@@ -11,20 +11,21 @@ async def extract_links(url):
             for link in soup.find_all('a'):
                 yield urljoin(url, link.get('href'))
 
+
 async def benchmark(url):
     # This will still block, because subprocess.run is not async
-    subprocess.run(['hey', '-n', '100', '-c', '10', url])
+    subprocess.run(['hey', '-n', '10000', '-c', '100', url])
 
-url = 'http://zen.box:9999/http/'
+url = 'http://localhost:9999/http/'
 
 async def main():
-    i = 1
     async for link in extract_links(url):
-        if i > 50:
-            break
-        await benchmark(link)
+        print("BENCHMARKING " + link.replace('/http/', '/'))
         await benchmark(link.replace('/http/', '/'))
-        i += 1
+
+        print("BENCHMARKING " + link)
+        await benchmark(link)
+
 
 # Python 3.7+
 asyncio.run(main())
diff --git a/internal/dav/listing.go b/internal/dav/listing.go
index fff3b54..cf6db11 100644
--- a/internal/dav/listing.go
+++ b/internal/dav/listing.go
@@ -76,7 +76,7 @@ func handleListTorrents(w http.ResponseWriter, requestPath string, t *torrent.To
 	}
 
 	resp, _ := t.ResponseCache.Get(basePath + ".dav")
-	davDoc := "<?xml version=\"1.0\" encoding=\"utf-8\"?><d:multistatus xmlns:d=\"DAV:\">" + dav.BaseDirectory(basePath, "") + dav.BaseDirectory(basePath, "") + resp.(string) + "</d:multistatus>"
+	davDoc := resp.(string)
 
 	return &davDoc, nil
 }
diff --git a/internal/torrent/manager.go b/internal/torrent/manager.go
index e09ea63..7a5d0c0 100644
--- a/internal/torrent/manager.go
+++ b/internal/torrent/manager.go
@@ -899,10 +899,14 @@ func (t *TorrentManager) updateSortedKeys() {
 					continue
 				}
 				davRet += dav.Directory(tor.AccessKey, tor.LatestAdded)
-				htmlRet += fmt.Sprintf("<a href=\"/%s/%s\">%s</a><br>", directory, tor.AccessKey, tor.AccessKey)
+				htmlRet += fmt.Sprintf("<li><a href=\"/%s/%s\">%s</a></li>", directory, tor.AccessKey, tor.AccessKey)
 			}
 		}
-		t.ResponseCache.Set(directory+".dav", davRet, 1)
-		t.ResponseCache.Set(directory+".html", "<ol>"+htmlRet, 1)
+
+		davRet = "<?xml version=\"1.0\" encoding=\"utf-8\"?><d:multistatus xmlns:d=\"DAV:\">" + dav.BaseDirectory(directory, "") + dav.BaseDirectory(directory, "") + davRet + "</d:multistatus>"
+		t.ResponseCache.Set(directory+".dav", davRet, 0)
+
+		htmlRet = "<ol>" + htmlRet
+		t.ResponseCache.Set(directory+".html", "<ol>"+htmlRet, 0)
 	})
 }