Bump version to 0.3.7

Signed-off-by: Julian Scheel <julian@jusst.de>
OctonetData: Use hash for channel nativeId
2025-03-01 10:53:09 +00:00 · 2017-07-10 08:56:43 +02:00 · 2017-07-06 14:21:41 +02:00 · 2017-07-06 14:16:00 +02:00 · 2017-05-26 10:46:28 +02:00 · 2017-05-26 10:46:28 +02:00
4 changed files with 11 additions and 12 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ before_install:
 #
 before_script:
  - cd $TRAVIS_BUILD_DIR/..
-  - git clone --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone --depth=1 https://github.com/xbmc/xbmc.git -b Krypton
  - mkdir -p xbmc/project/cmake/addons/addons/pvr.octonet
  - echo "pvr.octonet https://github.com/DigitalDevices/pvr.octonet master" > xbmc/project/cmake/addons/addons/pvr.octonet/pvr.octonet.txt
  - cd $TRAVIS_BUILD_DIR && mkdir build && cd build
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,15 +21,20 @@ environment:
    - GENERATOR: "Visual Studio 14"
      CONFIG: Release

+artifacts:
+  - path: build/install/
+    name: pvr.octonet
+    type: zip
+
 build_script:
  - cd ..
  - set ROOT=%cd%
-  - git clone --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone --depth=1 https://github.com/xbmc/xbmc.git -b Krypton
  - mkdir xbmc\project\cmake\addons\addons\pvr.octonet
  - echo pvr.octonet https://github.com/DigitalDevices/pvr.octonet master > xbmc\project\cmake\addons\addons\pvr.octonet\pvr.octonet.txt
  - cd %ADDON%
  - mkdir build
  - cd build
  # Must use absolute path for cmake to build depends correctly
-  - cmake -G "%GENERATOR%" -DADDONS_TO_BUILD=%ADDON% -DCMAKE_BUILD_TYPE=%CONFIG% -DADDON_SRC_PREFIX=%ROOT% -DCMAKE_INSTALL_PREFIX=%ROOT%\xbmc\addons -DPACKAGE_ZIP=1 %ROOT%\xbmc\project\cmake\addons
+  - cmake -G "%GENERATOR%" -DADDONS_TO_BUILD=%ADDON% -DCMAKE_BUILD_TYPE=%CONFIG% -DADDON_SRC_PREFIX=%ROOT% -DCMAKE_INSTALL_PREFIX=install -DPACKAGE_ZIP=1 %ROOT%\xbmc\project\cmake\addons
  - cmake --build . --config %CONFIG%
--- a/pvr.octonet/addon.xml
+++ b/pvr.octonet/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
 	id="pvr.octonet"
-	version="0.3.6"
+	version="0.3.7"
 	name="Digital Devices Octopus NET Client"
 	provider-name="digitaldevices">
 	<requires>
--- a/src/OctonetData.cpp
+++ b/src/OctonetData.cpp
@@ -53,14 +53,8 @@ OctonetData::~OctonetData(void)

 int64_t OctonetData::parseID(std::string id)
 {
-	int64_t nativeId;
-	size_t strip;
-	/* Strip colons from id */
-	while ((strip = id.find(":")) != std::string::npos)
-		id.erase(strip, 1);
-
-	std::stringstream ids(id);
-	ids >> nativeId;
+	std::hash<std::string> hash_fn;
+	int64_t nativeId = hash_fn(id);

 	return nativeId;
 }
Author	SHA1	Message	Date
Julian Scheel	d4077a142c	Bump version to 0.3.7 Signed-off-by: Julian Scheel <julian@jusst.de>	2017-07-10 08:56:43 +02:00
Julian Scheel	6ee28476fa	OctonetData: Use hash for channel nativeId We previously assumed that the channelId provided by the Octonet would only contain numbers and colons, which unfortunately is not true. The satellite names could contain arbitrary characters, which then caused the conversion to a numeric value to fail, stopping channels from being distinguishable. This caused all EPG events to be mapped to the first channel. Signed-off-by: Julian Scheel <julian@jusst.de>	2017-07-06 14:21:41 +02:00
Julian Scheel	de0a0f9a81	AppVeyor: Provide built addon as artifact Allow users to fetch the builds generated by AppVeyor. Signed-off-by: Julian Scheel <julian@jusst.de>	2017-07-06 14:16:00 +02:00
Julian Scheel	1b0c31654a	Travis: Build against Kodi Krypton This is the Krypton support branch, so it shall be build-tested against Krypton Kodi tree. Signed-off-by: Julian Scheel <julian@jusst.de>	2017-05-26 10:46:28 +02:00
Julian Scheel	f260cb07e9	AppVeyor: Build against Kodi Krypton This is the Krypton support branch, so it shall be build-tested against Krypton Kodi tree. Signed-off-by: Julian Scheel <julian@jusst.de>	2017-05-26 10:46:28 +02:00