From: Vásáry Dániel Date: Fri, 13 Apr 2018 15:16:57 +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=d90e081fb5362406de164fbceec01f6f8a49601b;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31029 --- diff --git a/client/MaestroShared/Metadata/ArchiveMetadata.cs b/client/MaestroShared/Metadata/ArchiveMetadata.cs index 097165b9..c2a46710 100644 --- a/client/MaestroShared/Metadata/ArchiveMetadata.cs +++ b/client/MaestroShared/Metadata/ArchiveMetadata.cs @@ -19,6 +19,7 @@ namespace MaestroShared.Metadata { public bool ok { get; set; } public string userName { get; set; } public string mediaType { get; set; } + public long duration { get; set; } public override string ToString() { return JsonConvert.SerializeObject(this, Formatting.Indented); diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs index 4fea4d0a..11683c29 100644 --- a/client/MaestroShared/Targets/UNCTargetProcessor.cs +++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs @@ -356,6 +356,7 @@ namespace MaestroShared.Targets { EnsureDirectoryExistence(statusWorkDir); string fileName = String.Format(METADATA_FILE, OutputName); //logger.Debug("Creating METADATA file {0}", fileName); + Parameters.ArchiveMetadata.duration = Parameters.Frames; byte[] content = Encoding.UTF8.GetBytes(Parameters.ArchiveMetadata.ToString()); string ouputPath = GetOutputFilePath(statusWorkDir, fileName); UploadContent(ouputPath, content); diff --git a/server/user.jobengine.executors/jobtemplates/archive-limited.xml b/server/user.jobengine.executors/jobtemplates/archive-limited.xml new file mode 100644 index 00000000..c9a671a2 --- /dev/null +++ b/server/user.jobengine.executors/jobtemplates/archive-limited.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/user.jobengine.executors/jobtemplates/archive-ondemand.xml b/server/user.jobengine.executors/jobtemplates/archive-ondemand.xml index 4a12203b..c9a671a2 100644 --- a/server/user.jobengine.executors/jobtemplates/archive-ondemand.xml +++ b/server/user.jobengine.executors/jobtemplates/archive-ondemand.xml @@ -1,5 +1,5 @@ - + diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java index 9c0265c3..95e846a2 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java @@ -26,6 +26,9 @@ public class ArchiveMaterialSubmitStep extends JobStep { public Object[] execute(String globalSourcePath, ArrayList archiveList, String transcoderTargetPath, String webPath, int killDateDays, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { marker = jobRuntime.getMarker(); + if (archiveList == null || archiveList.size() == 0) + return null; + if (jobRuntime.forkPrepare()) { for (int i = 0; i < archiveList.size(); i++) { ArchiveItem archiveItem = archiveList.get(i); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java index a5bd517e..4bfe9011 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java @@ -25,6 +25,9 @@ public class BatchRetrieveForkStep extends JobStep { int killDateDays, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { marker = (MediaCubeMarker) jobRuntime.getMarker(); marker.setTo(recipient); + + if (basket == null || basket.size() == 0) + return null; setProgress(10); if (jobRuntime.forkPrepare()) { for (Media mediaCubeMedia : basket) { diff --git a/server/user.jobengine.osgi.commons/test/user/common/octopus/test/OctopusDataMinerTest.java b/server/user.jobengine.osgi.commons/test/user/common/octopus/test/OctopusDataMinerTest.java index 2b59abb5..2f1298c3 100644 --- a/server/user.jobengine.osgi.commons/test/user/common/octopus/test/OctopusDataMinerTest.java +++ b/server/user.jobengine.osgi.commons/test/user/common/octopus/test/OctopusDataMinerTest.java @@ -13,7 +13,10 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.sql.SQLException; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -32,8 +35,13 @@ import org.junit.Test; import com.ibm.nosql.json.JSONUtil; import com.ibm.nosql.json.api.BasicDBList; import com.ibm.nosql.json.api.BasicDBObject; +import com.ibm.nosql.json.api.DB; +import com.ibm.nosql.json.api.DBCollection; +import com.ibm.nosql.json.api.DBCursor; import com.ibm.nosql.json.api.DBObject; +import user.commons.CalendarUtils; +import user.commons.ListUtils; import user.commons.nosql.NoSQLUtils; import user.commons.octopus.IOctopusAPI; import user.commons.octopus.OctopusAPI; @@ -295,6 +303,49 @@ public class OctopusDataMinerTest { assertNotNull(stepClass); } + @Test + public void test7() throws Exception { + DB db = NoSQLUtils.getNoSQLDB(); + DBCollection collection = db.getCollection("daily_news_history"); + DBCursor cursor = collection.find(new BasicDBObject(), new BasicDBObject("dateTime", 1)); + List items = ListUtils.cast(cursor.toArray()); + for (BasicDBObject item : items) { + Date date = item.getDate("dateTime"); + int hour = date.getHours(); + if (hour > 0) { + LocalDateTime ld = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); + ld = ld.minusHours(1); + Date ndate = Date.from(ld.atZone(ZoneId.systemDefault()).toInstant()); + System.out.println(item.getID() + " " + date + " " + ndate); + item.put("dateTime", ndate); + collection.save(item); + } else + System.out.println(date); + } + //collection.remove(new BasicDBObject("_id", ObjectId.massageToObjectId("5acee7ea3ff2a7bed079b13e"))); + } + + @Test + public void test8() throws Exception { + DB db = NoSQLUtils.getNoSQLDB(); + DBCollection collection = db.getCollection("daily_news_history"); + Calendar scheduledDate = CalendarUtils.createZeroCalendar(); + //scheduledDate.setTimeZone(TimeZone.getTimeZone("Europe/Budapest")); + + for (int i = 0; i < 30; i++) { + scheduledDate.add(Calendar.DAY_OF_YEAR, -1); + System.out.println(scheduledDate.getTime()); + DBCursor cursor = collection.find(new BasicDBObject("dateTime", scheduledDate.getTime())); + List items = ListUtils.cast(cursor.toArray()); + for (BasicDBObject item : items) { + Date date = item.getDate("dateTime"); + System.out.println(date); + } + } + + //collection.remove(new BasicDBObject("_id", ObjectId.massageToObjectId("5acee7ea3ff2a7bed079b13e"))); + } + // @Test // public void test7() throws Exception { // String x = "aaaassss"; diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryModel.java index a9fc4e08..c52e3af2 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryModel.java @@ -7,6 +7,7 @@ import java.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.TimeZone; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -56,10 +57,10 @@ public class NewsHistoryModel { @AfterCompose public void afterCompose(@ContextParam(ContextType.VIEW) Component view) { Selectors.wireComponents(view, this, false); - Calendar calendar = CalendarUtils.createZeroCalendar(); - calendar.add(Calendar.DAY_OF_YEAR, -1); - //calendar.setTimeZone(TimeZone.getTimeZone("Europe/Budapest")); - setSelectedDate(calendar.getTime()); + // Calendar calendar = CalendarUtils.createZeroCalendar(); + // calendar.add(Calendar.DAY_OF_YEAR, -1); + // setSelectedDate(calendar.getTime()); + setSelectedDate(new Date()); } private void clearChart(Charts charts) { @@ -155,10 +156,10 @@ public class NewsHistoryModel { initChart(typeChartSumDuration); initChart(planChart); - // Calendar scheduledDate = CalendarUtils.createZeroCalendar(selectedDate); - // scheduledDate.setTimeZone(TimeZone.getTimeZone("Europe/Budapest")); + Calendar scheduledDate = CalendarUtils.createZeroCalendar(selectedDate); + scheduledDate.setTimeZone(TimeZone.getTimeZone("Europe/Budapest")); - BasicDBObject dateFilter = new BasicDBObject("dateTime", selectedDate); + BasicDBObject dateFilter = new BasicDBObject("dateTime", scheduledDate.getTime()); BasicDBObject dailyData = (BasicDBObject) collection.findOne(dateFilter); if (dailyData == null) { return;