Added a more robust Secondlife URI parser to all RichTextBoxPrinters.

[radegast/radegast.git] / Radegast / GUI / Dialogs / MainForm.cs

diff --git a/Radegast/GUI/Dialogs/MainForm.cs b/Radegast/GUI/Dialogs/MainForm.cs
index f179b2e..ba24bf2 100644 (file)
--- a/Radegast/GUI/Dialogs/MainForm.cs
+++ b/Radegast/GUI/Dialogs/MainForm.cs
@@ -133,6 +133,7 @@ namespace Radegast
         private bool AutoPilotActive = false;
         private TransparentButton btnDialogNextControl;
         private MediaConsole mediaConsole;
+        private SlUriParser uriParser;
         #endregion
 
         #region Constructor and disposal
@@ -286,6 +287,7 @@ namespace Radegast
         public void InitializeControls()
         {
             InitializeTabsConsole();
+            uriParser = new SlUriParser();
 
             if (instance.MediaManager.SoundSystemAvailable)
             {
@@ -829,55 +831,8 @@ namespace Radegast
 
         public bool ProcessSecondlifeURI(string link)
         {
-            // First try if we have a region name, assume it's a teleport link if we have
-            Regex r = new Regex(@"^(secondlife://)(?<region>[^/$]+)(/(?<x>\d+))?(/(?<y>\d+))?(/(?<z>\d+))?",
-                RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture | RegexOptions.IgnoreCase);
-            Match m = r.Match(link);
-
-            if (m.Success)
-            {
-                string region = HttpUtility.UrlDecode(m.Groups["region"].Value);
-                int x = string.IsNullOrEmpty(m.Groups["x"].Value) ? 128 : int.Parse(m.Groups["x"].Value);
-                int y = string.IsNullOrEmpty(m.Groups["y"].Value) ? 128 : int.Parse(m.Groups["y"].Value);
-                int z = string.IsNullOrEmpty(m.Groups["z"].Value) ? 0 : int.Parse(m.Groups["z"].Value);
-                MapTab.Select();
-                WorldMap.DisplayLocation(region, x, y, z);
-                return true;
-            }
-
-            // Is it group profile link
-            r = new Regex(@"^secondlife:///app/group/(?<id>[^/]+)/about",
-                RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture | RegexOptions.IgnoreCase);
-            m = r.Match(link);
-
-            if (m.Success)
-            {
-                UUID id;
-                if (UUID.TryParse(m.Groups["id"].Value, out id))
-                {
-                    ShowGroupProfile(id);
-                    return true;
-                }
-                return false;
-            }
-
-            // Is it user profile link
-            r = new Regex(@"^secondlife:///app/agent/(?<id>[^/]+)/about",
-                RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture | RegexOptions.IgnoreCase);
-            m = r.Match(link);
-
-            if (m.Success)
-            {
-                UUID id;
-                if (UUID.TryParse(m.Groups["id"].Value, out id))
-                {
-                    ShowAgentProfile(instance.Names.Get(id), id);
-                    return true;
-                }
-                return false;
-            }
-
-            return false;
+            uriParser.ExecuteLink(link);
+            return true;
         }
 
         public void ProcessLink(string link)
@@ -893,7 +848,7 @@ namespace Radegast
                 link = link.Substring(pos + 1);
             }
 
-            if (link.StartsWith("secondlife://"))
+            if (link.StartsWith("secondlife://") || link.StartsWith("[secondlife://"))
             {
                 return ProcessSecondlifeURI(link);
             }