Joren/DRMDTool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Compare commits

base: Joren:main
Branches Tags
Joren:main
Joren:v1.0.7
Joren:v1.0.6
Joren:v1.0.5
Joren:v1.0.4
Joren:v1.0.3
Joren:v1.0.2
Joren:v1.0.1
Joren:v1.0.0
..
compare: Joren:v1.0.5
Branches Tags
Joren:main
Joren:v1.0.7
Joren:v1.0.6
Joren:v1.0.5
Joren:v1.0.4
Joren:v1.0.3
Joren:v1.0.2
Joren:v1.0.1
Joren:v1.0.0

No commits in common. "main" and "v1.0.5" have entirely different histories.
main ... v1.0.5

21 changed files with 78 additions and 822 deletions
Show Stats Expand all files Collapse all files

40
Makefile
View File

@ -1,40 +0,0 @@
GOCMD=go
GOBUILD=$(GOCMD) build
GOCLEAN=$(GOCMD) clean
GOTEST=$(GOCMD) test
GOGET=$(GOCMD) get
BINARY_NAME=drmdtool
SRC_DIR=src
all: test build
build:
cd $(SRC_DIR) && $(GOBUILD) -o ../$(BINARY_NAME) -v
test:
cd $(SRC_DIR) && $(GOTEST) -v ./...
clean:
$(GOCLEAN)
rm -f $(BINARY_NAME)
run:
cd $(SRC_DIR) && $(GOBUILD) -o ../$(BINARY_NAME) -v
./$(BINARY_NAME)
deps:
$(GOGET) github.com/BurntSushi/toml
$(GOGET) github.com/beevik/etree
$(GOGET) github.com/asticode/go-astisub
# Cross compilation
build-linux:
cd $(SRC_DIR) && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GOBUILD) -o ../$(BINARY_NAME)_linux -v
build-windows:
cd $(SRC_DIR) && CGO_ENABLED=0 GOOS=windows GOARCH=amd64 $(GOBUILD) -o ../$(BINARY_NAME).exe -v
build-mac:
cd $(SRC_DIR) && CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 $(GOBUILD) -o ../$(BINARY_NAME)_mac -v
.PHONY: all build test clean run deps build-linux build-windows build-mac

55
README.md
View File

@ -7,51 +7,15 @@ drmdtool is a utility for processing .drmd files using N_m3u8DL-RE.
Create a `config.toml` file in the same directory as the drmdtool executable: Create a `config.toml` file in the same directory as the drmdtool executable:
```toml ```toml
[General]
BaseDir = "/path/to/save/downloads" BaseDir = "/path/to/save/downloads"
Format = "mkv" Format = "mkv"
TempBaseDir = "/tmp/nre" TempBaseDir = "/tmp/nre"
EnableConsole = true
[WatchFolder] [N_m3u8DL-RE]
Path = "/path/to/watched/folder"
PollingInterval = 10
UsePolling = true
UseInotify = false
[N_m3u8DLRE]
Path = "/path/to/N_m3u8DL-RE" Path = "/path/to/N_m3u8DL-RE"
``` ```
### Configuration Options Adjust the paths and format as needed. (mkv, mp4)
- **General**
- `BaseDir`: Directory where downloaded files will be saved.
- `Format`: Output format for the downloaded files (e.g., `mkv`, `mp4`).
- `TempBaseDir`: Temporary directory for intermediate files.
- `EnableConsole`: Boolean to enable or disable console output.
- **WatchFolder**
- `Path`: Directory to watch for new `.drmd` files.
- `PollingInterval`: Interval in seconds for polling the watch folder.
- `UsePolling`: Boolean to enable or disable folder polling.
- `UseInotify`: Boolean to enable or disable inotify for file watching.
- **N_m3u8DLRE**
- `Path`: Path to the N_m3u8DL-RE executable.
### Environment Variable Overrides
You can override the configuration options using environment variables. The following environment variables are supported:
- `BASE_DIR`: Overrides `General.BaseDir`
- `FORMAT`: Overrides `General.Format`
- `TEMP_BASE_DIR`: Overrides `General.TempBaseDir`
- `ENABLE_CONSOLE`: Overrides `General.EnableConsole` (set to `true` or `false`)
- `WATCHED_FOLDER`: Overrides `WatchFolder.Path`
- `USE_POLLING`: Overrides `WatchFolder.UsePolling` (set to `true` or `false`)
- `USE_INOTIFY`: Overrides `WatchFolder.UseInotify` (set to `true` or `false`)
- `POLLING_INTERVAL`: Overrides `WatchFolder.PollingInterval`
## Web UI Usage ## Web UI Usage
@ -64,6 +28,7 @@ You can override the configuration options using environment variables. The foll
3. Use the interface to upload .drmd files and monitor download progress 3. Use the interface to upload .drmd files and monitor download progress
## CLI Usage ## CLI Usage
To process a file directly from the command line: To process a file directly from the command line:
@ -73,17 +38,3 @@ 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. This will download the file and save it in the base directory specified in the config.
# Previews
## Index Page
![Index Page](images/index.png)
## Select Page
![Select Page](images/select.png)
## Progress Page
![Progress Page](images/progress.png)

