begin implementing blurhash again

sevenrats · Nov 10, 2023 · e4d3bf3 · e4d3bf3
1 parent a428dac
commit e4d3bf3
Show file tree

Hide file tree

Showing 18 changed files with 355 additions and 3 deletions.
diff --git a/components/ItemGrid/GridItem.brs b/components/ItemGrid/GridItem.brs
@@ -37,7 +37,11 @@ sub itemContentChanged()
 
  ' Set Random background colors from pallet
  posterBackgrounds = m.global.constants.poster_bg_pallet
- m.backdrop.blendColor = posterBackgrounds[rnd(posterBackgrounds.count()) - 1]
+ if isValidAndNotEmpty(m.top.itemContent.posterBlurhashUrl):
+ m.backdrop.uri = m.top.itemContent.posterBlurhashUrl
+ else
+ m.backdrop.blendColor = posterBackgrounds[rnd(posterBackgrounds.count()) - 1]
+ end if
 
  itemData = m.top.itemContent
 

diff --git a/components/ItemGrid/GridItemSmall.brs b/components/ItemGrid/GridItemSmall.brs
@@ -1,5 +1,6 @@
 import "pkg:/source/utils/misc.brs"
 import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/fakeBlurhash.brs"
 
 sub init()
  m.itemPoster = m.top.findNode("itemPoster")
@@ -23,7 +24,11 @@ sub init()
 end sub
 
 sub itemContentChanged()
- m.backdrop.blendColor = "#101010"
+ if isValidAndNotEmpty(m.top.itemContent.posterBlurhashUrl):
+ m.backdrop.uri = m.top.itemContent.posterBlurhashUrl
+ else
+ m.backdrop.blendColor = "#101010"
+ end if
 
  m.title.visible = false
 

diff --git a/components/data/ChannelData.brs b/components/data/ChannelData.brs
@@ -1,6 +1,7 @@
 import "pkg:/source/api/Image.brs"
 import "pkg:/source/api/baserequest.brs"
 import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/fakeBlurhash.brs"
 
 sub setFields()
  json = m.top.json
@@ -14,11 +15,19 @@ end sub
 sub setPoster()
  if m.top.image <> invalid
  m.top.posterURL = m.top.image.url
- else if m.top.json.ImageTags <> invalid and m.top.json.ImageTags.Primary <> invalid
+ else if isValid(m.top.json.ImageTags) and isValid(m.top.json.ImageTags.Primary)
  imgParams = { "maxHeight": 60, "Tag": m.top.json.ImageTags.Primary }
  m.top.hdsmalliconurl = ImageURL(m.top.json.id, "Primary", imgParams)
 
  imgParams = { "maxHeight": 440, "maxWidth": 295, "Tag": m.top.json.ImageTags.Primary }
  m.top.posterURL = ImageURL(m.top.json.id, "Primary", imgParams)
+ if isValidAndNotEmpty(m.top.json.ImageBlurHashes.Primary)
+ blurhash = m.top.json.ImageBlurHashes.Primary[m.top.json.ImageTags.Primary]
+ if get_user_setting("ui.design.renderblurhashes") = "true" and isValidAndNotEmpty(blurhash)
+ timer = CreateObject("roTimeSpan")
+ m.top.posterBlurHashUrl = renderFakeBlurhash(blurhash, imgParams.maxWidth, imgParams.maxHeight)
+ print "Took " + Str(timer.totalMilliseconds()) + " milliseconds to render a blurhash in ChannelData."' DELETE THIS TEMPORARY LINE OF DEV CODE
+ end if
+ end if
  end if
 end sub
diff --git a/components/data/CollectionData.brs b/components/data/CollectionData.brs
@@ -1,6 +1,7 @@
 import "pkg:/source/api/Image.brs"
 import "pkg:/source/api/baserequest.brs"
 import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/fakeBlurhash.brs"
 
 sub setFields()
  json = m.top.json
@@ -24,9 +25,18 @@ sub setPoster()
  if m.top.json.ImageTags.Primary <> invalid
  imgParams = { "maxHeight": 440, "maxWidth": 295, "Tag": m.top.json.ImageTags.Primary }
  m.top.posterURL = ImageURL(m.top.json.id, "Primary", imgParams)
