Compare commits

..

No commits in common. "8a63f738399f13e439b707030204abcad6197c58" and "7159bae9f7b1886117465ebcb9ecc756b2617083" have entirely different histories.

8 changed files with 12 additions and 184 deletions

View File

@ -1,7 +1,6 @@
package main
import (
"bytes"
"encoding/base64"
"fmt"
"io"
@ -10,7 +9,6 @@ import (
"os/exec"
"path/filepath"
"strings"
"time"
)
func removeBOM(input []byte) []byte {
@ -21,12 +19,11 @@ func removeBOM(input []byte) []byte {
}
func downloadFile(item Item, jobInfo *JobInfo) error {
logger.LogInfo("Download File", fmt.Sprintf("Starting download for: %s", item.Filename))
fmt.Println("Downloading:", item.Filename)
tempDir := filepath.Join(config.TempBaseDir, sanitizeFilename(item.Filename))
err := os.MkdirAll(tempDir, 0755)
if err != nil {
logger.LogError("Download File", fmt.Sprintf("Error creating temporary directory: %v", err))
return fmt.Errorf("error creating temporary directory: %v", err)
}
@ -36,23 +33,19 @@ func downloadFile(item Item, jobInfo *JobInfo) error {
if !isValidURL(item.MPD) {
decodedMPD, err := base64.StdEncoding.DecodeString(item.MPD)
if err != nil {
logger.LogError("Download File", fmt.Sprintf("Error decoding base64 MPD: %v", err))
return fmt.Errorf("error decoding base64 MPD: %v", err)
}
tempFile, err := os.CreateTemp("", "temp_mpd_*.mpd")
if err != nil {
logger.LogError("Download File", fmt.Sprintf("Error creating temporary MPD file: %v", err))
return fmt.Errorf("error creating temporary MPD file: %v", err)
}
defer os.Remove(tempFile.Name())
if _, err := tempFile.Write(decodedMPD); err != nil {
logger.LogError("Download File", fmt.Sprintf("Error writing to temporary MPD file: %v", err))
return fmt.Errorf("error writing to temporary MPD file: %v", err)
}
if err := tempFile.Close(); err != nil {
logger.LogError("Download File", fmt.Sprintf("Error closing temporary MPD file: %v", err))
return fmt.Errorf("error closing temporary MPD file: %v", err)
}
@ -60,36 +53,30 @@ func downloadFile(item Item, jobInfo *JobInfo) error {
} else if strings.HasPrefix(item.MPD, "https://pubads.g.doubleclick.net") {
resp, err := http.Get(item.MPD)
if err != nil {
logger.LogError("Download File", fmt.Sprintf("Error downloading MPD: %v", err))
return fmt.Errorf("error downloading MPD: %v", err)
}
defer resp.Body.Close()
mpdContent, err := io.ReadAll(resp.Body)
if err != nil {
logger.LogError("Download File", fmt.Sprintf("Error reading MPD content: %v", err))
return fmt.Errorf("error reading MPD content: %v", err)
}
fixedMPDContent, err := fixGoPlay(string(mpdContent))
if err != nil {
logger.LogError("Download File", fmt.Sprintf("Error fixing MPD content: %v", err))
return fmt.Errorf("error fixing MPD content: %v", err)
}
tempFile, err := os.CreateTemp("", "fixed_mpd_*.mpd")
if err != nil {
logger.LogError("Download File", fmt.Sprintf("Error creating temporary MPD file: %v", err))
return fmt.Errorf("error creating temporary MPD file: %v", err)
}
defer os.Remove(tempFile.Name())
if _, err := tempFile.WriteString(fixedMPDContent); err != nil {
logger.LogError("Download File", fmt.Sprintf("Error writing to temporary MPD file: %v", err))
return fmt.Errorf("error writing to temporary MPD file: %v", err)
}
if err := tempFile.Close(); err != nil {
logger.LogError("Download File", fmt.Sprintf("Error closing temporary MPD file: %v", err))
return fmt.Errorf("error closing temporary MPD file: %v", err)
}
@ -101,25 +88,26 @@ func downloadFile(item Item, jobInfo *JobInfo) error {
if item.Subtitles != "" {
subtitlePaths, err := downloadAndConvertSubtitles(item.Subtitles)
if err != nil {
logger.LogError("Download File", fmt.Sprintf("Error processing subtitles: %v", err))
fmt.Printf("Error processing subtitles: %v\n", err)
} else {
for _, path := range subtitlePaths {
logger.LogInfo("Download File", fmt.Sprintf("Adding subtitle: %s", path))
fmt.Println("Adding subtitle:", path)
command += fmt.Sprintf(" --mux-import \"path=%s:lang=nl:name=Nederlands\"", path)
}
}
}
cmd := exec.Command("bash", "-c", command)
jobInfo.Cmd = cmd
var outputBuffer bytes.Buffer
cmd.Stdout = io.MultiWriter(&outputBuffer)
jobsMutex.Lock()
jobInfo.Cmd = cmd
jobsMutex.Unlock()
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Start()
if err != nil {
logger.LogError("Download File", fmt.Sprintf("Error starting download command: %v", err))
return fmt.Errorf("error starting download command: %v", err)
}
@ -128,36 +116,23 @@ func downloadFile(item Item, jobInfo *JobInfo) error {
done <- cmd.Wait()
}()
go func() {
for {
if outputBuffer.Len() > 0 {
broadcast(outputBuffer.Bytes())
outputBuffer.Reset()
}
time.Sleep(1 * time.Second)
}
}()
select {
case <-jobInfo.AbortChan:
if cmd.Process != nil {
cmd.Process.Kill()
}
os.RemoveAll(tempDir)
logger.LogInfo("Download File", "Download aborted")
return fmt.Errorf("download aborted")
case err := <-done:
if jobInfo.Paused {
logger.LogInfo("Download File", "Download paused")
return fmt.Errorf("download paused")
}
if err != nil {
logger.LogError("Download File", fmt.Sprintf("Error executing download command: %v", err))
return fmt.Errorf("error executing download command: %v", err)
}
}
logger.LogInfo("Download File", "Download completed successfully")
fmt.Println("Download completed successfully")
return nil
}

View File

@ -11,7 +11,6 @@ require (
require (
github.com/asticode/go-astikit v0.20.0 // indirect
github.com/asticode/go-astits v1.8.0 // indirect
github.com/gorilla/websocket v1.5.3
golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
golang.org/x/text v0.3.2 // indirect
)

View File

@ -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/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
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=

View File

@ -9,9 +9,6 @@ import (
"os"
"path/filepath"
"strings"
"sync"
"github.com/gorilla/websocket"
)
type ProgressInfo struct {
@ -50,23 +47,19 @@ func handleRoot(w http.ResponseWriter, r *http.Request) {
}
}{jobsInfo})
if err != nil {
logger.LogError("Handle Root", fmt.Sprintf("Error executing template: %v", err))
http.Error(w, err.Error(), http.StatusInternalServerError)
}
}
func handleUpload(w http.ResponseWriter, r *http.Request) {
logger.LogInfo("Handle Upload", "Starting file upload")
err := r.ParseMultipartForm(32 << 20)
if err != nil {
logger.LogError("Handle Upload", fmt.Sprintf("Error parsing multipart form: %v", err))
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
files := r.MultipartForm.File["files"]
if len(files) == 0 {
logger.LogError("Handle Upload", "No files uploaded")
http.Error(w, "No files uploaded", http.StatusBadRequest)
return
}
@ -76,7 +69,6 @@ func handleUpload(w http.ResponseWriter, r *http.Request) {
for _, fileHeader := range files {
file, err := fileHeader.Open()
if err != nil {
logger.LogError("Handle Upload", fmt.Sprintf("Error opening file: %v", err))
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@ -84,7 +76,6 @@ func handleUpload(w http.ResponseWriter, r *http.Request) {
tempFile, err := os.CreateTemp(uploadDir, fileHeader.Filename)
if err != nil {
logger.LogError("Handle Upload", fmt.Sprintf("Error creating temporary file: %v", err))
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@ -92,7 +83,6 @@ func handleUpload(w http.ResponseWriter, r *http.Request) {
_, err = io.Copy(tempFile, file)
if err != nil {
logger.LogError("Handle Upload", fmt.Sprintf("Error copying file: %v", err))
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@ -101,7 +91,6 @@ func handleUpload(w http.ResponseWriter, r *http.Request) {
_, err = parseInputFile(tempFile.Name())
if err != nil {
logger.LogError("Handle Upload", fmt.Sprintf("Error parsing input file: %v", err))
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@ -115,12 +104,10 @@ func handleUpload(w http.ResponseWriter, r *http.Request) {
}
if len(validFiles) == 0 {
logger.LogError("Handle Upload", "No valid files were uploaded")
http.Error(w, "No valid files were uploaded", http.StatusBadRequest)
return
}
logger.LogInfo("Handle Upload", fmt.Sprintf("Redirecting to select with files: %v", validFiles))
http.Redirect(w, r, "/select?files="+url.QueryEscape(strings.Join(validFiles, ",")), http.StatusSeeOther)
}
@ -137,13 +124,11 @@ func handleSelect(w http.ResponseWriter, r *http.Request) {
fullPath := filepath.Join(uploadDir, filename)
if _, err := os.Stat(fullPath); os.IsNotExist(err) {
logger.LogError("Handle Select", fmt.Sprintf("File does not exist: %s", fullPath))
continue
}
items, err := parseInputFile(fullPath)
if err != nil {
logger.LogError("Handle Select", fmt.Sprintf("Error parsing input file: %v", err))
continue
}
@ -154,7 +139,6 @@ func handleSelect(w http.ResponseWriter, r *http.Request) {
}
if len(allItems) == 0 {
logger.LogError("Handle Select", "No valid files were processed")
http.Error(w, "No valid files were processed", http.StatusBadRequest)
return
}
@ -167,22 +151,18 @@ func handleSelect(w http.ResponseWriter, r *http.Request) {
AllItems: allItems,
})
if err != nil {
logger.LogError("Handle Select", fmt.Sprintf("Error executing template: %v", err))
http.Error(w, err.Error(), http.StatusInternalServerError)
}
}
func handleProcess(w http.ResponseWriter, r *http.Request) {
logger.LogInfo("Handle Process", "Starting process")
if err := r.ParseForm(); err != nil {
logger.LogError("Handle Process", fmt.Sprintf("Error parsing form: %v", err))
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
selectedItems := r.Form["items"]
if len(selectedItems) == 0 {
logger.LogError("Handle Process", "No items selected")
http.Error(w, "No items selected", http.StatusBadRequest)
return
}
@ -191,7 +171,6 @@ func handleProcess(w http.ResponseWriter, r *http.Request) {
for _, item := range selectedItems {
parts := strings.SplitN(item, ":", 2)
if len(parts) != 2 {
logger.LogError("Handle Process", "Invalid item format")
continue
}
filename, itemName := parts[0], parts[1]
@ -199,11 +178,9 @@ func handleProcess(w http.ResponseWriter, r *http.Request) {
}
for filename, items := range itemsByFile {
logger.LogInfo("Handle Process", fmt.Sprintf("Processing file: %s", filename))
fullPath := filepath.Join(uploadDir, filename)
allItems, err := parseInputFile(fullPath)
if err != nil {
logger.LogError("Handle Process", fmt.Sprintf("Error parsing input file: %v", err))
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@ -246,7 +223,6 @@ func handleProgress(w http.ResponseWriter, r *http.Request) {
func handlePause(w http.ResponseWriter, r *http.Request) {
filename := r.URL.Query().Get("filename")
if filename == "" {
logger.LogError("Pause Handler", "Filename is required")
http.Error(w, "Filename is required", http.StatusBadRequest)
return
}
@ -256,14 +232,12 @@ func handlePause(w http.ResponseWriter, r *http.Request) {
jobsMutex.Unlock()
if !exists {
logger.LogError("Pause Handler", "Job not found")
http.Error(w, "Job not found", http.StatusNotFound)
return
}
jobInfo.Paused = true
if jobInfo.Cmd != nil && jobInfo.Cmd.Process != nil {
logger.LogJobState(filename, "pausing")
jobInfo.Cmd.Process.Kill()
}
@ -380,42 +354,3 @@ func updateProgress(filename string, value float64, currentFile string) {
}
}
}
var upgrader = websocket.Upgrader{}
var clients = make(map[*websocket.Conn]bool)
var mu sync.Mutex
func handleWebSocket(w http.ResponseWriter, r *http.Request) {
conn, err := upgrader.Upgrade(w, r, nil)
if err != nil {
fmt.Println("Error while upgrading connection:", err)
return
}
defer conn.Close()
mu.Lock()
clients[conn] = true
mu.Unlock()
for {
if _, _, err := conn.NextReader(); err != nil {
break
}
}
mu.Lock()
delete(clients, conn)
mu.Unlock()
}
func broadcast(message []byte) {
mu.Lock()
defer mu.Unlock()
for client := range clients {
if err := client.WriteMessage(websocket.TextMessage, message); err != nil {
client.Close()
delete(clients, client)
}
}
}

View File

@ -1,36 +0,0 @@
package main
import (
"log"
"os"
)
type Logger struct {
*log.Logger
}
const (
Reset = "\033[0m"
Red = "\033[31m"
Green = "\033[32m"
Yellow = "\033[33m"
Blue = "\033[34m"
)
func NewLogger(prefix string) *Logger {
return &Logger{
Logger: log.New(os.Stdout, prefix, log.Ldate|log.Ltime|log.Lshortfile),
}
}
func (l *Logger) LogInfo(jobName, message string) {
l.Printf("%s[INFO] [%s] %s%s", Green, jobName, message, Reset)
}
func (l *Logger) LogError(jobName, message string) {
l.Printf("%s[ERROR] [%s] %s%s", Red, jobName, message, Reset)
}
func (l *Logger) LogJobState(jobName, state string) {
l.Printf("%s[JOB STATE] [%s] %s%s", Yellow, jobName, state, Reset)
}

View File

@ -12,8 +12,6 @@ import (
"embed"
)
var logger *Logger
type Item struct {
MPD string
Keys string
@ -50,8 +48,6 @@ func init() {
}
templates = template.Must(template.ParseFS(templateFS, "templates/*"))
logger = NewLogger("")
}
func main() {
@ -64,7 +60,7 @@ func main() {
} else {
items, err := parseInputFile(*inputFile)
if err != nil {
logger.LogError("Main", fmt.Sprintf("Error parsing input file: %v", err))
fmt.Printf("Error parsing input file: %v\n", err)
return
}
processItems(*inputFile, items)
@ -81,7 +77,6 @@ func startWebServer() {
http.HandleFunc("/pause", handlePause)
http.HandleFunc("/resume", handleResume)
http.HandleFunc("/clear-completed", handleClearCompleted)
http.HandleFunc("/ws", handleWebSocket)
fmt.Println("Starting web server on http://0.0.0.0:8080")
http.ListenAndServe(":8080", nil)

View File

@ -15,16 +15,13 @@ func downloadAndConvertSubtitles(subtitlesURLs string) ([]string, error) {
urls := strings.Split(subtitlesURLs, ",")
for _, url := range urls {
logger.LogInfo("Subtitle Download", fmt.Sprintf("Downloading subtitle from %s", url))
vttPath, err := downloadSubtitle(url)
if err != nil {
logger.LogError("Subtitle Download", fmt.Sprintf("Error downloading subtitle: %v", err))
return nil, fmt.Errorf("error downloading subtitle: %v", err)
}
srtPath, err := convertVTTtoSRT(vttPath)
if err != nil {
logger.LogError("Subtitle Download", fmt.Sprintf("Error converting subtitle: %v", err))
return nil, fmt.Errorf("error converting subtitle: %v", err)
}
@ -35,28 +32,23 @@ func downloadAndConvertSubtitles(subtitlesURLs string) ([]string, error) {
}
func downloadSubtitle(url string) (string, error) {
logger.LogInfo("Download Subtitle", fmt.Sprintf("Starting download from %s", url))
resp, err := http.Get(url)
if err != nil {
logger.LogError("Download Subtitle", fmt.Sprintf("Error getting subtitle URL: %v", err))
return "", err
}
defer resp.Body.Close()
tempFile, err := os.CreateTemp("", "subtitle_*.vtt")
if err != nil {
logger.LogError("Download Subtitle", fmt.Sprintf("Error creating temp file: %v", err))
return "", err
}
defer tempFile.Close()
_, err = io.Copy(tempFile, resp.Body)
if err != nil {
logger.LogError("Download Subtitle", fmt.Sprintf("Error copying to temp file: %v", err))
return "", err
}
logger.LogInfo("Download Subtitle", "Subtitle downloaded successfully")
return tempFile.Name(), nil
}
@ -64,6 +56,5 @@ func convertVTTtoSRT(vttPath string) (string, error) {
srtPath := strings.TrimSuffix(vttPath, ".vtt") + ".srt"
s1, _ := astisub.OpenFile(vttPath)
s1.Write(srtPath)
logger.LogInfo("Convert VTT to SRT", fmt.Sprintf("Converted %s to %s", vttPath, srtPath))
return srtPath, nil
}

View File

@ -68,7 +68,7 @@
#abort-button:hover {
background-color: #d32f2f;
}
#pause-button, #resume-button, #toggle-console {
#pause-button, #resume-button {
background-color: #4CAF50;
color: white;
border: none;
@ -77,7 +77,7 @@
border-radius: 4px;
cursor: pointer;
}
#pause-button:hover, #resume-button:hover, #toggle-console:hover {
#pause-button:hover, #resume-button:hover {
background-color: #45a049;
}
#resume-button {
@ -96,17 +96,6 @@
#back-button:hover {
background-color: #1976D2;
}
#console {
display: none; /* Initially hidden */
background-color: black;
color: white;
height: 300px; /* Adjust height as needed */
overflow-y: scroll;
white-space: pre; /* Preserve whitespace */
font-family: monospace; /* Use monospace font */
margin-top: 10px;
border: 1px solid #ccc;
}
@media (max-width: 600px) {
body {
padding: 10px;
@ -139,10 +128,8 @@
<button id="abort-button" onclick="abortDownload()">Abort Download</button>
<button id="pause-button" onclick="pauseDownload()">Pause Download</button>
<button id="resume-button" onclick="resumeDownload()" style="display: none;">Resume Download</button>
<button id="toggle-console">Toggle Console View</button>
<button id="back-button" onclick="window.location.href='/'">Back to Index</button>
</div>
<div style="display: none;" id="console"></div>
<script>
let isPaused = false;
@ -216,22 +203,6 @@
});
}
const consoleDiv = document.getElementById('console');
const ws = new WebSocket(`ws://${window.location.host}/ws`);
ws.onmessage = function(event) {
consoleDiv.textContent += event.data;
consoleDiv.scrollTop = consoleDiv.scrollHeight;
};
document.getElementById('toggle-console').onclick = function() {
if (consoleDiv.style.display === "none") {
consoleDiv.style.display = "block";
} else {
consoleDiv.style.display = "none";
}
};
updateProgress();
</script>
</body>