Fix --continue, improve and rename persistentID

iped-api/src/main/java/iped3/IItem.java

@@ -99,8 +99,6 @@ public interface IItem extends IItemBase {
 
     ISeekableInputStreamFactory getInputStreamFactory();
 
-    String getParentIdInDataSource();
-
     /**
      * @return nome e caminho relativo ao caso com que o arquivo de evidência em si
      *         foi exportado
@@ -505,8 +503,6 @@ public interface IItem extends IItemBase {
 
     void setIdInDataSource(String string);
 
-    void setParentIdInDataSource(String string);
-
     void setThumb(byte[] thumb);
 
     void setImageSimilarityFeatures(byte[] imageSimilarityFeatures);

iped-app/resources/config/conf/metadataTypes.txt

@@ -3374,8 +3374,9 @@ og:type = java.lang.String
 og:url = java.lang.String
 ontent-Type" = java.lang.String
 p2pHistoryEntries = java.lang.Integer
-containerGlobalId = java.lang.String
-parentGlobalId = java.lang.String
+containerTrackId = java.lang.String
+parentTrackId = java.lang.String
+trackId = java.lang.String
 parentViewPosition = java.lang.String
 parserException = java.lang.String
 pdf:ADBE_ProducerDetails = java.lang.String
@@ -4055,7 +4056,6 @@ pdf:xmpMM:History:InstanceID = java.lang.String
 pdf:xmpMM:History:SoftwareAgent = java.lang.String
 pdf:xmpMM:History:When = java.util.Date
 pdf:xmpTPg:NPages = java.lang.Integer
-globalId = java.lang.String
 phoneNumber = java.lang.String
 property_ = java.lang.String
 property_1 = java.lang.Integer

iped-app/resources/localization/iped-engine-messages.properties

@@ -1,6 +1,6 @@
 AttachmentFileType.EmailAttach=Email Attachment
 CaseData.Case=Case
-ExportCSVTask.CsvColNames="Name","Link","Size","Extension","Bookmark","Category","MD5","SHA1","Deleted","Carved","Accessed","Modified","Created","Path","GlobalId"\r\n
+ExportCSVTask.CsvColNames="Name","Link","Size","Extension","Bookmark","Category","MD5","SHA1","Deleted","Carved","Accessed","Modified","Created","Path","TrackId"\r\n
 ExportCSVTask.CsvSeparator=,
 ExportCSVTask.CsvName=FileList.csv
 ExportCSVTask.LinkFunction=HYPERLINK
@@ -44,6 +44,8 @@ Manager.CreatingViewMap=Creating file preview map...
 Manager.DeletingTreeNodes=Deleting empty tree nodes
 Manager.FilteringKeywords=Filtering Keywords...
 Manager.Optimizing=Optimizing index...
+Manager.CommitStarted=Starting commit...
+Manager.CommitFinished=Commit finished.
 OriginalEmailFileType.ParentEmail=Parent Email
 P2PBookmarker.P2PBookmarkPrefix=Probably Shared By 
 ProgressConsole.files=\ files

iped-app/resources/localization/iped-engine-messages_de_DE.properties

@@ -1,6 +1,6 @@
 AttachmentFileType.EmailAttach=E-Mail Anhang
 CaseData.Case=Fall
-ExportCSVTask.CsvColNames="Name";"Link";"Size";"Extension";"Bookmark";"Category";"MD5";"SHA1";"Deleted";"Carved";"Accessed";"Modified";"Created";"Path";"GlobalId"\r\n
+ExportCSVTask.CsvColNames="Name";"Link";"Size";"Extension";"Bookmark";"Category";"MD5";"SHA1";"Deleted";"Carved";"Accessed";"Modified";"Created";"Path";"TrackId"\r\n
 ExportCSVTask.CsvSeparator=;
 ExportCSVTask.CsvName=FileList.csv
 ExportCSVTask.LinkFunction=HYPERLINK
@@ -44,6 +44,8 @@ Manager.CreatingViewMap=Erstelle Datei-Vorschau-Übersicht...
 Manager.DeletingTreeNodes=Lösche leere Baumknoten
 Manager.FilteringKeywords=Filtere Schlüsselwörter...
 Manager.Optimizing=Optimiere Index...
+Manager.CommitStarted=Starting commit...
+Manager.CommitFinished=Commit finished.
 OriginalEmailFileType.ParentEmail=Übergeordnete E-Mail
 P2PBookmarker.P2PBookmarkPrefix=Wahrscheinlich geteilt von
 ProgressConsole.files=\ Dateien

iped-app/resources/localization/iped-engine-messages_pt_BR.properties

@@ -1,6 +1,6 @@
 AttachmentFileType.EmailAttach=Anexo de Email
 CaseData.Case=Caso
-ExportCSVTask.CsvColNames="Nome";"Atalho";"Tamanho";"Ext";"Marcador";"Categoria";"MD5";"SHA1";"Deletado";"Recuperado";"Acesso";"Modificação";"Criação";"Caminho";"GlobalId"\r\n
+ExportCSVTask.CsvColNames="Nome";"Atalho";"Tamanho";"Ext";"Marcador";"Categoria";"MD5";"SHA1";"Deletado";"Recuperado";"Acesso";"Modificação";"Criação";"Caminho";"TrackId"\r\n
 ExportCSVTask.CsvSeparator=;
 ExportCSVTask.CsvName=Lista de Arquivos.csv
 ExportCSVTask.LinkFunction=HIPERLINK
@@ -44,6 +44,8 @@ Manager.CreatingViewMap=Obtendo mapeamento de versões de visualização para or
 Manager.DeletingTreeNodes=Excluindo nós da árvore vazios
 Manager.FilteringKeywords=Filtrando palavras-chave...
 Manager.Optimizing=Otimizando Índice...
+Manager.CommitStarted=Iniciando commit...
+Manager.CommitFinished=Commit finalizado.
 OriginalEmailFileType.ParentEmail=E-mail de Origem
 P2PBookmarker.P2PBookmarkPrefix=Provavelmente Compartilhados via 
 ProgressConsole.files=\ arquivos

iped-engine/src/main/java/dpf/sp/gpinf/carver/CarverTask.java

@@ -111,6 +111,8 @@ private void safeProcess(IItem evidence) {
                 type = MediaTypes.getParentType(type);
             }
 
+            clearExtraAttributes(evidence);
+
             findSig(tis);
 
         } catch (Exception t) {

iped-engine/src/main/java/dpf/sp/gpinf/indexer/datasource/FolderTreeReader.java

@@ -41,6 +41,7 @@
 import dpf.sp.gpinf.indexer.CmdLineArgs;
 import dpf.sp.gpinf.indexer.config.ConfigurationManager;
 import dpf.sp.gpinf.indexer.config.FileSystemConfig;
+import dpf.sp.gpinf.indexer.process.IndexItem;
 import dpf.sp.gpinf.indexer.util.Util;
 import gpinf.dev.data.DataSource;
 import gpinf.dev.data.Item;
@@ -101,23 +102,12 @@ public void read(File file, Item parent) throws Exception {
 
         rootFile = file;
 
-        List<Integer> parents;
-        List<String> paths;
-        if (parent != null) {
-            parents = parent.getParentIds();
-            parents.add(parent.getId());
-
-            StringTokenizer stringTokenizer = new StringTokenizer(parent.getPath(), File.separator);
-            paths = stringTokenizer.getTokenList();
-        } else {
-            parents = Collections.emptyList();
-            paths = Collections.emptyList();
-        }
-        transverse(file, parents, paths);
+        transverse(file, parent);
     }
 
-    private void transverse(File file, List<Integer> parents, List<String> paths) throws IOException {
-        new FolderVisitor(parents, paths).walk(file);
+    private void transverse(File file, Item parent)
+            throws IOException {
+        new FolderVisitor(parent).walk(file);
     }
 
     private IItem getEvidence(Path path, BasicFileAttributes attr) {
@@ -133,10 +123,8 @@ private IItem getEvidence(Path path, BasicFileAttributes attr) {
             item.setIdInDataSource(path.toString());
             if (file.equals(rootFile)) {
                 item.setName(evidenceName);
-                item.setParentIdInDataSource("");
             } else {
                 item.setName(file.getName());
-                item.setParentIdInDataSource(path.getParent().toString());
             }
             try {
                 String relativePath = Util.getRelativePath(output, file);
@@ -162,13 +150,13 @@ private IItem getEvidence(Path path, BasicFileAttributes attr) {
 
     class FolderVisitor implements FileVisitor<Path> {
 
-        private LinkedList<Integer> parentIds;
-        private LinkedList<String> paths;
+        private LinkedList<IItem> parents = new LinkedList<>();
 
-        public FolderVisitor(List<Integer> parentIds, List<String> paths) {
+        public FolderVisitor(IItem parent) {
             super();
-            this.parentIds = new LinkedList<>(parentIds);
-            this.paths = new LinkedList<>(paths);
+            if (parent != null) {
+                this.parents.add(parent);
+            }
         }
 
         public void walk(File file) throws IOException {
@@ -184,20 +172,19 @@ public FileVisitResult visitFile(Path path, BasicFileAttributes attr) {
 
             IItem item = getEvidence(path, attr);
             if (item != null) {
-                if (!parentIds.isEmpty()) {
-                    item.setParentId(parentIds.getLast());
-                    item.addParentIds(parentIds);
+                if (!parents.isEmpty()) {
+                    item.setParent(parents.getLast());
 
-                    if (parentIds.size() == 2) {
+                    if (parents.size() == 2) {
                         item.setExtraAttribute(ExtraProperties.DATASOURCE_READER, this.getClass().getSimpleName());
                     }
                 } else {
                     item.setRoot(true);
                 }
 
                 String fileName = item.getName();
-                String evidencePath = paths.isEmpty() ? fileName
-                        : paths.stream().collect(Collectors.joining(File.separator)) + File.separator + fileName;
+                String evidencePath = parents.isEmpty() ? fileName
+                        : parents.getLast().getPath() + File.separator + fileName;
                 item.setPath(evidencePath);
 
                 if (attr.isDirectory()) {
@@ -219,8 +206,7 @@ public FileVisitResult visitFile(Path path, BasicFileAttributes attr) {
                 if (attr.isDirectory()) {
                     // must getId() after caseData.addItem(), it could set item id to previous id
                     // with --continue
-                    parentIds.addLast(item.getId());
-                    paths.addLast(fileName);
+                    parents.addLast(item);
                 }
             }
 
@@ -239,8 +225,7 @@ public FileVisitResult preVisitDirectory(Path path, BasicFileAttributes attr) th
             }
 
             if (attr.isSymbolicLink() || attr.isOther()) { // pula links simbólicos e NTFS junctions
-                parentIds.pollLast();
-                paths.pollLast();
+                parents.pollLast();
                 return FileVisitResult.SKIP_SUBTREE;
             }
 
@@ -250,8 +235,7 @@ public FileVisitResult preVisitDirectory(Path path, BasicFileAttributes attr) th
         @Override
         public FileVisitResult postVisitDirectory(Path path, IOException exception) throws IOException {
 
-            parentIds.pollLast();
-            paths.pollLast();
+            parents.pollLast();
 
             if (exception != null) {
                 System.err.println(

iped-engine/src/main/java/dpf/sp/gpinf/indexer/datasource/IPEDReader.java

@@ -154,8 +154,8 @@ public void read(Set<HashValue> parentsWithLostSubitems, Manager manager) throws
             indexDir = ipedCase.getIndex();
 
             BooleanQuery.Builder parents = new BooleanQuery.Builder();
-            for (HashValue globalId : parentsWithLostSubitems) {
-                TermQuery tq = new TermQuery(new Term(IndexItem.GLOBAL_ID, globalId.toString().toLowerCase()));
+            for (HashValue trackID : parentsWithLostSubitems) {
+                TermQuery tq = new TermQuery(new Term(IndexItem.TRACK_ID, trackID.toString().toLowerCase()));
                 parents.add(tq, Occur.SHOULD);
             }
             BooleanQuery.Builder subitems = new BooleanQuery.Builder();