From: Sweidan Omar Date: Mon, 6 Dec 2021 11:16:54 +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=876be121f6ed6d1c048147684dc3ec33cc963c3d;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32449 --- diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java index a37e8cd8..a3f45946 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java @@ -1,7 +1,5 @@ package user.jobengine.server.steps.shared; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Calendar; import java.util.Date; import java.util.HashMap; @@ -54,8 +52,8 @@ public class OctopusDataMiner { private static final String FIELDS_STORYFOLDER = "id,name,modified"; private static final String FIELDS_STORYFOLDER_STORYIDS = "id,stories,Story.id"; private static final String RUNDOWN = "Rundown"; - // private static final String OCTOPUS_DEVICE_NAME = "Octopus-Device-Name"; - // private static final String OCTOPUS_DEVICE_ID = "Octopus-Device-Id"; + // private static final String OCTOPUS_DEVICE_NAME = "Octopus-Device-Name"; + // private static final String OCTOPUS_DEVICE_ID = "Octopus-Device-Id"; private static final String FIELDS = "fields"; private static final String EXIT = "Exit"; private static final String RESULT = "result"; @@ -66,9 +64,12 @@ public class OctopusDataMiner { private static final String MOSLABEL = "MOS: "; private static final Object STORY = "Story"; - // private static String OCTOPUS_API_ADDRESS = SystemConfiguration.getInstance().value("services.octopus.api.address"); - // private static String OCTOPUS_API_USER = SystemConfiguration.getInstance().value("services.octopus.api.user"); - // private static String OCTOPUS_API_PASSWORD = SystemConfiguration.getInstance().value("services.octopus.api.password"); + // private static String OCTOPUS_API_ADDRESS = + // SystemConfiguration.getInstance().value("services.octopus.api.address"); + // private static String OCTOPUS_API_USER = + // SystemConfiguration.getInstance().value("services.octopus.api.user"); + // private static String OCTOPUS_API_PASSWORD = + // SystemConfiguration.getInstance().value("services.octopus.api.password"); private DB db; private ResteasyWebTarget webTarget; private HashSet storyIDs = new HashSet<>(); @@ -124,7 +125,8 @@ public class OctopusDataMiner { references = new BasicDBList(); result.put(storyId, references); } - references.add(new BasicDBObject(IOctopusAPI.ID, storyFolderId).append(IOctopusAPI.POSITION, position++)); + references + .add(new BasicDBObject(IOctopusAPI.ID, storyFolderId).append(IOctopusAPI.POSITION, position++)); } } return result; @@ -139,7 +141,7 @@ public class OctopusDataMiner { logger.info("Processing rundown {}", rundown.get(IOctopusAPI.NAME)); BasicDBObject rundownWithStoryids = queryRundown(rundown, FIELDS_RUNDOWN_STORYIDS); - //TODO ez neha null? + // TODO ez neha null? long rundownId = rundownWithStoryids.getLong(IOctopusAPI.ID); List slugs = NoSQLUtils.asList(rundownWithStoryids, IOctopusAPI.SLUGS); if (slugs == null) @@ -194,7 +196,7 @@ public class OctopusDataMiner { public void execute(boolean includeArchived) throws Exception { this.includeArchived = includeArchived; logger.trace(STARTING); - //current = korábbi szinkronizálás + // current = korábbi szinkronizálás currentRundowns = getCurrentIDs(IOctopusAPI.RUNDOWN_COLLECTION); currentFolder = getCurrentIDs(IOctopusAPI.FOLDER_COLLECTION); currentStories = getCurrentIDs(IOctopusAPI.STORY_COLLECTION); @@ -293,7 +295,7 @@ public class OctopusDataMiner { return null; Map mosLabels = extractScriptMosObjectIDs(story); - //logger.info(Arrays.deepToString(new ArrayList<>(mosLabels.keySet()))); + // logger.info(Arrays.deepToString(new ArrayList<>(mosLabels.keySet()))); BasicDBList result = null; for (BasicDBObject mosObject : mosObjects) { if (!mosObject.containsKey(IOctopusAPI.MOS_ID)) @@ -305,11 +307,11 @@ public class OctopusDataMiner { if (objId == null) continue; - logger.info("MOS ID: {}", objId); - + MetadataType metadataType = MetadataTypeDetector.GuessMetadataType(objId); - if (!MetadataType.OctopusPlaceholder.equals(metadataType) && !MetadataType.OctopusStory.equals(metadataType)) + if (!MetadataType.OctopusPlaceholder.equals(metadataType) + && !MetadataType.OctopusStory.equals(metadataType)) continue; if (result == null) result = new BasicDBList(); @@ -387,7 +389,7 @@ public class OctopusDataMiner { private void fireProgressEvent() { currentObjectIndex++; - //logger.info("currentObjectIndex {}", currentObjectIndex); + // logger.info("currentObjectIndex {}", currentObjectIndex); int progress = currentObjectIndex * 100 / objectCount; if (progress != progressEvent.getProgress()) { progressEvent.setProgress(progress); @@ -438,14 +440,16 @@ public class OctopusDataMiner { throw new RuntimeException(e.getString("message")); } - //{"exception":{"message":"Invalid credentials.","publicName":"AuthenticationFailedException"}} + // {"exception":{"message":"Invalid + // credentials.","publicName":"AuthenticationFailedException"}} return result; } private Builder query(String path, String fields) { ResteasyWebTarget target = webTarget.path(path).queryParam(FIELDS, fields); - //Builder result = target.request().header(OCTOPUS_DEVICE_ID, OCTOPUS_API_USER).header(OCTOPUS_DEVICE_NAME, OCTOPUS_API_PASSWORD); + // Builder result = target.request().header(OCTOPUS_DEVICE_ID, + // OCTOPUS_API_USER).header(OCTOPUS_DEVICE_NAME, OCTOPUS_API_PASSWORD); Builder result = target.request(); return result; } @@ -495,7 +499,8 @@ public class OctopusDataMiner { Builder query = query(RUNDOWN, FIELDS_RUNDOWN); Response response = null; if (includeArchived) { - response = query.post(Entity.entity(new BasicDBObject(FILTER, new BasicDBObject(ARCHIVED, true)).toString(), MediaType.APPLICATION_JSON)); + response = query.post(Entity.entity(new BasicDBObject(FILTER, new BasicDBObject(ARCHIVED, true)).toString(), + MediaType.APPLICATION_JSON)); } else response = query.get(); @@ -545,14 +550,15 @@ public class OctopusDataMiner { if (resultObject != null) result = NoSQLUtils.asDBList(resultObject, RESULT); - // /* teszt */ - // List list = NoSQLUtils.asList(result); - // for (BasicDBObject actual : list) { - // String fullName = concatParentsToStoryFolder(actual, actual.getString(IOctopusAPI.NAME)); - // //logger.info("Checking StoryFolder {}", fullName); - // actual.remove(IOctopusAPI.NAME); - // actual.append(IOctopusAPI.NAME, fullName); - // } + // /* teszt */ + // List list = NoSQLUtils.asList(result); + // for (BasicDBObject actual : list) { + // String fullName = concatParentsToStoryFolder(actual, + // actual.getString(IOctopusAPI.NAME)); + // //logger.info("Checking StoryFolder {}", fullName); + // actual.remove(IOctopusAPI.NAME); + // actual.append(IOctopusAPI.NAME, fullName); + // } // logger.trace(EXIT); return result; @@ -604,7 +610,7 @@ public class OctopusDataMiner { private void storeStories() { logger.trace(ENTER); for (long storyID : storyIDs) { - //logger.info("Storing story {}", storyID); + // logger.info("Storing story {}", storyID); try { BasicDBObject story = queryStory(storyID); if (story != null)