Compare commits

..

2 Commits

Author SHA1 Message Date
7445627f7e
Add option to disable the console broadcasts 2024-09-24 15:17:58 +02:00
cc28f0f3c2
Correctly split console for each process 2024-09-24 15:01:09 +02:00
6 changed files with 51 additions and 16 deletions

View File

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

View File

@ -15,6 +15,7 @@ type Config struct {
N_m3u8DLRE struct { N_m3u8DLRE struct {
Path string Path string
} }
EnableConsole bool
} }
var config Config var config Config

View File

@ -20,7 +20,7 @@ func removeBOM(input []byte) []byte {
return input return input
} }
func downloadFile(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.TempBaseDir, sanitizeFilename(item.Filename))
@ -131,7 +131,10 @@ func downloadFile(item Item, jobInfo *JobInfo) error {
go func() { go func() {
for { for {
if outputBuffer.Len() > 0 { if outputBuffer.Len() > 0 {
broadcast(outputBuffer.Bytes()) message := outputBuffer.Bytes()
if config.EnableConsole {
broadcast(drmdFilename, message)
}
outputBuffer.Reset() outputBuffer.Reset()
} }
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)

View File

@ -382,19 +382,36 @@ func updateProgress(filename string, value float64, currentFile string) {
} }
var upgrader = websocket.Upgrader{} var upgrader = websocket.Upgrader{}
var clients = make(map[*websocket.Conn]bool) 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)
if !config.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) conn, err := upgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
fmt.Println("Error while upgrading connection:", err) logger.LogError("WebSocket", fmt.Sprintf("Error while upgrading connection: %v", err))
return return
} }
defer conn.Close() defer conn.Close()
logger.LogInfo("WebSocket", fmt.Sprintf("WebSocket connection established for filename: %s", filename))
mu.Lock() mu.Lock()
clients[conn] = true if clients[filename] == nil {
clients[filename] = make(map[*websocket.Conn]bool)
}
clients[filename][conn] = true
mu.Unlock() mu.Unlock()
for { for {
@ -404,18 +421,25 @@ func handleWebSocket(w http.ResponseWriter, r *http.Request) {
} }
mu.Lock() mu.Lock()
delete(clients, conn) delete(clients[filename], conn)
mu.Unlock() mu.Unlock()
logger.LogInfo("WebSocket", fmt.Sprintf("WebSocket connection closed for filename: %s", filename))
} }
func broadcast(message []byte) { func broadcast(filename string, message []byte) {
if !config.EnableConsole {
return
}
mu.Lock() mu.Lock()
defer mu.Unlock() defer mu.Unlock()
for client := range clients { for client := range clients[filename] {
if err := client.WriteMessage(websocket.TextMessage, message); err != nil { if err := client.WriteMessage(websocket.TextMessage, message); err != nil {
client.Close() client.Close()
delete(clients, client) delete(clients[filename], client)
logger.LogError("Broadcast", fmt.Sprintf("Error writing message to client: %v", err))
} }
} }
} }

View File

@ -145,9 +145,10 @@
<div style="display: none;" id="console"></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'
} }
@ -179,7 +180,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.');
@ -190,7 +191,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.');
@ -203,7 +204,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,7 +218,7 @@
} }
const consoleDiv = document.getElementById('console'); const consoleDiv = document.getElementById('console');
const ws = new WebSocket(`ws://${window.location.host}/ws`); const ws = new WebSocket(`ws://${window.location.host}/ws?filename=${filename}`);
ws.onmessage = function(event) { ws.onmessage = function(event) {
consoleDiv.textContent += event.data; consoleDiv.textContent += event.data;

View File

@ -259,21 +259,25 @@ func processItems(filename string, items []Item) error {
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(items[i], jobInfo) err := downloadFile(filename, 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
@ -282,6 +286,7 @@ func processItems(filename string, items []Item) error {
} }
} }
updateProgress(filename, 100, "") updateProgress(filename, 100, "")
logger.LogJobState(filename, "completed successfully")
return nil return nil
} }