Update #87, correct bug with Origin var name and associated Gson; cor…

…rect bug with metadata process with base item is a file.

app/hd3gtv/mydmam/cli/CliModuleMetadata.java

@@ -106,7 +106,7 @@ public void execCliModule(ApplicationArgs args) throws Exception {
 				return;
 			}
 			MetadataIndexer metadataIndexer = new MetadataIndexer(true);
-			metadataIndexer.process(root_indexing.storagename, root_indexing.currentpath, 0);
+			metadataIndexer.process(root_indexing, 0);
 			return;
 		} else if (args.getParamExist("-clean")) {
 			Log2.log.info("Start clean operations");

app/hd3gtv/mydmam/manager/JobNG.java

@@ -102,8 +102,6 @@ static ColumnPrefixDistributedRowLock<String> prepareLock() {
 	final static int TTL_DONE = 3600 * 24;
 	final static int TTL_TROUBLES = 3600 * 24 * 3;
 
-	// TODO
-
 	public enum JobStatus {
 		TOO_OLD, CANCELED, POSTPONED, WAITING, DONE, PROCESSING, STOPPED, ERROR, PREPARING, TOO_LONG_DURATION;
 	}

app/hd3gtv/mydmam/metadata/MetadataIndexer.java

@@ -46,6 +46,7 @@ public class MetadataIndexer implements IndexingEvent {
 	private MetadataIndexingLimit limit_processing;
 
 	public MetadataIndexer(boolean force_refresh) throws Exception {
+		explorer = new Explorer();
 		this.force_refresh = force_refresh;
 		current_create_job_list = new ArrayList<FutureCreateJobs>();
 	}
@@ -57,11 +58,27 @@ public void setLimitProcessing(MetadataIndexingLimit limit_processing) {
 	/**
 	 * @return new created jobs, never null
 	 */
-	public List<JobNG> process(String storagename, String currentpath, long min_index_date) throws Exception {
+	public List<JobNG> process(SourcePathIndexerElement item, long min_index_date) throws Exception {
+		if (item == null) {
+			return new ArrayList<JobNG>(1);
+		}
+
 		stop_analysis = false;
 		es_bulk = Elasticsearch.prepareBulk();
-		explorer = new Explorer();
-		explorer.getAllSubElementsFromElementKey(Explorer.getElementKey(storagename, currentpath), min_index_date, this);
+
+		Log2Dump dump = new Log2Dump();
+		dump.add("item", item);
+		dump.addDate("min_index_date", min_index_date);
+		Log2.log.debug("Prepare", dump);
+
+		if (item.directory) {
+			explorer.getAllSubElementsFromElementKey(item.prepare_key(), min_index_date, this);
+		} else {
+			if (onFoundElement(item) == false) {
+				return new ArrayList<JobNG>(1);
+			}
+		}
+
 		es_bulk.terminateBulk();
 
 		if (current_create_job_list.isEmpty()) {
@@ -215,7 +232,6 @@ public boolean onFoundElement(SourcePathIndexerElement element) throws Exception
 		if (limit_processing != null) {
 			indexing.setLimit(limit_processing);
 		}
-
 		ContainerOperations.save(indexing.doIndexing(), false, es_bulk);
 		return true;
 	}

app/hd3gtv/mydmam/metadata/MetadataIndexingOperation.java

@@ -155,8 +155,8 @@ public Container doIndexing() throws Exception {
 			reference.parentpath = physical_source.getParentFile().getAbsolutePath();
 		}
 
-		ContainerOrigin container_origin = ContainerOrigin.fromSource(reference, physical_source);
-		Container container = new Container(container_origin.getUniqueElementKey(), container_origin);
+		ContainerOrigin origin = ContainerOrigin.fromSource(reference, physical_source);
+		Container container = new Container(origin.getUniqueElementKey(), origin);
 		EntrySummary entry_summary = new EntrySummary();
 		container.addEntry(entry_summary);
 

app/hd3gtv/mydmam/metadata/WorkerIndexer.java

@@ -42,6 +42,7 @@ public class WorkerIndexer extends WorkerNG {
 	private volatile List<MetadataIndexer> analysis_indexers;
 
 	private HashMap<String, Long> lastindexeddatesforstoragenames;
+	private Explorer explorer = new Explorer();
 
 	public WorkerIndexer(AppManager manager) throws ClassNotFoundException {
 		if (isActivated() == false) {
@@ -95,8 +96,7 @@ protected void workerProcessJob(JobProgression progression, JobContext context)
 			} else {
 				lastindexeddatesforstoragenames.put(storagename, 0l);
 			}
-
-			metadataIndexer.process(storagename, analyst_context.currentpath, min_index_date);
+			metadataIndexer.process(explorer.getelementByIdkey(Explorer.getElementKey(storagename, analyst_context.currentpath)), min_index_date);
 			analysis_indexers.remove(metadataIndexer);
 		}
 	}

app/hd3gtv/mydmam/metadata/container/ContainerEntry.java

@@ -30,12 +30,12 @@ public abstract class ContainerEntry implements SelfSerializing, Log2Dumpable {
 	ContainerEntry() {
 	}
 
-	private ContainerOrigin containerOrigin;
+	private ContainerOrigin origin;
 
 	transient Container container;
 
 	public final ContainerOrigin getOrigin() {
-		return containerOrigin;
+		return origin;
 	}
 
 	public abstract String getES_Type();
@@ -44,15 +44,15 @@ public Log2Dump getLog2Dump() {
 		Log2Dump dump = new Log2Dump();
 		dump.add("type", this.getClass().getName());
 		dump.add("ES type", getES_Type());
-		dump.add("origin", containerOrigin);
+		dump.add("origin", origin);
 		return dump;
 	}
 
-	public final void setOrigin(ContainerOrigin containerOrigin) throws NullPointerException {
-		if (containerOrigin == null) {
+	public final void setOrigin(ContainerOrigin origin) throws NullPointerException {
+		if (origin == null) {
 			throw new NullPointerException("\"origin\" can't to be null");
 		}
-		this.containerOrigin = containerOrigin;
+		this.origin = origin;
 	}
 
 	/**
@@ -69,14 +69,14 @@ public ContainerEntry deserialize(JsonObject source, Gson gson) {
 		JsonElement j_origin = source.get("origin");
 		source.remove("origin");
 		ContainerEntry item = internalDeserialize(source, gson);
-		item.containerOrigin = gson.fromJson(j_origin, ContainerOrigin.class);
+		item.origin = gson.fromJson(j_origin, ContainerOrigin.class);
 		return item;
 	}
 
 	public JsonObject serialize(SelfSerializing _item, Gson gson) {
 		ContainerEntry item = (ContainerEntry) _item;
 		JsonObject jo = item.internalSerialize(item, gson);
-		jo.add("origin", gson.toJsonTree(item.containerOrigin));
+		jo.add("origin", gson.toJsonTree(item.origin));
 		return jo;
 	}
 

app/hd3gtv/mydmam/metadata/container/ContainerOperations.java

@@ -498,14 +498,14 @@ private static class HitPurge implements ElastisearchCrawlerHit {
 			elementcount_by_storage = new HashMap<String, Long>();
 		}
 
-		boolean containsStorageInBase(ContainerOrigin containerOrigin) {
-			if (elementcount_by_storage.containsKey(containerOrigin.storage) == false) {
-				elementcount_by_storage.put(containerOrigin.storage, explorer.countStorageContentElements(containerOrigin.storage));
-				if (elementcount_by_storage.get(containerOrigin.storage) == 0) {
-					Log2.log.info("Missing storage item in datatabase", new Log2Dump("storagename", containerOrigin.storage));
+		boolean containsStorageInBase(ContainerOrigin origin) {
+			if (elementcount_by_storage.containsKey(origin.storage) == false) {
+				elementcount_by_storage.put(origin.storage, explorer.countStorageContentElements(origin.storage));
+				if (elementcount_by_storage.get(origin.storage) == 0) {
+					Log2.log.info("Missing storage item in datatabase", new Log2Dump("storagename", origin.storage));
 				}
 			}
-			return elementcount_by_storage.get(containerOrigin.storage) > 0;
+			return elementcount_by_storage.get(origin.storage) > 0;
 		}
 
 		public boolean onFoundHit(SearchHit hit) {

app/hd3gtv/mydmam/metadata/container/ContainerOrigin.java

@@ -55,15 +55,15 @@ public String toString() {
 	}
 
 	public static ContainerOrigin fromSource(SourcePathIndexerElement element, File physical_source) {
-		ContainerOrigin containerOrigin = new ContainerOrigin();
-		containerOrigin.date = element.date;
-		containerOrigin.key = element.prepare_key();
-		containerOrigin.size = element.size;
-		containerOrigin.storage = element.storagename;
-		containerOrigin.currentpath = element.currentpath;
-		containerOrigin.pathindex_element = element;
-		containerOrigin.physical_source = physical_source;
-		return containerOrigin;
+		ContainerOrigin origin = new ContainerOrigin();
+		origin.date = element.date;
+		origin.key = element.prepare_key();
+		origin.size = element.size;
+		origin.storage = element.storagename;
+		origin.currentpath = element.currentpath;
+		origin.pathindex_element = element;
+		origin.physical_source = physical_source;
+		return origin;
 	}
 
 	/**

app/hd3gtv/mydmam/useraction/fileoperation/UAFileOperationReProcessMetadatas.java

@@ -23,6 +23,7 @@
 import hd3gtv.mydmam.manager.JobNG;
 import hd3gtv.mydmam.manager.JobProgression;
 import hd3gtv.mydmam.metadata.MetadataIndexer;
+import hd3gtv.mydmam.metadata.MetadataIndexingOperation.MetadataIndexingLimit;
 import hd3gtv.mydmam.pathindexing.Explorer;
 import hd3gtv.mydmam.pathindexing.SourcePathIndexerElement;
 import hd3gtv.mydmam.useraction.UACapability;
@@ -99,6 +100,9 @@ public void process(JobProgression progression, UserProfile userprofile, UAConfi
 		if (conf.limit_to_recent != null) {
 			min_index_date = conf.limit_to_recent.toDate();
 		}
+		if (conf.limit_processing == null) {
+			conf.limit_processing = MetadataIndexingLimit.NOLIMITS;
+		}
 
 		ArrayList<JobNG> new_created_jobs = new ArrayList<JobNG>();
 
@@ -137,7 +141,7 @@ public void process(JobProgression progression, UserProfile userprofile, UAConfi
 
 			indexer = new MetadataIndexer(true);
 			indexer.setLimitProcessing(conf.limit_processing);
-			new_created_jobs.addAll(indexer.process(item.storagename, item.currentpath, min_index_date));
+			new_created_jobs.addAll(indexer.process(item, min_index_date));
 		}
 
 		if (new_created_jobs.isEmpty() == false) {