handlers.go

@@ -5,10 +5,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"net/url"
 	"os"
 	"path/filepath"
-	"strings"
 )
 
 type ProgressInfo struct {
@@ -52,101 +50,53 @@ func handleRoot(w http.ResponseWriter, r *http.Request) {
 }
 
 func handleUpload(w http.ResponseWriter, r *http.Request) {
-	err := r.ParseMultipartForm(32 << 20)
+	file, header, err := r.FormFile("file")
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
-
-	files := r.MultipartForm.File["files"]
-	if len(files) == 0 {
-		http.Error(w, "No files uploaded", http.StatusBadRequest)
-		return
-	}
-
-	uploadedFiles := []string{}
-
-	for _, fileHeader := range files {
-		file, err := fileHeader.Open()
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
 	defer file.Close()
 
-		dst, err := os.Create(filepath.Join(uploadDir, fileHeader.Filename))
+	tempFile, err := os.CreateTemp(uploadDir, header.Filename)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-		defer dst.Close()
+	defer tempFile.Close()
 
-		_, err = io.Copy(dst, file)
+	_, err = io.Copy(tempFile, file)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 
-		uploadedFiles = append(uploadedFiles, fileHeader.Filename)
+	tempFilename := filepath.Base(tempFile.Name())
 
-		_, err = parseInputFile(dst.Name())
+	_, err = parseInputFile(tempFile.Name())
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	}
 
-	validFiles := []string{}
+	http.Redirect(w, r, "/select?filename="+tempFilename, http.StatusSeeOther)
-	for _, file := range uploadedFiles {
-		if file != "" {
-			validFiles = append(validFiles, file)
-		}
-	}
-
-	if len(validFiles) == 0 {
-		http.Error(w, "No valid files were uploaded", http.StatusBadRequest)
-		return
-	}
-
-	http.Redirect(w, r, "/select?files="+url.QueryEscape(strings.Join(validFiles, ",")), http.StatusSeeOther)
 }
 
 func handleSelect(w http.ResponseWriter, r *http.Request) {
-	filesParam := r.URL.Query().Get("files")
+	filename := r.URL.Query().Get("filename")
-	filenames := strings.Split(filesParam, ",")
+	items, err := parseInputFile(filepath.Join(uploadDir, filename))
-
-	allItems := make(map[string]map[string][]Item)
-
-	for _, filename := range filenames {
-		if filename == "" {
-			continue
-		}
-		fullPath := filepath.Join(uploadDir, filename)
-
-		if _, err := os.Stat(fullPath); os.IsNotExist(err) {
-			continue
-		}
-
-		items, err := parseInputFile(fullPath)
 	if err != nil {
-			continue
+		http.Error(w, err.Error(), http.StatusInternalServerError)
-		}
-
-		groupedItems := groupItemsBySeason(items)
-		allItems[filename] = groupedItems
-	}
-
-	if len(allItems) == 0 {
-		http.Error(w, "No valid files were processed", http.StatusBadRequest)
 		return
 	}
 
-	err := templates.ExecuteTemplate(w, "select", struct {
+	groupedItems := groupItemsBySeason(items)
-		Filenames string
+
-		AllItems  map[string]map[string][]Item
+	err = templates.ExecuteTemplate(w, "select", struct {
+		Filename string
+		Items    map[string][]Item
 	}{
-		Filenames: filesParam,
+		Filename: filename,
-		AllItems:  allItems,
+		Items:    groupedItems,
 	})
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -154,47 +104,36 @@ func handleSelect(w http.ResponseWriter, r *http.Request) {
 }
 
 func handleProcess(w http.ResponseWriter, r *http.Request) {
-	if err := r.ParseForm(); err != nil {
+	filename := r.FormValue("filename")
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-
 	selectedItems := r.Form["items"]
-	if len(selectedItems) == 0 {
-		http.Error(w, "No items selected", http.StatusBadRequest)
-		return
-	}
 
-	itemsByFile := make(map[string][]string)
+	items, err := parseInputFile(filepath.Join(uploadDir, filename))
-	for _, item := range selectedItems {
-		parts := strings.SplitN(item, ":", 2)
-		if len(parts) != 2 {
-			continue
-		}
-		filename, itemName := parts[0], parts[1]
-		itemsByFile[filename] = append(itemsByFile[filename], itemName)
-	}
-
-	for filename, items := range itemsByFile {
-		fullPath := filepath.Join(uploadDir, filename)
-		allItems, err := parseInputFile(fullPath)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 
-		selectedItems := filterSelectedItems(allItems, items)
+	filteredItems := filterSelectedItems(items, selectedItems)
-		go processItems(filename, selectedItems)
+
+	go func() {
+		err := processItems(filename, filteredItems)
+		if err != nil {
+			fmt.Printf("Error processing file: %v\n", err)
 		}
 
-	http.Redirect(w, r, "/", http.StatusSeeOther)
+		os.Remove(filepath.Join(uploadDir, filename))
+	}()
+
+	http.Redirect(w, r, "/progress?filename="+filename, http.StatusSeeOther)
 }
 
 func handleProgress(w http.ResponseWriter, r *http.Request) {
 	filename := r.URL.Query().Get("filename")
+	fmt.Printf("Handling progress request for filename: %s\n", filename)
 
 	if r.Header.Get("Accept") == "application/json" {
 		progressInfo := getProgress(filename)
+		fmt.Printf("Progress info for %s: %+v\n", filename, progressInfo)
 
 		if progressInfo == nil {
 			w.WriteHeader(http.StatusNotFound)
@@ -205,6 +144,7 @@ func handleProgress(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		err := json.NewEncoder(w).Encode(progressInfo)
 		if err != nil {
+			fmt.Printf("Error encoding progress info: %v\n", err)
 			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 			return
 		}
@@ -266,6 +206,7 @@ func handleResume(w http.ResponseWriter, r *http.Request) {
 	jobInfo.Paused = false
 	jobInfo.ResumeChan <- struct{}{}
 
+	// Update the progress information
 	progressMutex.Lock()
 	if progressInfo, ok := progress[filename]; ok {
 		progressInfo.Paused = false
@@ -350,4 +291,5 @@ func updateProgress(filename string, value float64, currentFile string) {
 			Paused:      paused,
 		}
 	}
+	fmt.Printf("Progress updated for %s: %.2f%%, Current file: %s, Paused: %v\n", filename, value, currentFile, paused)
 }

templates/index

@@ -112,7 +112,7 @@
 <body>
     <h1>Simple Downloader</h1>
     <form action="/upload" method="post" enctype="multipart/form-data">
-        <input type="file" name="files" accept=".drmd" multiple>
+        <input type="file" name="file" accept=".drmd">
         <input type="submit" value="Upload and Process">
     </form>
     <h2>Currently Running Jobs</h2>

templates/select

@@ -55,26 +55,23 @@
 <body>
     <h1>Select Items to Download</h1>
     <form action="/process" method="post">
-        <input type="hidden" name="filenames" value="{{.Filenames}}">
+        <input type="hidden" name="filename" value="{{.Filename}}">
-        {{range $filename, $fileItems := .AllItems}}
+        {{range $season, $items := .Items}}
-            <h2>{{$filename}}</h2>
-            {{range $season, $items := $fileItems}}
             <div class="season">
                 <div class="season-title">
-                        <input type="checkbox" class="season-checkbox" id="season-{{$filename}}-{{$season}}" checked onchange="toggleSeason('{{$filename}}-{{$season}}')">
+                    <input type="checkbox" class="season-checkbox" id="season-{{$season}}" checked onchange="toggleSeason('{{$season}}')">
-                        <label for="season-{{$filename}}-{{$season}}">{{$season}}</label>
+                    <label for="season-{{$season}}">{{$season}}</label>
                 </div>
                 {{range $item := $items}}
                     <div class="item">
                         <label>
-                                <input type="checkbox" name="items" value="{{$filename}}:{{$item.Filename}}" checked class="episode-{{$filename}}-{{$season}}">
+                            <input type="checkbox" name="items" value="{{$item.Filename}}" checked class="episode-{{$season}}">
                             {{$item.Filename}}
                         </label>
                     </div>
                 {{end}}
             </div>
         {{end}}
-        {{end}}
         <div>
             <button type="button" onclick="selectAll(true)">Select All</button>
             <button type="button" onclick="selectAll(false)">Select None</button>

utils.go

@@ -138,24 +138,16 @@ func findOrCreateSegmentTimeline(adaptationSet *etree.Element) *etree.Element {
 	return segmentTemplate.CreateElement("SegmentTimeline")
 }
 
-func parseInputFile(filename string) ([]Item, error) {
+func parseInputFile(inputFile string) ([]Item, error) {
-	fileInfo, err := os.Stat(filename)
+	jsonFile, err := os.Open(inputFile)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error opening file %s: %v", inputFile, err)
-	}
-	if fileInfo.IsDir() {
-		return nil, fmt.Errorf("%s is a directory", filename)
 	}
+	defer jsonFile.Close()
 
-	file, err := os.Open(filename)
+	byteValue, err := io.ReadAll(jsonFile)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error reading file %s: %v", inputFile, err)
-	}
-	defer file.Close()
-
-	byteValue, err := io.ReadAll(file)
-	if err != nil {
-		return nil, err
 	}
 
 	byteValue = removeBOM(byteValue)
@@ -163,7 +155,7 @@ func parseInputFile(filename string) ([]Item, error) {
 	var items Items
 	err = json.Unmarshal(byteValue, &items)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error unmarshaling JSON: %v", err)
 	}
 
 	return items.Items, nil
@@ -225,6 +217,7 @@ func processItems(filename string, items []Item) error {
 				select {
 				case <-jobInfo.ResumeChan:
 					jobInfo.Paused = false
+					fmt.Printf("Resuming download for %s\n", filename)
 				case <-jobInfo.AbortChan:
 					updateProgress(filename, 100, "Aborted")
 					return fmt.Errorf("download aborted")
@@ -238,6 +231,7 @@ func processItems(filename string, items []Item) error {
 					i--
 					continue
 				}
+				fmt.Printf("Error downloading file: %v\n", err)
 			}
 		}
 	}