Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support multiple credits elements, firstAired, year, star rating, episode-num in epg entry, readme update, multiple display-names's and matching channels, plus bugfixes - Matrix #275

Merged
merged 21 commits into from Sep 4, 2019

Conversation

phunkyfish
Copy link
Member

@phunkyfish phunkyfish commented Aug 27, 2019

v4.4.0

  • Fixed: Support full timeshift range of -12 to +14 hours
  • Fixed: Some providers incorrectly use tvg-ID instead of tvg-id
  • Fixed: Support multiple display-names and case insensitive tvg-id is always first, next tvg-name and then channel name find order
  • Added: support episode-num for both xmltv_ns and onscreen systems in epg entry
  • Added: Update readme for supported M3U and XMLTV formats and genres
  • Added: support star rating in epg entry
  • Added: support firstAired and year in epg entry
  • Added: Update OSX build script
  • Added: support multiple actor/director/writers elements in epg entry
  • Added: URLEncode and append .png ext for remote logos built from channel name
  • Added: Support for mapping by genre hex ID and added example files and settings
  • Added: Timing for Playlist and EPG Load
  • Added: Option to number channels by M3U order only
  • Update: Debug logging
  • Added: Channel group member order set to M3U order
  • Fixed: Fix segfault for compressed EPG files
  • Added: Add ordering for groups as per PVR API 6.1.0

@phunkyfish
Copy link
Member Author

@allixx can you test this on Matrix?

@allixx
Copy link
Contributor

allixx commented Aug 28, 2019

Tested 11b0fa8 on kodi 3a7e2f2 on Linux x86_64. Basic functionality (m3u playlist source: channels, groups, remote logos urlencode) worked fine. Don't use EPG so didn't test it. Nothing suspicious in kodi logs.

@phunkyfish phunkyfish force-pushed the fields-matrix branch 4 times, most recently from f983655 to fa4134a Compare August 29, 2019 18:12
@phunkyfish
Copy link
Member Author

@2small you should be able to map to EPG colours using custom text with this PR. Can you test when you get a chance? You will need the latest Matrix nightly (or an up to date repo if you build kodi from source).

@ghost
Copy link

ghost commented Aug 29, 2019

@2small you should be able to map to EPG colours using custom text with this PR. Can you test when you get a chance? You will need the latest Matrix nightly (or an up to date repo if you build kodi from source).

I correct understand, need describe genres.xml like:

<category type="64" subtype="16">Formula 1</category>
<category type="64" subtype="16">Basketball</category>

or not need set subtype?
and in the xmltv:

<category>Formula 1</category>
or
<category>Basketball</category>

and kodi will show epg color of sport entry, but write Basketball not Sports

@phunkyfish
Copy link
Member Author

You still need to supply subtype it just won’t get used.

Just remember to enable the feature in settings.

@phunkyfish
Copy link
Member Author

phunkyfish commented Aug 29, 2019

Alternatively on Matrix you can also just use genreId instead:

<category genreId="0x40">Formula 1</category>
<category genreId="0x40">Basketball</category>

@ghost
Copy link

ghost commented Aug 30, 2019

<programme channel="filmzoneplus" start="20190830123500 +0300" stop="20190830144500 +0300">
    <title>Ištroškę greičio</title>
    <sub-title>Kriminalinis / Trileris / Veiksmo - Indija / JAV</sub-title>
    <desc>...</desc>
    <category>Movie</category>
    <icon src="..."/>
    <credits>
        <director>...</director>
        <actor>...</actor>
    </credits>
    <star-rating>
        <value>6.5/10</value>
    </star-rating>
    <date>2014</date>
    <country>Indija / JAV</country>
</programme>
<programme channel="matcharena" start="20190830115500 +0300" stop="20190830133000 +0300">
    <title>ФОРМУЛА-1. Гран-при Бельгии. Свободная практика 1. Прямая трансляция</title>
    <desc>...</desc>
    <category>Formula 1</category>
    <icon src="..."/>
    <new/>
</programme>
<genres>
  <genre genreId="0x40">Formula 1</genre>
  <genre genreId="0x10">Movie</genre>
</genres>

colored epg +1
but not show correct genre string :(
screenshoots:
Screenshot from 2019-08-30 08-44-01
Screenshot from 2019-08-30 08-44-16
Screenshot from 2019-08-30 08-44-10
Screenshot from 2019-08-30 08-19-15
Screenshot from 2019-08-30 08-52-50
Screenshot from 2019-08-30 08-53-43

@phunkyfish
Copy link
Member Author

It works for me.

Colouring:
Screenshot 2019-08-30 at 09 45 34

One genre:
Screenshot 2019-08-30 at 09 45 28

The other:
Screenshot 2019-08-30 at 09 45 18

@phunkyfish
Copy link
Member Author

phunkyfish commented Aug 30, 2019

Did you build Kodi yourself? Also, do you have plain log file (doesn't need debug).

Maybe just the log file. I checked your commit hash and it's correct.

@phunkyfish
Copy link
Member Author

Weird that your genre is displaying as cC

@ghost
Copy link

ghost commented Aug 30, 2019

I install kodi from ppa-nightly
Starting Kodi (19.0-ALPHA1 Git:20190830-c28fb64). Platform: Linux x86 64-bit
I build pvr.iptvsimple from PR 275 and install it
pvr.iptvsimple.log

I think the genre string show like byte value -> string, because different startup/reload time show different genre symbols

@phunkyfish
Copy link
Member Author

Ok, I think I know the problem.

@phunkyfish
Copy link
Member Author

Ok, try this @2small.

If you could add a debug log (even if it's working) that would be great as I updated the logging and want to see if it works for you too.

@ghost
Copy link

ghost commented Aug 30, 2019

yes, great, genre name and color
Screenshot from 2019-08-30 16-02-20
good job

@phunkyfish
Copy link
Member Author

Cool, do you have a debug log also? Want to check the logging for channel EPGs.

@ghost
Copy link

ghost commented Aug 30, 2019

Next time i got debug log file, because for now out of development pc :)

@phunkyfish
Copy link
Member Author

NP, thanks.

@phunkyfish phunkyfish force-pushed the fields-matrix branch 3 times, most recently from ef84cc9 to 8eeeb09 Compare September 3, 2019 20:57
Copy link
Member

@ksooo ksooo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plenty of remarks/questions...

src/iptvsimple/utilities/XMLUtils.h Outdated Show resolved Hide resolved
src/iptvsimple/utilities/XMLUtils.h Outdated Show resolved Hide resolved
src/iptvsimple/utilities/XMLUtils.h Outdated Show resolved Hide resolved
src/iptvsimple/data/EpgEntry.cpp Outdated Show resolved Hide resolved
src/iptvsimple/data/EpgEntry.cpp Outdated Show resolved Hide resolved
src/iptvsimple/data/EpgEntry.h Outdated Show resolved Hide resolved
src/iptvsimple/utilities/XMLUtils.h Outdated Show resolved Hide resolved
src/iptvsimple/utilities/XMLUtils.h Outdated Show resolved Hide resolved
src/iptvsimple/utilities/FileUtils.h Show resolved Hide resolved
pvr.iptvsimple/addon.xml.in Outdated Show resolved Hide resolved
@phunkyfish
Copy link
Member Author

Ok, this is ready too. Strangely by encapsulating (or some other change in the refactor) I no longer require the #ifdef WINDOWS!!!

Copy link
Member

@ksooo ksooo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready to go, imo.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants