Merge pull request #51 from kubedzero/newscenes

Add 2021 Aerials Screensavers and fix reported bugs

README.md

@@ -1,5 +1,3 @@
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e5d8dc168cf940a385d1a47837fe7596)](https://www.codacy.com/app/92enen/screensaver.atv4?utm_source=github.com&utm_medium=referral&utm_content=enen92/screensaver.atv4&utm_campaign=Badge_Grade)
-
 # screensaver.atv4
 
 ## Apple Aerial screensavers for Kodi 19 (Matrix)
@@ -14,20 +12,20 @@ This addon adds the Apple Aerial screensavers to Kodi Entertainment Center. It c
 - Display Power Management Signaling (DPMS) configurable
   - When the display is supposed to go to sleep, pause/stop the Aerials video and turn the display off or put it into standby via HDMI CEC
 - Choose from playback of:
-  - HEVC H.265 or AVC H.264 codec (HEVC default)
-  - 4K or 1080p resolution (4K default)
+  - HEVC H.265 or AVC H.264 codec (H.264 default)
+  - 4K or 1080p resolution (1080p default)
   - High Dynamic Range (HDR) Dolby Vision or Standard Dynamic Range (SDR default)
 - Filtering of videos by location/scene
 - Offline caching of selected video quality
-  - Download scene by scene or all at once
+  - Download location by location or all at once
   - Full offline mode to prevent all network calls, using only local videos and JSON
   - Checksum validation to prevent unnecessary re-downloading of cached videos
 - Custom JSON file count and gigabytes per quality level:
-  - H.264 1080P SDR: 71 files, 17.3GB
-  - H.265 1080P SDR: 90 files, 15.5GB
-  - H.265 1080P HDR: 90 files, 19.9GB
-  - H.265 4K SDR: 90 files, 31.0GB
-  - H.265 4K HDR: 90 files, 39.5GB
+  - H.264 1080P SDR: 122 files, 39.4GB
+  - H.265 1080P SDR: 116 files, 24.5GB
+  - H.265 1080P HDR: 116 files, 37.8GB
+  - H.265 4K SDR: 116 files, 48.9GB
+  - H.265 4K HDR: 116 files, 75.3GB
 
 ## Aerials History
 - When the Apple TV first came out with Aerials screensavers, Apple published a [V1 JSON manifest](http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/entries.json) with all the different videos. Locations featured San Francisco, New York, China, Hong Kong, Greenland, Dubai, Los Angeles, and others. They were published in 1080p H.264 format
@@ -40,6 +38,8 @@ This addon adds the Apple Aerial screensavers to Kodi Entertainment Center. It c
   - As part of this update, Apple removed the `timeOfDay` key so this plugin's filtering based on time of day is no longer possible without manually adding JSON keys for each scene
   - The new JSON contained new URLs for the original videos, possibly behind a Content Delivery Network (CDN). For example, a Greenland video's URL changed from http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_GL_G004_C010_v03_6Mbps.mov to http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos/comp_GL_G004_C010_v03_6Mbps.mov (adding `.v2` and `.edgesuite.net`)
 - [Benjamin Mayo](https://github.com/benjaminmayo) published a [Google Doc](https://docs.google.com/spreadsheets/d/1bboTohF06r-fafrImTExAPqM9m6h2m2lgJyAkQuYVJI/edit?usp=sharing) with a historical record of all the Aerials videos and links to all their different variants (H264, HDR, 4K, etc.) and also hosts a [website](https://bzamayo.com/watch-all-the-apple-tv-aerial-video-screensavers) for streaming all the different options
+  - Videos added to Apple's catalog after January 2020 don't seem to be reflected here, as of January 2022
+- Apple started appending the tvOS version number to the URL of the tarball, so as of 2022-01-01 and tvOS 15 [this URL](https://sylvan.apple.com/Aerials/resources-15.tar) is the link to get the latest `entries.json`
 
 # Screenshots
 

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="screensaver.atv4" name="Aerial" version="3.0.2" provider-name="enen92">
+<addon id="screensaver.atv4" name="Aerial" version="3.0.3" provider-name="enen92">
 	<requires>
 		<import addon="xbmc.python" version="3.0.0"/>
 	</requires>
@@ -17,10 +17,11 @@
 		<summary lang="es_ES">Protector de pantalla Apple TV para Kodi</summary>
 		<description lang="en_GB">This screensaver addon provides Apple TV aerial screensavers in Kodi</description>
     <description lang="es_ES">Este complemento habilita el protector de pantalla Aerial de Apple TV para Kodi</description>
-		<news>v3.0.2  (2021-03-20)
-			- 4K, HDR, and HEVC versions available
-			- New scenes added (ISS, undersea, recolored, extended)
-			- Day/night toggle removed, Apple no longer supports this
+		<news>v3.0.3  (2022-01-01)
+			- New scenes added (Patagonia, Yosemite, Grand Canyon, Iceland, Scotland)
+			- Updated Apple resources.tar entries.json URL
+			- Location All is now sorted before any of the other locations
+			- Fixed bug that was preventing playback or download when HEVC was disabled
 		</news>
 		<assets>
 			<icon>icon.png</icon>

changelog.txt

@@ -1,3 +1,9 @@
+v3.0.3  (2022-01-01)
+- New scenes added (Patagonia, Yosemite, Grand Canyon, Iceland, Scotland)
+- Updated Apple resources.tar entries.json URL
+- Location All is now sorted before any of the other locations
+- Fixed bug that was preventing playback or download when HEVC was disabled
+
 v3.0.2  (2021-03-20)
 - 4K, HDR, and HEVC versions available
 - New scenes added (ISS, undersea, recolored, extended)

entrychecksumgenerator.py

@@ -18,7 +18,7 @@
 
 apple_local_feed = os.path.join("resources", "entries.json")
 tmp_folder = "tmpvideos"
-apple_resources_tar = "https://sylvan.apple.com/Aerials/resources.tar"
+apple_resources_tar = "https://sylvan.apple.com/Aerials/resources-15.tar"
 local_tar = "resources.tar"