diff --git a/components/home/HomeItem.bs b/components/home/HomeItem.bs index 8b25ba0fe..8aecc1219 100644 --- a/components/home/HomeItem.bs +++ b/components/home/HomeItem.bs @@ -360,17 +360,24 @@ sub displayEpisodeInfo(localGlobal as object, itemData as object) end if end if - if localGlobal.session.user.settings["ui.general.episodeimagesnextup"] = "webclient" - tmpSetting = localGlobal.session.user.Configuration.useEpisodeImagesInNextUpAndResume - if isValid(tmpSetting) and tmpSetting - m.itemPoster.uri = itemData.LookupCI("thumbnailURL") - else + episodeimagesnextupSetting = chainLookup(localGlobal, "session.user.settings.ui.general.episodeimagesnextup") + + ' Default to wide poster image + m.itemPoster.uri = itemData.LookupCI("widePosterURL") + + if isValid(episodeimagesnextupSetting) + if isStringEqual(episodeimagesnextupSetting, "webclient") + useEpisodeImagesInNextUpAndResumeSetting = chainLookup(localGlobal, "session.user.Configuration.useEpisodeImagesInNextUpAndResume") + if isValid(useEpisodeImagesInNextUpAndResumeSetting) and useEpisodeImagesInNextUpAndResumeSetting + m.itemPoster.uri = itemData.LookupCI("thumbnailURL") + else + m.itemPoster.uri = itemData.LookupCI("widePosterURL") + end if + else if isStringEqual(episodeimagesnextupSetting, "show") m.itemPoster.uri = itemData.LookupCI("widePosterURL") + else if isStringEqual(episodeimagesnextupSetting, "episode") + m.itemPoster.uri = itemData.LookupCI("thumbnailURL") end if - else if localGlobal.session.user.settings["ui.general.episodeimagesnextup"] = "show" - m.itemPoster.uri = itemData.LookupCI("widePosterURL") - else if localGlobal.session.user.settings["ui.general.episodeimagesnextup"] = "episode" - m.itemPoster.uri = itemData.LookupCI("thumbnailURL") end if ' Set Series and Episode Number for Extra Text diff --git a/manifest b/manifest index 29b880475..38cc38d14 100644 --- a/manifest +++ b/manifest @@ -3,7 +3,7 @@ title=viv major_version=1 minor_version=1 -build_version=1 +build_version=3 ### Main Menu Icons / Channel Poster Artwork diff --git a/package-lock.json b/package-lock.json index 01ee54f4d..421312d6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "viv", - "version": "1.1.1", + "version": "1.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "viv", - "version": "1.1.1", + "version": "1.1.2", "hasInstallScript": true, "license": "GPL-2.0", "dependencies": { @@ -15,10 +15,10 @@ }, "devDependencies": { "@rokucommunity/bslint": "0.8.26", - "brighterscript": "0.68.1", + "brighterscript": "0.68.2", "jshint": "2.13.6", "rimraf": "6.0.1", - "roku-deploy": "3.12.2", + "roku-deploy": "3.12.3", "rooibos-roku": "5.14.0", "ropm": "0.10.27", "undent": "0.1.0" @@ -375,14 +375,12 @@ "version": "0.12.5", "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.5.tgz", "integrity": "sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==", - "dev": true, "license": "MIT" }, "node_modules/@types/node": { "version": "22.7.4", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz", "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==", - "dev": true, "license": "MIT", "dependencies": { "undici-types": "~6.19.2" @@ -392,7 +390,6 @@ "version": "2.48.12", "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.12.tgz", "integrity": "sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==", - "dev": true, "license": "MIT", "dependencies": { "@types/caseless": "*", @@ -405,7 +402,6 @@ "version": "4.0.5", "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz", "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==", - "dev": true, "license": "MIT" }, "node_modules/@xml-tools/ast": { @@ -667,9 +663,9 @@ } }, "node_modules/brighterscript": { - "version": "0.68.1", - "resolved": "https://registry.npmjs.org/brighterscript/-/brighterscript-0.68.1.tgz", - "integrity": "sha512-sdbTfg0jmWO/GD0cJpOaBdoR7h80ocN2SqgFeIn6FrXmGHOopYJH89K76V9ZKNXzY3yBdMcZJGsXM+Rv1T0/Tg==", + "version": "0.68.2", + "resolved": "https://registry.npmjs.org/brighterscript/-/brighterscript-0.68.2.tgz", + "integrity": "sha512-KV7CcvpPRqFtlBBVNWYPR8dq7KmmKB6Ymkd6pTt1uztm1c3Fgm3DaqfT842I0yW2LZz3uIb2EKmoLDdnnjEQFQ==", "dev": true, "license": "MIT", "dependencies": { @@ -696,7 +692,7 @@ "parse-ms": "^2.1.0", "readline": "^1.3.0", "require-relative": "^0.8.7", - "roku-deploy": "^3.12.2", + "roku-deploy": "^3.12.3", "serialize-error": "^7.0.1", "source-map": "^0.7.4", "vscode-languageserver": "^9.0.1", @@ -1027,6 +1023,49 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/brighterscript/node_modules/roku-deploy": { + "version": "3.12.3", + "resolved": "https://registry.npmjs.org/roku-deploy/-/roku-deploy-3.12.3.tgz", + "integrity": "sha512-4gkNW/N4VeP4hKFMNUzMS9tCXm67OdLaJIPj9kBjf81Nqn7EPHfdYLVAa9sQbRV0tSNDUUM7qk5/bSLC1G653A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/request": "^2.47.0", + "chalk": "^2.4.2", + "dateformat": "^3.0.3", + "dayjs": "^1.11.0", + "fast-glob": "^3.2.12", + "fs-extra": "^7.0.1", + "is-glob": "^4.0.3", + "jsonc-parser": "^2.3.0", + "jszip": "^3.6.0", + "lodash": "^4.17.21", + "micromatch": "^4.0.4", + "moment": "^2.29.1", + "parse-ms": "^2.1.0", + "postman-request": "^2.88.1-postman.40", + "temp-dir": "^2.0.0", + "xml2js": "^0.5.0" + }, + "bin": { + "roku-deploy": "dist/cli.js" + } + }, + "node_modules/brighterscript/node_modules/roku-deploy/node_modules/fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, "node_modules/brighterscript/node_modules/universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", @@ -1723,7 +1762,6 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", - "dev": true, "license": "MIT", "dependencies": { "asynckit": "^0.4.0", @@ -2666,9 +2704,9 @@ } }, "node_modules/postman-request": { - "version": "2.88.1-postman.39", - "resolved": "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.39.tgz", - "integrity": "sha512-rsncxxDlbn1YpygXSgJqbJzIjGlHFcZjbYDzeBPTQHMDfLuSTzZz735JHV8i1+lOROuJ7MjNap4eaSD3UijHzQ==", + "version": "2.88.1-postman.40", + "resolved": "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.40.tgz", + "integrity": "sha512-uE4AiIqhjtHKp4pj9ei7fkdfNXEX9IqDBlK1plGAQne6y79UUlrTdtYLhwXoO0AMOvqyl9Ar+BU6Eo6P/MPgfg==", "license": "Apache-2.0", "dependencies": { "@postman/form-data": "~3.1.1", @@ -3409,11 +3447,12 @@ } }, "node_modules/roku-deploy": { - "version": "3.12.2", - "resolved": "https://registry.npmjs.org/roku-deploy/-/roku-deploy-3.12.2.tgz", - "integrity": "sha512-CePBiVk+6u4Pka/aq7WR4GnTW39BlAveEbhuDHQX2UfR9+4j3+YEvfXqxB0R69RU52eGfnk1ejI7H0HStEKa2Q==", + "version": "3.12.3", + "resolved": "https://registry.npmjs.org/roku-deploy/-/roku-deploy-3.12.3.tgz", + "integrity": "sha512-4gkNW/N4VeP4hKFMNUzMS9tCXm67OdLaJIPj9kBjf81Nqn7EPHfdYLVAa9sQbRV0tSNDUUM7qk5/bSLC1G653A==", "license": "MIT", "dependencies": { + "@types/request": "^2.47.0", "chalk": "^2.4.2", "dateformat": "^3.0.3", "dayjs": "^1.11.0", @@ -3426,7 +3465,7 @@ "micromatch": "^4.0.4", "moment": "^2.29.1", "parse-ms": "^2.1.0", - "postman-request": "^2.88.1-postman.32", + "postman-request": "^2.88.1-postman.40", "temp-dir": "^2.0.0", "xml2js": "^0.5.0" }, @@ -3818,68 +3857,6 @@ "node": ">=8" } }, - "node_modules/ropm/node_modules/roku-deploy": { - "version": "3.12.2", - "resolved": "https://registry.npmjs.org/roku-deploy/-/roku-deploy-3.12.2.tgz", - "integrity": "sha512-CePBiVk+6u4Pka/aq7WR4GnTW39BlAveEbhuDHQX2UfR9+4j3+YEvfXqxB0R69RU52eGfnk1ejI7H0HStEKa2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^2.4.2", - "dateformat": "^3.0.3", - "dayjs": "^1.11.0", - "fast-glob": "^3.2.12", - "fs-extra": "^7.0.1", - "is-glob": "^4.0.3", - "jsonc-parser": "^2.3.0", - "jszip": "^3.6.0", - "lodash": "^4.17.21", - "micromatch": "^4.0.4", - "moment": "^2.29.1", - "parse-ms": "^2.1.0", - "postman-request": "^2.88.1-postman.32", - "temp-dir": "^2.0.0", - "xml2js": "^0.5.0" - }, - "bin": { - "roku-deploy": "dist/cli.js" - } - }, - "node_modules/ropm/node_modules/roku-deploy/node_modules/fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/ropm/node_modules/roku-deploy/node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "dev": true, - "license": "MIT", - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/ropm/node_modules/roku-deploy/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/ropm/node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -4317,7 +4294,6 @@ "version": "6.19.8", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", - "dev": true, "license": "MIT" }, "node_modules/universalify": { diff --git a/package.json b/package.json index 2afbff5d9..cb5f10b05 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "viv", "type": "module", - "version": "1.1.1", + "version": "1.1.3", "description": "Unofficial Roku app for Jellyfin media server", "dependencies": { "@rokucommunity/bslib": "0.1.1", @@ -9,10 +9,10 @@ }, "devDependencies": { "@rokucommunity/bslint": "0.8.26", - "brighterscript": "0.68.1", + "brighterscript": "0.68.2", "jshint": "2.13.6", "rimraf": "6.0.1", - "roku-deploy": "3.12.2", + "roku-deploy": "3.12.3", "rooibos-roku": "5.14.0", "ropm": "0.10.27", "undent": "0.1.0" diff --git a/source/static/whatsNew/1.1.2.json b/source/static/whatsNew/1.1.2.json deleted file mode 100644 index a66fdbf35..000000000 --- a/source/static/whatsNew/1.1.2.json +++ /dev/null @@ -1,34 +0,0 @@ -[ - { - "description": "Add live TV programs to search results", - "author": "jimdogx" - }, - { - "description": "Make live TV schedule responsive faster", - "author": "1hitsong" - }, - { - "description": "Fix TV episode watched button text not changing when clicked", - "author": "1hitsong" - }, - { - "description": "Fix loss of focus bug when closing options popup from Live TV show details", - "author": "1hitsong" - }, - { - "description": "Fix search not returning people in results", - "author": "1hitsong" - }, - { - "description": "Fix search not returning playlists in results", - "author": "1hitsong" - }, - { - "description": "Fix crash on music artist view when no appears on album image available", - "author": "1hitsong" - }, - { - "description": "Update item API calls", - "author": "jimdogx" - } -] \ No newline at end of file diff --git a/source/static/whatsNew/1.1.3.json b/source/static/whatsNew/1.1.3.json new file mode 100644 index 000000000..461d032f0 --- /dev/null +++ b/source/static/whatsNew/1.1.3.json @@ -0,0 +1,6 @@ +[ + { + "description": "Fix crash on home screen", + "author": "1hitsong" + } +] \ No newline at end of file