Skip to content

Commit 575a49e

Browse files
author
Daniel Neto
committed
Enhance error handling and logging for video processing in youtubeDl.json
1 parent f1cdaff commit 575a49e

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

view/youtubeDl.json.php

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,13 @@ function cleanFilename($filename) {
7171
$downloader->connect();
7272
$downloader->queueFiles();
7373
$downloader->close();
74+
$obj = (object)['error' => false, 'msg' => 'Files queued'];
7475
} catch (Exception $e) {
7576
error_log("youtubeDl.json: FTPDownloader exception - " . $e->getMessage());
76-
$obj->msg = "FTP download failed: " . $e->getMessage();
77+
$obj = (object)['error' => true, 'msg' => "FTP download failed: " . $e->getMessage()];
7778
}
7879
} else {
79-
error_log("youtubeDl.json: Adding video with URL: {$_REQUEST['videoURL']}");
80+
error_log("youtubeDl.json: Adding video with URL: " . $_REQUEST['videoURL']);
8081
$obj = addVideo($_REQUEST['videoURL'], $streamers_id, @$_REQUEST['videoTitle']);
8182
}
8283
}
@@ -86,45 +87,39 @@ function cleanFilename($filename) {
8687

8788
if (isset($_REQUEST['videoTitle'])) {
8889
$_REQUEST['videoTitle'] = cleanFilename($_REQUEST['videoTitle']);
89-
error_log("youtubeDl.json: Cleaned video title: {$_REQUEST['videoTitle']}");
90+
error_log("youtubeDl.json: Cleaned video title: " . $_REQUEST['videoTitle']);
9091
}
9192

92-
// Check if videoDownloadedLink is set
93+
// Avoid sanitizing URLs
9394
if (!isset($_REQUEST['videoDownloadedLink']) || empty($_REQUEST['videoDownloadedLink'])) {
9495
error_log("youtubeDl.json: videoDownloadedLink is missing or empty in \\$_REQUEST");
95-
$_REQUEST['videoDownloadedLink'] = ""; // Set a default empty value or handle appropriately
96+
} else {
97+
error_log("youtubeDl.json: videoDownloadedLink provided: " . $_REQUEST['videoDownloadedLink']);
9698
}
9799

98-
// Clean videoDownloadedLink
99-
$_REQUEST['videoDownloadedLink'] = cleanFilename($_REQUEST['videoDownloadedLink']);
100-
error_log("youtubeDl.json: Cleaned video downloaded link: {$_REQUEST['videoDownloadedLink']}");
101-
102-
// Add logging before calling queueFiles
103-
error_log("youtubeDl.json: Calling queueFiles with videoDownloadedLink: {$_REQUEST['videoDownloadedLink']} and videoTitle: {$_REQUEST['videoTitle']}");
104-
105100
// Ensure $obj is populated before sending the response
106101
if (empty((array)$obj)) {
107-
error_log("youtubeDl.json: Object is empty after queueFiles. Debugging...");
108-
error_log("youtubeDl.json: videoDownloadedLink: {$_REQUEST['videoDownloadedLink']}, videoTitle: {$_REQUEST['videoTitle']}");
109-
$obj->msg = "An unknown error occurred";
102+
error_log("youtubeDl.json: Object is empty after processing. Debugging...");
103+
error_log("youtubeDl.json: videoURL: " . $_REQUEST['videoURL'] . ", videoTitle: " . $_REQUEST['videoTitle']);
104+
$obj = (object)['error' => true, 'msg' => "An unknown error occurred"];
110105
}
111106

112107
// Convert $obj to JSON for logging
113108
$objAsJson = json_encode($obj);
114109
if ($objAsJson === false) {
115110
$jsonError = json_last_error_msg();
116111
error_log("youtubeDl.json: Failed to encode object for logging - {$jsonError}");
117-
$objAsJson = "{\"error\":\"Failed to encode object\"}";
112+
$objAsJson = json_encode(["error" => true, "msg" => "Failed to encode object", "details" => $jsonError]);
118113
}
119114

120115
if (empty($doNotDie)) {
121116
$resp = json_encode($obj);
122117
if ($resp === false) {
123118
$jsonError = json_last_error_msg();
124119
error_log("youtubeDl.json: JSON encoding error - {$jsonError}");
125-
$resp = json_encode(["error" => "JSON encoding failed", "details" => $jsonError]);
120+
$resp = json_encode(["error" => true, "msg" => "JSON encoding failed", "details" => $jsonError]);
126121
} else {
127-
error_log("youtubeDl.json: Sending response {$resp}");
122+
error_log("youtubeDl.json: Sending response " . $resp);
128123
}
129124
echo $resp;
130125
exit;

0 commit comments

Comments
 (0)