From: Vásáry Dániel Date: Mon, 8 Jul 2019 11:55:09 +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=96f58a0cf25ebbb43f543cbb991b06b48868aebf;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31457 --- diff --git a/server/-configuration/run-mediacube-server-bsh.launch b/server/-configuration/run-mediacube-server-bsh.launch index 60593dc9..66d960cb 100644 --- a/server/-configuration/run-mediacube-server-bsh.launch +++ b/server/-configuration/run-mediacube-server-bsh.launch @@ -19,7 +19,7 @@ - + diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/OctopusDataMiner.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/OctopusDataMiner.java index dced4489..57f5cadb 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/OctopusDataMiner.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/OctopusDataMiner.java @@ -141,6 +141,8 @@ public class OctopusDataMiner { for (BasicDBObject rundown : rundownsList) { if (rundown == null || !rundown.containsKey(IOctopusAPI.ID)) continue; + + logger.info("Processing rundown {}", rundown.get(IOctopusAPI.NAME)); BasicDBObject rundownWithStoryids = queryRundown(rundown, FIELDS_RUNDOWN_STORYIDS); //TODO ez neha null? long rundownId = rundownWithStoryids.getLong(IOctopusAPI.ID); @@ -167,6 +169,7 @@ public class OctopusDataMiner { position = slug.getLong(IOctopusAPI.POSITION); references.add(new BasicDBObject(IOctopusAPI.ID, rundownId).append(IOctopusAPI.POSITION, position)); } + logger.info("Actual story amount {}", storyIDs.size()); } return result; } @@ -435,8 +438,11 @@ public class OctopusDataMiner { BasicDBList storyFolders; logger.info("Fetch story folders"); storyFolders = queryStoryFolders(); + logger.info("Story folders amount {}", storyFolders.size()); + logger.info("Fetch folder story references"); storyStoryFolders = buildFolderReferences(storyFolders); + logger.info("Actual stories amount {}", storyIDs.size()); return storyFolders; } @@ -444,8 +450,11 @@ public class OctopusDataMiner { BasicDBList rundowns; logger.info("Fetch rundowns"); rundowns = queryRundowns(); + logger.info("Rundowns amount {}", rundowns.size()); + logger.info("Fetch rundown story references"); storyRundowns = buildRundownReferences(rundowns); + logger.info("Actual stories amount {}", storyIDs.size()); return rundowns; } @@ -579,6 +588,7 @@ public class OctopusDataMiner { private void storeStories() { logger.trace(ENTER); for (long storyID : storyIDs) { + //logger.info("Storing story {}", storyID); try { BasicDBObject story = queryStory(storyID); if (story != null) diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.java index 560d8536..4b088798 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.java @@ -173,6 +173,12 @@ public class ProjectCleanupMountedLocationStep extends JobStep implements FileVi if (filePath.toFile().isDirectory() || !filePath.toString().toUpperCase().endsWith(".EZP")) return false; + //level check + if (filePath.getNameCount() != sourcePath.getNameCount() + 3) { + //logger.warn(marker, "A {} fájl elérési útja a várttól eltérő.", filePath); + return false; + } + List killDateFiles = getKillDateFiles(filePath); if (killDateFiles == null || killDateFiles.size() == 0) { logger.warn(marker, "A {} fájlhoz nem található 'killdate' állomány.", filePath); @@ -191,13 +197,14 @@ public class ProjectCleanupMountedLocationStep extends JobStep implements FileVi Path pathToDelete = Paths.get(sourcePath.toAbsolutePath().toString(), filePath.getName(sourcePath.getNameCount()).toString()); try { FileUtils.deleteDirectory(pathToDelete.toFile()); - logger.info(marker, "A {} mappa sikeresen törlődött", pathToDelete); - } catch (IOException e) { + logger.info(marker, "A {} mappa sikeresen törlődött. Lejárat: {}", pathToDelete, dateFormat.format(killDate)); + } catch (Exception e) { logger.error(marker, "A {} mappa törlése nem lehetséges, a rendszer üzenete: {}", pathToDelete, e.getMessage()); logger.error(e); } - } else - logger.warn(marker, "A {} fájlhoz nem határozható meg a törlendő szülőkönyvtár.", filePath); + } + // else + // logger.warn(marker, "A {} fájlhoz nem határozható meg a törlendő szülőkönyvtár.", filePath); return true; } diff --git a/server/user.jobengine.osgi.server/pages/mediaplayer.jsp b/server/user.jobengine.osgi.server/pages/mediaplayer.jsp index 1d5d0bca..79ee4a4d 100644 --- a/server/user.jobengine.osgi.server/pages/mediaplayer.jsp +++ b/server/user.jobengine.osgi.server/pages/mediaplayer.jsp @@ -61,5 +61,12 @@ controls : true, preload : "auto" }); +/* + var myVar = setInterval(myTimer, 5000); + function myTimer() { + console.log(player.currentTime()); + myVar = setInterval(myTimer, 5000); + } + */