git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 22 May 2018 13:14:34 +0000 (13:14 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 22 May 2018 13:14:34 +0000 (13:14 +0000)
client/Maestro/Configuration/UJ-configuration-tqc-check.json [new file with mode: 0644]
client/Maestro/Configuration/configuration-grafika.json [deleted file]
client/Maestro/Maestro.csproj
client/Maestro/MaestroForm.Designer.cs
client/Maestro/MaestroForm.Source.cs
client/Maestro/MaestroForm.SourceFolders.cs
client/Maestro/MaestroForm.resx
client/Maestro/Properties/AssemblyInfo.cs

diff --git a/client/Maestro/Configuration/UJ-configuration-tqc-check.json b/client/Maestro/Configuration/UJ-configuration-tqc-check.json
new file mode 100644 (file)
index 0000000..d408da9
--- /dev/null
@@ -0,0 +1,93 @@
+{\r
+  "title": "TQC check",\r
+  "active": true,\r
+  "startInTray": false,\r
+  "enableCustomMetadataId": true,\r
+  "player": {\r
+    "enabled": true,\r
+    "autoStart": false,\r
+    "segmentEditor": true\r
+  },\r
+  "source": {\r
+    "$type": "UNCSource",\r
+    "filter": "avi,wav,mxf",\r
+    "local": {\r
+      "address": "file://c:\\x",\r
+      "userName": "mediacube",\r
+      "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+      "timeout": 1000\r
+    }\r
+  },\r
+  "metadatas": [\r
+    {\r
+      "$type": "TrafficMetadata",\r
+      "server": {\r
+        "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
+        "userName": "MAM",\r
+        "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "$type": "MediaCubeMetadata",\r
+      "server": {\r
+        "address": "http://10.10.1.27/services/rest/jobengine/",\r
+        "timeout": 1000\r
+      }\r
+    }\r
+  ],\r
+  "targets": [\r
+    {\r
+      "label": "Adáskész",\r
+      "processor": "FXPTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "killDateDays": 5,\r
+      "saveSegments": true,\r
+      "tag": "Adáskész",\r
+      "disableFileVersioning": true,\r
+      "enableOverride": true,\r
+      "saveMorpheusMetadata": true,\r
+      "pathMorpheusMetadata": "/PLAYOUT/MorpheusGateway/Input",\r
+      "deviceIdMorpheus": "ISILON",\r
+      "remote": {\r
+        "address": "ftp://10.10.1.100/PLAYOUT/Video",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "label": "Újravágás",\r
+      "processor": "FXPTargetProcessor",\r
+      "subFolderFormat": "%IDROOT%-%TEXT%",\r
+      "outputFormat": "%ID%-%TEXT%",\r
+      "tag": "Újravágás",\r
+      "disableFileVersioning": true,\r
+      "enableOverride": true,\r
+      "remote": {\r
+        "address": "ftp://10.10.1.100/PLAYOUT_NLE",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      },\r
+      "sendEmailOnSuccess": true,\r
+      "successEmailRecipient": "vasary@elgekko.net",\r
+      "successEmailPattern": "A %TARGETNAME% újravágása szükséges."\r
+    },\r
+    {\r
+      "label": "Archiválás",\r
+      "processor": "FXPTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "tag": "Archiválás",\r
+      "saveArchiveMetadata": true,\r
+      "disableFileVersioning": true,\r
+      "enableOverride": true,\r
+      "remote": {\r
+        "address": "ftp://10.10.1.100/ARCHIVE",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      }\r
+    }\r
+  ]\r
+}\r
diff --git a/client/Maestro/Configuration/configuration-grafika.json b/client/Maestro/Configuration/configuration-grafika.json
deleted file mode 100644 (file)
index 8cdf4a3..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-{\r
-  "title": "Grafikai feltöltő",\r
-  "active": true,\r
-  "startInTray": false,\r
-  "enableCustomMetadataId": true,\r
-  "player": {\r
-    "enabled": true,\r
-    "autoStart": false,\r
-    "segmentEditor": false\r
-  },\r
-  "source": {\r
-    "$type": "UNCSource",\r
-    "filter": "png,tga,mov,mxf,wav",\r
-    "local": {\r
-      "address": "file://10.10.1.100/braavos/ingest",\r
-      "userName": "mediacube",\r
-      "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
-      "timeout": 1000\r
-    }\r
-  },\r
-  "metadatas": [\r
-    {\r
-      "$type": "OctopusMetadata",\r
-      "server": {\r
-        "address": "http://10.10.1.27/services/rest/octopus/",\r
-        "timeout": 1000\r
-      },\r
-      "projectSettings": {\r
-        "templateRoot": {\r
-          "address": "file://10.10.1.100/BRAAVOS/.MAESTRO",\r
-          "userName": "mediacube",\r
-          "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
-          "timeout": 1000\r
-        },\r
-        "templateName": "ALAPTIMELINE.ezp",\r
-        "target": {\r
-          "label": "Projekt létrehozása",\r
-          "processor": "UNCTargetProcessor",\r
-          "outputFormat": "%ID%",\r
-          "subFolderFormat": "%IDROOT%-%TEXT%/PROJECT",\r
-          "disableFileVersioning": true,\r
-          "remote": {\r
-            "address": "file://10.10.1.100/BRAAVOS/OCTOPUS",\r
-            "userName": "mediacube",\r
-            "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
-            "timeout": 1000\r
-          }\r
-        },\r
-        "disableOpenProject": false,\r
-        "disableOpenSourceFolder": false\r
-      }\r
-    },\r
-    {\r
-      "$type": "TrafficMetadata",\r
-      "server": {\r
-        "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
-        "userName": "MAM",\r
-        "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
-        "timeout": 1000\r
-      }\r
-    },\r
-    {\r
-      "$type": "MediaCubeMetadata",\r
-      "metadataTitleFormat": "%SOURCENAME%",\r
-      "metadataIDFormat": "%SOURCESTARTID%",\r
-      "server": {\r
-        "address": "http://10.10.1.27/services/rest/jobengine/",\r
-        "timeout": 1000\r
-      }\r
-    }\r
-  ],\r
-  "targets": [\r
-    {\r
-      "label": "Octopus mappába küldés",\r
-      "processor": "FTPTargetProcessor",\r
-      "outputFormat": "%SOURCENAME%",\r
-      "tag": "Betöltés",\r
-      "subFolderFormat": "%IDROOT%-%TEXT%/GRAFIKA-%TIMESTAMP%",\r
-      "killDateDays": 15,\r
-      "saveArchiveMetadata": false,\r
-      "remote": {\r
-        "address": "ftp://10.10.1.100/OCTOPUS",\r
-        "userName": "mediacube",\r
-        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
-        "timeout": 1000\r
-      }\r
-    },\r
-    {\r
-      "label": "Traffic mappába küldés",\r
-      "processor": "FTPTargetProcessor",\r
-      "outputFormat": "%SOURCENAME%",\r
-      "tag": "Betöltés",\r
-      "subFolderFormat": "%IDROOT%-%TEXT%/GRAFIKA-%TIMESTAMP%",\r
-      "killDateDays": 30,\r
-      "saveArchiveMetadata": false,\r
-      "remote": {\r
-        "address": "ftp://10.10.1.100/PLAYOUT_NLE",\r
-        "userName": "mediacube",\r
-        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
-        "timeout": 1000\r
-      }\r
-    },\r
-    {\r
-      "label": "Archiválás",\r
-      "processor": "FTPTargetProcessor",\r
-      "outputFormat": "%SOURCENAME%-%ID%",\r
-      "tag": "Archiválás",\r
-      "saveArchiveMetadata": true,\r
-      "remote": {\r
-        "address": "ftp://10.10.1.100:21/ARCHIVE",\r
-        "userName": "mediacube",\r
-        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
-        "timeout": 1000\r
-      }\r
-    }\r
-  ]\r
-}\r
index 3a46a4248335d8c891a137975c8e697175f1fe71..c6cda3bc822e139e039b6ae52f308bb25bb08911 100644 (file)
     <None Include="Configuration\-configuration-transcoder.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Configuration\configuration-grafika.json">\r
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
-    </None>\r
     <None Include="Configuration\global.json.bak">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Configuration\-configuration-tqc-check.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
+    <None Include="Configuration\UJ-configuration-tqc-check.json">\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
+    </None>\r
     <None Include="Connected Services\packages.config" />\r
     <None Include="Maestro_TemporaryKey.pfx" />\r
     <None Include="nlog.config">\r
index 48103fbc6c248691e99bab356344808d06d8246e..77ebc05072af87e06ca5098050c7ce7892b6cc16 100644 (file)
@@ -43,7 +43,7 @@ namespace Maestro {
             this.treeFolders = new MaestroShared.Controls.DoubleClickTreeView();\r
             this.ilFolders = new System.Windows.Forms.ImageList(this.components);\r
             this.pSourceFilter = new System.Windows.Forms.TableLayoutPanel();\r
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();\r
+            this.picResetSearch = new System.Windows.Forms.PictureBox();\r
             this.txtSourceFilter = new System.Windows.Forms.TextBox();\r
             this.picRefreshFileList = new System.Windows.Forms.PictureBox();\r
             this.pSourceDisplay = new System.Windows.Forms.TableLayoutPanel();\r
@@ -99,7 +99,7 @@ namespace Maestro {
             ((System.ComponentModel.ISupportInitialize)(this.dgSource)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();\r
             this.pSourceFilter.SuspendLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();\r
+            ((System.ComponentModel.ISupportInitialize)(this.picResetSearch)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.picRefreshFileList)).BeginInit();\r
             this.pSourceDisplay.SuspendLayout();\r
             this.tsSource.SuspendLayout();\r
@@ -217,11 +217,11 @@ namespace Maestro {
             this.treeFolders.Size = new System.Drawing.Size(330, 161);\r
             this.treeFolders.TabIndex = 18;\r
             this.treeFolders.Visible = false;\r
-            this.treeFolders.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.OnBeforeExpandFolder);\r
             this.treeFolders.AfterCollapse += new System.Windows.Forms.TreeViewEventHandler(this.OnAfterCollapseFolder);\r
+            this.treeFolders.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.OnBeforeExpandFolder);\r
             this.treeFolders.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.OnAfterFolderSelect);\r
-            this.treeFolders.MouseDown += new System.Windows.Forms.MouseEventHandler(this.OnFolderMouseDown);\r
             this.treeFolders.KeyUp += new System.Windows.Forms.KeyEventHandler(this.OnKeyUpFolder);\r
+            this.treeFolders.MouseDown += new System.Windows.Forms.MouseEventHandler(this.OnFolderMouseDown);\r
             // \r
             // ilFolders\r
             // \r
@@ -237,7 +237,7 @@ namespace Maestro {
             this.pSourceFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
             this.pSourceFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
             this.pSourceFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.pSourceFilter.Controls.Add(this.pictureBox1, 0, 0);\r
+            this.pSourceFilter.Controls.Add(this.picResetSearch, 0, 0);\r
             this.pSourceFilter.Controls.Add(this.txtSourceFilter, 0, 0);\r
             this.pSourceFilter.Controls.Add(this.picRefreshFileList, 2, 0);\r
             this.pSourceFilter.Dock = System.Windows.Forms.DockStyle.Top;\r
@@ -249,19 +249,20 @@ namespace Maestro {
             this.pSourceFilter.Size = new System.Drawing.Size(330, 24);\r
             this.pSourceFilter.TabIndex = 17;\r
             // \r
-            // pictureBox1\r
-            // \r
-            this.pictureBox1.BackColor = System.Drawing.Color.Transparent;\r
-            this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand;\r
-            this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));\r
-            this.pictureBox1.ImageLocation = "";\r
-            this.pictureBox1.Location = new System.Drawing.Point(284, 2);\r
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(2);\r
-            this.pictureBox1.Name = "pictureBox1";\r
-            this.pictureBox1.Size = new System.Drawing.Size(20, 20);\r
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;\r
-            this.pictureBox1.TabIndex = 18;\r
-            this.pictureBox1.TabStop = false;\r
+            // picResetSearch\r
+            // \r
+            this.picResetSearch.BackColor = System.Drawing.Color.Transparent;\r
+            this.picResetSearch.Cursor = System.Windows.Forms.Cursors.Hand;\r
+            this.picResetSearch.Image = ((System.Drawing.Image)(resources.GetObject("picResetSearch.Image")));\r
+            this.picResetSearch.ImageLocation = "";\r
+            this.picResetSearch.Location = new System.Drawing.Point(284, 2);\r
+            this.picResetSearch.Margin = new System.Windows.Forms.Padding(2);\r
+            this.picResetSearch.Name = "picResetSearch";\r
+            this.picResetSearch.Size = new System.Drawing.Size(20, 20);\r
+            this.picResetSearch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;\r
+            this.picResetSearch.TabIndex = 18;\r
+            this.picResetSearch.TabStop = false;\r
+            this.picResetSearch.Click += new System.EventHandler(this.picResetSearch_Click);\r
             // \r
             // txtSourceFilter\r
             // \r
@@ -955,7 +956,7 @@ namespace Maestro {
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).EndInit();\r
             this.pSourceFilter.ResumeLayout(false);\r
             this.pSourceFilter.PerformLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();\r
+            ((System.ComponentModel.ISupportInitialize)(this.picResetSearch)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.picRefreshFileList)).EndInit();\r
             this.pSourceDisplay.ResumeLayout(false);\r
             this.pSourceDisplay.PerformLayout();\r
@@ -1057,7 +1058,7 @@ namespace Maestro {
         private DataGridViewTextBoxColumn columnKillDate;\r
         private DataGridViewTextBoxColumn Message;\r
         private Commons.DataGridViewProgressColumn dataGridViewProgressColumn1;\r
-        private PictureBox pictureBox1;\r
+        private PictureBox picResetSearch;\r
     }\r
 }\r
 \r
index de12fd08ff500750c7c11d66df6e09c970c15a0c..fafb41b94d737ab44f295051757ba42fb23e9cf6 100644 (file)
@@ -311,33 +311,53 @@ namespace Maestro {
             Lookup(SelectedSource.Prefix);\r
         }\r
 \r
-        private void picClearFilter_Click(object sender, EventArgs e) {\r
-            ResetSourceSearch();\r
-        }\r
-\r
-        private void picRefreshFileList_Click(object sender, EventArgs e) {\r
-            ISource source = bindingSource.DataSource as ISource;\r
-            source.Reset();\r
-        }\r
-\r
         private void ResetSourceSearch() {\r
             txtSourceFilter.Text = null;\r
             bindingSource.Filter = null;\r
             SelectedSource = null;\r
         }\r
 \r
+        // Enter a keresomezoben\r
         private void txtSourceFilter_KeyDown(object sender, KeyEventArgs e) {\r
             if (e.KeyCode != Keys.Return)\r
                 return;\r
 \r
+            RefreshSource();\r
+        }\r
+\r
+        private void RefreshSource() {\r
             if (btnShowFolders.CheckState == CheckState.Checked) {\r
-                SearchFolders();\r
+                if (txtSourceFilter.Text.Trim().Length > 0)\r
+                    SearchFolders();\r
+                else {\r
+                    treeFolders.Nodes.Clear();\r
+                    ShowFolders();\r
+                } \r
             } else {\r
-                bindingSource.Filter = txtSourceFilter.Text;\r
-                SelectedSource = null;\r
+                if (txtSourceFilter.Text.Trim().Length > 0) {\r
+                    bindingSource.Filter = txtSourceFilter.Text;\r
+                    SelectedSource = null;\r
+                } else {\r
+                    ISource source = bindingSource.DataSource as ISource;\r
+                    source.Reset();\r
+                }\r
             }\r
         }\r
 \r
+        // Kattintas a kereses torles gombon\r
+        private void picResetSearch_Click(object sender, EventArgs e) {\r
+            ResetSourceSearch();\r
+            treeFolders.Nodes.Clear();\r
+            if (btnShowFolders.CheckState == CheckState.Checked)\r
+                ShowFolders();\r
+        }\r
+\r
+        // Kattintas a frissites gombon\r
+        private void picRefreshFileList_Click(object sender, EventArgs e) {\r
+            RefreshSource();\r
+        }\r
+\r
+\r
         private void textSelectedSource_KeyDown(object sender, KeyEventArgs e) {\r
             if (e.KeyCode != Keys.Return || !btnLookupBySource.Enabled)\r
                 return;\r
index d159a26fcb0e57389c082d4a0c692890f380eb1f..c9750286fef00831cc928cf2032333fdb20403b0 100644 (file)
@@ -9,6 +9,7 @@ using System.Windows.Forms;
 namespace Maestro {\r
 \r
     public partial class MaestroForm {\r
+\r
         private string GetLastSegment(string path) {\r
             Uri uri = new Uri(path);\r
             return Uri.UnescapeDataString(uri.Segments[uri.Segments.Length - 1]);\r
@@ -20,7 +21,8 @@ namespace Maestro {
                 btnShowFolders.CheckState = CheckState.Unchecked;\r
                 return;\r
             }\r
-            Uri address = Configuration.Source.Local.Address;\r
+\r
+            Uri address = Configuration?.Source?.Local?.Address;\r
             if (!Directory.Exists(address.LocalPath))\r
                 return;\r
 \r
@@ -33,11 +35,14 @@ namespace Maestro {
                 rootNode.Nodes.Add("..");\r
             }\r
 \r
+            if (treeFolders.Nodes.Count > 0) {\r
+                treeFolders.SelectedNode = treeFolders.Nodes[0];\r
+                treeFolders.Nodes[0].Expand();\r
+            }\r
+\r
             dgSource.Visible = false;\r
             treeFolders.Visible = true;\r
             treeFolders.Focus();\r
-            if (treeFolders.Nodes.Count > 0)\r
-                treeFolders.Nodes[0].Expand();\r
         }\r
 \r
         private void AddFolders(Uri address, TreeNode parent) {\r
@@ -81,13 +86,26 @@ namespace Maestro {
         }\r
 \r
         private Uri GetSelectedNodeUri() {\r
-            if (treeFolders.SelectedNode == null)\r
+            Uri address = Configuration?.Source?.Local?.Address;\r
+            if (treeFolders.SelectedNode == null || Configuration?.Source?.Local?.Address == null)\r
+                return null;\r
+            Uri result = null;\r
+            if (treeFolders.SelectedNode.Level == 0)\r
+                result = address;\r
+            else\r
+                result = new Uri(Uri.UnescapeDataString(Path.Combine(address.LocalPath, GetPath(treeFolders.SelectedNode))));\r
+            return result;\r
+        }\r
+\r
+        private Uri GetSelectedNodeRemoteUri() {\r
+            Uri address = Configuration?.Source?.Remote?.Address;\r
+            if (treeFolders.SelectedNode == null || address == null)\r
                 return null;\r
             Uri result = null;\r
             if (treeFolders.SelectedNode.Level == 0)\r
-                result = Configuration.Source.Local.Address;\r
+                result = address;\r
             else\r
-                result = new Uri(Uri.UnescapeDataString(Path.Combine(Configuration.Source.Local.Address.LocalPath, GetPath(treeFolders.SelectedNode))));\r
+                result = new Uri(Uri.UnescapeDataString(Path.Combine(address.ToString(), GetPath(treeFolders.SelectedNode))));\r
             return result;\r
         }\r
 \r
@@ -101,8 +119,11 @@ namespace Maestro {
                 return;\r
 \r
             txtSourceFilter.Text = null;\r
-            if (!String.IsNullOrEmpty(address.LocalPath))\r
+            Uri remoteAddress = GetSelectedNodeRemoteUri();\r
+            if (remoteAddress == null)\r
                 formTooltip.SetToolTip(groupSource, address.LocalPath);\r
+            else\r
+                formTooltip.SetToolTip(groupSource, remoteAddress?.ToString());\r
 \r
             FileSystemSource source = bindingSource.DataSource as FileSystemSource;\r
             if (source.Reset(address.LocalPath))\r
@@ -149,8 +170,15 @@ namespace Maestro {
         private void SearchFolders() {\r
             if (treeFolders.Nodes.Count == 0)\r
                 return;\r
-            string address = formTooltip.GetToolTip(groupSource);\r
-            List<string> searchResult = SearchDirectories(address, txtSourceFilter.Text);\r
+            //string address = formTooltip.GetToolTip(groupSource);\r
+            Uri address = Configuration?.Source?.Local?.Address;\r
+            List<string> searchResult = SearchDirectories(address.LocalPath, txtSourceFilter.Text);\r
+\r
+            if (searchResult == null) {\r
+                MessageBox.Show("Nincs találat!");\r
+                return;\r
+            }\r
+\r
             //logger.Info(searchResult.Count);\r
             treeFolders.BeginUpdate();\r
             TreeNode rootNode = treeFolders.Nodes[0];\r
@@ -159,11 +187,12 @@ namespace Maestro {
 \r
             Uri rootPath = GetSelectedNodeUri();\r
             foreach (String path in searchResult) {\r
-                logger.Info(path.Substring(rootPath.LocalPath.Length));\r
-                string entry = path.Replace("\\", "/");\r
+                Uri pathUri = new Uri(path);\r
+                string entry = pathUri.LocalPath.Substring(rootPath.LocalPath.Length).Replace('\\', '/');\r
+                logger.Info(entry);\r
 \r
                 TreeNode node = rootNode;\r
-                string[] entries = entry.Split('/');\r
+                string[] entries = entry.Split( new char[]{ '/' }, StringSplitOptions.RemoveEmptyEntries);\r
                 foreach (string segment in entries) {\r
 \r
                     if (node.Nodes.ContainsKey(segment))\r
index a38e785dd49f7d337f6d106d81ee6515a8dab27b..c0d65f6c371f319deb4e4607f7eac368d31bef98 100644 (file)
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS\r
-        CAAAAk1TRnQBSQFMAgEBAgEAAVgBAQFYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+        CAAAAk1TRnQBSQFMAgEBAgEAAWgBAQFoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r
 </value>\r
   </data>\r
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
-  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+  <data name="picResetSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAJ9JREFUSEvt\r
         lFEKgzAQBXOJ9hC2vf+XHsK257FvAgtrkLjB9EsHHhow86KRpIvz8lJG5ZZHde7KpDzyKAgTFuWt1EqQ\r
index 898b06c352e0cb806ee867c2d93e0f10fc62c484..8a35b64cdec93ba596ec1f1a6082ed77bb059901 100644 (file)
@@ -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.0")]\r
-[assembly: AssemblyFileVersion("2.0.8.0")]\r
+[assembly: AssemblyVersion("2.0.8.1")]\r
+[assembly: AssemblyFileVersion("2.0.8.1")]\r