Merge pull request #140 from phunkyfish/remove-p8platform

Use kodi StringUtils and remove p8-platform dependency - v6.0.1
kodi-pvr · Oct 8, 2020 · 51e41d1 · 51e41d1
2 parents f81c460 + e301675
commit 51e41d1
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,12 +4,10 @@ project(pvr.stalker)
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 
 find_package(Kodi REQUIRED)
-find_package(p8-platform REQUIRED)
 find_package(LibXml2 REQUIRED)
 find_package(JsonCpp REQUIRED)
 
 include_directories(
-        ${p8-platform_INCLUDE_DIRS}
         ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
         ${PROJECT_SOURCE_DIR}/lib
         ${LIBXML2_INCLUDE_DIR}
@@ -22,7 +20,6 @@ endif()
 add_subdirectory(lib/libstalkerclient)
 
 set(DEPLIBS
-        ${p8-platform_LIBRARIES}
         stalkerclient
         ${LIBXML2_LIBRARIES}
         ${JSONCPP_LIBRARIES})

diff --git a/depends/common/p8-platform/p8-platform.txt b/depends/common/p8-platform/p8-platform.txt
diff --git a/depends/windowsstore/p8-platform/p8-platform.txt b/depends/windowsstore/p8-platform/p8-platform.txt
diff --git a/pvr.stalker/addon.xml.in b/pvr.stalker/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.stalker"
-  version="6.0.0"
+  version="6.0.1"
   name="Stalker Client"
   provider-name="Jamal Edey">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.stalker/changelog.txt b/pvr.stalker/changelog.txt
@@ -1,3 +1,6 @@
+v6.0.1
+- Use kodi StringUtils and remove p8-platform dependency
+
 v6.0.0
 - PVR API 7.0.0
 - Rework addon to support new API interface

diff --git a/src/HTTPSocket.cpp b/src/HTTPSocket.cpp
@@ -11,7 +11,7 @@
 #include "Utils.h"
 
 #include <kodi/Filesystem.h>
-#include <p8-platform/util/StringUtils.h>
+#include <kodi/tools/StringUtils.h>
 
 #define TEMP_BUFFER_SIZE 1024
 
@@ -43,7 +43,7 @@ void HTTPSocket::SetDefaults(Request& request)
     for (std::vector<URLOption>::iterator it = request.options.begin(); it != request.options.end();
          ++it)
     {
-      if ((found = !StringUtils::CompareNoCase(it->name, option->name)))
+      if ((found = !kodi::tools::StringUtils::CompareNoCase(it->name, option->name)))
         break;
     }
 

diff --git a/src/SData.cpp b/src/SData.cpp
@@ -14,7 +14,7 @@
 #include <chrono>
 #include <cmath>
 #include <kodi/General.h>
-#include <p8-platform/util/StringUtils.h>
+#include <kodi/tools/StringUtils.h>
 
 #define SERROR_MSG_UNKNOWN 30501
 #define SERROR_MSG_INITIALIZE 30502
@@ -719,7 +719,7 @@ std::string SData::GetChannelStreamURL(const kodi::addon::PVRChannel& channel) c
     HTTPSocket sock(settings.connectionTimeout);
     bool failed(false);
 
-    strSplit = StringUtils::Split(chan->cmd, "/");
+    strSplit = kodi::tools::StringUtils::Split(chan->cmd, "/");
     if (!strSplit.empty())
     {
       oss << m_api->GetBasePath();
@@ -730,7 +730,7 @@ std::string SData::GetChannelStreamURL(const kodi::addon::PVRChannel& channel) c
 
       if (sock.Execute(request, response))
       {
-        strSplit = StringUtils::Split(response.body, " ");
+        strSplit = kodi::tools::StringUtils::Split(response.body, " ");
         if (!strSplit.empty())
         {
           cmd = strSplit.back();

diff --git a/src/XMLTV.cpp b/src/XMLTV.cpp
@@ -13,7 +13,7 @@
 #include <algorithm>
 #include <iterator>
 #include <kodi/Filesystem.h>
-#include <p8-platform/util/StringUtils.h>
+#include <kodi/tools/StringUtils.h>
 
 XMLTV::~XMLTV()
 {
@@ -118,7 +118,7 @@ bool XMLTV::Parse(HTTPSocket::Scope scope, const std::string& path)
         node3 = node3->next;
       }
       p.extra.genreType = EPGGenreByCategory(p.categories);
-      p.extra.genreDescription = StringUtils::Join(p.categories, ", ");
+      p.extra.genreDescription = kodi::tools::StringUtils::Join(p.categories, ", ");
 
       p.episodeNumber = prog->episode_num;
       p.previouslyShown = prog->previously_shown;
@@ -171,7 +171,7 @@ XMLTV::Channel* XMLTV::GetChannelByDisplayName(std::string& displayName)
 
     dnIt = std::find_if(channel.displayNames.begin(), channel.displayNames.end(),
                         [displayName](const std::string& dn) {
-                          return !StringUtils::CompareNoCase(displayName, dn);
+                          return !kodi::tools::StringUtils::CompareNoCase(displayName, dn);
                         });
 
     return dnIt != channel.displayNames.end();
@@ -199,7 +199,7 @@ int XMLTV::EPGGenreByCategory(std::vector<std::string>& categories)
 
       gmIt = std::find_if(
           genreCategories.begin(), genreCategories.end(),
-          [category](const std::string& g) { return !StringUtils::CompareNoCase(*category, g); });
+          [category](const std::string& g) { return !kodi::tools::StringUtils::CompareNoCase(*category, g); });
 
       if (gmIt != genreCategories.end())
       {
@@ -256,5 +256,5 @@ std::string XMLTV::CreditsAsString(std::vector<Credit>& credits,
        credit != filteredCredits.end(); ++credit)
     creditList.push_back(credit->name);
 
-  return StringUtils::Join(creditList, ", ");
+  return kodi::tools::StringUtils::Join(creditList, ", ");
 }