42
config.go Normal file
View File

@ -0,0 +1,42 @@
package main
import (
"fmt"
"io"
"os"
"github.com/BurntSushi/toml"
)
type Config struct {
BaseDir string
Format string
TempBaseDir string
N_m3u8DLRE struct {
Path string
}
}
var config Config
func loadConfig() {
configFile, err := os.Open("config.toml")
if err != nil {
fmt.Println("Error opening config file:", err)
return
}
defer configFile.Close()
byteValue, _ := io.ReadAll(configFile)
if _, err := toml.Decode(string(byteValue), &config); err != nil {
fmt.Println("Error decoding config file:", err)
return
}
if config.N_m3u8DLRE.Path == "" {
fmt.Println("Error: N_m3u8DL-RE path is not specified in the config file")
return
}
}

8
config.toml
View File

@ -1,14 +1,6 @@
[General]
BaseDir = "/mnt/media" BaseDir = "/mnt/media"
Format = "mkv" Format = "mkv"
TempBaseDir = "/tmp/nre" TempBaseDir = "/tmp/nre"
EnableConsole = true
[WatchFolder]
Path = "/mnt/watched"
PollingInterval = 10
UsePolling = false
UseInotify = true
[N_m3u8DLRE] [N_m3u8DLRE]
Path = "nre" Path = "nre"

55
src/downloaders.go → downloaders.go
View File

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

4
src/go.mod → go.mod
View File

@ -8,13 +8,9 @@ require (
github.com/beevik/etree v1.4.1 github.com/beevik/etree v1.4.1
) )
require golang.org/x/sys v0.4.0 // indirect
require ( require (
github.com/asticode/go-astikit v0.20.0 // indirect github.com/asticode/go-astikit v0.20.0 // indirect
github.com/asticode/go-astits v1.8.0 // indirect github.com/asticode/go-astits v1.8.0 // indirect
github.com/fsnotify/fsnotify v1.7.0
github.com/gorilla/websocket v1.5.3
golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
golang.org/x/text v0.3.2 // indirect golang.org/x/text v0.3.2 // indirect
) )

6
src/go.sum → go.sum
View File

@ -10,10 +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/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 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
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 h1:EN123kAtAAE2pg/+TvBsUBZfHCWNNFyL2ZBPPfNWAc0=
github.com/pkg/exec v0.0.0-20150614095509-0bd164ad2a5a/go.mod h1:b95YoNrAnScjaWG+asr8lxqlrsPUcT2ZEBcjvVGshMo= 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/pkg/profile v1.4.0/go.mod h1:NWz/XGvpEW1FyYQ7fCx4dqYBLlfTcE+A9FLAkNKqjFE=
@ -30,8 +26,6 @@ golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81R
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= 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/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

92
src/handlers.go → handlers.go
View File

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

BIN
images/index.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
images/progress.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
images/select.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 41 KiB

10
src/main.go → main.go
View File

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

144
src/config.go
View File