+ if isValidAndNotEmpty(m.top.json.ImageBlurHashes.Primary)
+ blurhash = m.top.json.ImageBlurHashes.Primary[m.top.json.ImageTags.Primary]
+ if get_user_setting("ui.design.renderblurhashes") = "true" and isValidAndNotEmpty(blurhash)
+ 'timer = CreateObject("roTimeSpan")
+ m.top.posterBlurHashUrl = renderFakeBlurhash(blurhash, imgParams.maxWidth, imgParams.maxHeight)
+ 'print "Took " + Str(timer.totalMilliseconds()) + " milliseconds to render a blurhash in CollectionData."' DELETE THIS TEMPORARY LINE OF DEV CODE
+ end if
+ end if
  else if m.top.json.BackdropImageTags <> invalid
  imgParams = { "maxHeight": 440, "Tag": m.top.json.BackdropImageTags[0] }
  m.top.posterURL = ImageURL(m.top.json.id, "Backdrop", imgParams)
+
  end if
 
  ' Add Backdrop Image

diff --git a/components/data/FolderData.brs b/components/data/FolderData.brs
@@ -1,6 +1,7 @@
 import "pkg:/source/api/Image.brs"
 import "pkg:/source/api/baserequest.brs"
 import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/fakeBlurhash.brs"
 
 sub setFields()
  json = m.top.json
@@ -27,6 +28,14 @@ sub setPoster()
  else if m.top.json.ImageTags.Primary <> invalid
  imgParams = { "maxHeight": 440, "maxWidth": 295, "Tag": m.top.json.ImageTags.Primary }
  m.top.posterURL = ImageURL(m.top.json.id, "Primary", imgParams)
+ if isValidAndNotEmpty(m.top.json.ImageBlurHashes.Primary)
+ blurhash = m.top.json.ImageBlurHashes.Primary[m.top.json.ImageTags.Primary]
+ if get_user_setting("ui.design.renderblurhashes") = "true" and isValidAndNotEmpty(blurhash)
+ 'timer = CreateObject("roTimeSpan")
+ m.top.posterBlurHashUrl = renderFakeBlurhash(blurhash, imgParams.maxWidth, imgParams.maxHeight)
+ 'print "Took " + Str(timer.totalMilliseconds()) + " milliseconds to render a blurhash in FolderData."' DELETE THIS TEMPORARY LINE OF DEV CODE
+ end if
+ end if
  end if
 end sub
 

diff --git a/components/data/JFContentItem.xml b/components/data/JFContentItem.xml
@@ -4,6 +4,7 @@
  <field id="favorite" type="boolean" />
  <field id="watched" type="boolean" />
  <field id="posterUrl" type="string" />
+ <field id="posterBlurhashUrl" type="string" />
  <field id="backdropUrl" type="string" />
  <field id="SubTitle" type="string" value="" />
  <field id="iconUrl" type="string" value="" />

diff --git a/components/data/MovieData.brs b/components/data/MovieData.brs
@@ -2,6 +2,7 @@ import "pkg:/source/api/Image.brs"
 import "pkg:/source/api/baserequest.brs"
 import "pkg:/source/utils/config.brs"
 import "pkg:/source/utils/misc.brs"
+import "pkg:/source/utils/fakeBlurhash.brs"
 
 sub setFields()
  json = m.top.json
@@ -47,6 +48,14 @@ sub setPoster()
  if isValid(m.top.json.ImageTags) and isValid(m.top.json.ImageTags.Primary)
  imgParams = { "maxHeight": 440, "maxWidth": 295, "Tag": m.top.json.ImageTags.Primary }
  m.top.posterURL = ImageURL(m.top.json.id, "Primary", imgParams)
+ if isValidAndNotEmpty(m.top.json.ImageBlurHashes.Primary)
+ blurhash = m.top.json.ImageBlurHashes.Primary[m.top.json.ImageTags.Primary]
+ if get_user_setting("ui.design.renderblurhashes") = "true" and isValidAndNotEmpty(blurhash)
+ 'timer = CreateObject("roTimeSpan")
+ m.top.posterBlurHashUrl = renderFakeBlurhash(blurhash, imgParams.maxWidth, imgParams.maxHeight)
+ 'print "Took " + Str(timer.totalMilliseconds()) + " milliseconds to render a blurhash in MoviesData."' DELETE THIS TEMPORARY LINE OF DEV CODE
+ end if
+ end if
  else if isValid(m.top.json.BackdropImageTags) and isValid(m.top.json.BackdropImageTags[0])
  imgParams = { "maxHeight": 440, "Tag": m.top.json.BackdropImageTags[0] }
  m.top.posterURL = ImageURL(m.top.json.id, "Backdrop", imgParams)

