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

Poller #9

Merged
Joren merged 4 commits from Poller into main 2024-10-07 12:59:19 +02:00
Conversation 0 Commits 4 Files Changed 7 +8 -8
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c46538a55f - Show all commits

8
src/downloaders.go
View File

@@ -23,7 +23,7 @@ func removeBOM(input []byte) []byte {
func downloadFile(drmdFilename string, item Item, jobInfo *JobInfo) error { func downloadFile(drmdFilename string, item Item, jobInfo *JobInfo) error {
logger.LogInfo("Download File", fmt.Sprintf("Starting download for: %s", item.Filename)) logger.LogInfo("Download File", fmt.Sprintf("Starting download for: %s", item.Filename))
tempDir := filepath.Join(config.TempBaseDir, sanitizeFilename(item.Filename)) tempDir := filepath.Join(config.General.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)) logger.LogError("Download File", fmt.Sprintf("Error creating temporary directory: %v", err))
@@ -132,7 +132,7 @@ func downloadFile(drmdFilename string, item Item, jobInfo *JobInfo) error {
for { for {
if outputBuffer.Len() > 0 { if outputBuffer.Len() > 0 {
message := outputBuffer.Bytes() message := outputBuffer.Bytes()
if config.EnableConsole { if config.General.EnableConsole {
broadcast(drmdFilename, message) broadcast(drmdFilename, message)
} }
outputBuffer.Reset() outputBuffer.Reset()
@@ -183,9 +183,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.Format) command += fmt.Sprintf(" --mux-after-done format=%s", config.General.Format)
saveDir := config.BaseDir saveDir := config.General.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 {

6
src/handlers.go
View File

@@ -386,8 +386,8 @@ var clients = make(map[string]map[*websocket.Conn]bool)
var mu sync.Mutex var mu sync.Mutex
func handleWebSocket(w http.ResponseWriter, r *http.Request) { func handleWebSocket(w http.ResponseWriter, r *http.Request) {
fmt.Println(config.EnableConsole) fmt.Println(config.General.EnableConsole)
if !config.EnableConsole { if !config.General.EnableConsole {
http.Error(w, "Console output is disabled", http.StatusForbidden) http.Error(w, "Console output is disabled", http.StatusForbidden)
return return
} }
@@ -428,7 +428,7 @@ func handleWebSocket(w http.ResponseWriter, r *http.Request) {
} }
func broadcast(filename string, message []byte) { func broadcast(filename string, message []byte) {
if !config.EnableConsole { if !config.General.EnableConsole {
return return
} }

2
src/main.go
View File

@@ -84,7 +84,7 @@ func startWebServer() {
http.HandleFunc("/clear-completed", handleClearCompleted) http.HandleFunc("/clear-completed", handleClearCompleted)
http.HandleFunc("/ws", handleWebSocket) http.HandleFunc("/ws", handleWebSocket)
fmt.Println("Starting web server on http://0.0.0.0:8080") logger.LogInfo("Main", "Starting web server on http://0.0.0.0:8080")
http.ListenAndServe(":8080", nil) http.ListenAndServe(":8080", nil)
} }