@ -1,144 +0,0 @@
package main
import (
"fmt"
"io"
"os"
"strconv"
"strings"
"github.com/BurntSushi/toml"
)
type Config struct {
General struct {
BaseDir string
Format string
TempBaseDir string
EnableConsole bool
}
WatchFolder struct {
Path string
UsePolling bool
UseInotify bool
PollingInterval int
}
N_m3u8DLRE struct {
Path string
}
}
var config Config
func loadConfig() {
configFile, err := os.Open("config.toml")
if err != nil {
logger.LogError("Config", fmt.Sprintf("Error opening config file: %v", err))
os.Exit(1)
}
defer configFile.Close()
byteValue, _ := io.ReadAll(configFile)
if _, err := toml.Decode(string(byteValue), &config); err != nil {
logger.LogError("Config", fmt.Sprintf("Error decoding config file: %v", err))
os.Exit(1)
}
overrideConfigWithEnv()
if err := validatePaths(); err != nil {
logger.LogError("Config", fmt.Sprintf("Configuration error: %v", err))
os.Exit(1)
}
if config.WatchFolder.PollingInterval <= 0 {
config.WatchFolder.PollingInterval = 10
}
logConfig()
}
func overrideConfigWithEnv() {
if envBaseDir := os.Getenv("BASE_DIR"); envBaseDir != "" {
config.General.BaseDir = envBaseDir
}
if envFormat := os.Getenv("FORMAT"); envFormat != "" {
config.General.Format = envFormat
}
if envTempBaseDir := os.Getenv("TEMP_BASE_DIR"); envTempBaseDir != "" {
config.General.TempBaseDir = envTempBaseDir
}
if envEnableConsole := os.Getenv("ENABLE_CONSOLE"); envEnableConsole != "" {
config.General.EnableConsole = strings.ToLower(envEnableConsole) == "true"
}
if envWatchedFolder := os.Getenv("WATCHED_FOLDER"); envWatchedFolder != "" {
config.WatchFolder.Path = envWatchedFolder
}
if envUsePolling := os.Getenv("USE_POLLING"); envUsePolling != "" {
config.WatchFolder.UsePolling = strings.ToLower(envUsePolling) == "true"
}
if envUseInotify := os.Getenv("USE_INOTIFY"); envUseInotify != "" {
config.WatchFolder.UseInotify = strings.ToLower(envUseInotify) == "true"
}
if envPollingInterval := os.Getenv("POLLING_INTERVAL"); envPollingInterval != "" {
if interval, err := strconv.Atoi(envPollingInterval); err == nil {
config.WatchFolder.PollingInterval = interval
}
}
}
func validatePaths() error {
paths := []struct {
name string
path string
}{
{"BaseDir", config.General.BaseDir},
}
for _, p := range paths {
if p.path == "" {
return fmt.Errorf("%s is not specified", p.name)
}
if _, err := os.Stat(p.path); os.IsNotExist(err) {
return fmt.Errorf("%s does not exist: %s", p.name, p.path)
} else if err != nil {
return fmt.Errorf("error accessing %s: %v", p.name, err)
}
}
if config.WatchFolder.UsePolling || config.WatchFolder.UseInotify {
if config.WatchFolder.Path == "" {
return fmt.Errorf("WatchedFolder is not specified")
}
if _, err := os.Stat(config.WatchFolder.Path); os.IsNotExist(err) {
return fmt.Errorf("WatchedFolder does not exist: %s", config.WatchFolder.Path)
} else if err != nil {
return fmt.Errorf("error accessing WatchedFolder: %v", err)
}
}
return nil
}
func logConfig() {
configInfo := fmt.Sprintf(`
Configuration Loaded:
General:
BaseDir: %s
Format: %s
TempBaseDir: %s
EnableConsole: %t
WatchFolder:
Path: %s
UsePolling: %t
UseInotify: %t
PollingInterval: %d
N_m3u8DLRE:
Path: %s
`, config.General.BaseDir, config.General.Format, config.General.TempBaseDir, config.General.EnableConsole,
config.WatchFolder.Path, config.WatchFolder.UsePolling, config.WatchFolder.UseInotify, config.WatchFolder.PollingInterval,
config.N_m3u8DLRE.Path)
logger.LogInfo("Config", configInfo)
}

36
src/logger.go
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)
}

125
src/main_test.go
View File

