make PlaybackSock::GetDiskSpace() return a FileSystemInfoList

also remove unused EncoderLink::GetDiskSpace().

Author: ulmus-scott

mythtv/programs/mythbackend/encoderlink.cpp

@@ -340,20 +340,6 @@ bool EncoderLink::CheckFile(ProgramInfo *pginfo)
     return pginfo->IsLocal();
 }
 
-/**
- *  \brief Appends total and used disk space in Kilobytes
- *
- *  \param o_strlist list to append to
- */
-void EncoderLink::GetDiskSpace(QStringList &o_strlist)
-{
-    if (HasSockAndIncrRef())
-    {
-        ReferenceLocker rlocker(m_sock);
-        m_sock->GetDiskSpace(o_strlist);
-    }
-}
-
 /** \fn EncoderLink::GetMaxBitrate()
  *  \brief Returns maximum bits per second this recorder might output.
  *

mythtv/programs/mythbackend/encoderlink.h

@@ -81,7 +81,6 @@ class EncoderLink
     bool IsTunerLocked(void) const { return m_locked; }
 
     bool CheckFile(ProgramInfo *pginfo);
-    void GetDiskSpace(QStringList &o_strlist);
     long long GetMaxBitrate(void);
     std::chrono::milliseconds SetSignalMonitoringRate(std::chrono::milliseconds rate, int notifyFrontend);
 

mythtv/programs/mythbackend/mainserver.cpp

@@ -5133,7 +5133,6 @@ void MainServer::BackendQueryDiskSpace(QStringList &strlist, bool consolidated,
 {
     FileSystemInfoList fsInfos = FileServerHandler::QueryFileSystems();
     QString allHostList;
-    QStringList tmplist;
     if (allHosts)
     {
         allHostList = gCoreContext->GetHostName();
@@ -5159,29 +5158,21 @@ void MainServer::BackendQueryDiskSpace(QStringList &strlist, bool consolidated,
         m_sockListLock.unlock();
 
         for (auto & pbs : localPlaybackList) {
-            pbs->GetDiskSpace(tmplist); // QUERY_FREE_SPACE
+            fsInfos << pbs->GetDiskSpace(); // QUERY_FREE_SPACE
             pbs->DecrRef();
         }
     }
 
-    if (!consolidated)
+    if (consolidated)
     {
-        strlist << FileSystemInfoManager::ToStringList(fsInfos) << tmplist;
-        return;
-    }
-
-    fsInfos.append(FileSystemInfoManager::FromStringList(tmplist));
-    tmplist.clear(); // not used after this point
-    strlist.clear();
+        // Consolidate hosts sharing storage
+        int64_t maxWriteFiveSec = GetCurrentMaxBitrate()/12 /*5 seconds*/;
+        maxWriteFiveSec = std::max((int64_t)2048, maxWriteFiveSec); // safety for NFS mounted dirs
 
-    // Consolidate hosts sharing storage
-    int64_t maxWriteFiveSec = GetCurrentMaxBitrate()/12 /*5 seconds*/;
-    maxWriteFiveSec = std::max((int64_t)2048, maxWriteFiveSec); // safety for NFS mounted dirs
-
-    FileSystemInfoManager::Consolidate(fsInfos, true, maxWriteFiveSec, allHostList);
+        FileSystemInfoManager::Consolidate(fsInfos, true, maxWriteFiveSec, allHostList);
+    }
 
-    // Pass the cleaned list back
-    strlist << FileSystemInfoManager::ToStringList(fsInfos);
+    strlist = FileSystemInfoManager::ToStringList(fsInfos);
 }
 
 void MainServer::GetFilesystemInfos(FileSystemInfoList &fsInfos,

mythtv/programs/mythbackend/playbacksock.cpp

@@ -138,16 +138,17 @@ bool PlaybackSock::GoToSleep(void)
 }
 
 /**
- *  \brief Appends host's dir's total and used space in kilobytes.
+ *  \brief Gets the total and used space in kilobytes for the host's directories.
  */
-void PlaybackSock::GetDiskSpace(QStringList &o_strlist)
+FileSystemInfoList PlaybackSock::GetDiskSpace()
 {
-    QStringList strlist(QString("QUERY_FREE_SPACE")); // should this be ..._SUMMARY? based on the comment above
+    QStringList strlist(QString("QUERY_FREE_SPACE"));
 
-    if (SendReceiveStringList(strlist, 8)) // TODO replace magic numbers FileSystemInfo::k_lines; return a list of FileSystemInfos instead?
+    if (SendReceiveStringList(strlist, FileSystemInfo::k_lines))
     {
-        o_strlist += strlist;
+        return FileSystemInfoManager::FromStringList(strlist);
     }
+    return {};
 }
 
 int PlaybackSock::CheckRecordingActive(const ProgramInfo *pginfo)

mythtv/programs/mythbackend/playbacksock.h

@@ -8,6 +8,7 @@
 #include <QMutex>
 #include <QSize>
 
+#include "libmythbase/filesysteminfo.h"
 #include "libmythbase/programinfo.h"  // ProgramInfo
 #include "libmythbase/programtypes.h" // RecStatus::Type
 #include "libmythbase/referencecounter.h"
@@ -60,7 +61,7 @@ class PlaybackSock : public ReferenceCounter
     QString getIP(void) const { return m_ip; }
 
     bool GoToSleep(void);
-    void GetDiskSpace(QStringList &o_strlist);
+    FileSystemInfoList GetDiskSpace();
     int DeleteFile(const QString &filename, const QString &sgroup);
     int StopRecording(const ProgramInfo *pginfo);
     int CheckRecordingActive(const ProgramInfo *pginfo);