diff --git a/components/data/MusicAlbumSongListData.brs b/components/data/MusicAlbumSongListData.brs
@@ -1,6 +1,7 @@
 import "pkg:/source/api/Image.brs"
 import "pkg:/source/api/baserequest.brs"
 import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/fakeBlurhash.brs"
 
 sub setFields()
  json = m.top.json
@@ -18,6 +19,14 @@ sub setPoster()
  if m.top.json.ImageTags.Primary <> invalid
  imgParams = { "maxHeight": 440, "maxWidth": 295 }
  m.top.posterURL = ImageURL(m.top.json.id, "Primary", imgParams)
+ if isValidAndNotEmpty(m.top.json.ImageBlurHashes.Primary)
+ blurhash = m.top.json.ImageBlurHashes.Primary[m.top.json.ImageTags.Primary]
+ if get_user_setting("ui.design.renderblurhashes") = "true" and isValidAndNotEmpty(blurhash)
+ 'timer = CreateObject("roTimeSpan")
+ m.top.posterBlurHashUrl = renderFakeBlurhash(blurhash, imgParams.maxWidth, imgParams.maxHeight)
+ 'print "Took " + Str(timer.totalMilliseconds()) + " milliseconds to render a blurhash in MusicAlbumSongListData."' DELETE THIS TEMPORARY LINE OF DEV CODE
+ end if
+ end if
  else if m.top.json.BackdropImageTags[0] <> invalid
  imgParams = { "maxHeight": 440 }
  m.top.posterURL = ImageURL(m.top.json.id, "Backdrop", imgParams)

diff --git a/components/data/MusicArtistData.brs b/components/data/MusicArtistData.brs
@@ -1,6 +1,7 @@
 import "pkg:/source/api/Image.brs"
 import "pkg:/source/api/baserequest.brs"
 import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/fakeBlurhash.brs"
 
 sub setFields()
  json = m.top.json
@@ -21,6 +22,14 @@ sub setPoster()
  if m.top.json.ImageTags.Primary <> invalid
  imgParams = { "maxHeight": 440, "maxWidth": 440 }
  m.top.posterURL = ImageURL(m.top.json.id, "Primary", imgParams)
+ if isValidAndNotEmpty(m.top.json.ImageBlurHashes.Primary)
+ blurhash = m.top.json.ImageBlurHashes.Primary[m.top.json.ImageTags.Primary]
+ if get_user_setting("ui.design.renderblurhashes") = "true" and isValidAndNotEmpty(blurhash)
+ 'timer = CreateObject("roTimeSpan")
+ m.top.posterBlurHashUrl = renderFakeBlurhash(blurhash, imgParams.maxWidth, imgParams.maxHeight)
+ 'print "Took " + Str(timer.totalMilliseconds()) + " milliseconds to render a blurhash in MusicArtistData."' DELETE THIS TEMPORARY LINE OF DEV CODE
+ end if
+ end if
  else if m.top.json.BackdropImageTags[0] <> invalid
  imgParams = { "maxHeight": 440 }
  m.top.posterURL = ImageURL(m.top.json.id, "Backdrop", imgParams)

diff --git a/components/data/PersonData.brs b/components/data/PersonData.brs
@@ -1,6 +1,7 @@
 import "pkg:/source/api/Image.brs"
 import "pkg:/source/api/baserequest.brs"
 import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/fakeBlurhash.brs"
 
 sub setFields()
  json = m.top.json
@@ -18,6 +19,14 @@ sub setPoster()
  if m.top.json.ImageTags.Primary <> invalid
  imgParams = { "maxHeight": 440, "maxWidth": 295, "Tag": m.top.json.ImageTags.Primary }
  m.top.posterURL = ImageURL(m.top.json.id, "Primary", imgParams)
