git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/DxPlay/Configuration/dxplay.json b/client/DxPlay/Configuration/dxplay.json1
similarity index 100%
rename from client/DxPlay/Configuration/dxplay.json
rename to client/DxPlay/Configuration/dxplay.json1

diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj
index 491bf692c016ec66358ba656523c6d35db08ec4b..ada4f36ec87fb4fc01fe7cefc2df60465b931ed8 100644 (file)
--- a/client/DxPlay/DxPlay.csproj
+++ b/client/DxPlay/DxPlay.csproj
@@ -243,7 +243,7 @@
     <None Include="Configuration\dxplay.en">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Configuration\dxplay.json">\r
+    <None Include="Configuration\dxplay.json1">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="packages.config">\r

diff --git a/client/DxPlay/DxPlayer.cs b/client/DxPlay/DxPlayer.cs
index 82fdefac46766c0f4d8e20c6cbf4434819ecf197..2fb0a3b03a4490135c38401cf6c0e0838233713c 100644 (file)
--- a/client/DxPlay/DxPlayer.cs
+++ b/client/DxPlay/DxPlayer.cs
@@ -1,7 +1,6 @@
 using System;\r
 using System.Drawing;\r
 using System.Runtime.InteropServices;\r
-using System.Diagnostics;\r
 using System.Windows.Forms;\r
 using System.Threading;\r
 \r
