Merge pull request #17 from pir8radio/dev

pir8radio · web-flow · commit 4253883ad64c · 2025-05-04T11:07:00.000-05:00
Dev update - added drive status info, cleaned up a bunch of code
diff --git a/DownloadViewarr.js b/DownloadViewarr.js
@@ -1,23 +1,47 @@
 const express = require('express');
 const axios = require('axios');
+const path = require('path');
 const app = express();
 
+
+
+/*==================================== SETTINGS =====================================*/
+
+// RADARR SERVER SETTINGS
+const DEFAULT_RADARR_SERVER_IP = '127.0.0.1'					// Radarr server IP/URL
+const DEFAULT_RADARR_SERVER_PORT = 7878						// Radarr server port
+const DEFAULT_RADARR_API_KEY = '1234abcdxxxxxxxxxxxxxxxxxxxxxxxx'		// Radarr API Key
+
+// SONARR SERVER SETTINGS
+const DEFAULT_SONARR_SERVER_IP = '127.0.0.1'					// Sonarr server IP/URL
+const DEFAULT_SONARR_SERVER_PORT = 8989						// Sonarr server port
+const DEFAULT_SONARR_API_KEY = '1234abcdxxxxxxxxxxxxxxxxxxxxxxxx'		// Sonarr API Key
+
+// DOWNLOAD VIEWARR SETTINGS
+const DEFAULT_SERVER_PORT = 8888						// Port to view download status page
+const DEFAULT_ENABLE_DRIVE_STATUS = "FALSE"					// True or False - Enable media drive(s) status.
+
 /*==================================== SETTINGS =====================================*/
+
+
+
+
+// Don't edit below this line
+
 const settings = {
     movies: {
-        apiServerIP: process.env.RADARR_SERVER_IP || '127.0.0.1',                    // Radarr server IP (Docker: from env var, Native: default to localhost)
-        apiServerPort: process.env.RADARR_SERVER_PORT || 7878,                       // Radarr server port
-        apiKey: process.env.RADARR_API_KEY || '1234abcdxxxxxxxxxxxxxxxxxxxxxxxx',    // Radarr API Key
+        apiServerIP: process.env.RADARR_SERVER_IP || DEFAULT_RADARR_SERVER_IP,
+        apiServerPort: process.env.RADARR_SERVER_PORT || DEFAULT_RADARR_SERVER_PORT,
+        apiKey: process.env.RADARR_API_KEY || DEFAULT_RADARR_API_KEY,
     },
     tvshows: {
-        apiServerIP: process.env.SONARR_SERVER_IP || '127.0.0.1',                    // Sonarr server IP (Docker: from env var, Native: default to localhost)
-        apiServerPort: process.env.SONARR_SERVER_PORT || 8989,                       // Sonarr server port
-        apiKey: process.env.SONARR_API_KEY || '1234abcdxxxxxxxxxxxxxxxxxxxxxxxx',    // Sonarr API Key
+        apiServerIP: process.env.SONARR_SERVER_IP || DEFAULT_SONARR_SERVER_IP,
+        apiServerPort: process.env.SONARR_SERVER_PORT || DEFAULT_SONARR_SERVER_PORT,
+        apiKey: process.env.SONARR_API_KEY || DEFAULT_SONARR_API_KEY,
     },
-    nodeServerPort: process.env.NODE_SERVER_PORT || 8888,                            // Port to view download page
+    nodeServerPort: process.env.NODE_SERVER_PORT || DEFAULT_SERVER_PORT,
+    enableDriveStatus: (process.env.ENABLE_DRIVE_STATUS || DEFAULT_ENABLE_DRIVE_STATUS).toLowerCase(),
 };
