config.go

@@ -9,10 +9,9 @@ import (
 )
 
 type Config struct {
-	BaseDir     string
+	BaseDir    string
-	Format      string
+	Format     string
-	TempBaseDir string
+	N_m3u8DLRE struct {
-	N_m3u8DLRE  struct {
 		Path string
 	}
 }

config.toml

@@ -1,6 +1,5 @@
 BaseDir = "/mnt/media"
 Format = "mkv" 
-TempBaseDir = "/tmp/nre"
 
 [N_m3u8DLRE]
 Path = "nre"

downloaders.go

@@ -18,17 +18,9 @@ func removeBOM(input []byte) []byte {
 	return input
 }
 
-func downloadFile(item Item, jobInfo *JobInfo) error {
+func downloadFile(item Item) error {
 	fmt.Println("Downloading:", item.Filename)
 
-	tempDir := filepath.Join(config.TempBaseDir, sanitizeFilename(item.Filename))
-	err := os.MkdirAll(tempDir, 0755)
-	if err != nil {
-		return fmt.Errorf("error creating temporary directory: %v", err)
-	}
-
-	jobInfo.TempDir = tempDir
-
 	mpdPath := item.MPD
 	if !isValidURL(item.MPD) {
 		decodedMPD, err := base64.StdEncoding.DecodeString(item.MPD)
@@ -83,7 +75,7 @@ func downloadFile(item Item, jobInfo *JobInfo) error {
 		mpdPath = tempFile.Name()
 	}
 
-	command := getDownloadCommand(item, mpdPath, tempDir)
+	command := getDownloadCommand(item, mpdPath)
 
 	if item.Subtitles != "" {
 		subtitlePaths, err := downloadAndConvertSubtitles(item.Subtitles)
@@ -99,45 +91,19 @@ func downloadFile(item Item, jobInfo *JobInfo) error {
 
 	cmd := exec.Command("bash", "-c", command)
 
-	jobsMutex.Lock()
-	jobInfo.Cmd = cmd
-	jobsMutex.Unlock()
-
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
-	err = cmd.Start()
+	err := cmd.Run()
 	if err != nil {
-		return fmt.Errorf("error starting download command: %v", err)
+		return fmt.Errorf("error executing download command: %v", err)
-	}
-
-	done := make(chan error)
-	go func() {
-		done <- cmd.Wait()
-	}()
-
-	select {
-	case <-jobInfo.AbortChan:
-		if cmd.Process != nil {
-			cmd.Process.Kill()
-		}
-		os.RemoveAll(tempDir)
-		return fmt.Errorf("download aborted")
-	case err := <-done:
-		if jobInfo.Paused {
-			return fmt.Errorf("download paused")
-		}
-		if err != nil {
-			return fmt.Errorf("error executing download command: %v", err)
-		}
 	}
 
 	fmt.Println("Download completed successfully")
-	os.RemoveAll(tempDir)
 	return nil
 }
 
-func getDownloadCommand(item Item, mpdPath string, tempDir string) string {
+func getDownloadCommand(item Item, mpdPath string) string {
 	metadata := parseMetadata(item.Metadata)
 	keys := getKeys(item.Keys)
 
@@ -166,8 +132,6 @@ func getDownloadCommand(item Item, mpdPath string, tempDir string) string {
 	}
 	command += fmt.Sprintf(" --save-dir \"%s\"", saveDir)
 
-	command += fmt.Sprintf(" --tmp-dir \"%s\"", tempDir)
-
 	fmt.Println(command)
 
 	return command

go.sum

@@ -10,8 +10,6 @@ github.com/beevik/etree v1.4.1 h1:PmQJDDYahBGNKDcpdX8uPy1xRCwoCGVUiW669MEirVI=
 github.com/beevik/etree v1.4.1/go.mod h1:gPNJNaBGVZ9AwsidazFZyygnd+0pAU38N4D+WemwKNs=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pkg/exec v0.0.0-20150614095509-0bd164ad2a5a h1:EN123kAtAAE2pg/+TvBsUBZfHCWNNFyL2ZBPPfNWAc0=
-github.com/pkg/exec v0.0.0-20150614095509-0bd164ad2a5a/go.mod h1:b95YoNrAnScjaWG+asr8lxqlrsPUcT2ZEBcjvVGshMo=
 github.com/pkg/profile v1.4.0/go.mod h1:NWz/XGvpEW1FyYQ7fCx4dqYBLlfTcE+A9FLAkNKqjFE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

handlers.go

@@ -135,100 +135,3 @@ func handleProgress(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 	}
 }
-
-func handlePause(w http.ResponseWriter, r *http.Request) {
-	filename := r.URL.Query().Get("filename")
-	if filename == "" {
-		http.Error(w, "Filename is required", http.StatusBadRequest)
-		return
-	}
-
-	jobsMutex.Lock()
-	jobInfo, exists := jobs[filename]
-	jobsMutex.Unlock()
-
-	if !exists {
-		http.Error(w, "Job not found", http.StatusNotFound)
-		return
-	}
-
-	jobInfo.Paused = true
-	if jobInfo.Cmd != nil && jobInfo.Cmd.Process != nil {
-		jobInfo.Cmd.Process.Kill()
-	}
-
-	fmt.Fprintf(w, "Pause signal sent for %s", filename)
-}
-
-func handleResume(w http.ResponseWriter, r *http.Request) {
-	filename := r.URL.Query().Get("filename")
-	if filename == "" {
-		http.Error(w, "Filename is required", http.StatusBadRequest)
-		return
-	}
-
-	jobsMutex.Lock()
-	jobInfo, exists := jobs[filename]
-	jobsMutex.Unlock()
-
-	if !exists {
-		http.Error(w, "Job not found", http.StatusNotFound)
-		return
-	}
-
-	jobInfo.Paused = false
-	jobInfo.ResumeChan <- struct{}{}
-
-	fmt.Fprintf(w, "Resume signal sent for %s", filename)
-}
-
-func handleAbort(w http.ResponseWriter, r *http.Request) {
-	filename := r.URL.Query().Get("filename")
-	if filename == "" {
-		http.Error(w, "Filename is required", http.StatusBadRequest)
-		return
-	}
-
-	jobsMutex.Lock()
-	jobInfo, exists := jobs[filename]
-	jobsMutex.Unlock()
-
-	if !exists {
-		http.Error(w, "Job not found", http.StatusNotFound)
-		return
-	}
-
-	close(jobInfo.AbortChan)
-	if jobInfo.Cmd != nil && jobInfo.Cmd.Process != nil {
-		jobInfo.Cmd.Process.Kill()
-	}
-
-	if jobInfo.TempDir != "" {
-		os.RemoveAll(jobInfo.TempDir)
-	}
-
-	fmt.Fprintf(w, "Abort signal sent for %s", filename)
-}
-
-func handleClearCompleted(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodPost {
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-
-	clearCompletedJobs()
-
-	w.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(w).Encode(map[string]bool{"success": true})
-}
-
-func clearCompletedJobs() {
-	progressMutex.Lock()
-	defer progressMutex.Unlock()
-
-	for filename, info := range progress {
-		if info.Percentage >= 100 {
-			delete(progress, filename)
-		}
-	}
-}

main.go

@@ -78,10 +78,6 @@ func startWebServer() {
 	http.HandleFunc("/select", handleSelect)
 	http.HandleFunc("/process", handleProcess)
 	http.HandleFunc("/progress", handleProgress)
-	http.HandleFunc("/abort", handleAbort)
-	http.HandleFunc("/pause", handlePause)
-	http.HandleFunc("/resume", handleResume)
-	http.HandleFunc("/clear-completed", handleClearCompleted)
 
 	fmt.Println("Starting web server on http://0.0.0.0:8080")
 	http.ListenAndServe(":8080", nil)

templates/index

@@ -45,7 +45,6 @@
         ul {
             list-style-type: none;
             padding: 0;
-            margin-bottom: 10px; 
         }
         li {
             background-color: #2d2d2d;
@@ -84,25 +83,6 @@
             input[type="file"], input[type="submit"] {
                 font-size: 16px;
             }
-            input[type="submit"], #clear-completed {
-                font-size: 16px;
-            }
-        }
-        input[type="submit"], #clear-completed {
-            cursor: pointer;
-            color: white;
-            border: 1px solid #444;
-            padding: 8px 12px;
-            border-radius: 4px;
-            margin-bottom: 10px;
-            max-width: 100%;
-            width: 100%;
-        }
-        #clear-completed {
-            background-color: #f44336;
-        }
-        #clear-completed:hover {
-            background-color: #d32f2f;
         }
     </style>
 </head>
@@ -127,19 +107,5 @@
             <li>No active jobs</li>
         {{end}}
     </ul>
-    <button id="clear-completed" onclick="clearCompleted()">Clear Completed Jobs</button>
-    <script>
-        function clearCompleted() {
-            fetch('/clear-completed', { method: 'POST' })
-                .then(response => response.json())
-                .then(data => {
-                    if (data.success) {
-                        location.reload();
-                    } else {
-                        alert('Failed to clear completed jobs');
-                    }
-                });
-        }
-    </script>
 </body>
 </html>

templates/progress

@@ -56,46 +56,6 @@
             margin-top: 10px;
             word-wrap: break-word;
         }
-        #abort-button {
-            background-color: #f44336;
-            color: white;
-            border: none;
-            padding: 10px 15px;
-            margin-top: 10px;
-            border-radius: 4px;
-            cursor: pointer;
-        }
-        #abort-button:hover {
-            background-color: #d32f2f;
-        }
-        #pause-button, #resume-button {
-            background-color: #4CAF50;
-            color: white;
-            border: none;
-            padding: 10px 15px;
-            margin-top: 10px;
-            border-radius: 4px;
-            cursor: pointer;
-        }
-        #pause-button:hover, #resume-button:hover {
-            background-color: #45a049;
-        }
-        #resume-button {
-            display: none;
-        }
-        #back-button {
-            background-color: #2196F3;
-            color: white;
-            border: none;
-            padding: 10px 15px;
-            margin-top: 10px;
-            border-radius: 4px;
-            cursor: pointer;
-            float: right;
-        }
-        #back-button:hover {
-            background-color: #1976D2;
-        }
         @media (max-width: 600px) {
             body {
                 padding: 10px;
@@ -124,12 +84,6 @@
         </div>
         <div id="currentFile"></div>
     </div>
-    <div>
-        <button id="abort-button" onclick="abortDownload()">Abort Download</button>
-        <button id="pause-button" onclick="pauseDownload()">Pause Download</button>
-        <button id="resume-button" onclick="resumeDownload()">Resume Download</button>
-        <button id="back-button" onclick="window.location.href='/'">Back to Index</button>
-    </div>
     <script>
         function updateProgress() {
             fetch('/progress?filename={{.Filename}}', {
@@ -149,43 +103,6 @@
                 });
         }
         updateProgress();
-
-        function abortDownload() {
-            fetch('/abort?filename={{.Filename}}', { method: 'POST' })
-                .then(response => {
-                    if (response.ok) {
-                        console.log('Abort signal sent. The download will stop soon.');
-                    } else {
-                        alert('Failed to abort the download.');
-                    }
-                });
-        }
-
-        function pauseDownload() {
-            fetch('/pause?filename={{.Filename}}', { method: 'POST' })
-                .then(response => {
-                    if (response.ok) {
-                        console.log('Pause signal sent. The download will pause soon.');
-                        document.getElementById('pause-button').style.display = 'none';
-                        document.getElementById('resume-button').style.display = 'inline-block';
-                    } else {
-                        alert('Failed to pause the download.');
-                    }
-                });
-        }
-
-        function resumeDownload() {
-            fetch('/resume?filename={{.Filename}}', { method: 'POST' })
-                .then(response => {
-                    if (response.ok) {
-                        console.log('Resume signal sent. The download will resume soon.');
-                        document.getElementById('resume-button').style.display = 'none';
-                        document.getElementById('pause-button').style.display = 'inline-block';
-                    } else {
-                        alert('Failed to resume the download.');
-                    }
-                });
-        }
     </script>
 </body>
 </html>

utils.go

@@ -6,29 +6,13 @@ import (
 	"io"
 	"net/url"
 	"os"
-	"os/exec"
-	"path/filepath"
 	"regexp"
 	"strconv"
 	"strings"
-	"sync"
 
 	"github.com/beevik/etree"
 )
 
-type JobInfo struct {
-	AbortChan  chan struct{}
-	ResumeChan chan struct{}
-	Cmd        *exec.Cmd
-	Paused     bool
-	TempDir    string
-}
-
-var (
-	jobsMutex sync.Mutex
-	jobs      = make(map[string]*JobInfo)
-)
-
 func sanitizeFilename(filename string) string {
 	filename = regexp.MustCompile(`[<>:"/\\|?*]`).ReplaceAllString(filename, "_")
 
@@ -189,96 +173,13 @@ func filterSelectedItems(items []Item, selectedItems []string) []Item {
 }
 
 func processItems(filename string, items []Item) error {
-	jobsMutex.Lock()
+	for i, item := range items {
-	jobInfo := &JobInfo{
+		updateProgress(filename, float64(i)/float64(len(items))*100, item.Filename)
-		AbortChan:  make(chan struct{}),
+		err := downloadFile(item)
-		ResumeChan: make(chan struct{}),
+		if err != nil {
-	}
+			fmt.Printf("Error downloading file: %v\n", err)
-	jobs[filename] = jobInfo
-	jobsMutex.Unlock()
-
-	defer func() {
-		jobsMutex.Lock()
-		delete(jobs, filename)
-		jobsMutex.Unlock()
-
-		if jobInfo.TempDir != "" {
-			os.RemoveAll(jobInfo.TempDir)
-		}
-	}()
-
-	for i := 0; i < len(items); i++ {
-		select {
-		case <-jobInfo.AbortChan:
-			updateProgress(filename, 100, "Aborted")
-			return fmt.Errorf("download aborted")
-		default:
-			if jobInfo.Paused {
-				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")
-				}
-			}
-			updateProgress(filename, float64(i)/float64(len(items))*100, items[i].Filename)
-			err := downloadFile(items[i], jobInfo)
-			if err != nil {
-				if err.Error() == "download paused" {
-					removeCompletedEpisodes(filename, items[:i])
-					i--
-					continue
-				}
-				fmt.Printf("Error downloading file: %v\n", err)
-			}
 		}
 	}
 	updateProgress(filename, 100, "")
 	return nil
 }
-
-func removeCompletedEpisodes(filename string, completedItems []Item) error {
-	inputFile := filepath.Join(uploadDir, filename)
-	items, err := parseInputFile(inputFile)
-	if err != nil {
-		return fmt.Errorf("error parsing input file: %v", err)
-	}
-
-	remainingItems := make([]Item, 0)
-	for _, item := range items {
-		if !isItemCompleted(item, completedItems) || isLastCompletedItem(item, completedItems) {
-			remainingItems = append(remainingItems, item)
-		}
-	}
-
-	updatedItems := Items{Items: remainingItems}
-	jsonData, err := json.MarshalIndent(updatedItems, "", "  ")
-	if err != nil {
-		return fmt.Errorf("error marshaling updated items: %v", err)
-	}
-
-	err = os.WriteFile(inputFile, jsonData, 0644)
-	if err != nil {
-		return fmt.Errorf("error writing updated DRMD file: %v", err)
-	}
-
-	return nil
-}
-
-func isItemCompleted(item Item, completedItems []Item) bool {
-	for _, completedItem := range completedItems {
-		if item.Filename == completedItem.Filename {
-			return true
-		}
-	}
-	return false
-}
-
-func isLastCompletedItem(item Item, completedItems []Item) bool {
-	if len(completedItems) == 0 {
-		return false
-	}
-	return item.Filename == completedItems[len(completedItems)-1].Filename
-}