Merge pull request #12 from sbsos/main

Added more hard-drive capturing, Fixing memo length, and replotting bug

Author: sbsos

hotplotterclient/hard_drive_controller.py

@@ -1,6 +1,8 @@
 import shutil
 import psutil
 import os
+import subprocess
+import re
 
 class hard_drive(object):
     total = 0
@@ -18,7 +20,7 @@ def __init__(self, total, free, drive_name):
 
 class hard_drive_controller(object):
     available_drive_letters = ["A:/", "B:/", "C:/", "D:/", "E:/", "F:/", "G:/", "H:/", "I:/", "J:/", "K:/", "L:/", "M:/", "N:/", "O:/", "P:/", "Q:/", "R:/", "S:/", "T:/", "U:/", "V:/", "W:/", "X:/", "Y:/", "Z:/"]
-    supported_hard_drive_formats = ['vfat','ext4', 'ext3', 'ext2', 'fat32', 'ntfs', 'fuseblk']
+    supported_hard_drive_formats = ['vfat','ext4', 'ext3', 'ext2', 'fat32', 'ntfs', 'fuseblk', 'tmpfs']
 
     def get_hard_drives_linux(self):
         hard_drives = []
@@ -34,13 +36,28 @@ def get_hard_drives_linux(self):
 
     def get_hard_drives_windows(self):
         hard_drives = []
-        for available_drive in self.available_drive_letters:
+        mountvol_hds = []
+        result = subprocess.run(['mountvol'], capture_output=True, text=True)
+        parsed_hard_drives = re.findall('[A-Z]:\\\.*', result.stdout)
+        
+        for hd in parsed_hard_drives:
+            try:
+                formatted_hd = hd.replace("\\","/")
+                mountvol_hds.append(formatted_hd)
+                hd_object = self.get_hard_disk_space(formatted_hd)
+                hard_drives.append(hd_object)
+            except Exception:
+                continue
+
+        #network drives don't show up in mountvol. manually iterate to see if they have any network storage
+        not_checked_drives = [i for i in self.available_drive_letters if i not in mountvol_hds]
+        for hd in not_checked_drives:
             try:
-                hd = self.get_hard_disk_space(available_drive)
-                hard_drives.append(hd)
-            
+                hd_object = self.get_hard_disk_space(hd)
+                hard_drives.append(hd_object)
             except Exception:
                 continue
+
         return hard_drives
 
     def get_hard_drives(self):
@@ -65,3 +82,4 @@ def get_hard_disk_space(self, drive):
 
 if __name__ == '__main__':
     controller = hard_drive_controller()
+    hds = controller.get_hard_drives_windows()    

hotplotterclient/replotting.py

@@ -5,7 +5,7 @@ class drivePlots(object):
     driveName = ""
     plots = []
     plotTypes = ""
-    offset = 58
+    formatLengthOffset = 52
     def __init__(self, driveName, plotTypes):
         self.driveName = driveName
         self.populatePlots(PlotTypes.OgPlots)
@@ -14,6 +14,10 @@ def filterPlotsInDirectory(self, files):
         plots = filter(lambda c: 'plot' in c, files)
         return plots
 
+    def getLength(self, byteArray):
+        length = byteArray[1] >> byteArray[0]
+        return length
+    
     def populatePlots(self, filterPlotType):
         files = os.listdir(self.driveName)
         plots = self.filterPlotsInDirectory(files)
@@ -25,13 +29,15 @@ def populatePlots(self, filterPlotType):
                 plotWithFullPath = self.driveName + plot
 
             with open(plotWithFullPath, "rb") as plotFile:
-                plotFile.read(self.offset)
+                plotFile.read(self.formatLengthOffset)
                 res = plotFile.read(2)
+                formatLength = self.getLength(res)
+                plotFile.read(formatLength)
 
-                #Two Byte to int, w/ big to achieve their Utility.TwoByteToInt
-                length = res[1] >> res[0]
+                memo = plotFile.read(2)
+                memoLength = self.getLength(memo)
 
-                plotType = self.getPlotType(length)
+                plotType = self.getPlotType(memoLength)
                 if plotType == filterPlotType:
                     self.plots.append(plotWithFullPath)
 
@@ -46,8 +52,10 @@ def getPlotType(self, memoLength):
         return None
 
     def getPlot(self):
-        plotName = self.plots.pop()
-        return plotName
+        if len(self.plots) > 0:
+            plotName = self.plots.pop()
+            return plotName
+        return None
 
 
 class replotting(object):
@@ -89,5 +97,3 @@ class PlotTypes(object):
 if __name__ == '__main__':
     replotting = replotting()
     replotting.addDrivePlots('A:/Plots', '1', True)
-    plotName = replotting.deletePlot('A:/Plots', '1')
-    print(plotName)