Skip to content

Commit ecfece2

Browse files
committed
'#2795: Use correct hashDb:set and hashDb:status properties.
1 parent aac37b3 commit ecfece2

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,8 +1811,8 @@ fileFragment = java.lang.Boolean
18111811
fileSystemId = java.lang.String
18121812
format-detection = java.lang.String
18131813
googlebot = java.lang.String
1814-
hash:set = java.lang.String
1815-
hash:status = java.lang.String
1814+
hashDb:set = java.lang.String
1815+
hashDb:status = java.lang.String
18161816
hasSubitem = java.lang.String
18171817
hasThumb = java.lang.Boolean
18181818
html:"Content-Type" = java.lang.String

iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/skype/SkypeParser.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ public void parse(InputStream stream, ContentHandler handler, Metadata metadata,
222222
meta.set(StandardParser.INDEXER_CONTENT_TYPE, ATTACHMENT_MIME_TYPE);
223223
List<String> hashSets = ChildPornHashLookup.lookupHash(item.getHash());
224224
if (!hashSets.isEmpty()) {
225-
meta.set("hash:status", "pedo");
225+
meta.set(ExtraProperties.HASHDB_STATUS, "pedo");
226226
for (String set : hashSets) {
227-
meta.add("hash:set", set);
227+
meta.add(ExtraProperties.HASHDB_SET, set);
228228
}
229229
}
230230
}
@@ -272,9 +272,9 @@ public void parse(InputStream stream, ContentHandler handler, Metadata metadata,
272272
}
273273
List<String> hashSets = ChildPornHashLookup.lookupHash(t.getItem().getHash());
274274
if (!hashSets.isEmpty()) {
275-
tMetadata.set("hash:status", "pedo");
275+
tMetadata.set(ExtraProperties.HASHDB_STATUS, "pedo");
276276
for (String set : hashSets) {
277-
tMetadata.add("hash:set", set);
277+
tMetadata.add(ExtraProperties.HASHDB_SET, set);
278278
}
279279
}
280280
}

iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/telegram/TelegramParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,9 @@ private void extractMessages(String chatName, List<Message> messages, Contact ac
295295
meta.set(StandardParser.INDEXER_CONTENT_TYPE, TELEGRAM_ATTACHMENT.toString());
296296
meta.set(ExtraProperties.LINKED_ITEMS, BasicProps.HASH + ":" + m.getMediaHash()); //$NON-NLS-1$
297297
if (!m.getChildPornSets().isEmpty()) {
298-
meta.set("hash:status", "pedo");
298+
meta.set(ExtraProperties.HASHDB_STATUS, "pedo");
299299
for (String set : m.getChildPornSets()) {
300-
meta.add("hash:set", set);
300+
meta.add(ExtraProperties.HASHDB_SET, set);
301301
}
302302
}
303303
// TODO store thumb in metadata?

iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/threema/ThreemaParser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,15 +382,15 @@ private void extractMessages(String chatName, Chat c, List<Message> messages, Th
382382
}
383383
if (m.getMediaQuery() != null && m.getMediaSize() > 2) {
384384
meta.set(StandardParser.INDEXER_CONTENT_TYPE, THREEMA_ATTACHMENT.toString());
385-
meta.set(ExtraProperties.LINKED_ITEMS, revertEscapeQuery(m.getMediaQuery())); // $NON-NLS-1$
385+
meta.set(ExtraProperties.LINKED_ITEMS, revertEscapeQuery(m.getMediaQuery()));
386386
}
387387
if (m.getMediaItem() != null && m.getMediaItem().getThumb() != null) {
388388
meta.set(ExtraProperties.THUMBNAIL_BASE64, Base64.getEncoder().encodeToString(m.getMediaItem().getThumb()));
389389
}
390390
if (!m.getChildPornSets().isEmpty()) {
391-
meta.set("hash:status", "pedo"); //$NON-NLS-1$ //$NON-NLS-2$
391+
meta.set(ExtraProperties.HASHDB_STATUS, "pedo");
392392
for (String set : m.getChildPornSets()) {
393-
meta.add("hash:set", set); //$NON-NLS-1$
393+
meta.add(ExtraProperties.HASHDB_SET, set);
394394
}
395395
}
396396

iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WhatsAppParser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,12 +1082,12 @@ private void extractMessages(String chatName, Chat c, List<Message> messages, WA
10821082
}
10831083
if (m.getMediaQuery() != null && m.getMediaSize() > 2) {
10841084
meta.set(StandardParser.INDEXER_CONTENT_TYPE, WHATSAPP_ATTACHMENT.toString());
1085-
meta.set(ExtraProperties.LINKED_ITEMS, revertEscapeQuery(m.getMediaQuery())); // $NON-NLS-1$
1085+
meta.set(ExtraProperties.LINKED_ITEMS, revertEscapeQuery(m.getMediaQuery()));
10861086
}
10871087
if (!m.getChildPornSets().isEmpty()) {
1088-
meta.set("hash:status", "pedo"); //$NON-NLS-1$ //$NON-NLS-2$
1088+
meta.set(ExtraProperties.HASHDB_STATUS, "pedo");
10891089
for (String set : m.getChildPornSets()) {
1090-
meta.add("hash:set", set); //$NON-NLS-1$
1090+
meta.add(ExtraProperties.HASHDB_SET, set);
10911091
}
10921092
}
10931093

0 commit comments

Comments
 (0)