-/*==================================== SETTINGS =====================================*/
-
 
 // Middleware to enable CORS
 app.use((req, res, next) => {
@@ -29,6 +53,107 @@ app.use((req, res, next) => {
 // Serve static files from the "public" directory
 app.use(express.static('public'));
 
+// Function to fetch root folders from Radarr or Sonarr
+async function fetchRootFolders(apiBaseUrl, apiKey) {
+    try {
+        const response = await axios.get(`${apiBaseUrl}/rootfolder`, {
+            headers: { 'X-Api-Key': apiKey },
+        });
+        return response.data.map(folder => folder.path); // Extract folder paths
+    } catch (error) {
+        console.error('Error fetching root folders:', error.message);
+        return [];
+    }
+}
+
+// Function to fetch disk space information from Radarr or Sonarr APIs
+async function fetchDiskSpace(apiBaseUrl, apiKey) {
+    try {
+        const response = await axios.get(`${apiBaseUrl}/diskspace?apikey=${apiKey}`);
+        return response.data; // Return the API response data
+    } catch (error) {
+        console.error(`Error fetching disk space from API: ${error.message}`);
+        return null; // Return null on error
+    }
+}
+
+app.get('/api/drive-space', async (req, res) => {
+    if (!["true", "yes"].includes(settings.enableDriveStatus)) {
+        return res.status(403).send('Drive status is disabled.');
+    }
+
+    try {
+        // Fetch root folders for Movies and TV Shows
+        const radarrRootFolders = await fetchRootFolders(
+            `http://${settings.movies.apiServerIP}:${settings.movies.apiServerPort}/api/v3`,
+            settings.movies.apiKey
+        );
+        const sonarrRootFolders = await fetchRootFolders(
+            `http://${settings.tvshows.apiServerIP}:${settings.tvshows.apiServerPort}/api/v3`,
+            settings.tvshows.apiKey
+        );
+
+        const allFolders = [...new Set([...radarrRootFolders, ...sonarrRootFolders])];
+
+        // Fetch disk space data from Radarr API first, fallback to Sonarr API if Radarr fails
+        let diskSpaces = await fetchDiskSpace(
+            `http://${settings.movies.apiServerIP}:${settings.movies.apiServerPort}/api/v3`,
+            settings.movies.apiKey
+        );
+
+        if (!diskSpaces) {
+            diskSpaces = await fetchDiskSpace(
+                `http://${settings.tvshows.apiServerIP}:${settings.tvshows.apiServerPort}/api/v3`,
+                settings.tvshows.apiKey
+            );
+        }
+
+        if (!diskSpaces) {
+            return res.status(500).send('Failed to fetch disk space data');
+        }
+
+        // Filter disk spaces to only include those with a matching root folder
+        const filteredDiskSpaces = diskSpaces.filter(disk =>
+            allFolders.some(folder => folder.startsWith(disk.path))
+        );
+
+        // Deduplicate results based on the root drive (e.g., "F:\\")
+        const uniqueDriveSpaces = Object.values(
+            filteredDiskSpaces.reduce((acc, drive) => {
+                const rootDrive = drive.path.split(':')[0] + ':\\'; // Extract root drive
+                if (!acc[rootDrive]) {
+                    acc[rootDrive] = { 
+                        path: rootDrive, 
+                        label: drive.label,
+                        freeSpace: drive.freeSpace,
+                        totalSpace: drive.totalSpace,
+                    };
+                } else {
+                    // If already exists, sum up the free and total space
+                    acc[rootDrive].freeSpace += drive.freeSpace;
+                    acc[rootDrive].totalSpace += drive.totalSpace;
+                }
+                return acc;
+            }, {})
+        );
+
+        // Format the response
+        const formattedDriveSpaces = uniqueDriveSpaces.map(drive => ({
+            path: drive.path,
+            label: drive.label,
+            freeSpace: `${(drive.freeSpace / 1e9).toFixed(2)} GB`,
+            totalSpace: `${(drive.totalSpace / 1e9).toFixed(2)} GB`,
+            usedSpace: `${((drive.totalSpace - drive.freeSpace) / 1e9).toFixed(2)} GB`,
+            percentageUsed: Math.round(((drive.totalSpace - drive.freeSpace) / drive.totalSpace) * 100)
+        }));
+
+        res.json(formattedDriveSpaces); // Return the formatted drive space data
+    } catch (error) {
+        console.error('Error in /api/drive-space:', error.message);
+        res.status(500).send('Failed to fetch drive space data');
+    }
+});
+
 // Function to fetch data from the external API
 async function fetchData(type) {
     try {
@@ -91,5 +216,6 @@ app.get('/api/queue/downloading', async (req, res) => {
 
 // Start the server
 app.listen(settings.nodeServerPort, () => {
+    console.log(`Drive status enabled: ${settings.enableDriveStatus}`);
     console.log(`Server running at http://localhost:${settings.nodeServerPort}`);
 });
diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ docker pull pir8radio/downloadviewarr
 ## Features
 
 - Fetches download queue data from Radarr and Sonarr using their APIs.
+- Fetches media drive space info from Radarr or Sonarr APIs.
 - Displays data in an organized format on a web page.
 - Easy to configure and run locally.
 - Can be used by itself, or embeded as an iframe within ombi or some other request app.
@@ -53,6 +54,12 @@ docker pull pir8radio/downloadviewarr
 <img src="https://github.com/user-attachments/assets/81261ff3-58c1-45d7-9686-ad0324aa8b4f" width="300">
 </div>
 
+- Media Drive Status (optional)
+<div align="center">
+<img src="https://github.com/user-attachments/assets/36ce7efb-c1a6-4c3e-90b0-f1e29638b604">
+</div>
+
+
 ## Installation
 
 1. Clone the repository:
@@ -72,20 +79,23 @@ docker pull pir8radio/downloadviewarr
 
 ```javascript
 /*==================================== SETTINGS =====================================*/
-const settings = {
-    movies: {
-        apiServerIP: process.env.RADARR_SERVER_IP || '127.0.0.1',                    // Radarr server IP (Docker: from env var, Native: default to localhost)
-        apiServerPort: process.env.RADARR_SERVER_PORT || 7878,                       // Radarr server port
-        apiKey: process.env.RADARR_API_KEY || '1234abcdxxxxxxxxxxxxxxxxxxxxxxxx',    // Radarr API Key
-    },
-    tvshows: {
-        apiServerIP: process.env.SONARR_SERVER_IP || '127.0.0.1',                    // Sonarr server IP (Docker: from env var, Native: default to localhost)
-        apiServerPort: process.env.SONARR_SERVER_PORT || 8989,                       // Sonarr server port
-        apiKey: process.env.SONARR_API_KEY || '1234abcdxxxxxxxxxxxxxxxxxxxxxxxx',    // Sonarr API Key
-    },
-    nodeServerPort: process.env.NODE_SERVER_PORT || 8888,                            // Port to view download page
-};
+
+// RADARR SERVER SETTINGS
+const DEFAULT_RADARR_SERVER_IP = '127.0.0.1'					// Radarr server IP/URL
+const DEFAULT_RADARR_SERVER_PORT = 7878						// Radarr server port
+const DEFAULT_RADARR_API_KEY = '1234abcdxxxxxxxxxxxxxxxxxxxxxxxx'		// Radarr API Key
+
+// SONARR SERVER SETTINGS
+const DEFAULT_SONARR_SERVER_IP = '127.0.0.1'					// Sonarr server IP/URL
+const DEFAULT_SONARR_SERVER_PORT = 8989						// Sonarr server port
+const DEFAULT_SONARR_API_KEY = '1234abcdxxxxxxxxxxxxxxxxxxxxxxxx'		// Sonarr API Key
+
+// DOWNLOAD VIEWARR SETTINGS
+const DEFAULT_SERVER_PORT = 8888						// Port to view download status page
+const DEFAULT_ENABLE_DRIVE_STATUS = "TRUE"					// True or False - Enable media drive(s) bar graphs.
+
 /*==================================== SETTINGS =====================================*/
+
 ```
 
 4. Start the application:
@@ -143,6 +153,11 @@ Developed by [pir8radio](https://github.com/pir8radio).
 
 
 # Update History
+## 05-04-2025
+- Cleaned up settings section, gave dedicated settings.
+- Added support for auto generated progress bar style drive information, % Used - Free - etc
+- Changed how we were getting drive capacity, now get it from the radarr or sonarr api, so no need to map drives or anything for docker users.
+
 ## 04-26-2025
 - This should be the last flash update, lol sorry guys, been pushing out features!
 - added tab download indicator to the floating button embed
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,4 +12,5 @@ services:
       RADARR_SERVER_PORT: 7878
       SONARR_SERVER_PORT: 8989
       NODE_SERVER_PORT: 8888
-    restart: unless-stopped
+      ENABLE_DRIVE_STATUS: "TRUE"
+    restart: unless-stopped
diff --git a/public/index.html b/public/index.html
@@ -54,6 +54,10 @@ <h1>Download Queue</h1>
         <div class="loader" id="loadingIcon"></div>
         <div class="live-text">Live</div>
     </div>
+
+    <div id="driveSpaceContainer" class="drive-space-container">
+        <!-- Drive bars will be dynamically populated here -->
+    </div>
     <script src="/scripts.js"></script>
 </body>
 </html>
diff --git a/public/scripts.js b/public/scripts.js
@@ -104,6 +104,9 @@ async function fetchAndPopulateTable() {
         // Call checkOverflow to handle progress bar overflows
         checkOverflow();
 
+	// Call fetchDriveSpace to update the drive space info
+	fetchDriveSpace();
+
         // Refresh loader animation
         resetLoaderAnimation();
         if (loaderTimeout) clearTimeout(loaderTimeout);
@@ -330,6 +333,72 @@ function checkOverflow() {
     });
 }
 
+// Function to check media drive(s) status
+let driveStatusDisabled = false;
+let runCounter = 0;
+
+async function fetchDriveSpace() {
+    // If "Drive status is disabled." was returned previously, skip execution
+    if (driveStatusDisabled) {
+        return;
+    }
+
+    // Execute only on first run and when runCounter reaches 0
+    if (runCounter > 0) {
+        runCounter--;
+        return;
+    }
+
+    try {
+        const response = await fetch('/api/drive-space');
+        
+        // First run check
+        if (response.status === 403) { // Status 403 indicates drive status is disabled
+            driveStatusDisabled = true; // Mark that future runs should be skipped
+            console.log("Drive status is disabled. Will not fetch drive space in future runs.");
+            return;
+        }
+
+        const drives = await response.json();
+
+        const driveSpaceContainer = document.getElementById('driveSpaceContainer');
+        if (driveSpaceContainer) {
+            driveSpaceContainer.innerHTML = ''; // Clear any existing content
+
+            drives.forEach(drive => {
+                // Convert values from GB to TB
+                const totalTB = (parseFloat(drive.totalSpace) / 1024).toFixed(2);
+                const usedTB = (parseFloat(drive.usedSpace) / 1024).toFixed(2);
+                const availableTB = (parseFloat(drive.freeSpace) / 1024).toFixed(2);
+                const percentage = drive.percentageUsed;
+
+                // Create bar graph section for each drive
+                const driveElement = document.createElement('div');
+                driveElement.className = 'drive-space';
+
+                driveElement.innerHTML = `
+                    <div class="drive-space-label">${drive.path}</div>
+                    <div class="drive-space-progress">
+                        <div class="drive-space-progress-bar" 
+                             style="width: ${percentage}%" 
+                             title="${usedTB} TB of ${totalTB} TB used (${availableTB} TB available)">
+                            <span class="drive-space-text">${percentage}%</span>
+                        </div>
+                    </div>
+                `;
+
+                driveSpaceContainer.appendChild(driveElement);
+            });
+        }
+
+        // Reset runCounter after fetch execution
+        runCounter = 10;
+
+    } catch (error) {
+        console.error('Failed to fetch drive space data:', error);
+    }
+}
+
 // Restore settings on page load
 document.addEventListener('DOMContentLoaded', () => {
     monitorTabFromUrl(); // Handle URL parameter on page load
diff --git a/public/styles.css b/public/styles.css