+ if isValidAndNotEmpty(m.top.json.ImageBlurHashes.Primary)
+ blurhash = m.top.json.ImageBlurHashes.Primary[m.top.json.ImageTags.Primary]
+ if get_user_setting("ui.design.renderblurhashes") = "true" and isValidAndNotEmpty(blurhash)
+ 'timer = CreateObject("roTimeSpan")
+ m.top.posterBlurHashUrl = renderFakeBlurhash(blurhash, imgParams.maxWidth, imgParams.maxHeight)
+ 'print "Took " + Str(timer.totalMilliseconds()) + " milliseconds to render a blurhash in MoviesData."' DELETE THIS TEMPORARY LINE OF DEV CODE
+ end if
+ end if
  else if m.top.json.BackdropImageTags[0] <> invalid
  imgParams = { "maxHeight": 440, "Tag": m.top.json.BackdropImageTags[0] }
  m.top.posterURL = ImageURL(m.top.json.id, "Backdrop", imgParams)

diff --git a/components/data/PhotoData.brs b/components/data/PhotoData.brs
@@ -1,6 +1,7 @@
 import "pkg:/source/api/Image.brs"
 import "pkg:/source/api/baserequest.brs"
 import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/fakeBlurhash.brs"
 
 sub setFields()
  json = m.top.json
@@ -20,6 +21,14 @@ sub setPoster()
  if m.top.json.ImageTags.Primary <> invalid
  imgParams = { "maxHeight": 440, "maxWidth": 295, "Tag": m.top.json.ImageTags.Primary }
  m.top.posterURL = ImageURL(m.top.json.id, "Primary", imgParams)
+ if isValidAndNotEmpty(m.top.json.ImageBlurHashes.Primary)
+ blurhash = m.top.json.ImageBlurHashes.Primary[m.top.json.ImageTags.Primary]
+ if get_user_setting("ui.design.renderblurhashes") = "true" and isValidAndNotEmpty(blurhash)
+ 'timer = CreateObject("roTimeSpan")
+ m.top.posterBlurHashUrl = renderFakeBlurhash(blurhash, imgParams.maxWidth, imgParams.maxHeight)
+ 'print "Took " + Str(timer.totalMilliseconds()) + " milliseconds to render a blurhash in PhotoData."' DELETE THIS TEMPORARY LINE OF DEV CODE
+ end if
+ end if
  else if m.top.json.BackdropImageTags[0] <> invalid
  imgParams = { "maxHeight": 440, "Tag": m.top.json.BackdropImageTags[0] }
  m.top.posterURL = ImageURL(m.top.json.id, "Backdrop", imgParams)

diff --git a/components/data/ScheduleProgramData.brs b/components/data/ScheduleProgramData.brs
@@ -1,6 +1,7 @@
 import "pkg:/source/api/Image.brs"
 import "pkg:/source/api/baserequest.brs"
 import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/fakeBlurhash.brs"
 
 sub setFields()
  json = m.top.json
@@ -42,6 +43,15 @@ sub setPoster()
  if m.top.json.ImageTags <> invalid and m.top.json.ImageTags.Thumb <> invalid
  imgParams = { "maxHeight": 500, "maxWidth": 500, "Tag": m.top.json.ImageTags.Thumb }
  m.top.posterURL = ImageURL(m.top.json.id, "Thumb", imgParams)
+ if isValidAndNotEmpty(m.top.json.ImageBlurHashes.Primary)
+ blurhash = m.top.json.ImageBlurHashes.Primary[m.top.json.ImageTags.Primary]
+ if get_user_setting("ui.design.renderblurhashes") = "true" and isValidAndNotEmpty(blurhash)
+ 'timer = CreateObject("roTimeSpan")
+ m.top.posterBlurHashUrl = renderFakeBlurhash(blurhash, imgParams.maxWidth, imgParams.maxHeight)
+ 'print "Took " + Str(timer.totalMilliseconds()) + " milliseconds to render a blurhash in ScheduleProgramData."' DELETE THIS TEMPORARY LINE OF DEV CODE
+ end if
+ end if
+
  end if
  end if
 end sub
diff --git a/components/data/SeriesData.brs b/components/data/SeriesData.brs
@@ -1,6 +1,7 @@
 import "pkg:/source/api/Image.brs"
 import "pkg:/source/api/baserequest.brs"
 import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/fakeBlurhash.brs"
 
 sub setFields()
  json = m.top.json
@@ -38,6 +39,14 @@ sub setPoster()
 
  imgParams = { "maxHeight": 440, "maxWidth": 295, "Tag": m.top.json.ImageTags.Primary }
  m.top.posterURL = ImageURL(m.top.json.id, "Primary", imgParams)
