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

diff --git a/client/Maestro/Sources/NexioRESTSource.cs b/client/Maestro/Sources/NexioRESTSource.cs
index 478fa0b683c8abf81935f861fbb2a7ab2c2a5f51..6c218fb4ab2043ea360f9719dd0204ee1c2fe8b5 100644 (file)
--- a/client/Maestro/Sources/NexioRESTSource.cs
+++ b/client/Maestro/Sources/NexioRESTSource.cs
@@ -160,13 +160,14 @@ namespace Maestro.Sources {
         private void OnList(JToken l) {\r
             if (l == null)\r
                 return;\r
-            l.Children().ToList().Select(t => CreateItem(t, false)).OrderByDescending(i => i.Created).ToList().ForEach(i => parent.SafeCall(() => Add(i)));\r
+            //l.Children().ToList().Select(t => CreateItem(t, false)).OrderByDescending(i => i.Created).ToList().ForEach(i => parent.SafeCall(() => Add(i)));\r
+            l.Children().ToList().Select(t => CreateItem(t, false)).Where(x => x.CanHandle(acceptableExtensions)).OrderByDescending(i => i.Created).ToList().ForEach(i => parent.SafeCall(() => Add(i)));\r
         }\r
 \r
         private void OnChanged(JToken token) {\r
             string id = token[ID].ToString();\r
             var item = Items.Where(x => x.ID == id).SingleOrDefault();\r
-            if (item != null) {\r
+            if (item != null && item.CanHandle(acceptableExtensions)) {\r
                 SetItem(ref item, token);\r
                 parent.SafeCall(() => {\r
                     messageBus.Send(new ModifyFileActionMsg() {\r
@@ -180,14 +181,16 @@ namespace Maestro.Sources {
 \r
         private void OnCreated(JToken token) {\r
             var item = CreateItem(token, true);\r
-            parent.SafeCall(() => {\r
-                Insert(0, item);\r
-                messageBus.Send(new CreateFileActionMsg() {\r
-                    FileName = item.Name,\r
-                    Source = parent\r
+            if (item.CanHandle(acceptableExtensions)) {\r
+                parent.SafeCall(() => {\r
+                    Insert(0, item);\r
+                    messageBus.Send(new CreateFileActionMsg() {\r
+                        FileName = item.Name,\r
+                        Source = parent\r
+                    });\r
                 });\r
-            });\r
-            Debug.WriteLine(string.Format("Created {0}", item.Name));\r
+                Debug.WriteLine(string.Format("Created {0}", item.Name));\r
+            }\r
         }\r
 \r
         private void OnDeleted(JToken d) {\r

diff --git a/client/Maestro/Sources/NexioSourceItem.cs b/client/Maestro/Sources/NexioSourceItem.cs
index db9cbf074c56e8e49f97610162ae552412ef0fe5..d9fc2d5bbf885b598e47258bb37037475d46f137 100644 (file)
--- a/client/Maestro/Sources/NexioSourceItem.cs
+++ b/client/Maestro/Sources/NexioSourceItem.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel;\r
 using System.IO;\r
 using System.Runtime.CompilerServices;\r
-\r
+using System.Collections.Generic;\r
 namespace Maestro.Sources {\r
     public class NexioSourceItem : ISourceItem {\r
         private bool isHighlighted;\r
@@ -73,5 +73,13 @@ namespace Maestro.Sources {
             }\r
         }\r
 \r
+        public bool CanHandle(List<String> extensions) {\r
+            if (extensions == null || extensions.Count < 1)\r
+                return true;\r
+            if (extensions.Contains(Name.Substring(Name.Length-3).ToLower()) || extensions.Contains(Name.Substring(Name.Length - 3).ToUpper()))\r
+                return true;\r
+            return false;\r
+        }\r
+\r
     }\r
 }\r

diff --git a/client/MediaCubeClient/MediaCubeApi.cs b/client/MediaCubeClient/MediaCubeApi.cs
index beefbfb104b74f718288aa2c2f083fd0a71e3983..731efedb19e336e75077f8b275575b402629520b 100644 (file)
--- a/client/MediaCubeClient/MediaCubeApi.cs
+++ b/client/MediaCubeClient/MediaCubeApi.cs
@@ -44,7 +44,7 @@ namespace JobEngineClient {
             //Debug.WriteLine(body);\r
             request.AddParameter("application/json", body, ParameterType.RequestBody);\r
             var response = client.Execute(request);\r
-            if (response.StatusCode != HttpStatusCode.OK || response.ContentLength < 1) {\r
+            if (response.StatusCode != HttpStatusCode.OK && response.ErrorMessage != null) {\r
                 ErrorReporter?.Invoke(DateTime.Now, "Error", String.Format("[MediaCube] {0}", response.ErrorMessage), Color.Red);\r
                 return null;\r
             }\r