Merge branch 'main' into dev

This commit is contained in:
JackDandy 2024-06-26 01:20:52 +01:00
commit 611097de1a
26 changed files with 19 additions and 9 deletions

View file

@ -5,6 +5,12 @@
* Update urllib3 2.2.1 (54d6edf) to 2.2.2 (27e2a5c)
### 3.32.1 (2024-06-26 01:15:00 UTC)
* Fix update tvinfo test data
* Fix type of self.plays_self
### 3.32.0 (2024-06-25 21:15:00 UTC)
* Update apprise 1.6.0 (0c0d5da) to 1.8.0 (81caf92)

View file

@ -360,8 +360,8 @@ class TmdbIndexer(TVInfoBase):
characters.append(
TVInfoCharacter(name=clean_char_name, ti_show=ti_show, person=[_it_person_obj],
episode_count=character.get('episode_count'),
plays_self=clean_char_name and
(clean_char_name or '').lower() in ('self', clean_lower_person_name))
plays_self=enforce_type(clean_char_name and
(clean_char_name or '').lower() in ('self', clean_lower_person_name), bool, False)),
)
_it_person_obj.characters = characters
@ -768,8 +768,8 @@ class TmdbIndexer(TVInfoBase):
clean_lower_person_name = (clean_person_name or '').lower() or None
character_obj = TVInfoCharacter(
name=clean_char_name,
plays_self=clean_char_name and
(clean_char_name or '').lower() in ('self', clean_lower_person_name),
plays_self=enforce_type(clean_char_name and
(clean_char_name or '').lower() in ('self', clean_lower_person_name), bool, False),
person=[
TVInfoPerson(
p_id=person_obj['id'], name=clean_person_name,

View file

@ -333,7 +333,8 @@ class TraktIndexer(TVInfoBase):
_ti_character = TVInfoCharacter(
name=clean_ch, regular=c.get('series_regular'), ti_show=ti_show, person=[result],
episode_count=c.get('episode_count'),
plays_self=(clean_ch or '').lower() in ('self', clean_lower_person_name))
plays_self=enforce_type((clean_ch or '').lower() in
('self', clean_lower_person_name), bool, False))
pc.append(_ti_character)
ti_show.cast[(RoleTypes.ActorGuest, RoleTypes.ActorMain)[
c.get('series_regular', False)]].append(_ti_character)

View file

@ -443,7 +443,8 @@ class TvMaze(TVInfoBase):
sizes={TVInfoImageSize.original: c.character.image['original'],
TVInfoImageSize.medium: c.character.image['medium']})]
ch.append(TVInfoCharacter(name=self._clean_character_name(c.character.name),
ti_show=ti_show, episode_count=1, plays_self=c.character.plays_self,
ti_show=ti_show, episode_count=1,
plays_self=enforce_type(c.character.plays_self, bool, False),
voice=c.character.voice,
image= c.character.image and c.character.image.get('original'),
thumb_url= c.character.image and c.character.image.get('medium'),
@ -537,7 +538,8 @@ class TvMaze(TVInfoBase):
sizes={TVInfoImageSize.original: c.character.image['original'],
TVInfoImageSize.medium: c.character.image['medium']})]
ch.append(TVInfoCharacter(name=_clean_char_name, ti_show=ti_show, regular=regular, episode_count=1,
person=[_ti_person_obj], plays_self=c.character.plays_self,
person=[_ti_person_obj],
plays_self=enforce_type(c.character.plays_self, bool, False),
voice=c.character.voice,
image=c.character.image and c.character.image.get('original'),
thumb_url=c.character.image and c.character.image.get('medium'),
@ -631,7 +633,8 @@ class TvMaze(TVInfoBase):
TVInfoCharacter(image=cur_ch.image and cur_ch.image.get('original'),
name=self._clean_character_name(cur_ch.name),
ids=TVInfoIDs({TVINFO_TVMAZE: cur_ch.id}),
p_id=cur_ch.id, person=[person], plays_self=cur_ch.plays_self,
p_id=cur_ch.id, person=[person],
plays_self=enforce_type(cur_ch.plays_self, bool, False),
thumb_url=cur_ch.image and cur_ch.image.get('medium'),
ti_show=_s_o
))

View file

@ -1 +1 @@
2024-01-11
2024-06-25