Skip to content

Fix #27 - better exception handling when adding picture or video actor #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ojacques merged 1 commit into from
Feb 23, 2025
Merged

Fix #27 - better exception handling when adding picture or video actor #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 34 additions & 12 deletions DOF2DMD/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,9 +492,13 @@ public static bool DisplayPicture(string path, float duration, string animation,
}

string fullPath = localPath + foundExtension;
if (localPath.Contains("&"))
{
LogIt($"❗ Can't display picture with '&' in the name {fullPath}.\nSolution is rename the file and replace '&' by '-' in file name - see https://github.com/DMDTools/DOF2DMD/issues/27");
return false;
}
bool isVideo = new List<string> { ".gif", ".avi", ".mp4" }.Contains(foundExtension.ToLower());
bool isImage = new List<string> { ".png", ".jpg", ".bmp" }.Contains(foundExtension.ToLower());

if (!isVideo && !isImage)
{
return false;
Expand Down Expand Up @@ -534,17 +538,34 @@ public static bool DisplayPicture(string path, float duration, string animation,
gDmdDevice.Post(() =>
{
gDmdDevice.Clear = true;

// Clear existing resources
_queue.RemoveAllScenes();
gDmdDevice.Graphics.Clear(Color.Black);
_scoreDelayTimer?.Dispose();
_scoreDelayTimer = null;
_scoreBoard.Visible = false;
Actor mediaActor = isVideo ?
(Actor)gDmdDevice.NewVideo("MyVideo", fullPath) :
(Actor)gDmdDevice.NewImage("MyImage", fullPath);
mediaActor.SetSize(gDmdDevice.Width, gDmdDevice.Height);
try
{
// Clear existing resources
_queue.RemoveAllScenes();
gDmdDevice.Graphics.Clear(Color.Black);
_scoreDelayTimer?.Dispose();
_scoreDelayTimer = null;
_scoreBoard.Visible = false;
}
catch (Exception ex)
{
LogIt($"⚠️ Warning: Error while clearing resources: {ex.Message}");
// Continue execution as this is not critical
}
Actor mediaActor;
try
{
mediaActor = isVideo ?
(Actor)gDmdDevice.NewVideo("MyVideo", fullPath) :
(Actor)gDmdDevice.NewImage("MyImage", fullPath);

mediaActor.SetSize(gDmdDevice.Width, gDmdDevice.Height);
}
catch (Exception ex)
{
LogIt($"❌ Error creating media actor: {ex.Message}");
return;
}

// Set random position if the file name contains "expl" (explosion?)
if (fullPath.Contains("expl"))
Expand Down Expand Up @@ -1042,6 +1063,7 @@ private static void Blank()
/// </summary>
private static string ProcessRequest(string dof2dmdUrl)
{
dof2dmdUrl = dof2dmdUrl.Replace(" & ", "%20%26%20"); // Handle cases such as "Track & Field"
var newUrl = new Uri(dof2dmdUrl);
var query = HttpUtility.ParseQueryString(newUrl.Query);
string sReturn = "OK";
Expand Down