From 694adf1ea22374e2ba475cea69e096d96d22ed90 Mon Sep 17 00:00:00 2001
From: Brahim Hadriche <brahim.hadriche@gmail.com>
Date: Wed, 4 Oct 2023 18:15:39 -0400
Subject: [PATCH] Multiple bug fixes

---
 CHANGELOG.md                                     |  1 +
 .../src/components/ChannelView/ChannelView.xml   |  3 ++-
 .../src/components/CirclePoster/CirclePoster.bs  |  7 +++----
 .../src/components/CirclePoster/CirclePoster.xml |  1 +
 .../src/components/MainScene.transpiled.xml      |  1 +
 .../components/PlaylistView/PlaylistViewCell.bs  | 10 ++++++++--
 .../components/PlaylistView/PlaylistViewCell.xml |  3 ++-
 .../VideoFeed/VideoRowCell/ChannelRowCell.bs     | 16 ++++------------
 .../VideoFeed/VideoRowCell/ChannelRowCell.xml    |  9 +++++++--
 .../VideoFeed/VideoRowCell/VideoRowCell.bs       |  9 ++++++++-
 .../VideoFeed/VideoRowCell/VideoRowCell.xml      |  3 ++-
 .../src/components/VideoPlayer/VideoUtils.bs     | 12 ++++++++++++
 12 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f988ebf3..89617387 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - (potentionally) a bug where many dialogs could cause an execution timeout
+- Mutltiple rare crashes when component content is set before component initialization
 
 ## [0.13.0] - 2023-10-02
 
diff --git a/playlet-lib/src/components/ChannelView/ChannelView.xml b/playlet-lib/src/components/ChannelView/ChannelView.xml
index 62c84169..777ebc73 100644
--- a/playlet-lib/src/components/ChannelView/ChannelView.xml
+++ b/playlet-lib/src/components/ChannelView/ChannelView.xml
@@ -27,7 +27,8 @@
                     id="thumbnail"
                     width="100"
                     height="100"
-                    translation="[2,2]" />
+                    translation="[2,2]"
+                    failedBitmapUri="pkg:/images/thumbnail-missing.jpg" />
 
                 <Label
                     id="authorLabel"
diff --git a/playlet-lib/src/components/CirclePoster/CirclePoster.bs b/playlet-lib/src/components/CirclePoster/CirclePoster.bs
index dd3c1e48..bd4333d7 100644
--- a/playlet-lib/src/components/CirclePoster/CirclePoster.bs
+++ b/playlet-lib/src/components/CirclePoster/CirclePoster.bs
@@ -4,11 +4,10 @@ function Init()
 end function
 
 function UpdateMaskSize()
-    width = m.top.poster.width
-    height = m.top.poster.height
+    width = m.top.width
+    height = m.top.height
 
-    maskSize = [width * GetScaleFactor(), height * GetScaleFactor()]
-    m.top.maskGroup.maskSize = maskSize
+    m.top.maskSize = [width * GetScaleFactor(), height * GetScaleFactor()]
 end function
 
 ' MaskGroup component do not scale with with UI resolution
diff --git a/playlet-lib/src/components/CirclePoster/CirclePoster.xml b/playlet-lib/src/components/CirclePoster/CirclePoster.xml
index 1153e271..2757ecd2 100644
--- a/playlet-lib/src/components/CirclePoster/CirclePoster.xml
+++ b/playlet-lib/src/components/CirclePoster/CirclePoster.xml
@@ -11,6 +11,7 @@
         <field id="loadStatus" type="string" alias="Poster.loadStatus" />
 
         <field id="maskUri" type="uri" value="pkg:/images/circle-mask-500.png" alias="MaskGroup.maskuri" />
+        <field id="maskSize" type="vector2d" alias="MaskGroup.maskSize" />
     </interface>
     <children>
         <MaskGroup
diff --git a/playlet-lib/src/components/MainScene.transpiled.xml b/playlet-lib/src/components/MainScene.transpiled.xml
index 40fdd42f..1acb0cf1 100644
--- a/playlet-lib/src/components/MainScene.transpiled.xml
+++ b/playlet-lib/src/components/MainScene.transpiled.xml
@@ -16,6 +16,7 @@
     <script type="text/brightscript" uri="pkg:/source/utils/StringUtils.brs" />
     <script type="text/brightscript" uri="pkg:/components/VideoPlayer/VideoUtils.brs" />
     <script type="text/brightscript" uri="pkg:/source/utils/FocusManagement.brs" />