@ -1,125 +0,0 @@
package main
import (
"encoding/json"
"os"
"reflect"
"testing"
)
func TestSanitizeFilename(t *testing.T) {
tests := []struct {
input string
expected string
}{
{"file:name.mp4", "file_name.mp4"},
{"file/name.mp4", "file_name.mp4"},
{"file\\name.mp4", "file_name.mp4"},
{"file?name.mp4", "file_name.mp4"},
{"file*name.mp4", "file_name.mp4"},
{"file<name>.mp4", "file_name_.mp4"},
{".hidden", "hidden"},
}
for _, test := range tests {
result := sanitizeFilename(test.input)
if result != test.expected {
t.Errorf("sanitizeFilename(%q) = %q, want %q", test.input, result, test.expected)
}
}
}
func TestIsValidURL(t *testing.T) {
tests := []struct {
input string
expected bool
}{
{"https://example.com", true},
{"http://example.com", true},
{"ftp://example.com", true},
{"not a url", false},
}
for _, test := range tests {
result := isValidURL(test.input)
if result != test.expected {
t.Errorf("isValidURL(%q) = %v, want %v", test.input, result, test.expected)
}
}
}
func TestParseMetadata(t *testing.T) {
tests := []struct {
input string
expected Metadata
}{
{"Show Title; serie; 01", Metadata{Title: "Show Title", Type: "serie", Season: "S01"}},
{"Movie Title; movie; ", Metadata{Title: "Movie Title", Type: "movie", Season: "S"}},
{"Invalid Metadata", Metadata{}},
}
for _, test := range tests {
result := parseMetadata(test.input)
if !reflect.DeepEqual(result, test.expected) {
t.Errorf("parseMetadata(%q) = %v, want %v", test.input, result, test.expected)
}
}
}
func TestParseInputFile(t *testing.T) {
tempFile, err := os.CreateTemp("", "test_input_*.json")
if err != nil {
t.Fatalf("Failed to create temp file: %v", err)
}
defer os.Remove(tempFile.Name())
testData := Items{
Items: []Item{
{MPD: "http://example.com/video1.mpd", Filename: "video1.mp4"},
{MPD: "http://example.com/video2.mpd", Filename: "video2.mp4"},
},
}
jsonData, _ := json.Marshal(testData)
if _, err := tempFile.Write(jsonData); err != nil {
t.Fatalf("Failed to write to temp file: %v", err)
}
tempFile.Close()
items, err := parseInputFile(tempFile.Name())
if err != nil {
t.Fatalf("parseInputFile() returned an error: %v", err)
}
if len(items) != len(testData.Items) {
t.Errorf("parseInputFile() returned %d items, want %d", len(items), len(testData.Items))
}
for i, item := range items {
if !reflect.DeepEqual(item, testData.Items[i]) {
t.Errorf("parseInputFile() item %d = %v, want %v", i, item, testData.Items[i])
}
}
}
func TestGroupItemsBySeason(t *testing.T) {
items := []Item{
{Filename: "show1_s01e01.mp4", Metadata: "Show 1; serie; 01"},
{Filename: "show1_s01e02.mp4", Metadata: "Show 1; serie; 01"},
{Filename: "show2_s01e01.mp4", Metadata: "Show 2; serie; 01"},
{Filename: "movie1.mp4", Metadata: "Movie 1; movie; "},
}
grouped := groupItemsBySeason(items)
expectedGroups := map[string]int{
"Show 1 - S01": 2,
"Show 2 - S01": 1,
"Movies": 1,
}
for group, count := range expectedGroups {
if len(grouped[group]) != count {
t.Errorf("groupItemsBySeason() group %q has %d items, want %d", group, len(grouped[group]), count)
}
}
}

142
src/watcher.go
View File

