From: Vásáry Dániel Date: Fri, 1 Dec 2017 16:48:16 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=d1005172618e409149fd867984462bfa5057c400;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30783 --- diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/-configuration-nle.json similarity index 100% rename from client/Maestro/Configuration/configuration-nle.json rename to client/Maestro/Configuration/-configuration-nle.json diff --git a/client/Maestro/Configuration/-configuration-tqc-check.json b/client/Maestro/Configuration/configuration-tqc-check.json similarity index 96% rename from client/Maestro/Configuration/-configuration-tqc-check.json rename to client/Maestro/Configuration/configuration-tqc-check.json index acd07c7e..d519cb83 100644 --- a/client/Maestro/Configuration/-configuration-tqc-check.json +++ b/client/Maestro/Configuration/configuration-tqc-check.json @@ -50,6 +50,7 @@ "saveSegments": true, "tag": "Adáskész", "disableFileVersioning": true, + "enableOverride": true, "saveMorpheusMetadata": true, "pathMorpheusMetadata": "/PLAYOUT/MorpheusGateway/Input", "deviceIdMorpheus": "ISILON", diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj index 54e50e8e..22f34e5c 100644 --- a/client/Maestro/Maestro.csproj +++ b/client/Maestro/Maestro.csproj @@ -270,13 +270,13 @@ Always - + Always Always - + Always diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs index 3b546495..01c68cc2 100644 --- a/client/MaestroShared/Targets/UNCTargetProcessor.cs +++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs @@ -178,7 +178,7 @@ namespace MaestroShared.Targets { MetadataType = Parameters.MetadataKind, Segments = Parameters.MovieSegments }; - + Parameters.MessageBus.Send(message); } private void UploadNexioMetadata() { diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index bc7cac1e..c4dddde7 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -151,7 +151,7 @@ namespace TrafficClient { } private void OnTypeFilterChanged(object sender, EventArgs e) { - dtScheduled.Enabled = rbMaterial.Checked; + //dtScheduled.Enabled = rbMaterial.Checked; RefreshResults(); } diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java index 979411bd..fd67d382 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java @@ -243,39 +243,39 @@ public class OctopusDataMiner implements Runnable { logger.info("Fetch rundowns"); - ResteasyWebTarget target = webTarget.path(RUNDOWN); - Builder result = target.request().header(OCTOPUS_DEVICE_ID, apiUser).header(OCTOPUS_DEVICE_NAME, apiPwd); - Response r = result.get(); - String x = r.readEntity(String.class); - return; - // BasicDBList rundowns = queryRundowns(); - // logger.info("Fetch rundown story references"); - // storyRundowns = buildRundownReferences(rundowns); - // logger.info("Fetch story folders"); - // BasicDBList storyFolders = queryStoryFolders(); - // logger.info("Fetch folder story references"); - // storyStoryFolders = buildFolderReferences(storyFolders); - // - // if (rundowns == null || rundowns.size() == 0) { - // progressEvent.setProgress(50); - // fireProgressEvent(progressEvent); - // } else { - // logger.info("Process rundowns"); - // storeRundowns(rundowns, null); - // } - // - // if (storyFolders == null || storyFolders.size() == 0) { - // progressEvent.setProgress(100); - // fireProgressEvent(progressEvent); - // } else { - // logger.info("Process story folders"); - // storeStoryFolders(storyFolders, null); - // } - // setLastUpdateTime(new Date()); - // logger.info("Activate"); - // db.getCollection(RUNDOWN_COLLECTION).rename(IOctopusAPI.RUNDOWN_COLLECTION, true); - // db.getCollection(FOLDER_COLLECTION).rename(IOctopusAPI.FOLDER_COLLECTION, true); - // db.getCollection(STORY_COLLECTION).rename(IOctopusAPI.STORY_COLLECTION, true); + // ResteasyWebTarget target = webTarget.path(RUNDOWN); + // Builder result = target.request().header(OCTOPUS_DEVICE_ID, apiUser).header(OCTOPUS_DEVICE_NAME, apiPwd); + // Response r = result.get(); + // String x = r.readEntity(String.class); + // return; + BasicDBList rundowns = queryRundowns(); + logger.info("Fetch rundown story references"); + storyRundowns = buildRundownReferences(rundowns); + logger.info("Fetch story folders"); + BasicDBList storyFolders = queryStoryFolders(); + logger.info("Fetch folder story references"); + storyStoryFolders = buildFolderReferences(storyFolders); + + if (rundowns == null || rundowns.size() == 0) { + progressEvent.setProgress(50); + fireProgressEvent(progressEvent); + } else { + logger.info("Process rundowns"); + storeRundowns(rundowns, null); + } + + if (storyFolders == null || storyFolders.size() == 0) { + progressEvent.setProgress(100); + fireProgressEvent(progressEvent); + } else { + logger.info("Process story folders"); + storeStoryFolders(storyFolders, null); + } + setLastUpdateTime(new Date()); + logger.info("Activate"); + db.getCollection(RUNDOWN_COLLECTION).rename(IOctopusAPI.RUNDOWN_COLLECTION, true); + db.getCollection(FOLDER_COLLECTION).rename(IOctopusAPI.FOLDER_COLLECTION, true); + db.getCollection(STORY_COLLECTION).rename(IOctopusAPI.STORY_COLLECTION, true); } catch (Exception e) { logger.catching(e);