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.

Sign up for GitHub

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

Migrate to V2 API #8

Merged
merged 8 commits into from
Nov 30, 2022
+25 −25
Merged

Migrate to V2 API #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dc1d420
Correct API Param on banner
the-jeffski Nov 21, 2022
61d605c
Merge branch 'master' of https://github.com/the-jeffski/hass-medusa
the-jeffski Nov 21, 2022
d04ce37
Refactor for V2 API
the-jeffski Nov 22, 2022
67fd548
Update Manifest Version
the-jeffski Nov 22, 2022
68f1c09
Mod Manifest version
the-jeffski Nov 22, 2022
3745af1
Fix airdate and add runtime
the-jeffski Nov 22, 2022
d5423bb
Fix populate on start up
the-jeffski Nov 24, 2022
85a3808
Revert "Mod Manifest version"
the-jeffski Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion custom_components/medusa/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"documentation": "https://github.com/IDmedia/hass-medusa",
"requirements": [],
"dependencies": [],
"version": "1.0.1",
"version": "1.0.2",
"codeowners": [
"@IDmedia"
]
Expand Down
48 changes: 24 additions & 24 deletions custom_components/medusa/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@


def setup_platform(hass, config, add_entities, discovery_info=None):
add_entities([MedusaSensor(config, hass)])
add_entities([MedusaSensor(config, hass)], True)


class MedusaSensor(Entity):
Expand Down Expand Up @@ -80,8 +80,8 @@ def update(self):
init['icon'] = 'mdi:eye-off'
card_json.append(init)

tv_shows = self.get_infos(self.protocol, self.host, self.port, self.web_root, self.token, 'future')
tv_shows = self.get_infos(self.protocol, self.host, self.port, self.web_root, self.token, 'schedule')

directory = "{0}/www/custom-lovelace/{1}/images/".format(self.base_dir, self._name)
if not os.path.exists(directory):
os.makedirs(directory)
Expand All @@ -91,54 +91,54 @@ def update(self):
del_images = list(filter(regex_img.search,
os.listdir(directory)))

for category in tv_shows["data"]:
for show in tv_shows["data"].get(category):
for category in tv_shows:
for show in tv_shows.get(category):

airdate_str = show["airdate"] + ' ' + show["airs"]
airdate_dt = datetime.strptime(airdate_str, "%Y-%m-%d %A %I:%M %p")
airdate = airdate_dt.strftime("%Y-%m-%dT%H:%M:%SZ")

number = "S" + str(show["season"]).zfill(2) + "E" + str(show["episode"]).zfill(2)

banner = "{0}-banner.jpg".format(show["indexerid"])
fanart = "{0}-fanart.jpg".format(show["indexerid"])
poster = "{0}-poster.jpg".format(show["indexerid"])
banner = "{0}-banner.jpg".format(show["showSlug"])
fanart = "{0}-fanart.jpg".format(show["showSlug"])
poster = "{0}-poster.jpg".format(show["showSlug"])

card_items = {}
card_items["airdate"] = airdate
card_items["number"] = number
card_items["category"] = category
card_items["studio"] = show["network"]
card_items["title"] = show["show_name"]
card_items["episode"] = show["ep_name"]
card_items["release"] = '$day, $date $time'
card_items["poster"] = self.add_poster(lst_images, directory, poster, show["indexerid"], card_items, del_images)
card_items["fanart"] = self.add_fanart(lst_images, directory, fanart, show["indexerid"], card_items, del_images)
card_items["banner"] = self.add_banner(lst_images, directory, banner, show["indexerid"], card_items, del_images)

card_items["title"] = show["showName"]
card_items["episode"] = show["epName"]
card_items["release"] = show["airdate"]
card_items["runtime"] = show["runtime"]
card_items["poster"] = self.add_poster(lst_images, directory, poster, show["showSlug"], card_items, del_images)
card_items["fanart"] = self.add_fanart(lst_images, directory, fanart, show["showSlug"], card_items, del_images)
card_items["banner"] = self.add_banner(lst_images, directory, banner, show["showSlug"], card_items, del_images)
card_shows.append(card_items)

if self.sort == "date":
card_shows.sort(key=lambda x: x.get("airdate"))
card_json = card_json + card_shows
attributes["data"] = card_json
self._state = tv_shows["result"]
self._state = "success"
self.data = attributes
self.delete_old_tvshows(del_images, directory)

def get_infos(self, proto, host, port, web_root, token, cmd):
url = "{0}://{1}:{2}{3}/api/v1/{4}/?cmd={5}&type=today|soon".format(
url = "{0}://{1}:{2}{3}/api/v2/{5}/?category[]=soon&category[]=today&api_key={4}".format(
proto, host, port, web_root, token, cmd)
ifs_movies = requests.get(url).json()
return ifs_movies
ifs_shows = requests.get(url).json()
return ifs_shows

def add_poster(self, lst_images, directory, poster, id, card_items, del_images):
if poster in lst_images:
if poster in del_images:
del_images.remove(poster)

else:
img_data = requests.get("{0}://{1}:{2}{3}/api/v1/{4}/?cmd=show.getposter&indexerid={5}".format(self.protocol, self.host, self.port, self.web_root, self.token, id))
img_data = requests.get("{0}://{1}:{2}{3}/api/v2/series/{5}/asset/posterThumb?api_key={4}".format(self.protocol, self.host, self.port, self.web_root, self.token, id))
if not img_data.status_code.__eq__(200):
_LOGGER.error(card_items)
return ""
Expand All @@ -154,8 +154,8 @@ def add_fanart(self, lst_images, directory, fanart, id, card_items, del_images):
if fanart in del_images:
del_images.remove(fanart)
else:
img_data = requests.get("{0}://{1}:{2}{3}/api/v1/{4}/?cmd=show.getfanart&indexerid={5}".format(self.protocol, self.host, self.port, self.web_root, self.token, id))

img_data = requests.get("{0}://{1}:{2}{3}/api/v2/series/{5}/asset/fanart?api_key={4}".format(self.protocol, self.host, self.port, self.web_root, self.token, id))
if not img_data.status_code.__eq__(200):
return ""

Expand All @@ -170,8 +170,8 @@ def add_banner(self, lst_images, directory, banner, id, card_items, del_images):
if banner in del_images:
del_images.remove(banner)
else:
img_data = requests.get("{0}://{1}:{2}/api/v1/{4}/?cmd=show.getbanner&indexerid={4}".format(self.protocol, self.host, self.port, self.web_root, self.token, id))

img_data = requests.get("{0}://{1}:{2}{3}/api/v2/series/{5}/asset/banner?api_key={4}".format(self.protocol, self.host, self.port, self.web_root, self.token, id))
_LOGGER.debug(img_data)
if not img_data.status_code.__eq__(200):
return ""

Expand Down