@ -1,142 +0,0 @@
package main
import (
"fmt"
"io"
"log"
"os"
"path/filepath"
"strings"
"time"
"github.com/fsnotify/fsnotify"
)
func watchFolder() {
if config.WatchFolder.UsePolling {
go pollFolder()
}
if config.WatchFolder.UseInotify {
go inotifyWatch()
}
}
func inotifyWatch() {
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()
done := make(chan bool)
go func() {
for {
select {
case event, ok := <-watcher.Events:
if !ok {
return
}
if event.Op&fsnotify.Create == fsnotify.Create {
if strings.HasSuffix(event.Name, ".drmd") {
fmt.Println("New .drmd detected:", event.Name)
processWatchedFile(event.Name)
}
}
case err, ok := <-watcher.Errors:
if !ok {
return
}
log.Println("Error:", err)
}
}
}()
err = watcher.Add(config.WatchFolder.Path)
if err != nil {
log.Fatal(err)
}
<-done
}
func pollFolder() {
ticker := time.NewTicker(time.Duration(config.WatchFolder.PollingInterval) * time.Second)
defer ticker.Stop()
for range ticker.C {
files, err := filepath.Glob(filepath.Join(config.WatchFolder.Path, "*.drmd"))
if err != nil {
log.Println("Error polling folder:", err)
continue
}
for _, file := range files {
fmt.Println("New .drmd detected via polling:", file)
go processWatchedFile(file)
}
}
}
func processWatchedFile(filePath string) {
for {
initialSize, err := getFileSize(filePath)
if err != nil {
logger.LogError("Watcher", fmt.Sprintf("Error getting file size: %v", err))
return
}
time.Sleep(1 * time.Second)
currentSize, err := getFileSize(filePath)
if err != nil {
logger.LogError("Watcher", fmt.Sprintf("Error getting file size: %v", err))
return
}
if initialSize == currentSize {
break
}
}
file, err := os.Open(filePath)
if err != nil {
logger.LogError("Watcher", fmt.Sprintf("Error opening file: %v", err))
return
}
defer file.Close()
originalFilename := filepath.Base(filePath)
tempFile, err := os.CreateTemp(uploadDir, originalFilename)
if err != nil {
logger.LogError("Watcher", fmt.Sprintf("Error creating temporary file: %v", err))
return
}
defer tempFile.Close()
_, err = io.Copy(tempFile, file)
if err != nil {
logger.LogError("Watcher", fmt.Sprintf("Error copying file: %v", err))
return
}
if err := os.Remove(filePath); err != nil {
logger.LogError("Watcher", fmt.Sprintf("Error deleting original file: %v", err))
}
items, err := parseInputFile(tempFile.Name())
if err != nil {
logger.LogError("Watcher", fmt.Sprintf("Error parsing input file: %v", err))
return
}
go processItems(filepath.Base(tempFile.Name()), items)
}
func getFileSize(filePath string) (int64, error) {
fileInfo, err := os.Stat(filePath)
if err != nil {
return 0, err
}
return fileInfo.Size(), nil
}

9
src/subtitles.go → subtitles.go
View File

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

2
src/templates/index → templates/index
View File

@ -11,7 +11,7 @@
color: #d4d4d4; color: #d4d4d4;
line-height: 1.6; line-height: 1.6;
padding: 20px; padding: 20px;
max-width: 900px; max-width: 800px;
margin: 0 auto; margin: 0 auto;
box-sizing: border-box; box-sizing: border-box;
} }

53
src/templates/progress → templates/progress
View File

