New upstream version 7.4.3+ds1
Vasyl Gello
3 years ago
22 | 22 | * `1.3.5`: Embedded EPG Genres, Tuner Details, Provider Name, Picon URLs |
23 | 23 | * `1.3.6`: Editing Recordings |
24 | 24 | * `1.3.7`: Backend Channel Numbers |
25 | * `1.3.9`: Recording Sizes | |
26 | * `1.4.4`: Recursive Movie listing | |
27 | * `1.4.6`: Use internal OWF MovieList (avoids memory leak on some images) | |
25 | 28 | |
26 | 29 | The contents of this README.md file are as follows: |
27 | 30 |
0 | 0 | <?xml version="1.0" encoding="UTF-8"?> |
1 | 1 | <addon |
2 | 2 | id="pvr.vuplus" |
3 | version="7.4.0" | |
3 | version="7.4.3" | |
4 | 4 | name="Enigma2 Client" |
5 | 5 | provider-name="Joerg Dembski and Ross Nicholson"> |
6 | 6 | <requires>@ADDON_DEPENDS@ |
182 | 182 | <icon>icon.png</icon> |
183 | 183 | </assets> |
184 | 184 | <news> |
185 | v7.4.3 | |
186 | - Fixed: Use OpenWebIfs internal MovieList to avoid memory leak on some images | |
187 | ||
188 | v7.4.2 | |
189 | - Update: Switch disk space logging to debug level | |
190 | ||
191 | v7.4.1 | |
192 | - Fixed: Don't log channel group not found for members at INFO level | |
193 | ||
185 | 194 | v7.4.0 |
186 | 195 | - Added: Add setting to omit recording location base dir from recording path |
187 | 196 | - Added: Correctly store the directory of a recording from the backend |
0 | v7.4.3 | |
1 | - Fixed: Use OpenWebIfs internal MovieList to avoid memory leak on some images | |
2 | ||
3 | v7.4.2 | |
4 | - Update: Switch disk space logging to debug level | |
5 | ||
6 | v7.4.1 | |
7 | - Fixed: Don't log channel group not found for members at INFO level | |
8 | ||
0 | 9 | v7.4.0 |
1 | 10 | - Added: Add setting to omit recording location base dir from recording path |
2 | 11 | - Added: Correctly store the directory of a recording from the backend |
Binary diff not shown
552 | 552 | iTotal = totalKb; |
553 | 553 | iUsed = totalKb - freeKb; |
554 | 554 | |
555 | Logger::Log(LEVEL_INFO, "%s Space Total: %lld, Used %lld", __func__, iTotal, iUsed); | |
555 | Logger::Log(LEVEL_DEBUG, "%s Space Total: %lld, Used %lld", __func__, iTotal, iUsed); | |
556 | 556 | |
557 | 557 | return PVR_ERROR_NO_ERROR; |
558 | 558 | } |
52 | 52 | |
53 | 53 | if (!channelGroup) |
54 | 54 | { |
55 | Logger::Log(LEVEL_INFO, "%s - Channel Group not found, could not get ChannelGroupsMembers for PVR for group: %s", __func__, groupName.c_str()); | |
55 | Logger::Log(LEVEL_DEBUG, "%s - Channel Group not found, could not get ChannelGroupsMembers for PVR for group: %s", __func__, groupName.c_str()); | |
56 | 56 | |
57 | 57 | return PVR_ERROR_NO_ERROR; |
58 | 58 | } |
59 | else | |
60 | { | |
61 | Logger::Log(LEVEL_DEBUG, "%s - Starting to get ChannelGroupsMembers for PVR for group: %s", __func__, groupName.c_str()); | |
62 | } | |
59 | ||
60 | Logger::Log(LEVEL_DEBUG, "%s - Starting to get ChannelGroupsMembers for PVR for group: %s", __func__, groupName.c_str()); | |
63 | 61 | |
64 | 62 | int channelOrder = 1; |
65 | 63 |
759 | 759 | namespace |
760 | 760 | { |
761 | 761 | |
762 | std::string GetRecursiveParam(const std::string recordingLocation, bool deleted) | |
763 | { | |
764 | std::string recursiveParam; | |
765 | ||
766 | if (!deleted && Settings::GetInstance().GetRecordingsRecursively()) | |
762 | std::string GetRecordingsParams(const std::string recordingLocation, bool deleted) | |
763 | { | |
764 | std::string recordingsParams; | |
765 | ||
766 | if (!deleted && Settings::GetInstance().GetRecordingsRecursively() && Settings::GetInstance().SupportsMovieListRecursive()) | |
767 | 767 | { |
768 | 768 | if (recordingLocation == "default") |
769 | recursiveParam = "?recursive=1"; | |
769 | recordingsParams = "?recursive=1"; | |
770 | 770 | else |
771 | recursiveParam = "&recursive=1"; | |
772 | } | |
773 | ||
774 | return recursiveParam; | |
771 | recordingsParams = "&recursive=1"; | |
772 | ||
773 | // &internal=true requests that openwebif uses it own OWFMovieList instead of the E2 MovieList | |
774 | // becuase the E2 MovieList causes memory leaks | |
775 | if (Settings::GetInstance().SupportsMovieListOWFInternal()) | |
776 | recordingsParams += "&internal=1"; | |
777 | } | |
778 | else | |
779 | { | |
780 | // &internal=true requests that openwebif uses it own OWFMovieList instead of the E2 MovieList | |
781 | // becuase the E2 MovieList causes memory leaks | |
782 | if (Settings::GetInstance().SupportsMovieListOWFInternal()) | |
783 | { | |
784 | if (recordingLocation == "default") | |
785 | recordingsParams += "?internal=1"; | |
786 | else | |
787 | recordingsParams += "&internal=1"; | |
788 | } | |
789 | } | |
790 | ||
791 | return recordingsParams; | |
775 | 792 | } |
776 | 793 | |
777 | 794 | } // unnamed namespace |
781 | 798 | std::string url; |
782 | 799 | std::string directory; |
783 | 800 | |
784 | std::string recursiveParam = GetRecursiveParam(recordingLocation, deleted); | |
801 | std::string recordingsParams = GetRecordingsParams(recordingLocation, deleted); | |
785 | 802 | |
786 | 803 | if (recordingLocation == "default") |
787 | 804 | { |
788 | url = StringUtils::Format("%s%s%s", Settings::GetInstance().GetConnectionURL().c_str(), "web/movielist", recursiveParam.c_str()); | |
805 | url = StringUtils::Format("%s%s%s", Settings::GetInstance().GetConnectionURL().c_str(), "web/movielist", recordingsParams.c_str()); | |
789 | 806 | directory = StringUtils::Format("/"); |
790 | 807 | } |
791 | 808 | else |
792 | 809 | { |
793 | 810 | url = StringUtils::Format("%s%s?dirname=%s%s", Settings::GetInstance().GetConnectionURL().c_str(), "web/movielist", |
794 | WebUtils::URLEncodeInline(recordingLocation).c_str(), recursiveParam.c_str()); | |
811 | WebUtils::URLEncodeInline(recordingLocation).c_str(), recordingsParams.c_str()); | |
795 | 812 | directory = recordingLocation; |
796 | 813 | } |
797 | 814 |
255 | 255 | bool SupportsProviderNumberAndPiconForChannels() const { return CheckOpenWebIfVersion(1, 3, 5); } |
256 | 256 | bool SupportsChannelNumberGroupStartPos() const { return CheckOpenWebIfVersion(1, 3, 8); } |
257 | 257 | bool SupportsRecordingSizes() const { return CheckOpenWebIfVersion(1, 3, 9); } |
258 | bool SupportsMovieListRecursive() const { return CheckOpenWebIfVersion(1, 4, 4); } | |
259 | bool SupportsMovieListOWFInternal() const { return CheckOpenWebIfVersion(1, 4, 6); } | |
258 | 260 | |
259 | 261 | bool UsesLastScannedChannelGroup() const { return m_usesLastScannedChannelGroup; } |
260 | 262 | void SetUsesLastScannedChannelGroup(bool value) { m_usesLastScannedChannelGroup = value; } |