properly use createtemp for the uploaded files

README.md

@@ -39,7 +39,7 @@ To process a file directly from the command line:
 This will download the file and save it in the base directory specified in the config.
 
 ## TODO
-- Filename Sanitation (Makes new directory on /... oops)
-- GoPlay Fix
+- ~~Filename Sanitation (Makes new directory on /... oops)~~
+- ~~GoPlay Fix~~
 - Windows?
 - Proper UI?

downloaders.go

@@ -5,9 +5,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 )
 
 func processInputFile(inputFile string) error {
@@ -22,6 +24,8 @@ func processInputFile(inputFile string) error {
 		return fmt.Errorf("error reading file %s: %v", inputFile, err)
 	}
 
+	byteValue = removeBOM(byteValue)
+
 	var items Items
 	err = json.Unmarshal(byteValue, &items)
 	if err != nil {
@@ -40,12 +44,18 @@ func processInputFile(inputFile string) error {
 	return nil
 }
 
+func removeBOM(input []byte) []byte {
+	if len(input) >= 3 && input[0] == 0xEF && input[1] == 0xBB && input[2] == 0xBF {
+		return input[3:]
+	}
+	return input
+}
+
 func downloadFile(item Item) error {
 	fmt.Println("Downloading:", item.Filename)
 
 	mpdPath := item.MPD
 	if !isValidURL(item.MPD) {
-
 		decodedMPD, err := base64.StdEncoding.DecodeString(item.MPD)
 		if err != nil {
 			return fmt.Errorf("error decoding base64 MPD: %v", err)
@@ -64,6 +74,37 @@ func downloadFile(item Item) error {
 			return fmt.Errorf("error closing temporary MPD file: %v", err)
 		}
 
+		mpdPath = tempFile.Name()
+	} else if strings.HasPrefix(item.MPD, "https://pubads.g.doubleclick.net") {
+		resp, err := http.Get(item.MPD)
+		if err != nil {
+			return fmt.Errorf("error downloading MPD: %v", err)
+		}
+		defer resp.Body.Close()
+
+		mpdContent, err := io.ReadAll(resp.Body)
+		if err != nil {
+			return fmt.Errorf("error reading MPD content: %v", err)
+		}
+
+		fixedMPDContent, err := fixGoPlay(string(mpdContent))
+		if err != nil {
+			return fmt.Errorf("error fixing MPD content: %v", err)
+		}
+
+		tempFile, err := os.CreateTemp("", "fixed_mpd_*.mpd")
+		if err != nil {
+			return fmt.Errorf("error creating temporary MPD file: %v", err)
+		}
+		defer os.Remove(tempFile.Name())
+
+		if _, err := tempFile.WriteString(fixedMPDContent); err != nil {
+			return fmt.Errorf("error writing to temporary MPD file: %v", err)
+		}
+		if err := tempFile.Close(); err != nil {
+			return fmt.Errorf("error closing temporary MPD file: %v", err)
+		}
+
 		mpdPath = tempFile.Name()
 	}
 

go.mod

@@ -2,11 +2,14 @@ module DRMDTool
 
 go 1.23.0
 
-require github.com/BurntSushi/toml v1.4.0
+require (
+	github.com/BurntSushi/toml v1.4.0
+	github.com/asticode/go-astisub v0.26.2
+	github.com/beevik/etree v1.4.1
+)
 
 require (
 	github.com/asticode/go-astikit v0.20.0 // indirect
-	github.com/asticode/go-astisub v0.26.2 // indirect
 	github.com/asticode/go-astits v1.8.0 // indirect
 	golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
 	golang.org/x/text v0.3.2 // indirect

go.sum

@@ -6,10 +6,15 @@ github.com/asticode/go-astisub v0.26.2 h1:cdEXcm+SUSmYCEPTQYbbfCECnmQoIFfH6pF8wD
 github.com/asticode/go-astisub v0.26.2/go.mod h1:WTkuSzFB+Bp7wezuSf2Oxulj5A8zu2zLRVFf6bIFQK8=
 github.com/asticode/go-astits v1.8.0 h1:rf6aiiGn/QhlFjNON1n5plqF3Fs025XLUwiQ0NB6oZg=
 github.com/asticode/go-astits v1.8.0/go.mod h1:DkOWmBNQpnr9mv24KfZjq4JawCFX1FCqjLVGvO0DygQ=
+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/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=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -24,4 +29,5 @@ golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

handlers.go

@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"time"
 )
 
 func handleRoot(w http.ResponseWriter, r *http.Request) {
@@ -37,32 +36,31 @@ func handleUpload(w http.ResponseWriter, r *http.Request) {
 	}
 	defer file.Close()
 
-	filename := fmt.Sprintf("%d_%s", time.Now().UnixNano(), header.Filename)
-	filepath := filepath.Join(uploadDir, filename)
-
-	newFile, err := os.Create(filepath)
+	tempFile, err := os.CreateTemp(uploadDir, header.Filename)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	defer newFile.Close()
+	defer tempFile.Close()
 
-	_, err = io.Copy(newFile, file)
+	_, err = io.Copy(tempFile, file)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 
+	tempFilename := filepath.Base(tempFile.Name())
+
 	go func() {
-		err := processInputFile(filepath)
+		err := processInputFile(tempFile.Name())
 		if err != nil {
 			fmt.Printf("Error processing file: %v\n", err)
 		}
 
-		os.Remove(filepath)
+		os.Remove(tempFile.Name())
 	}()
 
-	http.Redirect(w, r, "/progress?filename="+filename, http.StatusSeeOther)
+	http.Redirect(w, r, "/progress?filename="+tempFilename, http.StatusSeeOther)
 }
 
 func handleProgress(w http.ResponseWriter, r *http.Request) {

templates/index

@@ -1,5 +1,91 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Simple Downloader</title>
+    <style>
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
+            background-color: #1e1e1e;
+            color: #d4d4d4;
+            line-height: 1.6;
+            padding: 20px;
+            max-width: 800px;
+            margin: 0 auto;
+            box-sizing: border-box;
+        }
+        h1, h2 {
+            border-bottom: 1px solid #333;
+            padding-bottom: 10px;
+            word-wrap: break-word;
+        }
+        form {
+            margin-bottom: 20px;
+            display: flex;
+            flex-direction: column;
+        }
+        input[type="file"], input[type="submit"] {
+            background-color: #2d2d2d;
+            color: #d4d4d4;
+            border: 1px solid #444;
+            padding: 8px 12px;
+            border-radius: 4px;
+            margin-bottom: 10px;
+            max-width: 100%;
+        }
+        input[type="submit"] {
+            cursor: pointer;
+            background-color: #4CAF50;
+            color: white;
+        }
+        input[type="submit"]:hover {
+            background-color: #45a049;
+        }
+        ul {
+            list-style-type: none;
+            padding: 0;
+        }
+        li {
+            background-color: #2d2d2d;
+            margin-bottom: 10px;
+            padding: 10px;
+            border-radius: 4px;
+            word-wrap: break-word;
+        }
+        .job-title {
+            font-size: 1.1em;
+            font-weight: bold;
+            margin-bottom: 5px;
+        }
+        .job-title a {
+            color: #58a6ff;
+            text-decoration: none;
+        }
+        .job-title a:hover {
+            text-decoration: underline;
+        }
+        .job-info {
+            font-size: 0.9em;
+            color: #a0a0a0;
+        }
+        .progress-text {
+            display: inline-block;
+            width: 5em;
+        }
+        @media (max-width: 600px) {
+            body {
+                padding: 10px;
+            }
+            h1, h2 {
+                font-size: 1.5em;
+            }
+            input[type="file"], input[type="submit"] {
+                font-size: 16px;
+            }
+        }
+    </style>
+</head>
 <body>
     <h1>Simple Downloader</h1>
     <form action="/upload" method="post" enctype="multipart/form-data">
@@ -10,9 +96,12 @@
     <ul>
         {{range $filename, $info := .Jobs}}
             <li>
-                <a href="/progress?filename={{$filename}}">{{$filename}}</a>: 
-                {{printf "%.2f%%" $info.Percentage}}
-                (Current file: {{$info.CurrentFile}})
+                <div class="job-title">
+                    <a href="/progress?filename={{$filename}}">{{$filename}}</a>
+                </div>
+                <div class="job-info">
+                    Progress: <span class="progress-text">{{printf "%5.1f%%" $info.Percentage}}</span> Current file: {{$info.CurrentFile}}
+                </div>
             </li>
         {{else}}
             <li>No active jobs</li>

templates/progress

@@ -1,9 +1,89 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Processing {{.Filename}}</title>
+    <style>
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
+            background-color: #1e1e1e;
+            color: #d4d4d4;
+            line-height: 1.6;
+            padding: 20px;
+            max-width: 800px;
+            margin: 0 auto;
+            box-sizing: border-box;
+        }
+        h1 {
+            border-bottom: 1px solid #333;
+            padding-bottom: 10px;
+            word-wrap: break-word;
+        }
+        #progress-container {
+            background-color: #2d2d2d;
+            border-radius: 4px;
+            margin-bottom: 20px;
+            padding: 20px;
+        }
+        #progress-bar-container {
+            background-color: #444;
+            height: 20px;
+            border-radius: 10px;
+            overflow: hidden;
+            margin-bottom: 10px;
+            position: relative;
+        }
+        #progress-bar {
+            background-color: #4CAF50;
+            height: 100%;
+            width: 0;
+            transition: width 0.5s ease-in-out;
+        }
+        #progress-text {
+            position: absolute;
+            top: 50%;
+            left: 0;
+            right: 0;
+            transform: translateY(-50%);
+            text-align: center;
+            color: #fff;
+            font-weight: bold;
+            text-shadow: 1px 1px 2px rgba(0,0,0,0.5);
+            line-height: 20px;
+        }
+        #currentFile {
+            margin-top: 10px;
+            word-wrap: break-word;
+        }
+        @media (max-width: 600px) {
+            body {
+                padding: 10px;
+            }
+            h1 {
+                font-size: 1.5em;
+            }
+            #progress-container {
+                padding: 10px;
+            }
+            #progress-bar-container {
+                height: 15px;
+            }
+            #progress-text {
+                font-size: 0.9em;
+            }
+        }
+    </style>
+</head>
 <body>
     <h1>Processing {{.Filename}}</h1>