+ if isValidAndNotEmpty(m.top.json.ImageBlurHashes.Primary)
+ blurhash = m.top.json.ImageBlurHashes.Primary[m.top.json.ImageTags.Primary]
+ if get_user_setting("ui.design.renderblurhashes") = "true" and isValidAndNotEmpty(blurhash)
+ 'timer = CreateObject("roTimeSpan")
+ m.top.posterBlurHashUrl = renderFakeBlurhash(blurhash, imgParams.maxWidth, imgParams.maxHeight)
+ 'print "Took " + Str(timer.totalMilliseconds()) + " milliseconds to render a blurhash in SeriesData."' DELETE THIS TEMPORARY LINE OF DEV CODE
+ end if
+ end if
  else if m.top.json.BackdropImageTags <> invalid
  imgParams = { "maxHeight": 440, "Tag": m.top.json.BackdropImageTags[0] }
  m.top.posterURL = ImageURL(m.top.json.id, "Backdrop", imgParams)

diff --git a/components/data/TVEpisode.brs b/components/data/TVEpisode.brs
@@ -1,6 +1,7 @@
 import "pkg:/source/api/Image.brs"
 import "pkg:/source/api/baserequest.brs"
 import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/fakeBlurhash.brs"
 
 sub setFields()
  json = m.top.json
@@ -21,5 +22,13 @@ sub setPoster()
  else if m.top.json.ImageTags.Primary <> invalid
  imgParams = { "maxHeight": 440, "maxWidth": 295 }
  m.top.posterURL = ImageURL(m.top.json.id, "Primary", imgParams)
+ if isValidAndNotEmpty(m.top.json.ImageBlurHashes.Primary)
+ blurhash = m.top.json.ImageBlurHashes.Primary[m.top.json.ImageTags.Primary]
+ if get_user_setting("ui.design.renderblurhashes") = "true" and isValidAndNotEmpty(blurhash)
+ 'timer = CreateObject("roTimeSpan")
+ m.top.posterBlurHashUrl = renderFakeBlurhash(blurhash, imgParams.maxWidth, imgParams.maxHeight)
+ 'print "Took " + Str(timer.totalMilliseconds()) + " milliseconds to render a blurhash in MoviesData."' DELETE THIS TEMPORARY LINE OF DEV CODE
+ end if
+ end if
  end if
 end sub
diff --git a/components/data/VideoData.brs b/components/data/VideoData.brs
@@ -1,6 +1,7 @@
 import "pkg:/source/api/Image.brs"
 import "pkg:/source/api/baserequest.brs"
 import "pkg:/source/utils/config.brs"
+import "pkg:/source/utils/fakeBlurhash.brs"
 
 sub setFields()
  json = m.top.json
@@ -21,5 +22,13 @@ sub setPoster()
  else if m.top.json.ImageTags.Primary <> invalid
  imgParams = { "maxHeight": 440, "maxWidth": 295, "Tag": m.top.json.ImageTags.Primary }
  m.top.posterURL = ImageURL(m.top.json.id, "Primary", imgParams)
+ if isValidAndNotEmpty(m.top.json.ImageBlurHashes.Primary)
+ blurhash = m.top.json.ImageBlurHashes.Primary[m.top.json.ImageTags.Primary]
+ if get_user_setting("ui.design.renderblurhashes") = "true" and isValidAndNotEmpty(blurhash)
+ 'timer = CreateObject("roTimeSpan")
+ m.top.posterBlurHashUrl = renderFakeBlurhash(blurhash, imgParams.maxWidth, imgParams.maxHeight)
+ 'print "Took " + Str(timer.totalMilliseconds()) + " milliseconds to render a blurhash in VideoData."' DELETE THIS TEMPORARY LINE OF DEV CODE
+ end if
+ end if
  end if
 end sub
diff --git a/settings/settings.json b/settings/settings.json
@@ -218,6 +218,13 @@
  "type": "integer",
  "default": "365"
  },
+ {
+ "title": "Render blurhashes",
+ "description": "Use an EXPERIMENTAL algorithm to render image blurhashes. This may slow down page loading and cause the app the crash.",
+ "settingName": "ui.design.renderblurhashes",
+ "type": "bool",
+ "default": "false"
+ },
  {
  "title": "Show What's New Popup",
  "description": "Show What's New popup when Jellyfin is updated to a new version.",