rewrite FileSystemInfo

cmake/VersionInformation.cmake

@@ -17,7 +17,7 @@ endif()
 #
 
 # See mythtv/libs/libmythbase/mythversion.h.in
-set(MYTHTV_BINARY_CHANGED "20220913-1")
+set(MYTHTV_BINARY_CHANGED "20250212-1")
 set(MYTHTV_BINARY_VERSION "${PROJECT_VERSION_MAJOR}.${MYTHTV_BINARY_CHANGED}")
 
 # See mythtv/bindings/python/MythTV/static.py.in

mythplugins/mytharchive/mytharchive/mytharchive.cpp

@@ -19,7 +19,6 @@
 
 // mythtv
 #include <libmythbase/mythcorecontext.h>
-#include <libmythbase/mythcoreutil.h>
 #include <libmythbase/mythlogging.h>
 #include <libmythbase/mythplugin.h>
 #include <libmythbase/mythpluginapi.h>

mythplugins/mytharchive/mytharchive/selectdestination.cpp

@@ -7,8 +7,8 @@
 #include <QKeyEvent>
 
 // myth
+#include <libmythbase/filesysteminfo.h>
 #include <libmythbase/mythcorecontext.h>
-#include <libmythbase/mythcoreutil.h>
 #include <libmythbase/mythlogging.h>
 #include <libmythbase/stringutil.h>
 #include <libmythui/mythmainwindow.h>
@@ -241,9 +241,8 @@ void SelectDestination::setDestination(MythUIButtonListItem* item)
             m_doBurnText->Show();
             break;
         case AD_FILE:
-            int64_t dummy = 0;
             ArchiveDestinations[itemNo].freeSpace = 
-                    getDiskSpace(m_filenameEdit->GetText(), dummy, dummy);
+                    FileSystemInfo(QString(), m_filenameEdit->GetText()).getFreeSpace();
 
             m_filenameEdit->Show();
             m_findButton->Show();
@@ -294,12 +293,11 @@ void SelectDestination::fileFinderClosed(const QString& filename)
 
 void SelectDestination::filenameEditLostFocus()
 {
-    int64_t dummy = 0;
-    m_archiveDestination.freeSpace = getDiskSpace(m_filenameEdit->GetText(), dummy, dummy);
+    auto fsInfo = FileSystemInfo(QString(), m_filenameEdit->GetText());
 
     // if we don't get a valid freespace value it probably means the file doesn't
     // exist yet so try looking up the freespace for the parent directory 
-    if (m_archiveDestination.freeSpace == -1)
+    if (!fsInfo.refresh())
     {
         QString dir = m_filenameEdit->GetText();
         int pos = dir.lastIndexOf('/');
@@ -308,16 +306,18 @@ void SelectDestination::filenameEditLostFocus()
         else
             dir = "/";
 
-        m_archiveDestination.freeSpace = getDiskSpace(dir, dummy, dummy);
+        fsInfo = FileSystemInfo(QString(), dir);
     }
 
-    if (m_archiveDestination.freeSpace != -1)
+    if (fsInfo.refresh())
     {
+        m_archiveDestination.freeSpace = fsInfo.getFreeSpace();
         m_freespaceText->SetText(StringUtil::formatKBytes(m_archiveDestination.freeSpace, 2));
         m_freeSpace = m_archiveDestination.freeSpace;
     }
     else
     {
+        m_archiveDestination.freeSpace = -1;
         m_freespaceText->SetText(tr("Unknown"));
         m_freeSpace = 0;
     }

mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.cpp

@@ -29,14 +29,6 @@
 #include <iostream>
 #include <unistd.h>
 
-#include <QtGlobal>
-#if defined(Q_OS_DARWIN) or defined(__FreeBSD__)
-#include <sys/param.h>
-#include <sys/mount.h>
-#elif defined(__linux__)
-#include <sys/vfs.h>
-#endif
-
 // Qt headers
 #include <QApplication>
 #include <QDir>
@@ -53,8 +45,8 @@
 #include <libmyth/mythavframe.h>
 #include <libmyth/mythcontext.h>
 #include <libmythbase/exitcodes.h>
+#include <libmythbase/filesysteminfo.h>
 #include <libmythbase/mythcommandlineparser.h>
-#include <libmythbase/mythcoreutil.h>
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdb.h>
@@ -2228,21 +2220,8 @@ static int isRemote(const QString& filename)
     if (!QFile::exists(filename))
         return 0;
 
-// TODO replace with FileSystemInfo?
-#ifdef Q_OS_DARWIN
-    struct statfs statbuf {};
-    if ((statfs(qPrintable(filename), &statbuf) == 0) &&
-        ((!strcmp(statbuf.f_fstypename, "nfs")) ||      // NFS|FTP
-            (!strcmp(statbuf.f_fstypename, "afpfs")) || // ApplShr
-            (!strcmp(statbuf.f_fstypename, "smbfs"))))  // SMB
-        return 2;
-#elif defined(__linux__)
-    struct statfs statbuf {};
-    if ((statfs(qPrintable(filename), &statbuf) == 0) &&
-        ((statbuf.f_type == 0x6969) ||      // NFS
-            (statbuf.f_type == 0x517B)))    // SMB
+    if (!FileSystemInfo(QString(), filename).isLocal())
         return 2;
-#endif
 
     return 1;
 }

mythplugins/mythmusic/mythmusic/streamview.cpp

@@ -9,7 +9,6 @@
 #include <QThread>
 
 // MythTV
-#include <libmythbase/mythcoreutil.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>

mythplugins/mythnetvision/mythnetvision/netbase.cpp

@@ -1,7 +1,6 @@
 #include <QDir>
 
 #include <libmythbase/mythcorecontext.h>
-#include <libmythbase/mythcoreutil.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdirs.h>
 #include <libmythbase/mythlogging.h>

mythplugins/mythnetvision/mythnetvision/netsearch.cpp

@@ -6,7 +6,6 @@
 #include <QString>
 
 // MythTV
-#include <libmythbase/mythcoreutil.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>

mythplugins/mythnetvision/mythnetvision/nettree.cpp

@@ -5,7 +5,6 @@
 
 // MythTV
 #include <libmythbase/mythcorecontext.h>
-#include <libmythbase/mythcoreutil.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdirs.h>
 #include <libmythbase/mythlogging.h>

mythtv/configure

@@ -13,7 +13,7 @@
 MYTHTV_VERSION_MAJMIN="36.0"
 MYTHTV_LIBVERSION="36"
 # See mythtv/libs/libmythbase/mythversion.h.in
-MYTHTV_BINARY_VERSION="36.20220913-1"
+MYTHTV_BINARY_VERSION="36.20250212-1"
 # See bindings/python/MythTV/static.py.in
 MYTHTV_PYTHON_OWN_VERSION="(36,0,-1,0)"
 # See python/MythTV/services_api/send.py.in

mythtv/libs/libmythbase/CMakeLists.txt

@@ -30,7 +30,6 @@ set(LIBMYTHBASE_HEADERS
     mythchrono.h
     mythcommandlineparser.h
     mythcorecontext.h
-    mythcoreutil.h
     mythdate.h
     mythdb.h
     mythdbcheck.h
@@ -195,7 +194,6 @@ add_library(
   mythcommandlineparser.cpp
   mythconfig.h.in
   mythcorecontext.cpp
-  mythcoreutil.cpp
   mythdate.cpp
   mythdb.cpp
   mythdbcon.cpp