-    <div id="progress">0%</div>
-    <div id="currentFile"></div>
+    <div id="progress-container">
+        <div id="progress-bar-container">
+            <div id="progress-bar"></div>
+            <div id="progress-text">0%</div>
+        </div>
+        <div id="currentFile"></div>
+    </div>
     <script>
         function updateProgress() {
             fetch('/progress?filename={{.Filename}}', {
@@ -14,7 +94,8 @@
                 .then(response => response.json())
                 .then(data => {
                     const progress = Math.round(data.Percentage);
-                    document.getElementById('progress').innerText = progress + '%';
+                    document.getElementById('progress-bar').style.width = progress + '%';
+                    document.getElementById('progress-text').innerText = progress + '%';
                     document.getElementById('currentFile').innerText = 'Current file: ' + (data.CurrentFile || 'None');
                     if (progress < 100) {
                         setTimeout(updateProgress, 1000);

utils.go

@@ -1,9 +1,13 @@
 package main
 
 import (
+	"fmt"
 	"net/url"
 	"regexp"
+	"strconv"
 	"strings"
+
+	"github.com/beevik/etree"
 )
 
 func sanitizeFilename(filename string) string {
@@ -18,3 +22,99 @@ func isValidURL(toTest string) bool {
 	_, err := url.ParseRequestURI(toTest)
 	return err == nil
 }
+
+func fixGoPlay(mpdContent string) (string, error) {
+	doc := etree.NewDocument()
+	if err := doc.ReadFromString(mpdContent); err != nil {
+		return "", fmt.Errorf("error parsing MPD content: %v", err)
+	}
+
+	root := doc.Root()
+
+	// Remove ad periods
+	for _, period := range root.SelectElements("Period") {
+		if strings.Contains(period.SelectAttrValue("id", ""), "-ad-") {
+			root.RemoveChild(period)
+		}
+	}
+
+	// Find highest bandwidth for video
+	highestBandwidth := 0
+	for _, adaptationSet := range root.FindElements("//AdaptationSet") {
+		if strings.Contains(adaptationSet.SelectAttrValue("mimeType", ""), "video") {
+			for _, representation := range adaptationSet.SelectElements("Representation") {
+				bandwidth, _ := strconv.Atoi(representation.SelectAttrValue("bandwidth", "0"))
+				if bandwidth > highestBandwidth {
+					highestBandwidth = bandwidth
+				}
+			}
+		}
+	}
+
+	// Remove lower bitrate representations
+	for _, adaptationSet := range root.FindElements("//AdaptationSet") {
+		if strings.Contains(adaptationSet.SelectAttrValue("mimeType", ""), "video") {
+			for _, representation := range adaptationSet.SelectElements("Representation") {
+				bandwidth, _ := strconv.Atoi(representation.SelectAttrValue("bandwidth", "0"))
+				if bandwidth != highestBandwidth {
+					adaptationSet.RemoveChild(representation)
+				}
+			}
+		}
+	}
+
+	// Combine periods
+	periods := root.SelectElements("Period")
+	if len(periods) > 1 {
+		firstPeriod := periods[0]
+		var newVideoTimeline, newAudioTimeline *etree.Element
+
+		// Find or create SegmentTimeline elements
+		for _, adaptationSet := range firstPeriod.SelectElements("AdaptationSet") {
+			mimeType := adaptationSet.SelectAttrValue("mimeType", "")
+			if strings.Contains(mimeType, "video") && newVideoTimeline == nil {
+				newVideoTimeline = findOrCreateSegmentTimeline(adaptationSet)
+			} else if strings.Contains(mimeType, "audio") && newAudioTimeline == nil {
+				newAudioTimeline = findOrCreateSegmentTimeline(adaptationSet)
+			}
+		}
+
+		for _, period := range periods[1:] {
+			for _, adaptationSet := range period.SelectElements("AdaptationSet") {
+				mimeType := adaptationSet.SelectAttrValue("mimeType", "")
+				var timeline *etree.Element
+				if strings.Contains(mimeType, "video") {
+					timeline = newVideoTimeline
+				} else if strings.Contains(mimeType, "audio") {
+					timeline = newAudioTimeline
+				}
+
+				if timeline != nil {
+					segmentTimeline := findOrCreateSegmentTimeline(adaptationSet)
+					for _, s := range segmentTimeline.SelectElements("S") {
+						timeline.AddChild(s.Copy())
+					}
+				}
+			}
+			root.RemoveChild(period)
+		}
+	}
+
+	return doc.WriteToString()
+}
+
+func findOrCreateSegmentTimeline(adaptationSet *etree.Element) *etree.Element {
+	for _, representation := range adaptationSet.SelectElements("Representation") {
+		for _, segmentTemplate := range representation.SelectElements("SegmentTemplate") {
+			timeline := segmentTemplate.SelectElement("SegmentTimeline")
+			if timeline != nil {
+				return timeline
+			}
+		}
+	}
+
+	// If no SegmentTimeline found, create one
+	representation := adaptationSet.CreateElement("Representation")
+	segmentTemplate := representation.CreateElement("SegmentTemplate")
+	return segmentTemplate.CreateElement("SegmentTimeline")
+}