+    <script type="text/brightscript" uri="pkg:/components/Dialog/DialogUtils.brs" />
     <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
     <children>
         <AppController id="AppController">
diff --git a/playlet-lib/src/components/PlaylistView/PlaylistViewCell.bs b/playlet-lib/src/components/PlaylistView/PlaylistViewCell.bs
index 7627e58b..59bfe8a4 100644
--- a/playlet-lib/src/components/PlaylistView/PlaylistViewCell.bs
+++ b/playlet-lib/src/components/PlaylistView/PlaylistViewCell.bs
@@ -2,13 +2,15 @@ import "pkg:/source/utils/TimeUtils.bs"
 import "pkg:/source/utils/Types.bs"
 
 function Init()
+    FindChildren()
+end function
+
+function FindChildren()
     m.titleLabel = m.top.findNode("titleLabel")
     m.authorLabel = m.top.findNode("authorLabel")
     m.thumbnail = m.top.findNode("thumbnail")
     m.durationRect = m.top.FindNode("durationRect")
     m.durationLabel = m.top.FindNode("durationLabel")
-
-    m.thumbnail.failedBitmapUri = "pkg:/images/thumbnail-missing.jpg"
 end function
 
 function OnContentSet() as void
@@ -18,6 +20,10 @@ function OnContentSet() as void
         return
     end if
 
+    if m.titleLabel = invalid
+        FindChildren()
+    end if
+
     m.titleLabel.text = content.title
     m.authorLabel.text = content.author
 
diff --git a/playlet-lib/src/components/PlaylistView/PlaylistViewCell.xml b/playlet-lib/src/components/PlaylistView/PlaylistViewCell.xml
index 761b3144..aa952332 100644
--- a/playlet-lib/src/components/PlaylistView/PlaylistViewCell.xml
+++ b/playlet-lib/src/components/PlaylistView/PlaylistViewCell.xml
@@ -7,7 +7,8 @@
             id="thumbnail"
             loadDisplayMode="scaleToZoom"
             width="190"
-            height="106">
+            height="106"
+            failedBitmapUri="pkg:/images/thumbnail-missing.jpg">
             <Rectangle
                 id="durationRect"
                 width="60"
diff --git a/playlet-lib/src/components/VideoFeed/VideoRowCell/ChannelRowCell.bs b/playlet-lib/src/components/VideoFeed/VideoRowCell/ChannelRowCell.bs
index 9cb4ec74..90b42fdf 100644
--- a/playlet-lib/src/components/VideoFeed/VideoRowCell/ChannelRowCell.bs
+++ b/playlet-lib/src/components/VideoFeed/VideoRowCell/ChannelRowCell.bs
@@ -1,11 +1,3 @@
-function Init()
-    m.authorLabel = m.top.FindNode("authorLabel")
-    m.subCountLabel = m.top.FindNode("subCountLabel")
-    m.videoCountLabel = m.top.FindNode("videoCountLabel")
-    m.thumbnail = m.top.FindNode("thumbnail")
-    m.thumbnail.failedBitmapUri = "pkg:/images/thumbnail-missing.jpg"
-end function
-
 function OnContentSet() as void
     content = m.top.itemContent
 
@@ -14,8 +6,8 @@ function OnContentSet() as void
     end if
 
     ' NOTE: "_author" not "author". See PlaylistContentNode.xml for explanation.
-    m.authorLabel.text = content._author
-    m.subCountLabel.text = content.subCountText
-    m.videoCountLabel.text = content.videoCountText
-    m.thumbnail.uri = content.thumbnail
+    m.top._author = content._author
+    m.top.subCountText = content.subCountText
+    m.top.videoCountText = content.videoCountText
+    m.top.thumbnail = content.thumbnail
 end function
diff --git a/playlet-lib/src/components/VideoFeed/VideoRowCell/ChannelRowCell.xml b/playlet-lib/src/components/VideoFeed/VideoRowCell/ChannelRowCell.xml
index 3d7efc64..0971d73a 100644
--- a/playlet-lib/src/components/VideoFeed/VideoRowCell/ChannelRowCell.xml
+++ b/playlet-lib/src/components/VideoFeed/VideoRowCell/ChannelRowCell.xml
@@ -1,7 +1,11 @@
 <component name="ChannelRowCell" extends="Group">
     <interface>
-        <field id="itemContent" type="node" onChange="OnContentSet" />
         <field id="type" type="string" value="channel" />
