From 48e439da10c6213d57f82d1880d6398473259690 Mon Sep 17 00:00:00 2001
From: nxshock <nxshock@gmail.com>
Date: Wed, 10 Jul 2024 11:10:54 +0500
Subject: [PATCH 1/8] Demove duplicated attribute

---
 templates/index.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/index.htm b/templates/index.htm
index e1c18ef..6b608d9 100644
--- a/templates/index.htm
+++ b/templates/index.htm
@@ -16,7 +16,7 @@
 			File Storage
 		</span>
 		<label>
-			<input id="file-uploader" type="file" id="upload-button">
+			<input id="file-uploader" type="file">
 			Загрузить файл
 		</label>
 	</header>

From e7a7baa0a027b0f759e1ce3cc0f1a51adf7a7b22 Mon Sep 17 00:00:00 2001
From: nxshock <nxshock@gmail.com>
Date: Wed, 10 Jul 2024 11:15:35 +0500
Subject: [PATCH 2/8] Move script to head tag

---
 templates/index.htm | 64 ++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/templates/index.htm b/templates/index.htm
index 6b608d9..e49c631 100644
--- a/templates/index.htm
+++ b/templates/index.htm
@@ -7,6 +7,33 @@
 	<title>File Storage</title>
 	<link rel="stylesheet" href="/style.css">
 	<link rel="icon" href="/favicon.svg" type="image/svg+xml">
+
+	<script type="text/javascript">
+		function myProgressHandler(event) {
+			var p = Math.floor(event.loaded / event.total * 100);
+			document.querySelector("label").innerHTML = 'Загрузка: ' + p + '%...';
+		}
+
+		function myOnLoadHandler(event) {
+			const response = event.currentTarget;
+			if (response.status != 200) {
+				alert('Ошибка при загрузке файла:\n' + response.responseText);
+			}
+			document.querySelector("label").innerHTML = 'Загрузка завершена.';
+			location.reload();
+		}
+
+		document.getElementById("file-uploader").addEventListener('change', (e) => {
+			var file = document.getElementById("file-uploader").files[0];
+			var formData = new FormData;
+			formData.append('file', file);
+			var ajax = new XMLHttpRequest;
+			ajax.upload.addEventListener("progress", myProgressHandler, false);
+			ajax.addEventListener('load', myOnLoadHandler, false);
+			ajax.open('POST', '/upload', true);
+			ajax.send(formData);
+		});
+	</script>
 </head>
 
 <body>
@@ -30,42 +57,19 @@
 				<th>Размер</th>
 				<th>Дата</th>
 			</tr>
-{{range .Files}}			<tr>
+			{{range .Files}} <tr>
 				<td><img src="/icon?ext={{.Ext}}"> <a href="/download?filename={{.Name}}">{{.Name}}</a> <a class="right" href="/stream?filename={{.Name}}">просмотр</a></td>
-				<td><pre>{{.Size}}</pre></td>
+				<td>
+					<pre>{{.Size}}</pre>
+				</td>
 				<td>{{.Date}}</td>
 			</tr>
-{{end}}		</table>
+			{{end}}
+		</table>
 	</main>
 	<footer>
 		Файлы хранятся как минимум {{.StorageDuration}} ч.
 	</footer>
 </body>
 
-</html>
-<script type="text/javascript">
-function myProgressHandler(event) {
-	var p = Math.floor(event.loaded/event.total*100);
-	document.querySelector("label").innerHTML = 'Загрузка: ' + p + '%...';
-}
-
-function myOnLoadHandler(event) {
-	const response = event.currentTarget;
-	if (response.status != 200) {
-		alert('Ошибка при загрузке файла:\n' + response.responseText);
-	}
-	document.querySelector("label").innerHTML = 'Загрузка завершена.';
-	location.reload();
-}
-
-document.getElementById("file-uploader").addEventListener('change', (e) => {
-	var file = document.getElementById("file-uploader").files[0];
-	var formData = new FormData;
-	formData.append('file', file);
-	var ajax = new XMLHttpRequest;
-	ajax.upload.addEventListener("progress", myProgressHandler, false);
-	ajax.addEventListener('load', myOnLoadHandler, false);
-	ajax.open('POST', '/upload', true);
-	ajax.send(formData);
-});
-</script>
+</html>
\ No newline at end of file

From a2a16af6053999044a325168dadcc32bd1bb275c Mon Sep 17 00:00:00 2001
From: nxshock <nxshock@gmail.com>
Date: Wed, 10 Jul 2024 11:29:39 +0500
Subject: [PATCH 3/8] Add lang attribute

---
 templates/index.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.htm b/templates/index.htm
index e49c631..3ea67cc 100644
--- a/templates/index.htm
+++ b/templates/index.htm
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="ru">
 
 <head>
 	<meta charset="utf-8">

