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

diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs
index 732c967d330de144bedd7316bb538ef0d94090b7..aaebcbcf73f93d9fd181df2cc8e387c925bdf69c 100644 (file)
--- a/client/Maestro/MaestroForm.Designer.cs
+++ b/client/Maestro/MaestroForm.Designer.cs
@@ -188,7 +188,6 @@ namespace Maestro {
             this.dataGridSource.CellMouseEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridSource_CellMouseEnter);\r
             this.dataGridSource.CellMouseLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridSource_CellMouseLeave);\r
             this.dataGridSource.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dataGridSource_CellPainting);\r
-            this.dataGridSource.SelectionChanged += new System.EventHandler(this.sourceGridView_SelectionChanged);\r
             this.dataGridSource.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridSource_KeyDown);\r
             // \r
             // tableLayoutPanel2\r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index 12c815475f15d3a7d26402035a0904e1a6b96857..6b86b10483341590dfac9b0724dfa7f95a05d944 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -67,30 +67,23 @@ namespace Maestro {
         }\r
 \r
         private void dataGridSource_CellMouseEnter(object sender, DataGridViewCellEventArgs e) {\r
-            if (e.RowIndex == -1)\r
-                return;\r
-            DataGridView gridView = sender as DataGridView;\r
-            if (gridView == null)\r
-                return;\r
-            DataGridViewColumn currentColumn = gridView.Columns[e.ColumnIndex];\r
-            if (currentColumn.GetType() == typeof(DataGridViewImageColumn))\r
+            if (IsPlayColumn(e.ColumnIndex))\r
                 dataGridSource.Cursor = Cursors.Hand;\r
         }\r
 \r