+        <field id="_author" type="string" alias="authorLabel.text" />
+        <field id="subCountText" type="string" alias="subCountLabel.text" />
+        <field id="videoCountText" type="string" alias="videoCountLabel.text" />
+        <field id="thumbnail" type="uri" alias="thumbnail.uri" />
+        <field id="itemContent" type="node" onChange="OnContentSet" />
     </interface>
     <children>
         <LayoutGroup
@@ -10,7 +14,8 @@
             <CirclePoster
                 id="thumbnail"
                 width="196"
-                height="196" />
+                height="196"
+                failedBitmapUri="pkg:/images/thumbnail-missing.jpg" />
 
             <Label
                 id="authorLabel"
diff --git a/playlet-lib/src/components/VideoFeed/VideoRowCell/VideoRowCell.bs b/playlet-lib/src/components/VideoFeed/VideoRowCell/VideoRowCell.bs
index ad83a7ef..e604ea0e 100644
--- a/playlet-lib/src/components/VideoFeed/VideoRowCell/VideoRowCell.bs
+++ b/playlet-lib/src/components/VideoFeed/VideoRowCell/VideoRowCell.bs
@@ -3,6 +3,10 @@ import "pkg:/source/utils/TimeUtils.bs"
 import "pkg:/source/utils/Types.bs"
 
 function Init()
+    FindChildren()
+end function
+
+function FindChildren()
     m.titleLabel = m.top.FindNode("titleLabel")
     m.authorLabel = m.top.FindNode("authorLabel")
     m.viewCountDateLabel = m.top.FindNode("viewCountDateLabel")
@@ -11,7 +15,6 @@ function Init()
     m.durationRect = m.top.FindNode("durationRect")
     m.durationLabel = m.top.FindNode("durationLabel")
     m.thumbnail = m.top.FindNode("thumbnail")
-    m.thumbnail.failedBitmapUri = "pkg:/images/thumbnail-missing.jpg"
 end function
 
 function OnContentSet() as void
@@ -21,6 +24,10 @@ function OnContentSet() as void
         return
     end if
 
+    if m.titleLabel = invalid
+        FindChildren()
+    end if
+
     m.titleLabel.text = content.title
     m.authorLabel.text = content.author
 
diff --git a/playlet-lib/src/components/VideoFeed/VideoRowCell/VideoRowCell.xml b/playlet-lib/src/components/VideoFeed/VideoRowCell/VideoRowCell.xml
index 8731598b..323ebbac 100644
--- a/playlet-lib/src/components/VideoFeed/VideoRowCell/VideoRowCell.xml
+++ b/playlet-lib/src/components/VideoFeed/VideoRowCell/VideoRowCell.xml
@@ -10,7 +10,8 @@
                 id="thumbnail"
                 loadDisplayMode="scaleToZoom"
                 width="350"
-                height="196">
+                height="196"
+                failedBitmapUri="pkg:/images/thumbnail-missing.jpg">
                 <Rectangle
                     id="durationRect"
                     width="60"
diff --git a/playlet-lib/src/components/VideoPlayer/VideoUtils.bs b/playlet-lib/src/components/VideoPlayer/VideoUtils.bs
index 29fb1c8a..cd8652b5 100644
--- a/playlet-lib/src/components/VideoPlayer/VideoUtils.bs
+++ b/playlet-lib/src/components/VideoPlayer/VideoUtils.bs
@@ -1,3 +1,4 @@
+import "pkg:/components/Dialog/DialogUtils.bs"
 import "pkg:/source/utils/FocusManagement.bs"
 import "pkg:/source/utils/StringUtils.bs"
 
@@ -6,6 +7,17 @@ namespace VideoUtils
         CloseVideo(false)
 
         container = GetVideoContainer()
+        ' There should be no reason for this to be invalid, but there was a crash report
+        ' with this being invalid, so we'll abort playing a video and try to restore focus to the top screen
+        if container = invalid
+            LogError("VideoContainer not found! Attempting to restore focus to top screen...")
+            appController = m.top.getScene().findNode("AppController")
+            if appController <> invalid
+                appController@.FocusTopScreen(invalid)
+            end if
+            DialogUtils.ShowDialog(`VideoContainer not found!\nPlease try again. If the problem persist, contact Playlet authors.`, "Error playing video")
+            return
+        end if
         videoPlayer = container.createChild("videoPlayer")
         videoPlayer.id = "VideoPlayer"
         videoPlayer@.BindNode(invalid)