new SVDRP command CHKU

Author: Zabrimus

Makefile

@@ -82,8 +82,8 @@ OBJS = $(PLUGIN).o common.o config.o device.o pidscanner.o \
 	protocolcurl.o protocolext.o protocolfile.o protocolhttp.o \
 	protocoludp.o sectionfilter.o setup.o sidscanner.o socket.o \
 	protocolm3u.o protocolradio.o protocolstream.o \
-	m3u8handler.o process.o process_unix.o ffmpeghandler.o streambasehandler.o \
-	vlchandler.o source.o statistics.o streamer.o radioimage.o
+	m3u8handler.o process.o process_unix.o streambasehandler.o \
+	source.o statistics.o streamer.o radioimage.o checkurl.o
 
 ### The main target:
 

checkurl.cpp

@@ -17,23 +17,41 @@ CheckURL::CheckURL() {
 }
 
 CheckURL::~CheckURL() {
-    abort();
+    stop();
 }
 
 void CheckURL::start() {
     if (isRunning) {
         return;
     }
 
+    countChannels = 0;
+    checkedChannels = 0;
+    currentChannelId = "";
+    currentChannelUrl = "";
+
     isRunning = true;
     checkThread = std::thread(&CheckURL::executeChecks, this);
 }
 
-void CheckURL::abort() {
+void CheckURL::stop() {
+    if (!isRunning) {
+        return;
+    }
+
     isRunning = false;
-    checkThread.join();
+    if (checkThread.joinable()) {
+        checkThread.join();
+    }
 }
 
+cString CheckURL::status() {
+    if (!isRunning) {
+        return { "Check is not running or finished" };
+    }
+
+    return cString::sprintf("%d / %d finished, Currently testing %s, %s", getCheckedChannels(), getCountChannels(), *getCurrentChannelId(), *getCurrentChannelUrl());
+}
 
 static size_t check_header_callback(char *buffer, size_t size, size_t nitems, void *userdata)
 {
@@ -91,6 +109,8 @@ void CheckURL::executeChecks() {
         }
     }
 
+    countChannels = channels.size();
+
     // iterate over all channels and checks the URL
     CURLcode ret;
     CURL *hnd = curl_easy_init();
@@ -108,6 +128,11 @@ void CheckURL::executeChecks() {
         if (!isRunning) {
             break;
         }
+
+        checkedChannels++;
+        currentChannelId = a.first.c_str();
+        currentChannelUrl = a.second.c_str();
+
         fullsizeRead = 0;
         curl_easy_setopt(hnd, CURLOPT_URL, a.second.c_str());
 
@@ -120,17 +145,8 @@ void CheckURL::executeChecks() {
         curl_easy_getinfo(hnd, CURLINFO_RESPONSE_CODE, &response_code);
 
         if (!((ret == CURLE_OK || fullsizeRead >= READLIMIT_BYTES) && (response_code < 400))) {
-            printf("Error: %ld: %s -> %s\n", response_code, a.first.c_str(), a.second.c_str());
-            brokenChannels.emplace(a.first.c_str());
-
-            /*
-            {
-                LOCK_CHANNELS_READ;
-                tChannelID testChannelID = tChannelID::FromString(a.first.c_str());
-                const cChannel *testChannel = Channels->GetByChannelID(testChannelID);
-                cDevice::PrimaryDevice()->SwitchChannel(testChannel, true);
-            }
-            */
+            dsyslog("[iptv] Check url failed: %ld: %s -> %s, bytes read %ld\n", response_code, a.first.c_str(), a.second.c_str(), fullsizeRead);
+            mark404Channel(a.first.c_str());
         }
     }
 

checkurl.h

@@ -2,6 +2,7 @@
 
 #include <thread>
 #include <map>
+#include <set>
 
 class CheckURL {
 private:
@@ -13,11 +14,22 @@ class CheckURL {
 private:
     void executeChecks();
 
+    int countChannels;
+    int checkedChannels;
+    cString currentChannelId;
+    cString currentChannelUrl;
+
 public:
     CheckURL();
     ~CheckURL();
 
     void start();
-    void abort();
+    cString status();
+    void stop();
+
+    int getCountChannels() const { return countChannels; };
+    int getCheckedChannels() const { return checkedChannels; };
+    cString getCurrentChannelId() { return currentChannelId; };
+    cString getCurrentChannelUrl() { return currentChannelUrl; };
 };
 

common.cpp

@@ -117,14 +117,18 @@ void printBacktrace() {
 }
 
 void mark404Channel(int channelId) {
-    /*
     std::lock_guard<std::mutex> guard(all404ChannelMutex);
     all404Channels.emplace(channelId);
-    */
+}
+
+void mark404Channel(const char* channelId) {
+    std::lock_guard<std::mutex> guard(all404ChannelMutex);
+    LOCK_CHANNELS_READ;
+    const cChannel *channel = Channels->GetByChannelID(tChannelID::FromString(channelId));
+    all404Channels.emplace(channel->Number());
 }
 
 void rename404Channels() {
-    /*
     if (all404Channels.empty()) {
         return;
     }
@@ -145,6 +149,5 @@ void rename404Channels() {
             }
         }
     }
-    */
 }
 

common.h

@@ -83,6 +83,7 @@ void printBacktrace();
 #define CHANNELMARK404 "- 404"
 extern std::set<int> all404Channels;
 void mark404Channel(int channelId);
+void mark404Channel(const char* channelId);
 void rename404Channels();
 
 struct section_filter_table_type {

iptv.cpp

@@ -33,7 +33,7 @@ bool thread404Running;
 
 void run404() {
     while(thread404Running) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(200));
+        std::this_thread::sleep_for(std::chrono::milliseconds(1000));
         rename404Channels();
     }
 }
@@ -48,6 +48,10 @@ cPluginIptv::cPluginIptv() : deviceCountM(1) {
 cPluginIptv::~cPluginIptv() {
     debug16("%s", __PRETTY_FUNCTION__);
     // Clean up after yourself!
+    if (thread404.joinable()) {
+        thread404Running = false;
+        thread404.join();
+    }
 }
 
 const char *cPluginIptv::CommandLineHelp() {
@@ -133,8 +137,8 @@ bool cPluginIptv::Start() {
         info("%s", *info);
     }
 
-    // thread404Running = true;
-    // thread404 = std::thread(run404);
+    thread404Running = true;
+    thread404 = std::thread(run404);
 
     return true;
 }
@@ -264,7 +268,7 @@ const char **cPluginIptv::SVDRPHelpPages() {
         "    adds a STREAM URL to channels. PIDs and frequency will be automatically set\n",
         "ADDR <name>#<URL>\n"
         "    adds a RADIO URL to channels. PIDs and frequency will be automatically set\n",
-        "CHKU\n"
+        "CHKU START, STATUS, STOP\n"
         "    checks all configured URL and checks if a connect is possible and a valid result is returned.\n"
         "    If this is not the case the channel will be marked with ' - 404'\n",
         nullptr
@@ -570,11 +574,33 @@ cString cPluginIptv::SVDRPCommand(const char *commandP, const char *optionP, int
 
             return replyMessage;
         }
-    } else if (strcasecmp(commandP, "CHKS") == 0) {
-        chk.start();
+    } else if (strcasecmp(commandP, "CHKU") == 0) {
+        if (*optionP) {
+            char buf[strlen(optionP) + 1];
+            char *p = strcpy(buf, optionP);
 
-        replyCodeP = 250;
-        return { "URL check started" };
+            cString cmd = cString(p);
+            cmd = ChangeCase(cmd, true);
+
+            if (strcmp(cmd, "START") == 0)  {
+                chk.start();
+                replyCodeP = 250;
+                return { "URL check started" };
+            } else if (strcmp(cmd, "STATUS") == 0) {
+                replyCodeP = 250;
+                return  { chk.status() };
+            } else if (strcmp(cmd, "STOP") == 0) {
+                chk.stop();
+                replyCodeP = 250;
+                return { "URL check stopped" };
+            } else {
+                replyCodeP = 501;
+                return { "CHKU command is unknown" };
+            }
+        } else {
+            replyCodeP = 501;
+            return { "CHKU missing command START, STATUS or STOP" };
+        }
     }
 
     return nullptr;