From 33228539e966df52cb03a0224a6f29c7df9af381 Mon Sep 17 00:00:00 2001 From: eximus Date: Sat, 10 Nov 2018 15:52:43 +0000 Subject: [PATCH] playlists fixed --- Main.qml | 6 +-- reboot.svg => components/resources/reboot.svg | 0 .../resources/shutdown.svg | 0 .../resources/warning_red.png | Bin generate_playlist.sh | 19 --------- playlists/{playlist_4k.m3u => 4k.m3u} | 0 playlists/{playlist_all_sd.m3u => all_sd.m3u} | 0 playlists/day.m3u | 36 ++++++++++++++++++ playlists/night.m3u | 30 +++++++++++++++ playlists/playlist_day.m3u | 36 ------------------ playlists/playlist_night.m3u | 19 --------- theme.conf | 6 +-- theme.conf.user | 4 +- 13 files changed, 74 insertions(+), 82 deletions(-) rename reboot.svg => components/resources/reboot.svg (100%) rename shutdown.svg => components/resources/shutdown.svg (100%) rename warning_red.png => components/resources/warning_red.png (100%) delete mode 100755 generate_playlist.sh rename playlists/{playlist_4k.m3u => 4k.m3u} (100%) rename playlists/{playlist_all_sd.m3u => all_sd.m3u} (100%) create mode 100644 playlists/day.m3u create mode 100644 playlists/night.m3u delete mode 100644 playlists/playlist_day.m3u delete mode 100644 playlists/playlist_night.m3u diff --git a/Main.qml b/Main.qml index ee16ea6..966f40d 100644 --- a/Main.qml +++ b/Main.qml @@ -286,7 +286,7 @@ Rectangle { textColor: "white" tooltipBG: "#25000000" tooltipFG: "#dc322f" - image: "warning_red.png" + image: "components/resources/warning_red.png" onTextChanged: { if (password_input_box.text == "") { clear_passwd_button.visible = false @@ -456,7 +456,7 @@ Rectangle { ImageButton { id: reboot_button height: parent.height - source: "reboot.svg" + source: "components/resources/reboot.svg" visible: sddm.canReboot onClicked: sddm.reboot() @@ -467,7 +467,7 @@ Rectangle { ImageButton { id: shutdown_button height: parent.height - source: "shutdown.svg" + source: "components/resources/shutdown.svg" visible: sddm.canPowerOff onClicked: sddm.powerOff() KeyNavigation.backtab: reboot_button diff --git a/reboot.svg b/components/resources/reboot.svg similarity index 100% rename from reboot.svg rename to components/resources/reboot.svg diff --git a/shutdown.svg b/components/resources/shutdown.svg similarity index 100% rename from shutdown.svg rename to components/resources/shutdown.svg diff --git a/warning_red.png b/components/resources/warning_red.png similarity index 100% rename from warning_red.png rename to components/resources/warning_red.png diff --git a/generate_playlist.sh b/generate_playlist.sh deleted file mode 100755 index 7d0fa39..0000000 --- a/generate_playlist.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -curl 'http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/entries.json' 2>/dev/null | python2 -c ' -import sys, json; -day=open("playlist_day.m3u", "w") -night=open("playlist_night.m3u", "w") -for x in json.load(sys.stdin): - for asset in x["assets"]: - if asset["timeOfDay"] == "night": - print "[+] night - " + asset["url"] - night.write(asset["url"]+"\n") - elif asset["timeOfDay"] == "day": - print "[+] day - " + asset["url"] - day.write(asset["url"]+"\n") - else: - print "Unknown time of day %s" % asset["timeOfDay"] -day.close() -night.close() -' diff --git a/playlists/playlist_4k.m3u b/playlists/4k.m3u similarity index 100% rename from playlists/playlist_4k.m3u rename to playlists/4k.m3u diff --git a/playlists/playlist_all_sd.m3u b/playlists/all_sd.m3u similarity index 100% rename from playlists/playlist_all_sd.m3u rename to playlists/all_sd.m3u diff --git a/playlists/day.m3u b/playlists/day.m3u new file mode 100644 index 0000000..2d4d3f5 --- /dev/null +++ b/playlists/day.m3u @@ -0,0 +1,36 @@ +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b2-1.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b6-1.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b1-1.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b2-2.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b4-1.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b7-1.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b5-2.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b1-3.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b3-2.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b7-2.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b8-2.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b4-3.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b8-3.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b9-3.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_CH_C007_C011_PSNK_v02_SDR_PS_FINAL_20180709_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_CH_C002_C005_PSNK_v05_SDR_PS_FINAL_20180709_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_CH_C007_C004_PSNK_v02_SDR_PS_FINAL_20180709_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//DB_D008_C010_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//DB_D001_C001_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//DB_D002_C003_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//DB_D001_C005_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//GL_G004_C010_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//GL_G002_C002_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//HK_H004_C010_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//HK_H004_C013_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//HK_H004_C008_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_A103_C002_0205DG_v12_SDR_FINAL_20180706_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_A108_C001_v09_SDR_FINAL_22062018_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_GMT308_139K_142NC_CARIBBEAN_DAY_v09_SDR_FINAL_22062018_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_A105_C003_0212CT_FLARE_v10_SDR_PS_FINAL_20180711_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_A009_C001_010181A_v09_SDR_PS_FINAL_20180725_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_A114_C001_0305OT_v10_SDR_FINAL_22062018_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_A001_C004_1207W5_v23_SDR_FINAL_20180706_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//LA_A006_C008_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//LA_A008_C004_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//LA_A005_C009_2K_SDR_HEVC.mov diff --git a/playlists/night.m3u b/playlists/night.m3u new file mode 100644 index 0000000..0073b19 --- /dev/null +++ b/playlists/night.m3u @@ -0,0 +1,30 @@ +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b5-1.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//comp_GL_G010_C006_v08_6Mbps.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b6-2.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b8-1.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b1-2.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b3-1.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b6-3.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b2-3.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b4-2.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b1-4.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b2-4.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b3-3.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b5-3.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b6-4.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b7-3.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b9-2.mov +http://a1.v2.phobos.apple.com.edgesuite.net/us/r1000/000/Features/atv/AutumnResources/videos//b10-3.mov +http://sylvan.apple.com/Aerials/2x/Videos//DB_D011_C010_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//DB_D011_C009_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//HK_B005_C011_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//HK_H004_C001_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_GMT312_162NC_139M_1041_AFRICA_NIGHT_v14_SDR_FINAL_20180706_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_GMT306_139NC_139J_3066_CALI_TO_VEGAS_v07_SDR_FINAL_22062018_SDR_4K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_GMT329_113NC_396B_1105_CHINA_v04_SDR_FINAL_20180706_F900F2700_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_A083_C002_1130KZ_v04_SDR_PS_FINAL_20180725_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_GMT329_117NC_401C_1037_IRELAND_TO_ASIA_v48_SDR_PS_FINAL_20180725_F0F6300_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_GMT026_363A_103NC_E1027_KOREA_JAPAN_NIGHT_v17_SDR_FINAL_25062018_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//LA_A009_C009_2K_SDR_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//comp_LA_A006_C004_v01_SDR_FINAL_PS_20180730_SDR_2K_HEVC.mov +http://sylvan.apple.com/Aerials/2x/Videos//LA_A011_C003_2K_SDR_HEVC.mov diff --git a/playlists/playlist_day.m3u b/playlists/playlist_day.m3u deleted file mode 100644 index 56a4592..0000000 --- a/playlists/playlist_day.m3u +++ /dev/null @@ -1,36 +0,0 @@ -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_GL_G004_C010_v03_6Mbps.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_LA_A005_C009_v05_t9_6M.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_HK_H004_C008_v10_6Mbps.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_C002_C005_0818SC_001_v01_6M_HB_tag0.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_LW_L001_C006_t9_6M_tag0.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/plate_G002_C002_BG_t9_6M_HB_tag0.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_C007_C011_08244D_001_v01_6M_HB_tag0.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_LA_A006_C008_t9_6M_HB_tag0.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_DB_D001_C001_v03_6Mbps.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_HK_H004_C010_4k_v01_6Mbps.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_LA_A008_C004_ALT_v33_6Mbps.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_DB_D002_C003_t9_6M_HB_tag0.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_C007_C004_0824AJ_001_v01_6M_HB_tag0.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_DB_D001_C005_t9_6M_HB_tag0.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_HK_H004_C013_t9_6M_HB_tag0.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_DB_D008_C010_v04_6Mbps.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b1-1.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b1-3.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b2-1.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b2-2.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b3-2.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b3-3.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b4-1.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b4-3.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b5-1.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b5-2.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b6-1.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b6-3.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b7-1.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b7-2.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b8-2.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b8-3.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b9-1.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b9-3.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b10-1.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b10-3.mov diff --git a/playlists/playlist_night.m3u b/playlists/playlist_night.m3u deleted file mode 100644 index fcf49cc..0000000 --- a/playlists/playlist_night.m3u +++ /dev/null @@ -1,19 +0,0 @@ -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_DB_D011_D009_SIGNCMP_v15_6Mbps.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_HK_B005_C011_t9_6M_tag0.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_LA_A009_C009_t9_6M_tag0.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_GL_G010_C006_v08_6Mbps.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/comp_DB_D011_C010_v10_6Mbps.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b1-2.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b1-4.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b2-3.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b2-4.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b3-1.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b4-2.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b5-3.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b6-2.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b6-4.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b7-3.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b10-4.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b9-2.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b10-2.mov -http://a1.phobos.apple.com/us/r1000/000/Features/atv/AutumnResources/videos/b8-1.mov diff --git a/theme.conf b/theme.conf index 9b0f451..4d274cc 100644 --- a/theme.conf +++ b/theme.conf @@ -1,8 +1,8 @@ [General] background=background.jpg -background_day=playlists/playlist_day.m3u -background_night=playlists/playlist_night.m3u -displayFont="DejaVu Sans" +background_day=playlists/day.m3u +background_night=playlists/night.m3u +displayFont="Droid Sans Mono for Powerline" showLoginButton=true passwordLeftMargin=15 usernameLeftMargin=15 diff --git a/theme.conf.user b/theme.conf.user index a5e7311..7f0fc81 100644 --- a/theme.conf.user +++ b/theme.conf.user @@ -1,6 +1,6 @@ [General] -background_day=playlists/playlist_all_sd.m3u -background_night=playlists/playlist_all_sd.m3u +background_day=playlists/day.m3u +background_night=playlists/night.m3u displayFont="Misc Fixed" passwordLeftMargin=15 relativePositionX=0.5