@@ -182,7 +181,6 @@ namespace DxPlay {
         public void Seek(int value) {\r
             if (graph == null || graph.MediaSeeking == null)\r
                 return;\r
-\r
             double frameLength = (double)MEDIATIME_REFERENCE / MediaDescription.FrameRate;\r
             long avgTimePerFrame = (long)Math.Ceiling(MEDIATIME_REFERENCE / MediaDescription.FrameRate);\r
             long requestedPosition = (long)Math.Ceiling(value * frameLength);\r
@@ -382,9 +380,10 @@ namespace DxPlay {
         }\r
 \r
         public int BufferCB(double SampleTime, IntPtr pBuffer, int BufferLen) {\r
+            //Thread.Sleep(1000);\r
             return 0;\r
             int frames = (int)Math.Abs(SampleTime * MediaDescription.FrameRate);\r
-            //logger.Debug("BufferCB frames {0}, sample time {1}", frames, SampleTime);\r
+            logger.Debug("BufferCB frames {0}, sample time {1}", frames, SampleTime);\r
             Font font = new Font("Tahoma", 30);\r
             string display = frames.ToString();\r
             SizeF size = new SizeF(100, 100);\r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 5306dd916a3aa5ac66a1703e3157cfb7b51fc2b6..da571de83ff98d7be75f7bdc11768e0bbb961fcc 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -143,22 +143,6 @@ namespace DxPlay {
             }\r
         }\r
 \r
-        private void OnPlayEvent() {\r
-            if (!IsHandleCreated || Disposing || IsDisposed || m_play == null)\r
-                return;\r
-            BeginInvoke((Action)(() => {\r
-                if (Disposing || IsDisposed || m_play == null)\r
-                    return;\r
-                if (!trackBarAtUser)\r
-                    playerControls.TrackBar.Value = m_play.CurrentTC.ZeroBasedFrames;\r
-                playerControls.CurrentTC.Text = m_play.CurrentTC.ToString();\r
-                string labelStatusText = playerControls.Status.Text;\r
-                m_play.stringValues.TryGetValue(m_play.State, out labelStatusText);\r
-                playerControls.Status.Text = labelStatusText;\r
-            }));\r
-        }\r
-\r
-\r
         private void Form1_DragEnter(object sender, DragEventArgs e) {\r
             if (e.Data.GetDataPresent(DataFormats.FileDrop)) {\r
                 string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);\r
@@ -378,18 +362,35 @@ namespace DxPlay {
                     }\r
                     result = true;\r
                     break;\r
-                //case Keys.I:\r
-                //    if (m_play != null && true.Equals(Settings?.Player?.SegmentEditor))\r
-                //        SetActualPositionAsIn();\r
-                //    break;\r
-                //case Keys.O:\r
-                //    if (m_play != null && true.Equals(Settings?.Player?.SegmentEditor))\r
-                //        SetActualPositionAsOut();\r
-                //    break;\r
+                    //case Keys.I:\r
+                    //    if (m_play != null && true.Equals(Settings?.Player?.SegmentEditor))\r
+                    //        SetActualPositionAsIn();\r
+                    //    break;\r
+                    //case Keys.O:\r
+                    //    if (m_play != null && true.Equals(Settings?.Player?.SegmentEditor))\r
+                    //        SetActualPositionAsOut();\r
+                    //    break;\r
             }\r
+\r
             return result;\r
         }\r
 \r
+        private void OnPlayEvent() {\r
+            return;\r
+            if (!IsHandleCreated || Disposing || IsDisposed || m_play == null)\r
+                return;\r
+            BeginInvoke((Action)(() => {\r
+                if (Disposing || IsDisposed || m_play == null)\r
+                    return;\r
+                if (!trackBarAtUser)\r
+                    playerControls.TrackBar.Value = m_play.CurrentTC.ZeroBasedFrames;\r
+                playerControls.CurrentTC.Text = m_play.CurrentTC.ToString();\r
+                string labelStatusText = playerControls.Status.Text;\r
+                m_play.stringValues.TryGetValue(m_play.State, out labelStatusText);\r
+                playerControls.Status.Text = labelStatusText;\r
+            }));\r
+        }\r
+\r
         private void PlayerForm_FormClosing(object sender, FormClosingEventArgs e) {\r
             //if (m_play != null)\r
             //    m_play.Dispose();\r
@@ -591,7 +592,7 @@ namespace DxPlay {
                 return;\r
 \r
             try {\r
-                \r
+\r
                 m_play.Dispose();\r
                 model.Approve();\r
                 trafficBrowser.ClearSelection();\r

diff --git a/client/DxPlay/PlayerGraph.cs b/client/DxPlay/PlayerGraph.cs
index c9e388383123004ebe5178f1859e825501d23064..defadfbbd8721868cfc8dc508871144bd6bdf916 100644 (file)
--- a/client/DxPlay/PlayerGraph.cs
+++ b/client/DxPlay/PlayerGraph.cs
@@ -45,6 +45,7 @@ namespace DxPlay {
 \r
                 SearchAudioTracks(splitter);\r
                 EnableDeinterlace(videoDecoder);\r
+\r
             } catch (Exception e) {\r
                 logger.Error(e.Message);\r
             }\r

diff --git a/client/MCTool/MCTool.csproj b/client/MCTool/MCTool.csproj
index 4c76c7ee7ed11339382789f4079fee3e05783e48..5e2f893f11dc2bafa375db4fc546ca6e29d5c77b 100644 (file)
--- a/client/MCTool/MCTool.csproj
+++ b/client/MCTool/MCTool.csproj
@@ -35,6 +35,26 @@
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x64\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+    <Prefer32Bit>true</Prefer32Bit>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
+    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+    <Prefer32Bit>true</Prefer32Bit>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="System" />\r
     <Reference Include="System.Core" />\r

diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json
index 4231532da0e60f929b9689bc7865e008faf15c70..4040a89de4716cdc1c3e4d2b81a1371d86c35f0d 100644 (file)
--- a/client/Maestro/Configuration/configuration-nle.json
+++ b/client/Maestro/Configuration/configuration-nle.json
@@ -104,7 +104,6 @@
       "killDateDays": 7,\r
       "disableFileVersioning": true,\r
       "agency": "MAESTRO-NLE",\r
-      "reference": [ "Octopus mappába küldés", "Megtekintőbe küldés" ],\r
       "remote": {\r
         "address": "ftp://10.10.1.55:2098",\r
         "userName": "administrator",\r
@@ -170,6 +169,18 @@
         "timeout": 1000\r
       }\r
     },\r
+    {\r
+      "label": "Helyi küldés",\r
+      "processor": "UNCTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "deleteAfterCopy":  true,\r
+      "tag": "Betöltés",\r
+      "killDateDays": 0,\r
+      "remote": {\r
+        "address": "file://c:\\_video",\r
+        "timeout": 1000\r
+      }\r
+    },\r
     {\r
       "label": "Archiválás",\r
       "processor": "FTPTargetProcessor",\r

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index 6ec0cb725375b7fc9690dfdda215441d2d2672f0..4084a1a983fe09a80248af58c2d0be4dfbe005ef 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -120,9 +120,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-    <Reference Include="FluentFTP, Version=19.1.1.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">\r
-      <HintPath>..\packages\FluentFTP.19.1.1\lib\net45\FluentFTP.dll</HintPath>\r
-    </Reference>\r
     <Reference Include="LinkDotNet.MessageHandling, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">\r
       <HintPath>..\packages\LinkDotNet.MessageBus.0.1.1\lib\LinkDotNet.MessageHandling.dll</HintPath>\r
     </Reference>\r
@@ -335,8 +332,8 @@
     <None Include="Connected Services\packages.config" />\r
     <None Include="Maestro_TemporaryKey.pfx" />\r
     <None Include="nlog.config">\r
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
       <SubType>Designer</SubType>\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="packages.config">\r
       <SubType>Designer</SubType>\r

diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs
index 00e5f631622b5623afab69e25757267f715493db..df84699433d4f40cd7517171017c3d1f44d7cc07 100644 (file)
--- a/client/MaestroShared/Configuration/ConfigurationInfo.cs
+++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs
@@ -110,6 +110,8 @@ namespace MaestroShared.Configuration {
         public string PathMorpheusMetadata { get; set; }\r
         public bool DisableFileVersioning { get; set; }\r
         public bool EnableOverride { get; set; }\r
+        public bool DeleteAfterCopy { get; set; } //csak UNC source esetén!\r
+        public bool TemporaryCopy { get; set; } //Nexio esetén nem veszi figyelembe!\r
         public bool SendEmailOnError { get; set; }\r
         public string ErrorEmailRecipient { get; set; }\r
         public string ErrorEmailPattern { get; set; }\r

diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs
index 329d8b2755130312c418bf8bb4b3170591faeb42..444c2585b067f0e378269180db8a245c73eac98d 100644 (file)
--- a/client/MaestroShared/Properties/AssemblyInfo.cs
+++ b/client/MaestroShared/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.0.8.4")]\r
-[assembly: AssemblyFileVersion("2.0.8.4")]\r
+[assembly: AssemblyVersion("2.0.8.5")]\r
+[assembly: AssemblyFileVersion("2.0.8.5")]\r

diff --git a/client/MaestroShared/Targets/FTPTargetProcessor.cs b/client/MaestroShared/Targets/FTPTargetProcessor.cs
index c0d6b3e66a5b16ab9e3604aa6c7ee44ed5a2bcc5..7d7fbd5804d3b93fc4e352ca1b150b6556059e70 100644 (file)
--- a/client/MaestroShared/Targets/FTPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FTPTargetProcessor.cs
@@ -6,7 +6,6 @@ using System;
 using System.IO;\r
 using System.Linq;\r
 using System.Net;\r
-using System.Text;\r
 using System.Windows.Forms;\r
 \r
 namespace MaestroShared.Targets {\r
@@ -14,7 +13,7 @@ namespace MaestroShared.Targets {
     public class FTPTargetProcessor : UNCTargetProcessor {\r
         private const string PATTERN_CONCAT = "{0}{1}";\r
         private const string _226 = "226";\r
-        private const string UPLOAD_ERROR = "Feltöltési hiba.";\r
+        protected const string UPLOAD_ERROR = "Feltöltési hiba.";\r
         private const string _200 = "200";\r
         private const string SITE0011 = "SITE 0011";\r
         private const string _1211 = "1211";\r
@@ -37,8 +36,7 @@ namespace MaestroShared.Targets {
                 if (relativePath.StartsWith(SLASH))\r
                     relativePath = relativePath.Substring(1);\r
                 Input = new Uri(Path.Combine(address, relativePath, parameters.InputFileName)).LocalPath;\r
-            }\r
-            else\r
+            } else\r
                 Input = new Uri(Path.Combine(address, parameters.InputFileName)).LocalPath;\r
 \r
             inputFile = new FileInfo(Input);\r
@@ -52,7 +50,7 @@ namespace MaestroShared.Targets {
         protected bool IsNexioServer(FtpClient ftpClient) {\r
             bool result = false;\r
             //Device Type Request\r
-            FtpReply reply = targetFTP.Execute(SITE0011);\r
+            FtpReply reply = ftpClient.Execute(SITE0011);\r
             if (_200.Equals(reply.Code))\r
                 result = reply.Message != null && reply.Message.Contains(_1211);\r
             return result;\r
@@ -95,16 +93,18 @@ namespace MaestroShared.Targets {
         }\r
 \r
         protected override void UploadFile() {\r
+            string targetFilePath = OutputName;\r
+            if (Parameters.TargetConfig.TemporaryCopy)\r
+                targetFilePath = OutputName + ".tmp";\r
+\r
             using (FileStream istream = File.OpenRead(Input)) {\r
-                using (Stream ostream = targetFTP.OpenWrite(OutputName)) {\r
+                using (Stream ostream = targetFTP.OpenWrite(targetFilePath)) {\r
                     try {\r
                         CopyStream(istream, inputFile.Length, ostream);\r
-                    }\r
-                    catch (Exception e) {\r
+                    } catch (Exception e) {\r
                         logger.Error(e.Message);\r
                         throw e;\r
-                    }\r
-                    finally {\r
+                    } finally {\r
                         ostream.Close();\r
                     }\r
                 }\r
@@ -112,18 +112,21 @@ namespace MaestroShared.Targets {
             FtpReply reply = targetFTP.GetReply();\r
             if (!reply.Success || !_226.Equals(reply.Code))\r
                 throw new Exception(UPLOAD_ERROR);\r
+\r
+            if (Parameters.TargetConfig.TemporaryCopy) {\r
+                if (!targetFTP.MoveFile(targetFilePath, OutputName))\r
+                    throw new Exception(UPLOAD_ERROR);\r
+            }\r
         }\r
 \r
         protected override void UploadContent(string outputPath, byte[] content) {\r
             using (Stream ostream = targetFTP.OpenWrite(outputPath, FtpDataType.Binary, false)) {\r
                 try {\r
                     ostream.Write(content, 0, content.Length);\r
-                }\r
-                catch (Exception e) {\r
+                } catch (Exception e) {\r
                     logger.Error(e.Message);\r
                     throw e;\r
-                }\r
-                finally {\r
+                } finally {\r
                     ostream.Close();\r
                 }\r
             }\r
@@ -137,8 +140,7 @@ namespace MaestroShared.Targets {
             long x = -1;\r
             try {\r
                 x = targetFTP.GetFileSize(path);\r
-            }\r
-            catch (Exception e) {\r
+            } catch (Exception e) {\r
                 logger.Warn(e.Message);\r
             }\r
             return x > -1;\r

diff --git a/client/MaestroShared/Targets/FXPTargetProcessor.cs b/client/MaestroShared/Targets/FXPTargetProcessor.cs
index 2514ab0768e623e3393ccfed584baa420fcf3d1e..e1ee7d3e1c0b92d2903548224b165c8e0cfa31c6 100644 (file)
--- a/client/MaestroShared/Targets/FXPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FXPTargetProcessor.cs
@@ -48,15 +48,12 @@ namespace MaestroShared.Targets {
             try {\r
                 sourceFTP = CreateClient(sourceConfig.Remote);\r
 \r
-                logger.Info("1 " + IsNexioServer(sourceFTP));\r
-\r
                 string input = Uri.UnescapeDataString(inputUri.AbsolutePath);\r
                 sourceFileLength = sourceFTP.GetFileSize(input);\r
-                if (Parameters.TargetConfig.NexioServer)\r
+                bool nexioTarget = IsNexioServer(targetFTP);\r
+                if (nexioTarget)\r
                     sourceFileLength = sourceFileLength / 2;\r
 \r
-                logger.Info("2 " + IsNexioServer(sourceFTP));\r
-\r
                 FtpReply replyPASV = targetFTP.Execute("PASV");\r
                 if (!replyPASV.Success)\r
                     throw new Exception(replyPASV.ErrorMessage);\r
@@ -69,15 +66,10 @@ namespace MaestroShared.Targets {
                 if (!replyPORT.Success)\r
                     throw new Exception(replyPORT.ErrorMessage);\r
 \r
-                logger.Info("3 " + IsNexioServer(sourceFTP));\r
-\r
-\r
                 FtpReply sourceReplyTYPE = sourceFTP.Execute("TYPE I");\r
                 if (!sourceReplyTYPE.Success)\r
                     throw new Exception(sourceReplyTYPE.ErrorMessage);\r
 \r
-                logger.Info("4 " + IsNexioServer(sourceFTP));\r
-\r
                 if (input.LastIndexOf("/") == 0)\r
                     input = input.Replace("/", "");\r
                 FtpReply replyRETR = sourceFTP.Execute("RETR " + input);\r
@@ -91,19 +83,22 @@ namespace MaestroShared.Targets {
                         throw new Exception(replyRETR.ErrorMessage);\r
                 }\r
 \r
-                logger.Info("5 " + IsNexioServer(sourceFTP));\r
-\r
                 FtpReply targetReplyTYPE = targetFTP.Execute("TYPE I");\r
                 if (!targetReplyTYPE.Success)\r
                     throw new Exception(targetReplyTYPE.ErrorMessage);\r
 \r
                 string currentWorkingDir = targetFTP.GetWorkingDirectory();\r
                 logger.Debug("Current target working directory is {0}", currentWorkingDir);\r
-                FtpReply replySTOR = targetFTP.Execute("STOR " + OutputName);\r
+\r
+                bool useTemporaryName = !nexioTarget && Parameters.TargetConfig.TemporaryCopy;\r
+                string targetFilePath = OutputName;\r
+                if (useTemporaryName)\r
+                    targetFilePath = OutputName + ".tmp";\r
+\r
+                FtpReply replySTOR = targetFTP.Execute("STOR " + targetFilePath);\r
                 if (!replySTOR.Success)\r
                     throw new Exception(replySTOR.ErrorMessage);\r
 \r
-\r
                 monitorFTP = CreateClient(Parameters.TargetConfig.Remote);\r
                 monitorFTP.SetWorkingDirectory(workingDir);\r
                 FtpReply monitorReplyTYPE = monitorFTP.Execute("TYPE I");\r
@@ -131,6 +126,10 @@ namespace MaestroShared.Targets {
                     }\r
                     Thread.Sleep(1000);\r
                 }\r
+                if (useTemporaryName) {\r
+                    if (!targetFTP.MoveFile(targetFilePath, OutputName))\r
+                        throw new Exception(UPLOAD_ERROR);\r
+                }\r
             }\r
             catch (Exception e) {\r
                 throw e;\r

diff --git a/client/MaestroShared/Targets/TargetProcessor.cs b/client/MaestroShared/Targets/TargetProcessor.cs
index e32f3b38d8696f4049168af2d58e87a799c8bdf0..f28e2493fe088bb4070877584e4ef721989ed3b5 100644 (file)
--- a/client/MaestroShared/Targets/TargetProcessor.cs
+++ b/client/MaestroShared/Targets/TargetProcessor.cs
@@ -36,7 +36,13 @@ namespace MaestroShared.Targets {
         public static ITargetProcessor Create(string processorName) {\r
             string typeName = string.Format("{0}.{1}", typeof(ITargetProcessor).Namespace, processorName);\r
             Type type = typeof(ITargetProcessor).Assembly.GetType(typeName);\r
-            return Activator.CreateInstance(type) as ITargetProcessor;\r
+            ITargetProcessor result = null;\r
+            try {\r
+                result = Activator.CreateInstance(type) as ITargetProcessor;\r
+            } catch (Exception ex) {\r
+                    \r
+            }\r
+            return result;\r
         }\r
 \r
         public virtual void Initialize(Control parent, TargetProcessorParameter parameters) {\r

diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs
index 5d5339f2073fdc4bb10780f3c9a993e124ba23f3..77615dfc3f3daddbed578445bb632fa5de06f512 100644 (file)
--- a/client/MaestroShared/Targets/UNCTargetProcessor.cs
+++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs
@@ -263,6 +263,17 @@ namespace MaestroShared.Targets {
         }\r
 \r
         protected virtual void AfterExecute() {\r
+\r
+            if (Parameters.SourceConfig is UNCSource && Parameters.TargetConfig.DeleteAfterCopy) {\r
+                logger.Debug("Deleting source: " + Input);\r
+                try {\r
+                    if (FileExists(inputFile.FullName))\r
+                        DeleteFile(inputFile.FullName);\r
+                } catch (Exception e) {\r
+                    logger.Error(e.Message);    \r
+                }\r
+            }\r
+\r
             logger.Trace(Strings.ENTRY);\r
             Finished = DateTime.Now;\r
             workFlowAction.finished = Finished;\r
@@ -388,7 +399,13 @@ namespace MaestroShared.Targets {
 \r
         protected virtual void UploadFile() {\r
             int pbCancel = 0;\r
-            Win32File.CopyFileEx(Input, Output, new CopyProgressRoutine(this.CopyProgressHandler), IntPtr.Zero, ref pbCancel, CopyFileFlags.COPY_FILE_RESTARTABLE);\r
+            string targetFilePath = Output;\r
+            if (Parameters.TargetConfig.TemporaryCopy)\r
+                targetFilePath = Output + ".tmp";\r
+            if (Win32File.CopyFileEx(Input, targetFilePath, new CopyProgressRoutine(this.CopyProgressHandler), IntPtr.Zero, ref pbCancel, CopyFileFlags.COPY_FILE_RESTARTABLE)\r
+                && Parameters.TargetConfig.TemporaryCopy) {\r
+                File.Move(targetFilePath, Output);\r
+            }\r
         }\r
 \r
         protected virtual string GetOutputFilePath(string path, string fileName) {\r

diff --git a/client/MediaCube.sln b/client/MediaCube.sln
index 587ed2097bc5c70e975b023a06681664a5fc8ac7..fc2f9f4b39cb5ece53f105ce0550dd4d2297ae2c 100644 (file)
--- a/client/MediaCube.sln
+++ b/client/MediaCube.sln
@@ -36,116 +36,62 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeOctopusClient", "Nati
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Debug|Any CPU = Debug|Any CPU\r
                Debug|x64 = Debug|x64\r
-               Release|Any CPU = Release|Any CPU\r
                Release|x64 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x64.ActiveCfg = Debug|x64\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Debug|x64.Build.0 = Debug|x64\r
-               {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x64.ActiveCfg = Release|x64\r
                {0B44B3D7-52D7-4C0E-9B1C-F48CEEDA36FE}.Release|x64.Build.0 = Release|x64\r
-               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.ActiveCfg = Debug|x64\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Debug|x64.Build.0 = Debug|x64\r
-               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x64.ActiveCfg = Release|x64\r
                {BAF3E174-5D82-40FA-9E62-8C76ADBEA1E4}.Release|x64.Build.0 = Release|x64\r
-               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.ActiveCfg = Debug|x64\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Debug|x64.Build.0 = Debug|x64\r
-               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x64.ActiveCfg = Release|x64\r
                {CEFD0348-DED4-453E-BF3A-0B52F8890AB3}.Release|x64.Build.0 = Release|x64\r
-               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.ActiveCfg = Debug|x64\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Debug|x64.Build.0 = Debug|x64\r
-               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x64.ActiveCfg = Release|x64\r
                {8CC7C930-9DBF-487B-AED5-776937A649D5}.Release|x64.Build.0 = Release|x64\r
-               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.ActiveCfg = Debug|x64\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Debug|x64.Build.0 = Debug|x64\r
-               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x64.ActiveCfg = Release|x64\r
                {4A61E975-F8DB-4BBF-BEFF-72FE67B2C08B}.Release|x64.Build.0 = Release|x64\r
-               {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x64.ActiveCfg = Debug|x64\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Debug|x64.Build.0 = Debug|x64\r
-               {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|x64.ActiveCfg = Release|x64\r
                {616D8912-16A4-493B-BC45-53BF2A5D9B92}.Release|x64.Build.0 = Release|x64\r
-               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.ActiveCfg = Debug|x64\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Debug|x64.Build.0 = Debug|x64\r
-               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x64.ActiveCfg = Release|x64\r
                {A7A21311-CB0E-465F-8AD6-829FAF093F00}.Release|x64.Build.0 = Release|x64\r
-               {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x64.ActiveCfg = Debug|x64\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Debug|x64.Build.0 = Debug|x64\r
-               {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|x64.ActiveCfg = Release|x64\r
                {8C51D508-1759-4C10-84A4-80965FD074FF}.Release|x64.Build.0 = Release|x64\r
-               {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|x64.ActiveCfg = Debug|x64\r
                {BF494EE9-1E70-44E8-8942-DD726510A766}.Debug|x64.Build.0 = Debug|x64\r
-               {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|x64.ActiveCfg = Release|x64\r
                {BF494EE9-1E70-44E8-8942-DD726510A766}.Release|x64.Build.0 = Release|x64\r
-               {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x64.ActiveCfg = Debug|Any CPU\r
-               {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x64.ActiveCfg = Debug|x64\r
+               {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Debug|x64.Build.0 = Debug|x64\r
                {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x64.ActiveCfg = Release|x64\r
                {D4417174-F21E-4CE2-AE5C-8EB30C9A9625}.Release|x64.Build.0 = Release|x64\r
-               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.ActiveCfg = Debug|Any CPU\r
-               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|Any CPU.Build.0 = Release|Any CPU\r
-               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.ActiveCfg = Release|Any CPU\r
-               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.Build.0 = Release|Any CPU\r
-               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x64.ActiveCfg = Debug|Any CPU\r
-               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|Any CPU.Build.0 = Release|Any CPU\r
-               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x64.ActiveCfg = Release|Any CPU\r
-               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x64.Build.0 = Release|Any CPU\r
-               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x64.ActiveCfg = Debug|Any CPU\r
-               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x64.Build.0 = Debug|Any CPU\r
-               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|Any CPU.Build.0 = Release|Any CPU\r
-               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x64.ActiveCfg = Release|Any CPU\r
-               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x64.Build.0 = Release|Any CPU\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.ActiveCfg = Debug|x64\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Debug|x64.Build.0 = Debug|x64\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.ActiveCfg = Release|x64\r
+               {8CB8266D-2229-47E2-B06D-54FDE82CBDC4}.Release|x64.Build.0 = Release|x64\r
+               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x64.ActiveCfg = Debug|x64\r
+               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Debug|x64.Build.0 = Debug|x64\r
+               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x64.ActiveCfg = Release|x64\r
+               {A64ADB88-2CC4-4E46-BC53-643E2C49E179}.Release|x64.Build.0 = Release|x64\r
+               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x64.ActiveCfg = Debug|x64\r
+               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Debug|x64.Build.0 = Debug|x64\r
+               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x64.ActiveCfg = Release|x64\r
+               {C1A664BE-7852-4418-BF33-6F59434FC5DC}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/client/MetadataSelector/MetadataSelector.csproj b/client/MetadataSelector/MetadataSelector.csproj
index bf4d9ae31016763db4dbca72c4cc8d6e3d8c6e53..64e0ca1205c2d99832616528276e682b94ddae7a 100644 (file)
--- a/client/MetadataSelector/MetadataSelector.csproj
+++ b/client/MetadataSelector/MetadataSelector.csproj
@@ -33,6 +33,24 @@
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x64\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
+    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="LinkDotNet.MessageHandling, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">\r
       <HintPath>..\packages\LinkDotNet.MessageBus.0.1.1\lib\LinkDotNet.MessageHandling.dll</HintPath>\r

diff --git a/client/NativeOctopusClient/NativeOctopusClient.csproj b/client/NativeOctopusClient/NativeOctopusClient.csproj
index 9b89ea4c8461c2b93135c5f1dfe883ebce95cef3..a0874dc3d17558c837331eb9e9ba9a9ae07af750 100644 (file)
--- a/client/NativeOctopusClient/NativeOctopusClient.csproj
+++ b/client/NativeOctopusClient/NativeOctopusClient.csproj
@@ -33,6 +33,24 @@
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\x64\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
+    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <Optimize>true</Optimize>\r
+    <DebugType>pdbonly</DebugType>\r
+    <PlatformTarget>x64</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="LinkDotNet.MessageHandling.Contracts, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">\r
       <HintPath>..\packages\LinkDotNet.MessageBus.Contracts.0.1.1\lib\LinkDotNet.MessageHandling.Contracts.dll</HintPath>\r