From 14c1e8902557e72130dff61c38e4a93073b59097 Mon Sep 17 00:00:00 2001
From: nxshock <nxshock@gmail.com>
Date: Wed, 10 Jul 2024 11:30:45 +0500
Subject: [PATCH 4/8] Remove type attribute

---
 templates/index.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.htm b/templates/index.htm
index 3ea67cc..838f02f 100644
--- a/templates/index.htm
+++ b/templates/index.htm
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="/style.css">
 	<link rel="icon" href="/favicon.svg" type="image/svg+xml">
 
-	<script type="text/javascript">
+	<script>
 		function myProgressHandler(event) {
 			var p = Math.floor(event.loaded / event.total * 100);
 			document.querySelector("label").innerHTML = 'Загрузка: ' + p + '%...';

From 456880bbe7afedfc8f51e513b199595ba46f55b0 Mon Sep 17 00:00:00 2001
From: nxshock <nxshock@gmail.com>
Date: Wed, 10 Jul 2024 11:33:16 +0500
Subject: [PATCH 5/8] Add alt for image

---
 templates/index.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.htm b/templates/index.htm
index 838f02f..2fd2292 100644
--- a/templates/index.htm
+++ b/templates/index.htm
@@ -39,7 +39,7 @@
 <body>
 	<header>
 		<span>
-			<img src="/favicon.svg">
+			<img src="/favicon.svg" alt="icon">
 			File Storage
 		</span>
 		<label>

From c2cbf597935a5468afdcc58bc0967b681b0af148 Mon Sep 17 00:00:00 2001
From: nxshock <nxshock@gmail.com>
Date: Wed, 10 Jul 2024 16:16:02 +0500
Subject: [PATCH 6/8] Remove unused code

---
 walker.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/walker.go b/walker.go
index d6695c7..768d724 100644
--- a/walker.go
+++ b/walker.go
@@ -11,7 +11,7 @@ import (
 func removeOldFilesThread(path string, olderThan time.Duration) {
 	ticker := time.NewTicker(time.Hour)
 
-	for _ = range ticker.C {
+	for range ticker.C {
 		log.Debugln("Removing old files...")
 		err := removeOldFiles(path, olderThan)
 		if err != nil {

From 09463c3b24f02c0b0fc009872e941e37e3d23865 Mon Sep 17 00:00:00 2001
From: nxshock <nxshock@gmail.com>
Date: Wed, 10 Jul 2024 16:16:15 +0500
Subject: [PATCH 7/8] Remove unused variable

---
 walker.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/walker.go b/walker.go
index 768d724..697e2d2 100644
--- a/walker.go
+++ b/walker.go
@@ -8,12 +8,12 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func removeOldFilesThread(path string, olderThan time.Duration) {
+func removeOldFilesThread(olderThan time.Duration) {
 	ticker := time.NewTicker(time.Hour)
 
 	for range ticker.C {
 		log.Debugln("Removing old files...")
-		err := removeOldFiles(path, olderThan)
+		err := removeOldFiles(olderThan)
 		if err != nil {
 			log.Println(err)
 		}
@@ -21,7 +21,7 @@ func removeOldFilesThread(path string, olderThan time.Duration) {
 	}
 }
 
-func removeOldFiles(path string, olderThan time.Duration) error {
+func removeOldFiles(olderThan time.Duration) error {
 	return filepath.Walk(config.StoragePath, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err

From c41ff56ffa3f86af02be0772cee90d798c733020 Mon Sep 17 00:00:00 2001
From: nxshock <nxshock@gmail.com>
Date: Wed, 10 Jul 2024 16:16:51 +0500
Subject: [PATCH 8/8] Implement multiple file upload

---
 PKGBUILD            |  2 +-
 handlers.go         | 53 ++++++++++++++++++++++------------------
 main.go             |  2 +-
 templates/index.htm | 59 +++++++++++++++++++++++----------------------
 4 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index fc5793b..7471148 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=simplefileshare
-pkgver=0.1.3
+pkgver=0.1.4
 pkgrel=0
 pkgdesc="Simple file share"
 arch=('x86_64' 'aarch64')
diff --git a/handlers.go b/handlers.go
index 9043fbc..1b5e353 100644
--- a/handlers.go
+++ b/handlers.go
@@ -74,30 +74,37 @@ func HandleUpload(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	file, header, err := r.FormFile("file")
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-	defer file.Close()
+	var errors []string
+	for _, header := range r.MultipartForm.File["file"] {
+		file, err := header.Open()
+		if err != nil {
+			errors = append(errors, err.Error())
+			continue
+		}
+		defer file.Close()
 
-	filePath := filepath.Join(config.StoragePath, header.Filename)
-	if _, err := os.Stat(filePath); !os.IsNotExist(err) {
-		http.Error(w, "файл с таким именем уже существует", http.StatusBadRequest)
-		return
+		filePath := filepath.Join(config.StoragePath, header.Filename)
+		if _, err := os.Stat(filePath); !os.IsNotExist(err) {
+			errors = append(errors, fmt.Sprintf("файл с именем %s уже существует", header.Filename))
+			continue
+		}
+
+		f, err := os.Create(filePath)
+		if err != nil {
+			errors = append(errors, err.Error())
+			continue
+		}
+		defer f.Close()
+
+		_, err = io.Copy(f, file)
+		if err != nil {
+			errors = append(errors, err.Error())
+			continue
+		}
 	}
 
-	f, err := os.Create(filePath)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	defer f.Close()
-
-	_, err = io.Copy(f, file)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
+	if len(errors) > 0 {
+		http.Error(w, strings.Join(errors, "\n"), http.StatusBadRequest)
 	}
 }
 
@@ -127,7 +134,7 @@ func HandleDownload(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Accept-Ranges", "none")
 	w.Header().Set("Content-Length", strconv.Itoa(int(fileStat.Size())))
 
-	io.CopyBuffer(w, f, make([]byte, 4096))
+	_, _ = io.CopyBuffer(w, f, make([]byte, 4096))
 }
 
 func HandleStream(w http.ResponseWriter, r *http.Request) {
@@ -157,5 +164,5 @@ func HandleIcon(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "image/svg+xml")
 	w.Header().Set("Cache-Control", "public, max-age=31557600")
 
-	io.Copy(w, f)
+	_, _ = io.Copy(w, f)
 }
diff --git a/main.go b/main.go
index 536ae2f..e177df8 100644
--- a/main.go
+++ b/main.go
@@ -28,7 +28,7 @@ func init() {
 	}
 
 	if config.RemoveFilePeriod > 0 {
-		go removeOldFilesThread(config.StoragePath, time.Duration(config.RemoveFilePeriod)*time.Hour)
+		go removeOldFilesThread(time.Duration(config.RemoveFilePeriod) * time.Hour)
 	}
 
 	http.HandleFunc("/", HandleRoot)
diff --git a/templates/index.htm b/templates/index.htm
index 2fd2292..06346cf 100644
--- a/templates/index.htm
+++ b/templates/index.htm
@@ -7,33 +7,6 @@
 	<title>File Storage</title>
 	<link rel="stylesheet" href="/style.css">
 	<link rel="icon" href="/favicon.svg" type="image/svg+xml">
-
-	<script>
-		function myProgressHandler(event) {
-			var p = Math.floor(event.loaded / event.total * 100);
-			document.querySelector("label").innerHTML = 'Загрузка: ' + p + '%...';
-		}
-
-		function myOnLoadHandler(event) {
-			const response = event.currentTarget;
-			if (response.status != 200) {
-				alert('Ошибка при загрузке файла:\n' + response.responseText);
-			}
-			document.querySelector("label").innerHTML = 'Загрузка завершена.';
-			location.reload();
-		}
-
-		document.getElementById("file-uploader").addEventListener('change', (e) => {
-			var file = document.getElementById("file-uploader").files[0];
-			var formData = new FormData;
-			formData.append('file', file);
-			var ajax = new XMLHttpRequest;
-			ajax.upload.addEventListener("progress", myProgressHandler, false);
-			ajax.addEventListener('load', myOnLoadHandler, false);
-			ajax.open('POST', '/upload', true);
-			ajax.send(formData);
-		});
-	</script>
 </head>
 
 <body>
@@ -43,8 +16,8 @@
 			File Storage
 		</span>
 		<label>
-			<input id="file-uploader" type="file">
-			Загрузить файл
+			<input id="file-uploader" type="file" multiple>
+			Загрузить файл(ы)
 		</label>
 	</header>
 	<main>
@@ -70,6 +43,34 @@
 	<footer>
 		Файлы хранятся как минимум {{.StorageDuration}} ч.
 	</footer>
+	<script>
+		function myProgressHandler(event) {
+			var p = Math.floor(event.loaded / event.total * 100);
+			document.querySelector("label").innerHTML = 'Загрузка: ' + p + '%...';
+		}
+
+		function myOnLoadHandler(event) {
+			const response = event.currentTarget;
+			if (response.status != 200) {
+				alert('Ошибка при загрузке:\n' + response.responseText);
+			}
+			document.querySelector("label").innerHTML = 'Загрузка завершена.';
+			window.location.reload();
+		}
+
+		document.getElementById("file-uploader").addEventListener('change', (e) => {
+			var formData = new FormData;
+			var ajax = new XMLHttpRequest;
+			for (var i = 0; i < document.getElementById("file-uploader").files.length; i++) {
+				file = document.getElementById("file-uploader").files[i];
+				formData.append('file', file);
+			}
+			ajax.upload.addEventListener("progress", myProgressHandler, false);
+			ajax.addEventListener('load', myOnLoadHandler, false);
+			ajax.open('POST', '/upload', true);
+			ajax.send(formData);
+		});
+	</script>
 </body>
 
 </html>
\ No newline at end of file
