Merge branch '1.4'

Author: ASgoPew

IronPythonPlugin/IronPythonConfig.cs

@@ -21,10 +21,22 @@ public class IronPythonConfig
         public static string ControlPermission = "python.control";
         [JsonProperty("execute_permission")]
         public static string ExecutePermission = "python.execute";
+        [JsonProperty("iron_python_path")]
+        public static string IronPythonPath = "C:\\Program Files\\IronPython 3.4";
         [JsonProperty("default_environment")]
         public static string DefaultEnvironment;
         [JsonProperty("untrusted_environment")]
         public static string UntrustedEnvironment;
+        //language=regex
+        [JsonProperty("inline_code_regex")]
+        public static string InlineCodeRegex = "<<(.*?)>>";
+        //language=regex
+        [JsonProperty("inline_code_with_script_regex")]
+        public static string InlineCodeWithScriptRegex = "<<<(.*?)>>>";
+        [JsonProperty("inline_output_color_hex")]
+        public static string InlineOutputColorHEX = "ff5500";
+        [JsonProperty("inline_script_color_hex")]
+        public static string InlineScriptColorHEX = "ffffff";
         [JsonProperty("environments")]
         public static Dictionary<string, IronPythonEnvironment> Environments;
 
@@ -66,8 +78,6 @@ public static void Load()
 
         public static void Update()
         {
-            //if (DefaultLua != null && Environments.Count > 0 && !Environments.ContainsKey(DefaultLua))
-
             if (Environments == null)
                 Environments = new Dictionary<string, IronPythonEnvironment>();
             foreach (var pair in Environments)

IronPythonPlugin/IronPythonPlugin.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Terraria;
 using TerrariaApi.Server;
@@ -17,14 +18,16 @@ public class IronPythonPlugin : TerrariaPlugin
     {
         #region Data
 
-        public override string Author => "ASgo";
+        public override string Author => "ASgo & Anzhelika";
         public override string Description => "Plugin that provides IronPython to server development";
         public override string Name => "IronPythonPlugin";
-        public override Version Version => new Version(1, 0, 0, 0);
+        public override Version Version => new Version(2, 0, 0, 0);
 
         public static IronPythonPlugin Instance = null;
         public static string[] IronPythonEnv = new string[Main.maxPlayers + 1];
         public static Dictionary<string, object> Data = new Dictionary<string, object>();
+        private static MethodInfo TextFieldSetter = null;
+        private static MethodInfo CommandFieldSetter = null;
 
         #endregion
 
@@ -75,13 +78,57 @@ public static void OnServerChat(ServerChatEventArgs args)
             if (!player.HasPermission(IronPythonConfig.ExecutePermission) || args.Handled)
                 return;
             args.Handled = CheckIronPythonInput(player, args.Text);
+
+            // Replacing script result inside of chat messages
+            MatchCollection matches;
+            if (args.Handled)
+                return;
+            if (TextFieldSetter == null)
+                TextFieldSetter = args.GetType().GetProperty("Text").GetSetMethod(true);
+            try
+            {
+                if ((matches = Regex.Matches(args.Text, IronPythonConfig.InlineCodeWithScriptRegex)).Count > 0)
+                    TextFieldSetter.Invoke(args, new object[] { player.PyEnv().ProcessText(args.Text, matches,
+                        IronPythonConfig.InlineOutputColorHEX, true, IronPythonConfig.InlineScriptColorHEX,
+                        new object[] { player }) });
+                if ((matches = Regex.Matches(args.Text, IronPythonConfig.InlineCodeRegex)).Count > 0)
+                    TextFieldSetter.Invoke(args, new object[] { player.PyEnv().ProcessText(args.Text, matches,
+                        IronPythonConfig.InlineOutputColorHEX, false, IronPythonConfig.InlineScriptColorHEX,
+                        new object[] { player }) });
+            } catch (Exception e)
+            {
+                args.Handled = true;
+                PrintError(player, player.PyEnv(), e);
+            }
         }
 
         public static void OnServerCommand(CommandEventArgs args)
         {
             if (args.Handled)
                 return;
             args.Handled = CheckIronPythonInput(TSPlayer.Server, args.Command);
+
+            // Replacing script result inside of console commands
+            MatchCollection matches;
+            if (args.Handled)
+                return;
+            if (CommandFieldSetter == null)
+                CommandFieldSetter = args.GetType().GetProperty("Command").GetSetMethod(true);
+            try
+            {
+                if ((matches = Regex.Matches(args.Command, IronPythonConfig.InlineCodeWithScriptRegex)).Count > 0)
+                    CommandFieldSetter.Invoke(args,
+                        new object[] { TSPlayer.Server.PyEnv().ProcessText(args.Command, matches,
+                        null, true, null, new object[] { TSPlayer.Server }) });
+                if ((matches = Regex.Matches(args.Command, IronPythonConfig.InlineCodeRegex)).Count > 0)
+                    CommandFieldSetter.Invoke(args,
+                        new object[] { TSPlayer.Server.PyEnv().ProcessText(args.Command, matches,
+                        null, false, null, new object[] { TSPlayer.Server }) });
+            } catch (Exception e)
+            {
+                args.Handled = true;
+                PrintError(TSPlayer.Server, TSPlayer.Server.PyEnv(), e);
+            }
         }
 
         public static bool CheckIronPythonInput(TSPlayer player, string text)
@@ -126,7 +173,7 @@ public static bool InitializeEnvironment(IronPythonEnvironment pyEnv, TSPlayer p
         {
             try
             {
-                pyEnv.Initialize(player);
+                pyEnv.Initialize(player, IronPythonConfig.IronPythonPath);
                 return true;
             }
             catch (Exception e)

IronPythonPlugin/IronPythonPlugin.csproj

@@ -29,6 +29,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -65,9 +66,15 @@
       <Name>MyIronPython</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>if not exist "$(ProjectDir)_BuildResult" mkdir "$(ProjectDir)_BuildResult"
-copy /Y "$(TargetDir)$(TargetName).dll" "$(ProjectDir)_BuildResult\$(TargetName).dll</PostBuildEvent>
+copy /Y "$(TargetDir)$(TargetName).dll" "$(ProjectDir)_BuildResult\$(TargetName).dll
+copy /Y "$(TargetDir)IronPython.dll" "$(ProjectDir)_BuildResult\IronPython.dll
+copy /Y "$(TargetDir)Microsoft.Dynamic.dll" "$(ProjectDir)_BuildResult\Microsoft.Dynamic.dll
+copy /Y "$(TargetDir)Microsoft.Scripting.dll" "$(ProjectDir)_BuildResult\Microsoft.Scripting.dll</PostBuildEvent>
   </PropertyGroup>
 </Project>