Merge pull request #826 from phunkyfish/conn-mgr-special-paths

Fix supporting of local paths in Connection Manager
kodi-pvr · Jan 5, 2024 · a063bdd · a063bdd
2 parents cc885d2 + 4b8bfa7
commit a063bdd
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/pvr.iptvsimple/addon.xml.in b/pvr.iptvsimple/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.iptvsimple"
-  version="21.7.0"
+  version="21.7.1"
   name="IPTV Simple Client"
   provider-name="nightik and Ross Nicholson">
   <requires>@ADDON_DEPENDS@

diff --git a/pvr.iptvsimple/changelog.txt b/pvr.iptvsimple/changelog.txt
@@ -1,3 +1,6 @@
+v21.7.1
+- Fix supporting of local paths in Connection Manager
+
 v21.7.0
 - Add connection manager support to wait for a valid M3U file before starting the add-on instance
 - The minimum refresh interval for the M3U should be 1 minutes and not zero, as that would be infinite refresh

diff --git a/src/iptvsimple/ConnectionManager.cpp b/src/iptvsimple/ConnectionManager.cpp
@@ -141,6 +141,8 @@ void ConnectionManager::Process()
     }
 
     const std::string url = m_settings->GetM3ULocation();
+    int tcpTimeout = m_settings->GetConnectioncCheckTimeoutSecs();
+    bool isLocalPath = m_settings->GetM3UPathType() == PathType::LOCAL_PATH;
 
     /* URL is set */
     if (url.empty())
@@ -151,7 +153,7 @@ void ConnectionManager::Process()
     }
 
     /* Connect */
-    if ((firstRun || !m_onStartupOnly) && !WebUtils::Check(url, m_settings->GetConnectioncCheckTimeoutSecs()))
+    if ((firstRun || !m_onStartupOnly) && !WebUtils::Check(url, tcpTimeout, isLocalPath))
     {
       /* Unable to connect */
       if (retryAttempt == 0)

diff --git a/src/iptvsimple/ConnectionManager.h b/src/iptvsimple/ConnectionManager.h
@@ -50,7 +50,6 @@ namespace iptvsimple
     PVR_CONNECTION_STATE m_state;
 
     bool m_onStartupOnly = true;
-    bool m_notifyStateChangeToUser = false;
 
     std::shared_ptr<iptvsimple::InstanceSettings> m_settings;
   };

diff --git a/src/iptvsimple/utilities/WebUtils.cpp b/src/iptvsimple/utilities/WebUtils.cpp
@@ -7,6 +7,7 @@
 
 #include "WebUtils.h"
 
+#include "FileUtils.h"
 #include "Logger.h"
 
 #include <cctype>
@@ -130,8 +131,13 @@ std::string WebUtils::RedactUrl(const std::string& url)
   return redactedUrl;
 }
 
-bool WebUtils::Check(const std::string& strURL, int connectionTimeoutSecs)
+bool WebUtils::Check(const std::string& strURL, int connectionTimeoutSecs, bool isLocalPath)
 {
+  // For local paths we only need to check existence of the file
+  if (isLocalPath && FileUtils::FileExists(strURL))
+    return true;
+
+  //Otherwise it's remote
   kodi::vfs::CFile fileHandle;
   if (!fileHandle.CURLCreate(strURL))
   {

diff --git a/src/iptvsimple/utilities/WebUtils.h b/src/iptvsimple/utilities/WebUtils.h
@@ -27,7 +27,7 @@ namespace iptvsimple
       static std::string ReadFileContentsStartOnly(const std::string& url, int* httpCode);
       static bool IsHttpUrl(const std::string& url);
       static std::string RedactUrl(const std::string& url);
-      static bool Check(const std::string& url, int connectionTimeoutSecs);
+      static bool Check(const std::string& url, int connectionTimeoutSecs, bool isLocalPath = false);
     };
   } // namespace utilities
 } // namespace iptvsimple