+
+
+
+
+
+
+
+
+
+
+
+ System Status
+
+ Operational
+
+
+
+
+
+
+
+ Uptime
+
+ Loading...
+
+
+
+
+
+
+
+ Storage Used
+
+ Loading...
+
+
+
+
+
+
+
+ Upload Rate
+
+ 0.00 MB/s
+
+
+ Limit: 30 MB/s per transfer
+
+
+
+
+
+
+
+ Active Transfers
+
+ 0
+
+
+ Max: 2
+
+
+
+
+
+
+
+ Files in Queue
+
+ 0
+
+
+ Total: 0 GB
+
+
+
+
+
+
+ Completed Today
+
+ 0
+
+
+ Total: 0 GB
+
+
+
+
+
+
+
+
+
+ Active Uploads
+
+
+ View All
+
+
+
+
+
+
+
+
+ | Filename | +Folder | +Directory | +Key | +Progress | +Filesize | +Time Left | +Speed | +
|---|---|---|---|---|---|---|---|
| + Loading... + | +|||||||
+
+
+
+
+ filename.mkv
+
+
+ movies
+
+
+ path/to/file
+
+
+ GDSA1
+
+
+
+
+ 4.7 GB
+
+
+ 3m 24s
+
+
+ 24MB/s
+
+
+
+
+
+
+
+
-
+
+ Latest Queue
+
+
+ View All
-
-
+
+
+
- 0
+
+
+
+
+
+
+
+
+ | # | +Filename | +Folder | +Directory | +Filesize | +Added | +
|---|---|---|---|---|---|
| + Loading... + | +|||||
+
+
+
+
+
+
+
+
+ Recent History
+
+
+ View All
+
+
+
+
+
+
+
+
+ | Filename | +Folder | +Directory | +Key | +Filesize | +Time spent | +Uploaded | +
|---|---|---|---|---|---|---|
| + Loading... + | +||||||
+
+
+
+
+
+
+
+ Active Uploads
+
+
+
+
+ 0 active
+
+
+
+
+
+
+
+
+
+ | Filename | ++ Folder + | ++ Directory + | ++ Key + | +Progress | ++ Filesize + | +Time Left | +Speed | +
|---|---|---|---|---|---|---|---|
+
+ 45%
-
-
+
+
+
+
+
-
-
-
+
+
+
+ Upload Queue
+
+
+
+
+ 0 in queue
+
+
+
+
+
+
+
+ | # | +Filename | ++ Folder + | ++ Directory + | ++ Filesize + | +Added | +
|---|---|---|---|---|---|
-
-
- In Progress
-
-
+
-
-
-
-
+
+ | Filename | -Folder | -Key | -Progress bar | -Filesize | -Time Left | -
| No entries found. | -|||||
+
-
+
+
+
+ Completed Uploads
+
+
+
+
+
+ Clear History
+
+
+
+
+
+
+
+
+
+
+ | Filename | +Folder | +Directory | +Key | +Filesize | +Time spent | ++ Uploaded + + | +
|---|---|---|---|---|---|---|
-
- Completed
-
-
- No entries found. ${data.file_name} ${data.drive} ${data.gdsa}
-
-
- ${data.file_size} ${data.upload_remainingtime} (with ${data.upload_speed}) No entries found. ${data.file_name} ${data.drive} ${data.gdsa} ${data.file_size} ${data.time_elapsed ?? 'n/a'} ${endTime} `);
- });
- }
- })
+ // Form submissions - with improved handling
+ setupFormSubmissions();
+
+ // Setup pause control
+ setupPauseControl();
+
+ // Clear history button
+ $("#clnHist").on("click", function () {
+ $.ajax({
+ type: "POST",
+ url: "srv/api/system/clean_history.php",
+ success: function () {
+ handleCompletedJobList();
+ showToast("Upload history cleared successfully", "success", 2500);
+ },
+ error: function () {
+ showToast("Failed to clear upload history", "error", 3000);
+ },
+ });
+ });
+
+ // Toggle time format
+ $("#prettyEndTime").on("click", function () {
+ handleCompletedJobList();
+ });
+
+ // Page size selection
+ $("#pageSize > li.page-item").on("click", function () {
+ $("#pageSize > li.page-item.active").removeClass("active");
+ $(this).addClass("active");
+ uploaderApp.pageSize = parseInt($(this).find("a").text());
+ saveUserSetting("pageSize", uploaderApp.pageSize);
+ handleCompletedJobList();
+ });
+
+ // History filter buttons
+ $(".filter-btn").on("click", function () {
+ $(".filter-btn").removeClass("active");
+ $(this).addClass("active");
+ uploaderApp.historyFilter = $(this).data("filter");
+ handleCompletedJobList();
+ });
+
+ // Chart time range selector
+ $("#chart-timerange").on("change", function () {
+ const timeRange = $(this).val();
+ createMockUploadChart("upload-history-chart", timeRange);
+ saveUserSetting("chartTimeRange", timeRange);
+ });
+}
+
+/**
+ * Settings Modal and Tabbed Interface Functionality
+ */
+function setupSettingsModal() {
+ // Modal open/close
+ $("#settings-toggle").on("click", function () {
+ $("#settings-modal").addClass("active");
+ $("#modal-overlay").addClass("active");
+ });
+
+ $("#modal-close, #modal-overlay").on("click", function () {
+ $("#settings-modal").removeClass("active");
+ $("#modal-overlay").removeClass("active");
+ });
+
+ // Close modal when clicking outside of it
+ $(document).on("click", function (event) {
+ if (
+ $("#settings-modal").hasClass("active") &&
+ !$(event.target).closest(".modal-content").length &&
+ !$(event.target).closest("#settings-toggle").length
+ ) {
+ $("#settings-modal").removeClass("active");
+ $("#modal-overlay").removeClass("active");
}
+ });
- function checkStatus() {
- $.getJSON("srv/api/system/status.php", function (json) {
- if(json === undefined || json.status === "UNKNOWN") {
- console.log("unable to check status");
- return
- }
- alignPauseControl(json.status);
+ // Prevent closing when clicking inside modal content
+ $(".modal-content").on("click", function (event) {
+ event.stopPropagation();
+ });
+
+ // Tab switching
+ $(".tab-button").on("click", function () {
+ const targetId = $(this).data("target");
+
+ // Update active state for buttons
+ $(".tab-button").removeClass("active");
+ $(this).addClass("active");
+
+ // Update active state for content
+ $(".tab-content").removeClass("active");
+ $("#" + targetId).addClass("active");
+ });
+
+ // Submit handling for forms in tabs
+ $(".tab-content form").on("submit", function (e) {
+ e.preventDefault();
+
+ // Get form ID to determine which settings to update
+ const formId = $(this).attr("id");
+
+ // Serialize form data
+ const formData = {};
+ const formArray = $(this).serializeArray();
+
+ // Convert form data to a simple object
+ formArray.forEach((item) => {
+ // Convert form field names to uppercase as the backend expects them that way
+ formData[item.name.toUpperCase()] = item.value;
+ });
+
+ // Update environment file with new settings
+ updateEnvSettings(formId, formData);
+ });
+}
+/**
+ * Special handling for form submissions
+ */
+function setupFormSubmissions() {
+ let autoSaveTimeout = null;
+
+ function collectFormData($form) {
+ const formData = {};
+ $form.find("input, select, textarea").each(function () {
+ const $input = $(this);
+ const name = $input.attr("name");
+ if (name) {
+ if ($input.is(":checkbox")) {
+ formData[name.toUpperCase()] = $input.is(":checked")
+ ? "true"
+ : "false";
+ } else {
+ formData[name.toUpperCase()] = $input.val();
+ }
+ }
+ });
+ return formData;
+ }
+
+ function showAutoSaveIndicator() {
+ showToast("Settings auto-saved successfully", "success", 2500);
+ }
+
+ $("#unified-settings-form").on(
+ "change",
+ "input, select, textarea",
+ function () {
+ const $form = $("#unified-settings-form");
+ if (autoSaveTimeout) clearTimeout(autoSaveTimeout);
+ autoSaveTimeout = setTimeout(() => {
+ const formData = collectFormData($form);
+ console.log("Auto-saving settings:", formData);
+ $.ajax({
+ url: "srv/api/system/update_env.php",
+ method: "POST",
+ data: JSON.stringify(formData),
+ contentType: "application/json",
+ success: function (response) {
+ console.log("Auto-save successful:", response);
+ showAutoSaveIndicator();
+ },
+ error: function (xhr, status, error) {
+ console.error("Auto-save failed:", error);
+ },
});
+ }, 1000);
+ }
+ );
+
+ $("#unified-settings-form").on("submit", function (e) {
+ e.preventDefault();
+ const $form = $(this);
+ const formData = collectFormData($form);
+ console.log("Submitting unified settings:", formData);
+ updateEnvSettings("unified-settings-form", formData);
+ });
+}
+
+/**
+ * Initialize styled selects in the settings form using a dropdown
+ * layout similar to the theme selector. Keeps the original select hidden
+ * and syncs value changes to trigger auto-save.
+ */
+function initStyledSelects() {
+ const $form = $("#unified-settings-form");
+ if ($form.length === 0) return;
+
+ // Enhance each select with a styled dropdown
+ $form.find(".form-group select").each(function () {
+ const $select = $(this);
+ if ($select.data("styled")) return; // avoid double init
+
+ // Build dropdown structure
+ const currentText = $select.find("option:selected").text();
+ const $dropdown = $(`
+ ").addClass(rowClass);
+ row.append(
+ $("")
+ .attr("data-title", "Filename")
+ .addClass("truncate")
+ .text(job.file_name)
+ );
+ row.append($(" ").attr("data-title", "Folder").text(job.drive));
+ row.append(
+ $(" ")
+ .attr("data-title", "Directory")
+ .addClass("truncate")
+ .text(directory)
+ );
+ row.append($(" ").attr("data-title", "Key").text(job.gdsa));
+ row.append(
+ $(" ").attr("data-title", "Filesize").text(job.file_size)
+ );
+ row.append(
+ $(" ")
+ .attr("data-title", "Time spent")
+ .text(job.time_elapsed || "n/a")
+ );
+
+ // Show error message in tooltip for failed uploads
+ let uploadedCell = $(" ")
+ .attr("data-title", "Uploaded")
+ .text(endTime);
+ if (!job.successful && job.error_message) {
+ uploadedCell.attr("title", job.error_message).addClass("has-error");
+ }
+ row.append(uploadedCell);
+
+ $completedTableBody.append(row);
+ });
+
+ // Fetch all completed uploads for today
+ fetchCompletedTodayStats();
+ },
+ });
+}
+
+/**
+ * Fetch statistics for all uploads completed today
+ */
+function fetchCompletedTodayStats() {
+ $.getJSON("srv/api/jobs/completed_today_stats.php", function (data) {
+ if (data && data.count !== undefined) {
+ uploaderApp.completedTodayCount = data.count;
+ uploaderApp.completedTodaySize = data.total_size || 0;
+
+ // Update the stats display
+ $("#completed-count").text(data.count);
+ $("#completed-total").text(`Total: ${formatFileSize(data.total_size)}`);
}
+ }).fail(function () {
+ // If the API doesn't exist yet, fall back to counting visible rows
+ // This is a temporary solution until the API endpoint is implemented
+ calculateCompletedTodayStats();
+ });
+}
- //Register listener on pagesize
- $('#pageSize > li.page-item').click(function () {
- t = jQuery(this);
- $('#pageSize > li.page-item.active').removeClass('active');
- t.addClass('active');
- handleCompletedJobList();
+/**
+ * Calculate statistics for today's completed uploads from visible table rows
+ * This is a fallback method used until the API endpoint is implemented
+ */
+function calculateCompletedTodayStats() {
+ let completedToday = 0;
+ let totalSize = 0;
+
+ // Process visible completed uploads
+ $("#completedTable tbody tr")
+ .not(':contains("No completed")')
+ .each(function () {
+ const uploadedText = $(this).find("td:eq(5)").text();
+ const sizeText = $(this).find("td:eq(3)").text();
+
+ // Check if this upload happened today
+ if (
+ uploadedText.includes("ago") ||
+ uploadedText.includes(new Date().toLocaleDateString())
+ ) {
+ completedToday++;
+
+ // Parse the file size
+ const size = parseFileSize(sizeText);
+ totalSize += size;
+ }
+ });
+
+ // Update the stats
+ $("#completed-count").text(completedToday);
+ $("#completed-total").text(`Total: ${formatFileSize(totalSize)}`);
+
+ // Save to app state
+ uploaderApp.completedTodayCount = completedToday;
+ uploaderApp.completedTodaySize = totalSize;
+}
+
+/**
+ * Handle queue list display
+ */
+function handleQueueList() {
+ $.getJSON("srv/api/jobs/queue.php", function (json) {
+ const $tableBody = $("#queueTable > tbody");
+ $tableBody.empty();
+
+ if (!json.success || !json.files || json.files.length === 0) {
+ $tableBody.append(
+ ' ");
+
+ // Position number
+ row.append($("").text(index + 1));
+
+ // Filename
+ row.append($(" ").addClass("truncate").text(file.filename));
+
+ // Folder (hidden on mobile)
+ row.append(
+ $(" ")
+ .addClass("d-none d-lg-table-cell")
+ .text(file.drive || "N/A")
+ );
+
+ // Directory (hidden on mobile) - remove folder prefix
+ let directory = file.filedir || "/";
+ if (file.drive && directory.startsWith(file.drive + "/")) {
+ directory = directory.substring(file.drive.length + 1);
+ }
+ row.append(
+ $(" ").addClass("d-none d-lg-table-cell truncate").text(directory)
+ );
+
+ // Filesize (hidden on mobile) - format the size
+ const formattedSize = formatFileSize(parseFileSize(file.filesize));
+ row.append(
+ $(" ").addClass("d-none d-lg-table-cell").text(formattedSize)
+ );
+
+ // Added time
+ const addedTime = file.created_at
+ ? formatRelativeTime(file.created_at)
+ : "Unknown";
+ row.append($(" ").text(addedTime));
+
+ $tableBody.append(row);
+ });
+ }).fail(function (jqXHR, textStatus, errorThrown) {
+ console.error("Failed to fetch queue list:", textStatus, errorThrown);
+ const $tableBody = $("#queueTable > tbody");
+ $tableBody.empty();
+ $tableBody.append(
+ ' No files in queue
+ ${index + 1}
+ ${escapeHtml(file.filename)}
+ ${escapeHtml(file.drive || "N/A")}
+ ${escapeHtml(directory)}
+ ${size}
+ ${time}
+
+ `);
+ $tbody.append($row);
+ });
+ }).fail(function () {
+ $("#dashboard-queue-table tbody").html(
+ 'Failed to load queue No active uploads
+ ${escapeHtml(
+ job.file_name || job.job_name || "Unknown"
+ )}
+ ${escapeHtml(job.drive || "N/A")}
+ ${escapeHtml(directory)}
+ ${escapeHtml(job.gdsa || "N/A")}
+
+
+ ${size}
+ ${timeLeft}
+ ${speed}
+
+ `);
+ $tbody.append($row);
+ });
+ }).fail(function () {
+ $("#dashboard-active-table tbody").html(
+ 'Failed to load active uploads No upload history
+ ${escapeHtml(job.file_name || "")}
+ ${escapeHtml(job.drive || "N/A")}
+ ${escapeHtml(directory)}
+ ${escapeHtml(job.gdsa || "N/A")}
+ ${size}
+ ${timeSpent}
+ ${uploaded}
+
+ `);
+ $tbody.append($row);
+ });
+ }).fail(function () {
+ $("#dashboard-history-table tbody").html(
+ 'Failed to load history ").addClass(rowClass);
+ row.append(
+ $("")
+ .attr("data-title", "Filename")
+ .addClass("truncate")
+ .text(job.file_name)
+ );
+ row.append($(" ").attr("data-title", "Folder").text(job.drive));
+ row.append($(" ").attr("data-title", "Key").text(job.gdsa));
+ row.append(
+ $(" ").attr("data-title", "Filesize").text(job.file_size)
+ );
+ row.append(
+ $(" ")
+ .attr("data-title", "Time spent")
+ .text(job.time_elapsed || "n/a")
+ );
+ row.append($(" ").attr("data-title", "Uploaded").text(endTime));
+
+ $completedTableBody.append(row);
+ });
+
+ // Fetch all completed uploads for today
+ fetchCompletedTodayStats();
+ },
+ });
+}
+
+/**
+ * Fetch statistics for all uploads completed today
+ */
+function fetchCompletedTodayStats() {
+ $.getJSON("srv/api/jobs/completed_today_stats.php", function (data) {
+ if (data && data.count !== undefined) {
+ uploaderApp.completedTodayCount = data.count;
+ uploaderApp.completedTodaySize = data.total_size || 0;
+
+ // Update the stats display
+ $("#completed-count").text(data.count);
+ $("#completed-total").text(`Total: ${formatFileSize(data.total_size)}`);
+ }
+ }).fail(function () {
+ // If the API doesn't exist yet, fall back to counting visible rows
+ // This is a temporary solution until the API endpoint is implemented
+ calculateCompletedTodayStats();
+ });
+}
+
+/**
+ * Calculate statistics for today's completed uploads from visible table rows
+ * This is a fallback method used until the API endpoint is implemented
+ */
+function calculateCompletedTodayStats() {
+ let completedToday = 0;
+ let totalSize = 0;
+
+ // Process visible completed uploads
+ $("#completedTable tbody tr")
+ .not(':contains("No completed")')
+ .each(function () {
+ const uploadedText = $(this).find("td:eq(5)").text();
+ const sizeText = $(this).find("td:eq(3)").text();
+
+ // Check if this upload happened today
+ if (
+ uploadedText.includes("ago") ||
+ uploadedText.includes(new Date().toLocaleDateString())
+ ) {
+ completedToday++;
+
+ // Parse the file size
+ const size = parseFileSize(sizeText);
+ totalSize += size;
+ }
+ });
+
+ // Update the stats
+ $("#completed-count").text(completedToday);
+ $("#completed-total").text(`Total: ${formatFileSize(totalSize)}`);
+
+ // Save to app state
+ uploaderApp.completedTodayCount = completedToday;
+ uploaderApp.completedTodaySize = totalSize;
+}
+
+/**
+ * Handle queue list display
+ */
+function handleQueueList() {
+ $.getJSON("srv/api/jobs/queue.php", function (json) {
+ const $tableBody = $("#queueTable > tbody");
+ $tableBody.empty();
+
+ if (!json.success || !json.files || json.files.length === 0) {
+ $tableBody.append(
+ ' ");
+
+ // Position number
+ row.append($("").text(index + 1));
+
+ // Filename
+ row.append($(" ").addClass("truncate").text(file.filename));
+
+ // Folder (hidden on mobile)
+ row.append(
+ $(" ")
+ .addClass("d-none d-lg-table-cell")
+ .text(file.drive || "N/A")
+ );
+
+ // Directory (hidden on mobile)
+ row.append(
+ $(" ")
+ .addClass("d-none d-lg-table-cell truncate")
+ .text(file.filedir || "/")
+ );
+
+ // Filesize (hidden on mobile)
+ row.append(
+ $(" ")
+ .addClass("d-none d-lg-table-cell")
+ .text(file.filesize || "N/A")
+ );
+
+ // Added time
+ const addedTime = file.created_at
+ ? formatRelativeTime(file.created_at)
+ : "Unknown";
+ row.append($(" ").text(addedTime));
+
+ $tableBody.append(row);
+ });
+ }).fail(function (jqXHR, textStatus, errorThrown) {
+ console.error("Failed to fetch queue list:", textStatus, errorThrown);
+ const $tableBody = $("#queueTable > tbody");
+ $tableBody.empty();
+ $tableBody.append(
+ ' No files in queue
+ ${escapeHtml(file.filename)}
+ ${escapeHtml(file.drive || "N/A")}
+ ${escapeHtml(file.filedir || "")}
+ ${size}
+ ${time}
+
+ `);
+ $tbody.append($row);
+ });
+ }).fail(function () {
+ $("#dashboard-queue-table tbody").html(
+ 'Failed to load queue No active uploads
+ ${escapeHtml(
+ job.file_name || job.job_name || "Unknown"
+ )}
+ ${escapeHtml(job.drive || "N/A")}
+ ${escapeHtml(job.file_directory || "N/A")}
+
+
+ ${size}
+ ${speed}
+
+ `);
+ $tbody.append($row);
+ });
+ }).fail(function () {
+ $("#dashboard-active-table tbody").html(
+ 'Failed to load active uploads No upload history
+ ${escapeHtml(job.file_name || "")}
+ ${escapeHtml(job.drive || "N/A")}
+ ${size}
+ ${time}
+
+ `);
+ $tbody.append($row);
+ });
+ }).fail(function () {
+ $("#dashboard-history-table tbody").html(
+ 'Failed to load history } Response data
+ */
+async function fetchWithErrorHandling(url, options = {}) {
+ try {
+ const response = await fetch(url, options);
+
+ if (!response.ok) {
+ throw new Error(`HTTP error ${response.status}`);
+ }
+
+ return await response.json();
+ } catch (error) {
+ console.error("Fetch error:", error);
+ showToast(`Failed to fetch data: ${error.message}`, "error");
+ throw error;
+ }
+}
+
+/**
+ * Show a status message
+ * @param {string} message - Message to display
+ * @param {boolean} isError - Whether this is an error message
+ */
+function showStatusMessage(message, isError = false) {
+ const statusMessage = document.getElementById("status-message");
+ if (!statusMessage) {
+ console.error("Status message element not found");
+ console.log(message);
+ return;
+ }
+
+ statusMessage.textContent = message;
+
+ if (isError) {
+ statusMessage.classList.add("error");
+ } else {
+ statusMessage.classList.remove("error");
+ }
+
+ statusMessage.style.display = "block";
+
+ // Hide after 3 seconds
+ setTimeout(() => {
+ statusMessage.style.display = "none";
+ }, 3000);
+}
+
+/**
+ * Debounce function to limit the rate at which a function can fire
+ * @param {Function} func - Function to debounce
+ * @param {number} wait - Wait time in milliseconds
+ * @returns {Function} Debounced function
+ */
+function debounce(func, wait) {
+ let timeout;
+
+ return function executedFunction(...args) {
+ const later = () => {
+ clearTimeout(timeout);
+ func(...args);
+ };
+
+ clearTimeout(timeout);
+ timeout = setTimeout(later, wait);
+ };
+}
+
+/**
+ * Get query parameters from URL
+ * @returns {Object} Object containing query parameters
+ */
+function getQueryParams() {
+ const params = {};
+ const searchParams = new URLSearchParams(window.location.search);
+
+ for (const [key, value] of searchParams.entries()) {
+ params[key] = value;
+ }
+
+ return params;
+}
+
+/**
+ * Show a toast notification
+ * @param {string} message - Message to display
+ * @param {string} type - Type of toast (success, error, info, warning)
+ * @param {number} duration - Duration in milliseconds (default: 3000)
+ */
+function showToast(message, type = "info", duration = 3000) {
+ // Create toast container if it doesn't exist
+ let container = document.querySelector(".toast-container");
+ if (!container) {
+ container = document.createElement("div");
+ container.className = "toast-container";
+ document.body.appendChild(container);
+ }
+
+ // Create toast element
+ const toast = document.createElement("div");
+ toast.className = `toast toast-${type}`;
+
+ // Set icon based on type
+ const icons = {
+ success: "fa-check-circle",
+ error: "fa-exclamation-circle",
+ info: "fa-info-circle",
+ warning: "fa-exclamation-triangle",
+ };
+
+ toast.innerHTML = `
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/docker-uploader/root/var/www/html/js/app.js b/apps/docker-uploader/root/var/www/html/js/app.js
index bab065811e..913407f5fb 100755
--- a/apps/docker-uploader/root/var/www/html/js/app.js
+++ b/apps/docker-uploader/root/var/www/html/js/app.js
@@ -1,160 +1,1733 @@
+/**
+ * Main application JavaScript for the Uploader Dashboard
+ *
+ * Note: Common utility functions have been moved to utils.js
+ * This file now focuses on application-specific functionality
+ */
+
+// Store global data
+const uploaderApp = {
+ activePage: 1,
+ pageSize: 10,
+ completedTodayCount: 0,
+ completedTodaySize: 0,
+ // Store env settings loaded from the API
+ envSettings: {},
+ // Current filter in history section
+ historyFilter: "all",
+ // Interval IDs for periodic updates
+ intervals: {
+ inProgress: null,
+ completed: null,
+ stats: null,
+ queue: null,
+ failedCount: null,
+ },
+};
+
+// Update the document ready function to hide the upload history chart
$(document).ready(function () {
- function handleInProgressJobs() {
- $.getJSON("srv/api/jobs/inprogress.php", function (json) {
- inProgressTableBody = $('#uploadsTable > tbody');
+ // Hide the upload history card as it's not needed
+ $(".card:has(#upload-history-chart)").hide();
- totalDownloadRate = 0;
- downloadRateType = null;
+ // Initialize the app
+ initializeApp();
- inProgressTableBody.empty();
- if (json.jobs === null || json.jobs.length === 0) {
- inProgressTableBody.append('| Filename | -Folder | -Key | -Filesize | -Time spent | -Uploaded | -
| No entries found. | |||||
|
-
-
- Clear History
-
-
- |
- |||||
+
-
+
+
+
+ About Docker Uploader
+
+
+
+
+
+ 
+
+
+
+ + Docker Uploader +
++ Version 5.0.0 +
+
+
+
+ + Description +
++ Docker Uploader is a powerful and efficient file upload + management system designed to run in Docker containers. It + provides a modern web interface for monitoring and controlling + file uploads with features like bandwidth management, + concurrent transfer control, and real-time progress tracking. +
+
+
+
+ + Key Features +
+-
+
- Real-time upload monitoring and progress tracking +
- Bandwidth limiting and transfer management +
- Multiple concurrent upload support +
- Complete upload history with statistics +
- Pause and resume functionality +
- 17 beautiful theme options +
- Responsive design for mobile and desktop +
- Docker containerized deployment +
+
+
+ + Technology Stack +
+
+
+
+
+
+ Docker
+
+
+
+ PHP
+
+
+
+ JavaScript
+
+
+
+ HTML5/CSS3
+
+
+
+ + Links & Resources +
+ +
+
+ + + + dockserver GitHub + + | + + + dockserver wiki + +
++ Copyrights © ™ 2021 + + Developed with + + by dockserver.io +
+
-
-
-
+ GitHub : dockserver GitHub
-Docs : dockserver wiki
-Copyrights © ™ - 2021 Developed with by dockserver.io
-
-
-
-
+
+
+
+ `);
+
+ $dropdown.find(".selected-text").text(currentText);
+
+ const $menu = $dropdown.find(".settings-dropdown-menu");
+ $select.find("option").each(function () {
+ const value = $(this).attr("value");
+ const label = $(this).text();
+ const isSelected = $(this).is(":selected");
+ const $item = $(
+ `${label}
`
+ );
+ if (isSelected) $item.addClass("active");
+ $menu.append($item);
+ });
+
+ // Hide original select and insert dropdown after it
+ $select.hide().after($dropdown);
+ $select.data("styled", true);
+
+ // Toggle menu
+ const $btn = $dropdown.find(".settings-select-btn");
+ $btn.on("click", function (e) {
+ e.stopPropagation();
+ const expanded = $(this).attr("aria-expanded") === "true";
+ $(this).attr("aria-expanded", expanded ? "false" : "true");
+ $menu.toggleClass("active", !expanded);
+ });
+
+ // Close when clicking outside
+ $(document).on("click", function () {
+ $menu.removeClass("active");
+ $btn.attr("aria-expanded", "false");
+ });
+
+ // Select item
+ $menu.on("click", ".settings-dropdown-item", function (e) {
+ e.stopPropagation();
+ const value = $(this).data("value");
+ const label = $(this).text();
+ $menu.find(".settings-dropdown-item").removeClass("active");
+ $(this).addClass("active");
+ $dropdown.find(".selected-text").text(label);
+ $menu.removeClass("active");
+ $btn.attr("aria-expanded", "false");
+ // Update original select and trigger change for auto-save
+ $select.val(value).trigger("change");
+ });
+ });
+}
+
+/**
+ * Start all periodic update intervals
+ */
+function startPeriodicUpdates() {
+ // Clear any existing intervals
+ stopPeriodicUpdates();
+
+ // Set new intervals
+ uploaderApp.intervals.inProgress = setInterval(handleInProgressJobs, 1000);
+ uploaderApp.intervals.queue = setInterval(handleQueueList, 5000);
+ uploaderApp.intervals.stats = setInterval(updateRealTimeStats, 2000);
+ uploaderApp.intervals.status = setInterval(checkStatus, 30000);
+ uploaderApp.intervals.dashboard = setInterval(loadDashboardActivity, 5000);
+}
+
+/**
+ * Stop all periodic update intervals
+ */
+function stopPeriodicUpdates() {
+ Object.values(uploaderApp.intervals).forEach((interval) => {
+ if (interval) clearInterval(interval);
+ });
+}
+
+/**
+ * Handle in-progress uploads display
+ */
+function handleInProgressJobs() {
+ $.getJSON("srv/api/jobs/inprogress.php", function (json) {
+ const $tableBody = $("#uploadsTable > tbody");
+ let totalUploadRate = 0;
+
+ $tableBody.empty();
+
+ if (!json.jobs || json.jobs.length === 0) {
+ $tableBody.append(
+ '
+
+
+ ${progress}%
+
+
+
+
+
+
+
+ ${progress}%
+
+
+
+
+
+
+
+
+ `;
+
+ // Add to container
+ container.appendChild(toast);
+
+ // Close button handler
+ const closeBtn = toast.querySelector(".toast-close");
+ closeBtn.addEventListener("click", () => {
+ removeToast(toast);
+ });
+
+ // Auto-remove after duration
+ setTimeout(() => {
+ removeToast(toast);
+ }, duration);
+}
+
+/**
+ * Remove a toast notification
+ * @param {HTMLElement} toast - Toast element to remove
+ */
+function removeToast(toast) {
+ toast.classList.add("removing");
+ setTimeout(() => {
+ if (toast.parentNode) {
+ toast.parentNode.removeChild(toast);
+ }
+ }, 300);
+}
+
+/**
+ * Save a user setting to localStorage
+ * @param {string} key - Setting key
+ * @param {any} value - Setting value
+ */
+function saveUserSetting(key, value) {
+ try {
+ localStorage.setItem(`uploader_${key}`, JSON.stringify(value));
+ } catch (error) {
+ console.error("Failed to save setting:", error);
+ }
+}
+
+/**
+ * Get a user setting from localStorage
+ * @param {string} key - Setting key
+ * @param {any} defaultValue - Default value if setting doesn't exist
+ * @returns {any} Setting value
+ */
+function getUserSetting(key, defaultValue) {
+ try {
+ const value = localStorage.getItem(`uploader_${key}`);
+ return value !== null ? JSON.parse(value) : defaultValue;
+ } catch (error) {
+ console.error("Failed to retrieve setting:", error);
+ return defaultValue;
+ }
+}
+
+/**
+ * Creates a mock Chart.js chart for the upload history if Chart.js is loaded
+ * @param {string} chartId - ID of the canvas element
+ * @param {string} timeRange - Time range to display (day, week, month)
+ */
+function createMockUploadChart(chartId, timeRange = "week") {
+ if (!window.Chart) {
+ console.warn("Chart.js not loaded, skipping chart creation");
+ return;
+ }
+
+ const ctx = document.getElementById(chartId);
+ if (!ctx) return;
+
+ // Clean up any existing chart
+ if (window.uploadChart) {
+ window.uploadChart.destroy();
+ }
+
+ // Generate mock data based on timeRange
+ const labels = [];
+ const uploadData = [];
+ const completedData = [];
+
+ const today = new Date();
+ let days = 7;
+
+ switch (timeRange) {
+ case "day":
+ days = 1;
+ // Generate hourly data for the last 24 hours
+ for (let i = 0; i < 24; i++) {
+ const hour = new Date(today);
+ hour.setHours(today.getHours() - 23 + i);
+ labels.push(
+ hour.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" })
+ );
+ uploadData.push(Math.floor(Math.random() * 5) + 1); // 1-5 GB/hour
+ completedData.push(Math.floor(Math.random() * 4) + 1); // 1-4 files/hour
+ }
+ break;
+
+ case "month":
+ days = 30;
+ // Generate daily data for the last 30 days
+ for (let i = 0; i < days; i++) {
+ const day = new Date(today);
+ day.setDate(today.getDate() - (days - 1) + i);
+ labels.push(
+ day.toLocaleDateString([], { month: "short", day: "numeric" })
+ );
+ uploadData.push(Math.floor(Math.random() * 20) + 5); // 5-25 GB/day
+ completedData.push(Math.floor(Math.random() * 15) + 5); // 5-20 files/day
+ }
+ break;
+
+ case "week":
+ default:
+ // Generate daily data for the last 7 days
+ for (let i = 0; i < days; i++) {
+ const day = new Date(today);
+ day.setDate(today.getDate() - (days - 1) + i);
+ labels.push(day.toLocaleDateString([], { weekday: "short" }));
+ uploadData.push(Math.floor(Math.random() * 15) + 3); // 3-18 GB/day
+ completedData.push(Math.floor(Math.random() * 10) + 2); // 2-12 files/day
+ }
+ break;
+ }
+
+ // Create chart
+ window.uploadChart = new Chart(ctx, {
+ type: "bar",
+ data: {
+ labels: labels,
+ datasets: [
+ {
+ label: "Upload Volume (GB)",
+ data: uploadData,
+ backgroundColor: getComputedStyle(
+ document.documentElement
+ ).getPropertyValue("--accent-transparent"),
+ borderColor: getComputedStyle(
+ document.documentElement
+ ).getPropertyValue("--accent-color"),
+ borderWidth: 1,
+ yAxisID: "y",
+ },
+ {
+ label: "Files Completed",
+ data: completedData,
+ type: "line",
+ backgroundColor: "rgba(75, 192, 192, 0.2)",
+ borderColor: "rgba(75, 192, 192, 1)",
+ borderWidth: 2,
+ pointRadius: 3,
+ pointBackgroundColor: "rgba(75, 192, 192, 1)",
+ yAxisID: "y1",
+ },
+ ],
+ },
+ options: {
+ responsive: true,
+ maintainAspectRatio: false,
+ scales: {
+ y: {
+ beginAtZero: true,
+ title: {
+ display: true,
+ text: "Upload Volume (GB)",
+ },
+ grid: {
+ color: "rgba(255, 255, 255, 0.1)",
+ },
+ ticks: {
+ color: "rgba(255, 255, 255, 0.7)",
+ },
+ },
+ y1: {
+ beginAtZero: true,
+ position: "right",
+ title: {
+ display: true,
+ text: "Files Completed",
+ },
+ grid: {
+ drawOnChartArea: false,
+ },
+ ticks: {
+ color: "rgba(75, 192, 192, 0.7)",
+ },
+ },
+ x: {
+ grid: {
+ color: "rgba(255, 255, 255, 0.1)",
+ },
+ ticks: {
+ color: "rgba(255, 255, 255, 0.7)",
+ },
+ },
+ },
+ plugins: {
+ legend: {
+ labels: {
+ color: "rgba(255, 255, 255, 0.7)",
+ },
+ },
+ tooltip: {
+ mode: "index",
+ intersect: false,
+ },
+ },
+ },
+ });
+}
+
+/**
+ * Update the theme colors for the chart
+ */
+function updateChartThemeColors() {
+ if (!window.uploadChart) return;
+
+ const accentColor = getComputedStyle(document.documentElement)
+ .getPropertyValue("--accent-color")
+ .trim();
+ const accentTransparent = getComputedStyle(document.documentElement)
+ .getPropertyValue("--accent-transparent")
+ .trim();
+
+ window.uploadChart.data.datasets[0].borderColor = accentColor;
+ window.uploadChart.data.datasets[0].backgroundColor = accentTransparent;
+ window.uploadChart.update();
+}
+
+/**
+ * Set the theme for the application
+ * @param {string} theme - Theme name
+ */
+function setTheme(theme) {
+ console.log("Applying theme:", theme);
+
+ // Apply theme attributes
+ document.documentElement.setAttribute("data-theme", theme);
+ document.body.setAttribute("data-theme", theme);
+
+ updateThemeBackground(theme);
+
+ // Update active visual state
+ const themeOptions = document.querySelectorAll(".theme-option");
+ themeOptions.forEach((option) => {
+ if (option.dataset.theme === theme) {
+ option.classList.add("active");
+ } else {
+ option.classList.remove("active");
+ }
+ });
+
+ updateChartThemeColors();
+
+ // Save theme in a single place
+ saveUserSetting("theme", theme);
+}
+
+// Alternative jQuery implementation
+// $(".theme-option").removeClass("active");
+// $(`.theme-option[data-theme="${theme}"]`).addClass("active");
+
+// Update chart colors when theme changes
+
+/**
+ * Ensure theme backgrounds apply correctly
+ * @param {string} theme - Theme name
+ */
+function updateThemeBackground(theme) {
+ const themesWithBackgrounds = [
+ "overseerr",
+ "hotline",
+ "maroon",
+ "plex",
+ "aquamarine",
+ "dark",
+ "nord",
+ "dracula",
+ "space-gray",
+ "hotpink",
+ ];
+
+ // Clear any existing background properties
+ document.body.style.background = "";
+ document.body.style.backgroundImage = "none";
+ document.body.style.backgroundColor = "";
+
+ // Apply the theme data attribute which will activate the CSS rules
+ document.documentElement.setAttribute("data-theme", theme);
+ document.body.setAttribute("data-theme", theme);
+
+ // For themes with custom backgrounds, we need to ensure they get applied
+ if (themesWithBackgrounds.includes(theme)) {
+ // Force a repaint to ensure background styles apply correctly
+ void document.body.offsetWidth;
+ }
+}
+
+/**
+ * Initialize theme on page load
+ */
+function initializeTheme() {
+ console.log("Initializing theme...");
+
+ // Try both storage methods for backward compatibility
+ let savedTheme;
+
+ try {
+ // First try direct localStorage (used in index.html)
+ const directTheme = localStorage.getItem("uploader_theme");
+ if (directTheme) {
+ savedTheme = JSON.parse(directTheme);
+ } else {
+ // Fallback to getUserSetting method
+ savedTheme = getUserSetting("theme", "dark");
+ }
+ } catch (error) {
+ console.warn("Error loading theme, using default:", error);
+ savedTheme = "dark";
+ }
+
+ setTheme(savedTheme);
+ saveUserSetting("theme", savedTheme);
+}
+
+/**
+ * Setup event listeners for theme switching
+ */
+function setupThemeEventListeners() {
+ // Theme selection using event delegation for better performance
+ document.addEventListener("click", function (e) {
+ const themeOption = e.target.closest(".theme-option");
+ if (themeOption) {
+ const theme = themeOption.dataset.theme;
+ setTheme(theme);
+ saveUserSetting("theme", theme);
+ }
+ });
+
+ // Alternative jQuery implementation
+ // $(".theme-option").on("click", function () {
+ // const theme = $(this).data("theme");
+ // setTheme(theme);
+ // saveUserSetting("theme", theme);
+ // });
+}
+
+/**
+ * Escape HTML special characters to prevent XSS
+ * @param {string} text - Text to escape
+ * @returns {string} Escaped text
+ */
+function escapeHtml(text) {
+ if (!text) return "";
+ const map = {
+ "&": "&",
+ "<": "<",
+ ">": ">",
+ '"': """,
+ "'": "'",
+ };
+ return String(text).replace(/[&<>"']/g, function (m) {
+ return map[m];
+ });
+}
diff --git a/apps/docker-uploader/root/var/www/html/logo.png b/apps/docker-uploader/root/var/www/html/logo.png
new file mode 100644
index 0000000000..45624629bb
Binary files /dev/null and b/apps/docker-uploader/root/var/www/html/logo.png differ
diff --git a/apps/docker-uploader/root/var/www/html/srv/api/jobs/completed.php b/apps/docker-uploader/root/var/www/html/srv/api/jobs/completed.php
index 73c465ff09..d214f13fa2 100755
--- a/apps/docker-uploader/root/var/www/html/srv/api/jobs/completed.php
+++ b/apps/docker-uploader/root/var/www/html/srv/api/jobs/completed.php
@@ -8,60 +8,71 @@ function processJsonFiles()
{
$response = new ApiResponse();
$response->jobs = [];
- $db = new SQLite3(DATABASE, SQLITE3_OPEN_READONLY);
- $pagination_query = "";
- $count_result = $db->query("SELECT count(*) as COUNT FROM completed_uploads");
- //Check GET parameter..
- $total_records = $count_result->fetchArray()['COUNT'];
- $response->total_count = $total_records; // Save total completed job count to let frontend calculate pagination
- if (isset($_GET["pageNumber"]) && isset($_GET["pageSize"])
- && is_numeric($_GET["pageNumber"]) && is_numeric($_GET["pageSize"]) && $total_records >= 5) {
- $current_page = intval($_GET["pageNumber"]);
- $page_size = intval($_GET["pageSize"]);
- $total_pages = ceil($total_records / $page_size);
- // Validate parameters and default them if necessary
- if ($current_page > $total_pages) {
- $current_page = $total_pages;
- }
- if ($current_page < 1) {
- $current_page = 1;
- }
- if ($page_size > 50 || $page_size < 1) {
- $page_size = 10;
- }
- // Slice the data
- $offset = ($current_page - 1) * $page_size;
- $pagination_query .= " LIMIT $page_size OFFSET $offset ";
- }
+ try {
+ $db = new SQLite3(DATABASE, SQLITE3_OPEN_READONLY);
+ $db->busyTimeout(5000); // Wait up to 5 seconds if database is locked
+ $pagination_query = "";
+ $count_result = $db->query("SELECT count(*) as COUNT FROM completed_uploads");
+ //Check GET parameter..
+ $total_records = $count_result->fetchArray()['COUNT'];
+ $response->total_count = $total_records; // Save total completed job count to let frontend calculate pagination
+ if (
+ isset($_GET["pageNumber"]) && isset($_GET["pageSize"])
+ && is_numeric($_GET["pageNumber"]) && is_numeric($_GET["pageSize"]) && $total_records >= 5
+ ) {
+ $current_page = intval($_GET["pageNumber"]);
+ $page_size = intval($_GET["pageSize"]);
+ $total_pages = ceil($total_records / $page_size);
+ // Validate parameters and default them if necessary
+ if ($current_page > $total_pages) {
+ $current_page = $total_pages;
+ }
+ if ($current_page < 1) {
+ $current_page = 1;
+ }
+ if ($page_size > 50 || $page_size < 1) {
+ $page_size = 10;
+ }
- $results = $db->query("SELECT drive, filedir, filebase, filesize, gdsa, starttime, endtime, status
+ // Slice the data
+ $offset = ($current_page - 1) * $page_size;
+ $pagination_query .= " LIMIT $page_size OFFSET $offset ";
+ }
+
+ $results = $db->query("SELECT drive, filedir, filebase, filesize, gdsa, starttime, endtime, status
FROM completed_uploads ORDER BY endtime DESC " . $pagination_query);
- while ($row = $results->fetchArray()) {
- try {
- $jobStatus = new UploadJobStatus();
- $jobStatus->job_last_update_timestamp = $row['endtime'];
- $jobStatus->job_name = $row['filebase'];
- $jobStatus->drive = $row['drive'];
- $jobStatus->gdsa = $row['gdsa'];
- $jobStatus->file_directory = $row['filedir'];
- $jobStatus->file_name = $row['filebase'];
- $jobStatus->file_size = $row['filesize'];
+ while ($row = $results->fetchArray()) {
+ try {
+ $jobStatus = new UploadJobStatus();
+ $jobStatus->job_last_update_timestamp = $row['endtime'];
+ $jobStatus->job_name = $row['filebase'];
+ $jobStatus->drive = $row['drive'];
+ $jobStatus->gdsa = $row['gdsa'];
+ $jobStatus->file_directory = $row['filedir'];
+ $jobStatus->file_name = $row['filebase'];
+ $jobStatus->file_size = $row['filesize'];
- $jobStatus->time_end = date('d.m.y H:i:s', $row['endtime']);
- $jobStatus->time_end_clean = secs_to_str(time() - $row['endtime']) . ' ago';
- $jobStatus->time_start = $row['starttime'];
- $jobStatus->time_elapsed = secs_to_str($row['endtime'] - $row['starttime']);
- $jobStatus->successful = $row['status'] === 1;
- $response->jobs[] = $jobStatus;
- } catch (Exception $e) {
- //TODO: Error handling.. logfile?
+ $jobStatus->time_end = date('d.m.y H:i:s', $row['endtime']);
+ $jobStatus->time_end_clean = secs_to_str(time() - $row['endtime']) . ' ago';
+ $jobStatus->time_start = $row['starttime'];
+ $jobStatus->time_elapsed = secs_to_str($row['endtime'] - $row['starttime']);
+ $jobStatus->successful = $row['status'] === 1;
+ $response->jobs[] = $jobStatus;
+ } catch (Exception $e) {
+ //TODO: Error handling.. logfile?
+ }
}
- }
- $db?->close();
- unset($db);
- return json_encode($response);
+ $db?->close();
+ unset($db);
+ return json_encode($response);
+ } catch (Exception $e) {
+ // Return empty response on database error
+ error_log("Database error in completed.php: " . $e->getMessage());
+ $response->total_count = 0;
+ return json_encode($response);
+ }
}
/** actual logic */
diff --git a/apps/docker-uploader/root/var/www/html/srv/api/jobs/completed_today_stats.php b/apps/docker-uploader/root/var/www/html/srv/api/jobs/completed_today_stats.php
new file mode 100644
index 0000000000..922c375b0f
--- /dev/null
+++ b/apps/docker-uploader/root/var/www/html/srv/api/jobs/completed_today_stats.php
@@ -0,0 +1,103 @@
+ 0,
+ 'total_size' => 0
+ );
+
+ try {
+ $db = new SQLite3(DATABASE, SQLITE3_OPEN_READONLY);
+ $db->busyTimeout(5000); // Wait up to 5 seconds if database is locked
+
+ // Get start of today timestamp
+ $startOfToday = strtotime('today midnight');
+
+ // Count uploads completed today
+ $countQuery = "SELECT COUNT(*) as count FROM completed_uploads WHERE endtime >= $startOfToday";
+ $countResult = $db->query($countQuery);
+ $response['count'] = $countResult->fetchArray()['count'];
+
+ // First try to get total size in bytes from filesize_bytes column
+ $sizeQuery = "SELECT SUM(filesize_bytes) as total_bytes FROM completed_uploads WHERE endtime >= $startOfToday AND filesize_bytes > 0";
+ $sizeResult = $db->query($sizeQuery);
+ $totalBytes = $sizeResult->fetchArray()['total_bytes'];
+
+ // If filesize_bytes returns null or 0, fall back to calculating from filesize string
+ if (!$totalBytes) {
+ $fallbackQuery = "SELECT filesize FROM completed_uploads WHERE endtime >= $startOfToday";
+ $fallbackResult = $db->query($fallbackQuery);
+ $totalBytes = 0;
+
+ while ($row = $fallbackResult->fetchArray()) {
+ $totalBytes += convertSizeToBytes($row['filesize']);
+ }
+ }
+
+ $response['total_size'] = $totalBytes ?: 0;
+
+ $db->close();
+ unset($db);
+
+ return json_encode($response);
+ } catch (Exception $e) {
+ // Return default response on database error
+ error_log("Database error in completed_today_stats.php: " . $e->getMessage());
+ return json_encode($response);
+ }
+}
+
+/**
+ * Convert a file size string to bytes
+ * @param string $sizeStr File size string (e.g. "2.5 GiB", "500 MiB") or numeric string
+ * @return int Size in bytes
+ */
+function convertSizeToBytes($sizeStr)
+{
+ if (empty($sizeStr)) {
+ return 0;
+ }
+
+ // If it's already a number (or a numeric string), return it directly
+ if (is_numeric($sizeStr)) {
+ return (int)$sizeStr;
+ }
+
+ // Extract numeric part and unit for formatted strings
+ if (preg_match('/^([0-9.]+)\s*([KMGT]i?B?)$/i', $sizeStr, $matches)) {
+ $num = (float) $matches[1];
+ $unit = strtoupper($matches[2]);
+
+ // Convert based on unit
+ switch ($unit) {
+ case 'B':
+ return (int) $num;
+ case 'KB':
+ case 'KIB':
+ return (int) ($num * 1024);
+ case 'MB':
+ case 'MIB':
+ return (int) ($num * 1024 * 1024);
+ case 'GB':
+ case 'GIB':
+ return (int) ($num * 1024 * 1024 * 1024);
+ case 'TB':
+ case 'TIB':
+ return (int) ($num * 1024 * 1024 * 1024 * 1024);
+ default:
+ return 0;
+ }
+ }
+
+ return 0;
+}
+
+echo getCompletedTodayStats();
diff --git a/apps/docker-uploader/root/var/www/html/srv/api/jobs/failed.php b/apps/docker-uploader/root/var/www/html/srv/api/jobs/failed.php
new file mode 100644
index 0000000000..ea06bbc326
--- /dev/null
+++ b/apps/docker-uploader/root/var/www/html/srv/api/jobs/failed.php
@@ -0,0 +1,83 @@
+jobs = [];
+
+ try {
+ $db = new SQLite3(DATABASE, SQLITE3_OPEN_READONLY);
+ $db->busyTimeout(5000); // Wait up to 5 seconds if database is locked
+
+ $pagination_query = "";
+ $count_result = $db->query("SELECT count(*) as COUNT FROM completed_uploads WHERE status = 0");
+ $total_records = $count_result->fetchArray()['COUNT'];
+ $response->total_count = $total_records;
+
+ // Handle pagination
+ if (
+ isset($_GET["pageNumber"]) && isset($_GET["pageSize"])
+ && is_numeric($_GET["pageNumber"]) && is_numeric($_GET["pageSize"]) && $total_records >= 5
+ ) {
+ $current_page = intval($_GET["pageNumber"]);
+ $page_size = intval($_GET["pageSize"]);
+ $total_pages = ceil($total_records / $page_size);
+
+ if ($current_page > $total_pages) {
+ $current_page = $total_pages;
+ }
+ if ($current_page < 1) {
+ $current_page = 1;
+ }
+ if ($page_size > 50 || $page_size < 1) {
+ $page_size = 10;
+ }
+
+ $offset = ($current_page - 1) * $page_size;
+ $pagination_query .= " LIMIT $page_size OFFSET $offset ";
+ }
+
+ $results = $db->query("SELECT drive, filedir, filebase, filesize, gdsa, starttime, endtime, status, error
+ FROM completed_uploads
+ WHERE status = 0
+ ORDER BY endtime DESC " . $pagination_query);
+
+ while ($row = $results->fetchArray()) {
+ try {
+ $jobStatus = new UploadJobStatus();
+ $jobStatus->job_last_update_timestamp = $row['endtime'];
+ $jobStatus->job_name = $row['filebase'];
+ $jobStatus->drive = $row['drive'];
+ $jobStatus->gdsa = $row['gdsa'];
+ $jobStatus->file_directory = $row['filedir'];
+ $jobStatus->file_name = $row['filebase'];
+ $jobStatus->file_size = $row['filesize'];
+ $jobStatus->time_end = date('d.m.y H:i:s', $row['endtime']);
+ $jobStatus->time_end_clean = secs_to_str(time() - $row['endtime']) . ' ago';
+ $jobStatus->time_start = $row['starttime'];
+ $jobStatus->time_elapsed = secs_to_str($row['endtime'] - $row['starttime']);
+ $jobStatus->successful = false; // Always false for failed uploads
+ $jobStatus->error_message = $row['error']; // Include error message
+ $response->jobs[] = $jobStatus;
+ } catch (Exception $e) {
+ //TODO: Error handling.. logfile?
+ }
+ }
+
+ $db?->close();
+ unset($db);
+ return json_encode($response);
+ } catch (Exception $e) {
+ error_log("Database error in failed.php: " . $e->getMessage());
+ $response->total_count = 0;
+ return json_encode($response);
+ }
+}
+
+/** actual logic */
+header('Content-Type: application/json; charset=utf-8');
+echo getFailedUploads();
diff --git a/apps/docker-uploader/root/var/www/html/srv/api/jobs/failed_count.php b/apps/docker-uploader/root/var/www/html/srv/api/jobs/failed_count.php
new file mode 100644
index 0000000000..b0495b2335
--- /dev/null
+++ b/apps/docker-uploader/root/var/www/html/srv/api/jobs/failed_count.php
@@ -0,0 +1,38 @@
+ 0
+ );
+
+ try {
+ if (!file_exists(DATABASE)) {
+ $response['error'] = 'Database file not found';
+ return json_encode($response);
+ }
+
+ $db = new SQLite3(DATABASE, SQLITE3_OPEN_READONLY);
+ $db->busyTimeout(5000);
+
+ try {
+ $result = $db->querySingle("SELECT count(*) as COUNT FROM completed_uploads WHERE status = 0", true);
+ if ($result && is_array($result)) {
+ $response['count'] = (int)$result['COUNT'];
+ }
+ } catch (Exception $e) {
+ $response['error'] = $db->lastErrorMsg();
+ }
+
+ $db?->close();
+ } catch (Exception $e) {
+ $response['error'] = $e->getMessage();
+ }
+
+ return json_encode($response);
+}
+
+/** actual logic */
+header('Content-Type: application/json; charset=utf-8');
+echo getFailedCount();
diff --git a/apps/docker-uploader/root/var/www/html/srv/api/jobs/inprogress.php b/apps/docker-uploader/root/var/www/html/srv/api/jobs/inprogress.php
index 10d90a13e5..92908e72a9 100755
--- a/apps/docker-uploader/root/var/www/html/srv/api/jobs/inprogress.php
+++ b/apps/docker-uploader/root/var/www/html/srv/api/jobs/inprogress.php
@@ -8,33 +8,42 @@ function processJsonFiles()
{
$response = new ApiResponse();
$response->jobs = [];
- $db = new SQLite3(DATABASE, SQLITE3_OPEN_READONLY);
- $results = $db->query("SELECT drive, filedir, filebase, filesize, gdsa, logfile FROM uploads");
- while ($row = $results->fetchArray()) {
- try {
- $jobStatus = new UploadJobStatus();
- $jobStatus->job_name = $row['filebase'];
- $jobStatus->drive = $row['drive'];
- $jobStatus->gdsa = $row['gdsa'];
- $jobStatus->file_directory = $row['filedir'];
- $jobStatus->file_name = $row['filebase'];
- $jobStatus->file_size = $row['filesize'];
- //Parse rclone logfile
- if ($row['logfile'] != null) {
- mapLogFileInformation($row['logfile'], $jobStatus);
- $response->jobs[] = $jobStatus;
+ try {
+ $db = new SQLite3(DATABASE, SQLITE3_OPEN_READONLY);
+ $db->busyTimeout(5000); // Wait up to 5 seconds if database is locked
+ $results = $db->query("SELECT drive, filedir, filebase, filesize, gdsa, logfile FROM uploads");
+ while ($row = $results->fetchArray()) {
+ try {
+ $jobStatus = new UploadJobStatus();
+ $jobStatus->job_name = $row['filebase'];
+ $jobStatus->drive = $row['drive'];
+ $jobStatus->gdsa = $row['gdsa'];
+ $jobStatus->file_directory = $row['filedir'];
+ $jobStatus->file_name = $row['filebase'];
+ $jobStatus->file_size = $row['filesize'];
+
+ //Parse rclone logfile
+ if ($row['logfile'] != null) {
+ mapLogFileInformation($row['logfile'], $jobStatus);
+ $response->jobs[] = $jobStatus;
+ }
+ } catch (Exception $e) {
+ //TODO: Error handling
}
- } catch (Exception $e) {
- //TODO: Error handling
}
- }
- $response->total_count = isset($response->jobs) ? count($response->jobs) : 0;
+ $response->total_count = isset($response->jobs) ? count($response->jobs) : 0;
- $db?->close();
- unset($db);
- return json_encode($response);
+ $db?->close();
+ unset($db);
+ return json_encode($response);
+ } catch (Exception $e) {
+ // Return empty response on database error
+ error_log("Database error in inprogress.php: " . $e->getMessage());
+ $response->total_count = 0;
+ return json_encode($response);
+ }
}
function mapLogFileInformation($logfile, UploadJobStatus $jobStatus): UploadJobStatus
diff --git a/apps/docker-uploader/root/var/www/html/srv/api/jobs/queue.php b/apps/docker-uploader/root/var/www/html/srv/api/jobs/queue.php
new file mode 100644
index 0000000000..d7dce6f91f
--- /dev/null
+++ b/apps/docker-uploader/root/var/www/html/srv/api/jobs/queue.php
@@ -0,0 +1,70 @@
+ true,
+ 'files' => array()
+ );
+
+ try {
+ // Check if database file exists
+ if (!file_exists(DATABASE)) {
+ $response['success'] = false;
+ $response['error'] = 'Database file not found';
+ return json_encode($response);
+ }
+
+ $db = new SQLite3(DATABASE, SQLITE3_OPEN_READONLY);
+ $db->busyTimeout(5000); // Wait up to 5 seconds if database is locked
+
+ // Get all files from the queue ordered by time (oldest first)
+ $query = "SELECT time, drive, filedir, filebase, filesize, metadata FROM upload_queue ORDER BY time ASC";
+ $result = $db->query($query);
+
+ if ($result === false) {
+ $response['success'] = false;
+ $response['error'] = $db->lastErrorMsg();
+ $db->close();
+ return json_encode($response);
+ }
+
+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+ // Convert SQLite datetime to Unix timestamp
+ $timestamp = !empty($row['time']) ? strtotime($row['time']) : time();
+
+ $response['files'][] = array(
+ 'filename' => $row['filebase'],
+ 'filesize' => $row['filesize'],
+ 'drive' => $row['drive'],
+ 'filedir' => $row['filedir'],
+ 'metadata' => $row['metadata'],
+ 'created_at' => $timestamp
+ );
+ }
+
+ $db->close();
+ unset($db);
+ } catch (Exception $e) {
+ $response['success'] = false;
+ $response['error'] = $e->getMessage();
+ }
+
+ return json_encode($response);
+}
+
+// Return the queue files
+echo getQueueFiles();
diff --git a/apps/docker-uploader/root/var/www/html/srv/api/jobs/queue_stats.php b/apps/docker-uploader/root/var/www/html/srv/api/jobs/queue_stats.php
new file mode 100644
index 0000000000..9067529ef5
--- /dev/null
+++ b/apps/docker-uploader/root/var/www/html/srv/api/jobs/queue_stats.php
@@ -0,0 +1,99 @@
+ 0,
+ 'total_size' => 0
+ );
+
+ try {
+ $db = new SQLite3(DATABASE, SQLITE3_OPEN_READONLY);
+ $db->busyTimeout(5000); // Wait up to 5 seconds if database is locked
+
+ // Count files in the queue
+ $countQuery = "SELECT COUNT(*) as count FROM upload_queue";
+ $countResult = $db->query($countQuery);
+ $response['count'] = $countResult->fetchArray()['count'];
+
+ // Calculate total size of files in the queue
+ $filesResult = $db->query("SELECT filesize FROM upload_queue");
+ $totalBytes = 0;
+
+ while ($row = $filesResult->fetchArray()) {
+ $sizeStr = $row['filesize'];
+ $totalBytes += convertSizeToBytes($sizeStr);
+ }
+
+ $response['total_size'] = $totalBytes;
+
+ $db->close();
+ unset($db);
+
+ return json_encode($response);
+ } catch (Exception $e) {
+ // Return default response on database error
+ error_log("Database error in queue_stats.php: " . $e->getMessage());
+ return json_encode($response);
+ }
+}
+
+/**
+ * Convert a file size string to bytes
+ * @param string $sizeStr File size string (e.g. "2.5 GiB", "500 MiB") or numeric string
+ * @return int Size in bytes
+ */
+function convertSizeToBytes($sizeStr)
+{
+ if (empty($sizeStr)) {
+ return 0;
+ }
+
+ // If it's already a number (or a numeric string), return it directly
+ if (is_numeric($sizeStr)) {
+ return (int)$sizeStr;
+ }
+
+ // Extract numeric part and unit for formatted strings
+ if (preg_match('/^([0-9.]+)\s*([KMGT]i?B?)$/i', $sizeStr, $matches)) {
+ $num = (float) $matches[1];
+ $unit = strtoupper($matches[2]);
+
+ // Convert based on unit
+ switch ($unit) {
+ case 'B':
+ return (int) $num;
+ case 'KB':
+ case 'KIB':
+ return (int) ($num * 1024);
+ case 'MB':
+ case 'MIB':
+ return (int) ($num * 1024 * 1024);
+ case 'GB':
+ case 'GIB':
+ return (int) ($num * 1024 * 1024 * 1024);
+ case 'TB':
+ case 'TIB':
+ return (int) ($num * 1024 * 1024 * 1024 * 1024);
+ default:
+ return 0;
+ }
+ }
+
+ return 0;
+}
+
+echo getQueueStats();
diff --git a/apps/docker-uploader/root/var/www/html/srv/api/settings/update.php b/apps/docker-uploader/root/var/www/html/srv/api/settings/update.php
new file mode 100644
index 0000000000..a103901a42
--- /dev/null
+++ b/apps/docker-uploader/root/var/www/html/srv/api/settings/update.php
@@ -0,0 +1,210 @@
+ false, 'message' => 'Could not read env file'];
+ }
+
+ // Create backup
+ $backupFile = $envFile . '.bak_' . date('YmdHis');
+ if (!copy($envFile, $backupFile)) {
+ return ['success' => false, 'message' => 'Could not create backup of env file'];
+ }
+
+ // Update the values
+ foreach ($settings as $key => $value) {
+ // Normalize PROXY to explicit empty quotes when blank/null-ish
+ if ($key === 'PROXY' && ($value === 'null' || $value === null || $value === '')) {
+ $value = '""';
+ }
+
+ $found = false;
+ foreach ($lines as &$line) {
+ if (preg_match('/^' . $key . '=/', $line)) {
+ // Properly format the value
+ if ($value === 'true' || $value === 'false' || $value === 'null' || is_numeric($value)) {
+ // Boolean, null, or numeric values don't need quotes
+ $line = $key . '=' . $value;
+ } else {
+ // String values should be quoted
+ $line = $key . '="' . $value . '"';
+ }
+ $found = true;
+ break;
+ }
+ }
+
+ // If key wasn't found, add it to appropriate section
+ if (!$found) {
+ // Determine which section to add it to
+ $sectionFound = false;
+
+ // Common settings categories
+ $sections = [
+ 'USER VALUES' => ['PUID', 'PGID', 'TIMEZONE'],
+ 'CRITICAL SETUP FOR CRYPT USER' => ['HASHPASSWORD', 'GDSA_NAME', 'DB_NAME', 'DB_TEAM'],
+ 'RCLONE - SETTINGS' => ['BANDWIDTH_LIMIT', 'GOOGLE_IP', 'PROXY', 'LOG_LEVEL', 'DLFOLDER', 'TRANSFERS'],
+ 'USER - SETTINGS' => ['DRIVEUSEDSPACE', 'FOLDER_DEPTH', 'FOLDER_PRIORITY', 'MIN_AGE_UPLOAD'],
+ 'VFS - SETTINGS' => ['VFS_REFRESH_ENABLE', 'MOUNT'],
+ 'LOG - SETTINGS' => ['LOG_ENTRY', 'LOG_RETENTION_DAYS'],
+ 'AUTOSCAN - SETTINGS' => ['AUTOSCAN_URL', 'AUTOSCAN_USER', 'AUTOSCAN_PASS'],
+ 'NOTIFICATION - SETTINGS' => ['NOTIFICATION_URL', 'NOTIFICATION_LEVEL', 'NOTIFICATION_SERVERNAME'],
+ 'STRIPARR - SETTINGS' => ['STRIPARR_URL'],
+ 'LANGUAGE MESSAGES' => ['LANGUAGE']
+ ];
+
+ // Find which section this key belongs to
+ $targetSection = null;
+ foreach ($sections as $section => $keys) {
+ if (in_array($key, $keys)) {
+ $targetSection = $section;
+ break;
+ }
+ }
+
+ // Default to USER - SETTINGS if no matching section found
+ if ($targetSection === null) {
+ $targetSection = 'USER - SETTINGS';
+ }
+
+ // Find the section in the file
+ for ($i = 0; $i < count($lines); $i++) {
+ if (strpos($lines[$i], '## ' . $targetSection) !== false) {
+ // Find the end of the section
+ $j = $i + 1;
+ while ($j < count($lines) && !preg_match('/^##\s+/', $lines[$j])) {
+ $j++;
+ }
+
+ // Format the value
+ $valueFormatted = $value;
+ if ($value === '""') {
+ $valueFormatted = '""';
+ } elseif ($value !== 'true' && $value !== 'false' && $value !== 'null' && !is_numeric($value)) {
+ $valueFormatted = '"' . $value . '"';
+ }
+
+ // Insert the new key-value at the end of the section
+ array_splice($lines, $j, 0, $key . '=' . $valueFormatted);
+ $sectionFound = true;
+ break;
+ }
+ }
+
+ // If section not found, add it at the end before the footer
+ if (!$sectionFound) {
+ // Find the footer
+ $footerIdx = array_search('#-------------------------------------------------------', $lines);
+ if ($footerIdx !== false) {
+ $valueFormatted = $value;
+ if ($value !== 'true' && $value !== 'false' && $value !== 'null' && !is_numeric($value)) {
+ $valueFormatted = '"' . $value . '"';
+ }
+
+ array_splice($lines, $footerIdx, 0, [
+ '',
+ '## CUSTOM - SETTINGS',
+ $key . '=' . $valueFormatted
+ ]);
+ }
+ }
+ }
+ }
+
+ // Write the file back
+ if (file_put_contents($envFile, implode("\n", $lines)) === false) {
+ // Restore backup on failure
+ copy($backupFile, $envFile);
+ return ['success' => false, 'message' => 'Could not write env file'];
+ }
+
+ // Set proper permissions
+ chmod($envFile, 0755);
+ chown($envFile, 'abc');
+ chgrp($envFile, 'abc');
+
+ // Remove backups older than 7 days
+ $oldBackups = glob($envFile . '.bak_*');
+ foreach ($oldBackups as $backup) {
+ if (filemtime($backup) < time() - 7 * 24 * 60 * 60) {
+ unlink($backup);
+ }
+ }
+
+ return ['success' => true, 'message' => 'Settings updated successfully'];
+}
+
+function readEnvFile()
+{
+ $envFile = '/system/uploader/uploader.env';
+ $settings = [];
+
+ // Check if file exists
+ if (!file_exists($envFile)) {
+ return ['success' => false, 'message' => 'Environment file not found'];
+ }
+
+ // Read file
+ $lines = file($envFile, FILE_IGNORE_NEW_LINES);
+ foreach ($lines as $line) {
+ // Skip comments and empty lines
+ if (empty($line) || $line[0] == '#' || strpos($line, '=') === false) {
+ continue;
+ }
+
+ // Parse key=value
+ list($key, $value) = explode('=', $line, 2);
+ $key = trim($key);
+ $value = trim($value);
+
+ // Remove quotes if present
+ if (preg_match('/^"(.*)"$/', $value, $matches)) {
+ $value = $matches[1];
+ }
+
+ // Convert special values
+ if ($value === 'true') {
+ $value = true;
+ } elseif ($value === 'false') {
+ $value = false;
+ } elseif ($value === 'null') {
+ $value = null;
+ } elseif (is_numeric($value)) {
+ $value = $value + 0; // Convert to number
+ }
+
+ $settings[$key] = $value;
+ }
+
+ return ['success' => true, 'settings' => $settings];
+}
+
+// Handle requests
+header('Content-Type: application/json');
+$method = $_SERVER['REQUEST_METHOD'];
+
+switch ($method) {
+ case 'GET':
+ echo json_encode(readEnvFile());
+ break;
+
+ case 'POST':
+ $settings = json_decode(file_get_contents('php://input'), true);
+ if ($settings) {
+ echo json_encode(updateEnvFile($settings));
+ } else {
+ echo json_encode(['success' => false, 'message' => 'Invalid JSON data']);
+ }
+ break;
+
+ default:
+ header('HTTP/1.1 405 Method Not Allowed');
+ echo json_encode(['success' => false, 'message' => 'Method not allowed']);
+ break;
+}
diff --git a/apps/docker-uploader/root/var/www/html/srv/api/system/clean_history.php b/apps/docker-uploader/root/var/www/html/srv/api/system/clean_history.php
index a67ec554be..6b59c84fd5 100644
--- a/apps/docker-uploader/root/var/www/html/srv/api/system/clean_history.php
+++ b/apps/docker-uploader/root/var/www/html/srv/api/system/clean_history.php
@@ -1,8 +1,15 @@
exec('DELETE FROM completed_uploads');
-$db->close();
-unset($db);
\ No newline at end of file
+try {
+ $db = new SQLite3(DATABASE);
+ $db->busyTimeout(5000); // Wait up to 5 seconds if database is locked
+ $count_result = $db->exec('DELETE FROM completed_uploads');
+ $db->close();
+ unset($db);
+} catch (Exception $e) {
+ error_log("Database error in clean_history.php: " . $e->getMessage());
+ http_response_code(500);
+ echo json_encode(['success' => false, 'error' => 'Database error']);
+ exit;
+}
diff --git a/apps/docker-uploader/root/var/www/html/srv/api/system/env_settings.php b/apps/docker-uploader/root/var/www/html/srv/api/system/env_settings.php
new file mode 100644
index 0000000000..8959f3d98a
--- /dev/null
+++ b/apps/docker-uploader/root/var/www/html/srv/api/system/env_settings.php
@@ -0,0 +1,52 @@
+status = file_exists(PAUSE_FILE) ? StatusResponse::STATUS_STOPPED : StatusResponse::STATUS_STARTED;
+
+ // Get container uptime (not host system uptime)
+ if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+ // Windows - fallback to basic info
+ $response->uptime = "Running";
+ } else {
+ // Linux/Unix - Get the uptime of PID 1 (container's main process)
+ $stat = @file_get_contents('/proc/1/stat');
+ if ($stat) {
+ // Extract start time from /proc/1/stat
+ $parts = explode(' ', $stat);
+ $startTimeJiffies = isset($parts[21]) ? (float)$parts[21] : 0;
+
+ // Get system clock ticks per second
+ $clockTicks = 100; // Sensible default for many Linux systems
+ $clkTckOutput = @shell_exec('getconf CLK_TCK 2>/dev/null');
+ if ($clkTckOutput !== null) {
+ $clkTckOutput = trim($clkTckOutput);
+ if (is_numeric($clkTckOutput) && (float)$clkTckOutput > 0) {
+ $clockTicks = (float)$clkTckOutput;
+ }
+ }
+
+ // Get system uptime
+ $uptimeData = @file_get_contents('/proc/uptime');
+ if ($uptimeData && $startTimeJiffies > 0) {
+ $uptimeParts = explode(' ', trim($uptimeData));
+ $systemUptime = (float)$uptimeParts[0];
+
+ // Calculate process start time in seconds
+ $processStartTime = $startTimeJiffies / $clockTicks;
+
+ // Calculate how long the process has been running
+ $processUptime = $systemUptime - $processStartTime;
+
+ // Format the uptime
+ $days = floor($processUptime / 86400);
+ $hours = floor(($processUptime % 86400) / 3600);
+ $minutes = floor(($processUptime % 3600) / 60);
+
+ $uptimeParts = [];
+ if ($days > 0) $uptimeParts[] = "$days day" . ($days > 1 ? 's' : '');
+ if ($hours > 0) $uptimeParts[] = "$hours hour" . ($hours > 1 ? 's' : '');
+ if ($minutes > 0) $uptimeParts[] = "$minutes minute" . ($minutes > 1 ? 's' : '');
+
+ $response->uptime = !empty($uptimeParts) ? implode(', ', $uptimeParts) : 'Just started';
+ } else {
+ $response->uptime = "N/A";
+ }
+ } else {
+ $response->uptime = "N/A";
+ }
+ }
+
+ // Get storage information
+ $possiblePaths = [
+ '/mnt/downloads',
+ '/data/downloads',
+ '/config/downloads',
+ '/downloads',
+ dirname(__DIR__, 4) . '/data/downloads',
+ __DIR__,
+ '/'
+ ];
+
+ $storage = "N/A";
+ foreach ($possiblePaths as $uploadPath) {
+ if (is_dir($uploadPath) && is_readable($uploadPath)) {
+ $total = @disk_total_space($uploadPath);
+ $free = @disk_free_space($uploadPath);
+
+ if ($total !== false && $free !== false && $total > 0) {
+ $used = $total - $free;
+
+ // Use GB for smaller values, TB for larger
+ if ($total < 1024 ** 4) {
+ $usedGB = round($used / (1024 ** 3), 2);
+ $totalGB = round($total / (1024 ** 3), 2);
+ $storage = "$usedGB GB / $totalGB GB";
+ } else {
+ $usedTB = round($used / (1024 ** 4), 2);
+ $totalTB = round($total / (1024 ** 4), 2);
+ $storage = "$usedTB TB / $totalTB TB";
+ }
+ break;
+ }
+ }
+ }
+
+ $response->storage = $storage;
+
return json_encode($response);
}
function updateStatus($action)
{
+ // Enable error logging
+ error_log("Status update requested: Action=$action");
+
if ($action === 'pause') {
- $pfile = fopen(PAUSE_FILE, 'w');
- fwrite($pfile, '');
- fclose($pfile);
- } else {
- unlink(PAUSE_FILE);
+ // Create pause file to pause uploads
+ error_log("Creating pause file: " . PAUSE_FILE);
+ $result = file_put_contents(PAUSE_FILE, '');
+ if ($result === false) {
+ error_log("Failed to create pause file. Check permissions.");
+ // Try to fix permissions
+ $dir = dirname(PAUSE_FILE);
+ if (!is_dir($dir)) {
+ mkdir($dir, 0777, true);
+ error_log("Created directory: $dir");
+ }
+ chmod($dir, 0777);
+ error_log("Set directory permissions: $dir");
+
+ // Try again
+ $result = file_put_contents(PAUSE_FILE, '');
+ error_log("Second attempt to create pause file: " . ($result !== false ? "success" : "failed"));
+ }
+ } else if ($action === 'continue') {
+ // Remove pause file to resume uploads
+ error_log("Removing pause file: " . PAUSE_FILE);
+ if (file_exists(PAUSE_FILE)) {
+ $result = unlink(PAUSE_FILE);
+ error_log("Unlink result: " . ($result ? "success" : "failed"));
+ if (!$result) {
+ error_log("Failed to remove pause file. Error: " . error_get_last()['message']);
+ // Try to fix permissions
+ chmod(PAUSE_FILE, 0666);
+ $result = unlink(PAUSE_FILE);
+ error_log("Second attempt: " . ($result ? "success" : "failed"));
+ }
+ } else {
+ error_log("Pause file doesn't exist, nothing to remove.");
+ }
}
}
@@ -26,6 +149,25 @@ function updateStatus($action)
$method = filter_input(\INPUT_SERVER, 'REQUEST_METHOD', \FILTER_SANITIZE_SPECIAL_CHARS);
if ($method === 'POST') {
- updateStatus($_POST["action"]);
+ // Get the action from POST data
+ if (isset($_POST["action"])) {
+ $action = $_POST["action"];
+ error_log("Received POST with action: $action");
+ updateStatus($action);
+ } else {
+ // Try to get data from JSON input if POST array is empty
+ $input = file_get_contents('php://input');
+ error_log("Received raw input: $input");
+
+ if (!empty($input)) {
+ $data = json_decode($input, true);
+ if (isset($data['action'])) {
+ $action = $data['action'];
+ error_log("Parsed action from JSON: $action");
+ updateStatus($action);
+ }
+ }
+ }
}
+
echo checkStatus();
diff --git a/apps/docker-uploader/root/var/www/html/srv/api/system/update_env.php b/apps/docker-uploader/root/var/www/html/srv/api/system/update_env.php
new file mode 100644
index 0000000000..cefe257553
--- /dev/null
+++ b/apps/docker-uploader/root/var/www/html/srv/api/system/update_env.php
@@ -0,0 +1,242 @@
+ false,
+ 'message' => 'Invalid request method. Only POST is allowed.'
+ ));
+ }
+
+ // Get the request data
+ $rawInput = file_get_contents('php://input');
+ error_log("Raw input received: " . $rawInput);
+
+ $data = json_decode($rawInput, true);
+
+ if (!$data || !is_array($data)) {
+ error_log("Invalid data format received");
+
+ // Try to get regular POST data if JSON parsing failed
+ if (!empty($_POST)) {
+ $data = $_POST;
+ error_log("Using standard POST data instead: " . print_r($data, true));
+ } else {
+ return json_encode(array(
+ 'success' => false,
+ 'message' => 'Invalid request data.',
+ 'received' => $rawInput
+ ));
+ }
+ }
+
+ error_log("Processing data: " . print_r($data, true));
+
+ // Use the full path defined in the Docker container
+ $envFile = '/system/uploader/uploader.env';
+
+ // Check if file exists and is writable
+ if (!file_exists($envFile)) {
+ error_log("Environment file not found: $envFile");
+ return json_encode(array(
+ 'success' => false,
+ 'message' => 'Environment file not found.',
+ 'path' => $envFile
+ ));
+ }
+
+ // Check permissions
+ $filePerms = substr(sprintf('%o', fileperms($envFile)), -4);
+ error_log("File permissions: $filePerms");
+
+ if (!is_writable($envFile)) {
+ error_log("Environment file is not writable: $envFile");
+
+ // Try to fix permissions
+ $chmodResult = chmod($envFile, 0666);
+ error_log("Attempted to fix permissions: " . ($chmodResult ? "success" : "failed"));
+
+ if (!is_writable($envFile)) {
+ return json_encode(array(
+ 'success' => false,
+ 'message' => 'Environment file is not writable.',
+ 'permissions' => $filePerms
+ ));
+ }
+ }
+
+ // Create a backup before modifying
+ $backupFile = $envFile . '.bak.' . date('YmdHis');
+ if (!copy($envFile, $backupFile)) {
+ error_log("Failed to create backup file");
+ return json_encode(array(
+ 'success' => false,
+ 'message' => 'Failed to create backup file.'
+ ));
+ }
+
+ // Read the current env file
+ $lines = file($envFile, FILE_IGNORE_NEW_LINES);
+ if ($lines === false) {
+ error_log("Failed to read environment file");
+ return json_encode(array(
+ 'success' => false,
+ 'message' => 'Failed to read environment file.'
+ ));
+ }
+
+ error_log("Read " . count($lines) . " lines from environment file");
+ $updated = false;
+
+ // Process input data - special handling for certain fields
+ foreach ($data as $key => &$value) {
+ // Skip empty or invalid keys
+ if (empty($key) || !is_string($key)) {
+ continue;
+ }
+
+ // Remove any dangerous characters
+ $key = preg_replace('/[^A-Za-z0-9_]/', '', $key);
+
+ // Special handling for BANDWIDTH_LIMIT
+ if ($key === 'BANDWIDTH_LIMIT' && !empty($value) && $value !== 'null' && !preg_match('/[KMG]$/i', $value)) {
+ // Append 'M' if no unit is specified
+ $value = $value . 'M';
+ error_log("Added M suffix to bandwidth limit: $value");
+ }
+
+ // Ensure PROXY is stored as an empty quoted string when blank or null-ish
+ if ($key === 'PROXY' && ($value === 'null' || $value === null || $value === '')) {
+ $value = '""';
+ error_log("Normalized PROXY value to explicit empty quotes");
+ }
+
+ error_log("Processed setting: $key=$value");
+ }
+ // Important: unset the reference to avoid issues
+ unset($value);
+
+ // Update the env file with new values
+ foreach ($lines as $i => $line) {
+ foreach ($data as $key => $value) {
+ // Match the exact key at the start of the line
+ $upperKey = strtoupper($key);
+ $pattern = '/^' . preg_quote($upperKey, '/') . '=/';
+
+ if (preg_match($pattern, $line)) {
+ $oldLine = $lines[$i];
+
+ // Check if the value needs quotes
+ if ($value === 'true' || $value === 'false' || $value === 'null' || is_numeric($value)) {
+ $formattedValue = $value;
+ } else {
+ // If the value already has quotes, keep them
+ if (preg_match('/^".*"$/', $value) || preg_match("/^'.*'$/", $value)) {
+ $formattedValue = $value;
+ } else {
+ $formattedValue = '"' . $value . '"';
+ }
+ }
+
+ $lines[$i] = $upperKey . '=' . $formattedValue;
+
+ error_log("Updated line: '$oldLine' to '{$lines[$i]}'");
+ $updated = true;
+
+ // Remove from data array to keep track of what's been processed
+ unset($data[$key]);
+ }
+ }
+ }
+
+ // Add any settings that weren't found (new settings)
+ if (!empty($data)) {
+ error_log("Adding new settings: " . print_r($data, true));
+
+ // Find the end section marker
+ $endMarkerPattern = '/^#-+$/';
+ $endIndex = null;
+
+ foreach ($lines as $i => $line) {
+ if (preg_match($endMarkerPattern, $line) && $i > count($lines) / 2) {
+ $endIndex = $i;
+ break;
+ }
+ }
+
+ if ($endIndex !== null) {
+ $insertIndex = $endIndex;
+
+ // Find the appropriate section to add the setting
+ foreach ($data as $key => $value) {
+ // Convert key to uppercase for env file
+ $upperKey = strtoupper($key);
+
+ // Check if the value needs quotes
+ if ($value === 'true' || $value === 'false' || $value === 'null' || is_numeric($value)) {
+ $formattedValue = $value;
+ } else {
+ if (preg_match('/^".*"$/', $value) || preg_match("/^'.*'$/", $value)) {
+ $formattedValue = $value;
+ } else {
+ $formattedValue = '"' . $value . '"';
+ }
+ }
+
+ $newLine = "$upperKey=$formattedValue";
+
+ error_log("Inserting new line at $insertIndex: $newLine");
+
+ // Insert the new line before the end section
+ array_splice($lines, $insertIndex, 0, $newLine);
+ $insertIndex++;
+ $updated = true;
+ }
+ } else {
+ error_log("Could not find end marker in env file");
+ }
+ }
+
+ if (!$updated) {
+ error_log("No settings were updated");
+ return json_encode(array(
+ 'success' => false,
+ 'message' => 'No settings were updated.'
+ ));
+ }
+
+ error_log("Writing " . count($lines) . " lines back to file");
+
+ // Write the updated content back to the file
+ $result = file_put_contents($envFile, implode("\n", $lines));
+ if ($result === false) {
+ error_log("Failed to write to environment file");
+ return json_encode(array(
+ 'success' => false,
+ 'message' => 'Failed to write to environment file.'
+ ));
+ }
+
+ error_log("Successfully wrote $result bytes to environment file");
+ return json_encode(array(
+ 'success' => true,
+ 'message' => 'Settings updated successfully.',
+ 'bytes_written' => $result
+ ));
+}
+
+echo updateEnvSettings();
diff --git a/apps/docker-uploader/root/var/www/html/srv/api/system/version.php b/apps/docker-uploader/root/var/www/html/srv/api/system/version.php
new file mode 100644
index 0000000000..0db3ee3a84
--- /dev/null
+++ b/apps/docker-uploader/root/var/www/html/srv/api/system/version.php
@@ -0,0 +1,85 @@
+getMessage();
+ }
+ } else {
+ $debug_info[$path] .= " - Couldn't read file";
+ }
+ }
+}
+
+// Try file_get_contents on a known file to verify permissions
+$test_file = '/var/www/html/index.html';
+$can_read_test = file_exists($test_file) ? "Yes" : "No";
+$test_content = file_exists($test_file) ? (file_get_contents($test_file) !== false ? "Can read" : "Cannot read") : "N/A";
+
+// Let's also print information about the current script
+$current_script = [
+ 'script_path' => __FILE__,
+ 'script_dir' => __DIR__,
+ 'parent_dir' => dirname(__DIR__),
+ 'cwd' => getcwd(),
+ 'file_perms' => function_exists('posix_getpwuid') ? posix_getpwuid(posix_geteuid())['name'] : 'Unknown user'
+];
+
+// Return comprehensive debug information
+echo json_encode([
+ 'version' => $version,
+ 'success' => true,
+ 'found_path' => $found_path,
+ 'paths_checked' => $debug_info,
+ 'test_file_exists' => $can_read_test,
+ 'test_file_readable' => $test_content,
+ 'script_info' => $current_script
+]);
+
+// Also log this information to the error log
+error_log('Version API result: ' . $version . ' from path: ' . $found_path);
+error_log('Debug paths: ' . json_encode($debug_info));
diff --git a/apps/docker-uploader/root/var/www/html/srv/entities/StatusResponse.php b/apps/docker-uploader/root/var/www/html/srv/entities/StatusResponse.php
index 1e41c19607..df08d805f5 100644
--- a/apps/docker-uploader/root/var/www/html/srv/entities/StatusResponse.php
+++ b/apps/docker-uploader/root/var/www/html/srv/entities/StatusResponse.php
@@ -3,12 +3,17 @@
class StatusResponse
{
public $status;
+ public $uptime;
+ public $storage;
public const STATUS_UNKNOWN = 'UNKNOWN';
public const STATUS_STARTED = 'STARTED';
public const STATUS_STOPPED = 'STOPPED';
- public function __construct(){
+ public function __construct()
+ {
$status = StatusResponse::STATUS_UNKNOWN;
+ $uptime = null;
+ $storage = null;
}
-}
\ No newline at end of file
+}
diff --git a/apps/docker-uploader/root/var/www/html/srv/entities/UploadJobStatus.php b/apps/docker-uploader/root/var/www/html/srv/entities/UploadJobStatus.php
index d3f7f47972..619bf4c3d6 100755
--- a/apps/docker-uploader/root/var/www/html/srv/entities/UploadJobStatus.php
+++ b/apps/docker-uploader/root/var/www/html/srv/entities/UploadJobStatus.php
@@ -2,6 +2,9 @@
class UploadJobStatus
{
+ public $job_name;
+ public $job_last_update_timestamp;
+ public $drive;
public $file_directory;
public $file_name;
public $file_size;
@@ -11,5 +14,8 @@ class UploadJobStatus
public $gdsa;
public $time_start;
public $time_end;
+ public $time_end_clean;
public $time_elapsed;
-}
\ No newline at end of file
+ public $successful;
+ public $error_message;
+}