Merge pull request #707 from phunkyfish/fix-default-settings-omega

Set default settings correctly and update settings migration - Omega
kodi-pvr · Feb 20, 2023 · f4a645b · f4a645b
2 parents 958963f + 7099f7d
commit f4a645b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,9 @@
 
 # IPTV Simple PVR
 
-IPTV Live TV and Radio PVR client addon for [Kodi](https://kodi.tv) with support for both Gzip and XZ compression of XMLTV. Supports catchup/archive streams if supported by the IPTV provider as well as streams from Kodi video add-ons.
+IPTV Live TV and Radio PVR client addon for [Kodi](https://kodi.tv) with support for both Gzip and XZ compression of XMLTV. Multiple pairs of M3U/XML files are supported via Kodi PVR since Kodi 20 (Nexus). Supports catchup/archive streams if supported by the IPTV provider as well as streams from Kodi video add-ons.
+
+To use multiple pairs of M3U/XML files simply visit the add-ons settings under `Configure`, and choose new `Add add-on configuration`.
 
 IPTV Simple will play back videos and streams using a number of different inputstreams. The options available, such as pause/resume, seeking, timshifting etc. will depend on both the provider of the streams and the inputstream used. For video on demand stream seeking will be enabled within the duration of the video regardless of the inputstream used. The differences occur with the playback of live and catchup streams.
 

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.1.0"
+  version="21.1.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.1.1
+- Set default settings correctly and update settings migration
+
 v21.1.0
 - Add support for multiple instances each supporting their own M3U/XMLTV and settings
 

diff --git a/src/iptvsimple/InstanceSettings.h b/src/iptvsimple/InstanceSettings.h
@@ -237,7 +237,7 @@ namespace iptvsimple
     PathType m_m3uPathType = PathType::REMOTE_PATH;
     std::string m_m3uPath;
     std::string m_m3uUrl;
-    bool m_cacheM3U = false;
+    bool m_cacheM3U = true;
     int m_startChannelNumber = 1;
     bool m_numberChannelsByM3uOrderOnly = false;
     RefreshMode m_m3uRefreshMode = RefreshMode::DISABLED;
@@ -256,7 +256,7 @@ namespace iptvsimple
     std::string m_threeTVGroup = "";
     std::string m_fourTVGroup = "";
     std::string m_fiveTVGroup = "";
-    std::string m_customTVGroupsFile = "";
+    std::string m_customTVGroupsFile = DEFAULT_CUSTOM_TV_GROUPS_FILE;
     bool m_allowRadioChannelGroupsOnly = false;
     ChannelGroupMode m_radioChannelGroupMode = ChannelGroupMode::ALL_GROUPS;
     int m_numRadioGroups = DEFAULT_NUM_GROUPS;
@@ -265,28 +265,28 @@ namespace iptvsimple
     std::string m_threeRadioGroup = "";
     std::string m_fourRadioGroup = "";
     std::string m_fiveRadioGroup = "";
-    std::string m_customRadioGroupsFile = "";
+    std::string m_customRadioGroupsFile = DEFAULT_CUSTOM_RADIO_GROUPS_FILE;
 
     // EPG
     PathType m_epgPathType = PathType::REMOTE_PATH;
     std::string m_epgPath;
     std::string m_epgUrl;
-    bool m_cacheEPG = false;
-    float m_epgTimeShiftHours = 0;
-    bool m_tsOverride = true;
+    bool m_cacheEPG = true;
+    float m_epgTimeShiftHours = 0.0f;
+    bool m_tsOverride = false;
     bool m_ignoreCaseForEpgChannelIds = true;
 
     // Genres
     bool m_useEpgGenreTextWhenMapping = false;
     PathType m_genresPathType = PathType::LOCAL_PATH;
-    std::string m_genresPath;
+    std::string m_genresPath = DEFAULT_GENRE_TEXT_MAP_FILE;
     std::string m_genresUrl;
 
     // Channel Logos
     PathType m_logoPathType = PathType::REMOTE_PATH;
     std::string m_logoPath;
     std::string m_logoBaseUrl;
-    EpgLogosMode m_epgLogosMode = EpgLogosMode::IGNORE_XMLTV;
+    EpgLogosMode m_epgLogosMode = EpgLogosMode::PREFER_M3U;
     bool m_useLocalLogosOnly = false;
 
     // Media
@@ -298,9 +298,9 @@ namespace iptvsimple
 
     // Timeshift
     bool m_timeshiftEnabled = false;
-    bool m_timeshiftEnabledAll = false;
-    bool m_timeshiftEnabledHttp = false;
-    bool m_timeshiftEnabledUdp = false;
+    bool m_timeshiftEnabledAll = true;
+    bool m_timeshiftEnabledHttp = true;
+    bool m_timeshiftEnabledUdp = true;
     bool m_timeshiftEnabledCustom = false;
 
     // Catchup

diff --git a/src/iptvsimple/utilities/SettingsMigration.cpp b/src/iptvsimple/utilities/SettingsMigration.cpp
@@ -41,12 +41,13 @@ const std::vector<std::pair<const char*, const char*>> stringMap = {{"m3uPath",
                                                                     {"genresUrl", ""},
                                                                     {"logoPath", ""},
                                                                     {"logoBaseUrl", ""},
-                                                                    {"udpxyHost", "127.0.0.1"},
+                                                                    {"catchupQueryFormat", ""},
+                                                                    {"udpxyHost", ""},
                                                                     {"defaultUserAgent", ""},
                                                                     {"defaultInputstream", ""},
                                                                     {"defaultMimeType", ""}};
 
-const std::vector<std::pair<const char*, int>> intMap = {{"m3uPathType", 0},
+const std::vector<std::pair<const char*, int>> intMap = {{"m3uPathType", 1},
                                                          {"startNum", 1},
                                                          {"m3uRefreshMode", 0},
                                                          {"m3uRefreshIntervalMins", 60},
@@ -61,12 +62,13 @@ const std::vector<std::pair<const char*, int>> intMap = {{"m3uPathType", 0},
                                                          {"logoFromEpg", 1},
                                                          {"catchupDays", 5},
                                                          {"allChannelsCatchupMode", 0},
+                                                         {"catchupOverrideMode", 0},
                                                          {"catchupWatchEpgBeginBufferMins", 5},
                                                          {"catchupWatchEpgEndBufferMins", 15},
                                                          {"udpxyPort", 4022}};
 
-const std::vector<std::pair<const char*, float>> floatMap = {{"epgTimeShift", 0.0},
-                                                             {"catchupCorrection", 0.0}};
+const std::vector<std::pair<const char*, float>> floatMap = {{"epgTimeShift", 0.0f},
+                                                             {"catchupCorrection", 0.0f}};
 
 const std::vector<std::pair<const char*, bool>> boolMap = {{"m3uCache", true},
                                                            {"numberByOrder", false},
@@ -84,9 +86,9 @@ const std::vector<std::pair<const char*, bool>> boolMap = {{"m3uCache", true},
                                                            {"mediaTitleSeasonEpisode", false},
                                                            {"mediaVODAsRecordings", true},
                                                            {"timeshiftEnabled", false},
-                                                           {"timeshiftEnabledAll", true},
-                                                           {"timeshiftEnabledHttp", true},
-                                                           {"timeshiftEnabledUdp", true},
+                                                           {"timeshiftEnabledAll", false},
+                                                           {"timeshiftEnabledHttp", false},
+                                                           {"timeshiftEnabledUdp", false},
                                                            {"timeshiftEnabledCustom", false},
                                                            {"catchupEnabled", false},
                                                            {"catchupPlayEpgAsLive", false},