+        private bool IsPlayColumn(int columnIndex) {\r
+            return columnIndex > -1 && dataGridSource.Columns[columnIndex] is DataGridViewImageColumn;\r
+        }\r
+\r
         private void dataGridSource_CellMouseLeave(object sender, DataGridViewCellEventArgs e) {\r
-            if (e.ColumnIndex != 2)\r
-                return;\r
-            dataGridSource.Cursor = Cursors.Default;\r
+            if (IsPlayColumn(e.ColumnIndex))\r
+                dataGridSource.Cursor = Cursors.Default;\r
         }\r
 \r
         private void dataGridSource_CellEnter(object sender, DataGridViewCellEventArgs e) {\r
             ISourceItem item = bindingSource.Current as ISourceItem;\r
-            if (item == null || e.RowIndex < 0 || e.ColumnIndex < 0)\r
-                return;\r
-            item.IsHighlighted = false;\r
-        }\r
-\r
-        private void sourceGridView_SelectionChanged(object sender, EventArgs e) {\r
+            if (item != null)\r
+                item.IsHighlighted = false;\r
         }\r
 \r
         private void sourceGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) {\r
@@ -102,19 +95,19 @@ namespace Maestro {
                 SetSourceFromCheckBoxAction(selectedrows);\r
                 return;\r
             }\r
-            if (e.ColumnIndex != 3)\r
-                return;\r
-            FileSourceItem fileSourceItem = selectedItems as FileSourceItem;\r
-            if (fileSourceItem == null)\r
-                return;\r
-            Cursor = Cursors.WaitCursor;\r
-            BeginInvoke(new Action(() => {\r
-                PlayerForm player = new PlayerForm();\r
-                player.AutoStart = Configuration.Player.AutoStart;\r
-                player.Open(fileSourceItem.FileInfo);\r
-                player.ShowDialog();\r
-                Cursor = Cursors.Default;\r
-            }));\r
+            if (IsPlayColumn(e.ColumnIndex)) {\r
+                FileSourceItem fileSourceItem = selectedItems as FileSourceItem;\r
+                if (fileSourceItem == null)\r
+                    return;\r
+                Cursor = Cursors.WaitCursor;\r
+                BeginInvoke(new Action(() => {\r
+                    PlayerForm player = new PlayerForm();\r
+                    player.AutoStart = Configuration.Player.AutoStart;\r
+                    player.Open(fileSourceItem.FileInfo);\r
+                    player.ShowDialog();\r
+                    Cursor = Cursors.Default;\r
+                }));\r
+            }\r
         }\r
 \r
         private void SetSourceFromCheckBoxAction(DataGridViewSelectedRowCollection selectedRows) {\r

diff --git a/client/Maestro/Resources/configuration-ingest.json b/client/Maestro/Resources/configuration-ingest.json
index a8be4c5c58734fa97d384024b88fa33097454a12..07acce92a9c097d5f202cdb61f35cf661313a3c3 100644 (file)
--- a/client/Maestro/Resources/configuration-ingest.json
+++ b/client/Maestro/Resources/configuration-ingest.json
@@ -12,7 +12,7 @@
     "$type": "UNCSource",\r
     "filter": "avi,wav,mxf",\r
     "local": {\r
-      "address": "file://c:\\_video\\v\\sxs\\xdroot\\clip"\r
+      "address": "file://e:/XDROOT/Clip"\r
     }\r
   },\r
   "metadatas": [\r

diff --git a/client/Maestro/Sources/FileSourceItem.cs b/client/Maestro/Sources/FileSourceItem.cs
index e917d4111070640a25262b0c60a32bfcdca94a46..b90f88c58218cda5735c394983239b13fbbd7254 100644 (file)
--- a/client/Maestro/Sources/FileSourceItem.cs
+++ b/client/Maestro/Sources/FileSourceItem.cs
@@ -6,10 +6,12 @@ using System.Runtime.CompilerServices;
 using System.Collections.Generic;\r
 \r
 namespace Maestro.Sources {\r
+\r
     public class FileSourceItem : ISourceItem {\r
         private FileInfo fileInfo;\r
         private Icon icon;\r
         private bool isHighlighted;\r
+        private static string[] sizes = { "", "KB", "MB", "GB", "TB" };\r
 \r
         public event PropertyChangedEventHandler PropertyChanged;\r
 \r
@@ -45,12 +47,29 @@ namespace Maestro.Sources {
                 return FileInfo?.Name;\r
             }\r
         }\r
+\r
         public DateTime Created {\r
             get {\r
                 return (FileInfo == null) ? DateTime.MinValue : FileInfo.CreationTime;\r
             }\r
         }\r
 \r
+        public string FormattedSize {\r
+            get {\r
+                return (FileInfo == null) ? String.Empty : GetSizeString(FileInfo.Length);\r
+            }\r
+        }\r
+\r
+        private string GetSizeString(long length) {\r
+            double len = length;\r
+            int order = 0;\r
+            while (len >= 1024 && order < sizes.Length - 1) {\r
+                order++;\r
+                len = len / 1024;\r
+            }\r
+            return String.Format("{0:0.##} {1}", len, sizes[order]);\r
+        }\r
+\r
         public Icon Icon {\r
             get {\r
                 return icon;\r

diff --git a/client/Maestro/Sources/FileSystemSource.cs b/client/Maestro/Sources/FileSystemSource.cs
index 042e4b8ebda767080aa229a1a653c72500021348..d840107b2d695c2a414ffd3f125619535724627e 100644 (file)
--- a/client/Maestro/Sources/FileSystemSource.cs
+++ b/client/Maestro/Sources/FileSystemSource.cs
@@ -37,6 +37,12 @@ namespace Maestro.Sources {
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
                         Width = 200\r
                     },\r
+                    new DataGridViewTextBoxColumn(){\r
+                        DataPropertyName = "FormattedSize",\r
+                        HeaderText = StringResources.MERET,\r
+                        AutoSizeMode = DataGridViewAutoSizeColumnMode.None,\r
+                        Width = 100\r
+                    },\r
                     new DataGridViewTextBoxColumn() {\r
                         DataPropertyName = "Created",\r
                         HeaderText = StringResources.LETREHOZVA,\r

diff --git a/client/Maestro/StringResources.Designer.cs b/client/Maestro/StringResources.Designer.cs
index 452f016e87a744b712da73bae8b7f3839848cdc0..b55133b398a64661a9375a8e23bd1d4b7dc46f56 100644 (file)
--- a/client/Maestro/StringResources.Designer.cs
+++ b/client/Maestro/StringResources.Designer.cs
@@ -213,6 +213,15 @@ namespace Maestro {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Méret.\r
+        /// </summary>\r
+        internal static string MERET {\r
+            get {\r
+                return ResourceManager.GetString("MERET", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Metaadat.\r
         /// </summary>\r

diff --git a/client/Maestro/StringResources.resx b/client/Maestro/StringResources.resx
index 66d10991122876aee809a58e1ab828d264e764ea..1f3a0cc529e1f7b2af9de351e421883458617231 100644 (file)
--- a/client/Maestro/StringResources.resx
+++ b/client/Maestro/StringResources.resx
@@ -168,6 +168,9 @@
   <data name="LETREHOZVA" xml:space="preserve">\r
     <value>Létrehozva</value>\r
   </data>\r
+  <data name="MERET" xml:space="preserve">\r
+    <value>Méret</value>\r
+  </data>\r
   <data name="METAADAT" xml:space="preserve">\r
     <value>Metaadat</value>\r
   </data>\r

diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs
index 74b3e9de91355964ee0ef060373854d00bb2aa82..4bdbfd2b8f9bbaa8ff337b7746b079273091bbda 100644 (file)
--- a/client/Maestro/Targets/UNCTargetProcessor.cs
+++ b/client/Maestro/Targets/UNCTargetProcessor.cs
@@ -124,18 +124,18 @@ namespace Maestro.Targets {
 \r
         private void UploadKillDateFile() {\r
             Uri address = parameters.TargetConfig.Remote.Address;\r
-            string statusWorkDir = Path.Combine(address.LocalPath, STATUS_FOLDER);\r
+            string statusWorkDir = Path.Combine(workingDir, STATUS_FOLDER);\r
             EnsureDirectoryExistence(statusWorkDir);\r
             DateTime date = DateTime.Now;\r
             date = date.AddDays(parameters.TargetConfig.KillDateDays);\r
             string fileName = String.Format(KILLDATE_FILE, OutputName, date.ToString("yyyyMMdd"));\r
             logger.Debug("Creating KILLDATE status file {0}", fileName);\r
-            UploadContent(Path.Combine(statusWorkDir, fileName), null);\r
+            UploadContent(Path.Combine(statusWorkDir, fileName), new byte[] { });\r
         }\r
 \r
         private void CreateMetadata() {\r
             Uri address = parameters.TargetConfig.Remote.Address;\r
-            string statusWorkDir = Path.Combine(address.LocalPath, STATUS_FOLDER);\r
+            string statusWorkDir = Path.Combine(workingDir, STATUS_FOLDER);\r
             EnsureDirectoryExistence(statusWorkDir);\r
             string fileName = String.Format(METADATA_FILE, OutputName);\r
             logger.Debug("Creating METADATA file {0}", fileName);\r