@ -11,7 +11,7 @@
color: #d4d4d4; color: #d4d4d4;
line-height: 1.6; line-height: 1.6;
padding: 20px; padding: 20px;
max-width: 900px; max-width: 800px;
margin: 0 auto; margin: 0 auto;
box-sizing: border-box; box-sizing: border-box;
} }
@ -68,7 +68,7 @@
#abort-button:hover { #abort-button:hover {
background-color: #d32f2f; background-color: #d32f2f;
} }
#pause-button, #resume-button, #toggle-console { #pause-button, #resume-button {
background-color: #4CAF50; background-color: #4CAF50;
color: white; color: white;
border: none; border: none;
@ -77,7 +77,7 @@
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
} }
#pause-button:hover, #resume-button:hover, #toggle-console:hover { #pause-button:hover, #resume-button:hover {
background-color: #45a049; background-color: #45a049;
} }
#resume-button { #resume-button {
@ -96,17 +96,6 @@
#back-button:hover { #back-button:hover {
background-color: #1976D2; 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) { @media (max-width: 600px) {
body { body {
padding: 10px; padding: 10px;
@ -139,16 +128,13 @@
<button id="abort-button" onclick="abortDownload()">Abort Download</button> <button id="abort-button" onclick="abortDownload()">Abort Download</button>
<button id="pause-button" onclick="pauseDownload()">Pause 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="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> <button id="back-button" onclick="window.location.href='/'">Back to Index</button>
</div> </div>
<div style="display: none;" id="console"></div>
<script> <script>
let isPaused = false; let isPaused = false;
const filename = "{{.Filename}}";
function updateProgress() { function updateProgress() {
fetch(`/progress?filename=${filename}`, { fetch('/progress?filename={{.Filename}}', {
headers: { headers: {
'Accept': 'application/json' 'Accept': 'application/json'
} }
@ -180,7 +166,7 @@
} }
function abortDownload() { function abortDownload() {
fetch(`/abort?filename=${filename}`, { method: 'POST' }) fetch('/abort?filename={{.Filename}}', { method: 'POST' })
.then(response => { .then(response => {
if (response.ok) { if (response.ok) {
console.log('Abort signal sent. The download will stop soon.'); console.log('Abort signal sent. The download will stop soon.');
@ -191,7 +177,7 @@
} }
function pauseDownload() { function pauseDownload() {
fetch(`/pause?filename=${filename}`, { method: 'POST' }) fetch('/pause?filename={{.Filename}}', { method: 'POST' })
.then(response => { .then(response => {
if (response.ok) { if (response.ok) {
console.log('Pause signal sent. The download will pause soon.'); console.log('Pause signal sent. The download will pause soon.');
@ -204,7 +190,7 @@
} }
function resumeDownload() { function resumeDownload() {
fetch(`/resume?filename=${filename}`, { method: 'POST' }) fetch('/resume?filename={{.Filename}}', { method: 'POST' })
.then(response => { .then(response => {
if (response.ok) { if (response.ok) {
console.log('Resume signal sent. The download will resume soon.'); console.log('Resume signal sent. The download will resume soon.');
@ -217,31 +203,6 @@
}); });
} }
const consoleDiv = document.getElementById('console');
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
const ws = new WebSocket(`${protocol}//${window.location.host}/ws?filename=${filename}`);
ws.onmessage = function(event) {
consoleDiv.textContent += event.data;
consoleDiv.scrollTop = consoleDiv.scrollHeight;
};
ws.onclose = function() {
console.log('WebSocket connection closed');
};
ws.onerror = function(error) {
console.error('WebSocket error:', error);
};
document.getElementById('toggle-console').onclick = function() {
if (consoleDiv.style.display === "none") {
consoleDiv.style.display = "block";
} else {
consoleDiv.style.display = "none";
}
};
updateProgress(); updateProgress();
</script> </script>
</body> </body>

24
src/templates/select → templates/select
View File

@ -11,7 +11,7 @@
color: #d4d4d4; color: #d4d4d4;
line-height: 1.6; line-height: 1.6;
padding: 20px; padding: 20px;
max-width: 900px; max-width: 800px;
margin: 0 auto; margin: 0 auto;
box-sizing: border-box; box-sizing: border-box;
} }
@ -50,18 +50,6 @@
button:hover, input[type="submit"]:hover { button:hover, input[type="submit"]:hover {
background-color: #45a049; background-color: #45a049;
} }
#fix-order-button {
background-color: #2196F3;
color: white;
border: none;
padding: 10px 15px;
margin: 5px;
border-radius: 4px;
cursor: pointer;
}
#fix-order-button:hover {
background-color: #1976D2;
}
</style> </style>
</head> </head>
<body> <body>
@ -71,12 +59,11 @@
{{range $filename, $fileItems := .AllItems}} {{range $filename, $fileItems := .AllItems}}
<h2>{{$filename}}</h2> <h2>{{$filename}}</h2>
{{range $season, $items := $fileItems}} {{range $season, $items := $fileItems}}
<div class="season" id="season-{{$filename}}-{{$season}}"> <div class="season">
<div class="season-title"> <div class="season-title">
<input type="checkbox" class="season-checkbox" id="season-checkbox-{{$filename}}-{{$season}}" checked onchange="toggleSeason('{{$filename}}-{{$season}}')"> <input type="checkbox" class="season-checkbox" id="season-{{$filename}}-{{$season}}" checked onchange="toggleSeason('{{$filename}}-{{$season}}')">
<label for="season-checkbox-{{$filename}}-{{$season}}">{{$season}}</label> <label for="season-{{$filename}}-{{$season}}">{{$season}}</label>
</div> </div>
<div class="season-items">
{{range $item := $items}} {{range $item := $items}}
<div class="item"> <div class="item">
<label> <label>
@ -85,7 +72,6 @@
</label> </label>
</div> </div>
{{end}} {{end}}
</div>
</div> </div>
{{end}} {{end}}
{{end}} {{end}}
@ -108,7 +94,7 @@
} }
function toggleSeason(season) { function toggleSeason(season) {
var seasonCheckbox = document.getElementById('season-checkbox-' + season); var seasonCheckbox = document.getElementById('season-' + season);
var episodeCheckboxes = document.getElementsByClassName('episode-' + season); var episodeCheckboxes = document.getElementsByClassName('episode-' + season);
for (var i = 0; i < episodeCheckboxes.length; i++) { for (var i = 0; i < episodeCheckboxes.length; i++) {
episodeCheckboxes[i].checked = seasonCheckbox.checked; episodeCheckboxes[i].checked = seasonCheckbox.checked;

47
src/utils.go → utils.go
View File

@ -9,7 +9,6 @@ import (
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"regexp" "regexp"
"sort"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
@ -197,43 +196,6 @@ func filterSelectedItems(items []Item, selectedItems []string) []Item {
return filtered return filtered
} }
func sortItems(items []Item) {
sort.Slice(items, func(i, j int) bool {
iMeta := parseMetadata(items[i].Metadata)
jMeta := parseMetadata(items[j].Metadata)
if iMeta.Title != jMeta.Title {
return iMeta.Title < jMeta.Title
}
iSeason := extractNumber(iMeta.Season)
jSeason := extractNumber(jMeta.Season)
if iSeason != jSeason {
return iSeason < jSeason
}
iEpisode := extractEpisodeNumber(items[i].Filename)
jEpisode := extractEpisodeNumber(items[j].Filename)
return iEpisode < jEpisode
})
}
func extractNumber(s string) int {
num, _ := strconv.Atoi(strings.TrimLeft(s, "S"))
return num
}
func extractEpisodeNumber(filename string) int {
parts := strings.Split(filename, "E")
if len(parts) > 1 {
num, _ := strconv.Atoi(parts[1])
return num
}
return 0
}
func processItems(filename string, items []Item) error { func processItems(filename string, items []Item) error {
jobsMutex.Lock() jobsMutex.Lock()
jobInfo := &JobInfo{ jobInfo := &JobInfo{
@ -253,31 +215,25 @@ func processItems(filename string, items []Item) error {
} }
}() }()
sortItems(items)
for i := 0; i < len(items); i++ { for i := 0; i < len(items); i++ {
select { select {
case <-jobInfo.AbortChan: case <-jobInfo.AbortChan:
updateProgress(filename, 100, "Aborted") updateProgress(filename, 100, "Aborted")
logger.LogJobState(filename, "aborted")
return fmt.Errorf("download aborted") return fmt.Errorf("download aborted")
default: default:
if jobInfo.Paused { if jobInfo.Paused {
select { select {
case <-jobInfo.ResumeChan: case <-jobInfo.ResumeChan:
jobInfo.Paused = false jobInfo.Paused = false
logger.LogJobState(filename, "resumed")
case <-jobInfo.AbortChan: case <-jobInfo.AbortChan:
updateProgress(filename, 100, "Aborted") updateProgress(filename, 100, "Aborted")
logger.LogJobState(filename, "aborted")
return fmt.Errorf("download aborted") return fmt.Errorf("download aborted")
} }
} }
updateProgress(filename, float64(i)/float64(len(items))*100, items[i].Filename) updateProgress(filename, float64(i)/float64(len(items))*100, items[i].Filename)
err := downloadFile(filename, items[i], jobInfo) err := downloadFile(items[i], jobInfo)
if err != nil { if err != nil {
if err.Error() == "download paused" { if err.Error() == "download paused" {
logger.LogJobState(filename, "paused")
removeCompletedEpisodes(filename, items[:i]) removeCompletedEpisodes(filename, items[:i])
i-- i--
continue continue
@ -286,7 +242,6 @@ func processItems(filename string, items []Item) error {
} }
} }
updateProgress(filename, 100, "") updateProgress(filename, 100, "")
logger.LogJobState(filename, "completed successfully")
return nil return nil
} }