From eda2459b13785c94ad5cfbd88ae5ea44b5b0a530 Mon Sep 17 00:00:00 2001 From: lolo101 Date: Mon, 1 Apr 2024 19:46:00 +0200 Subject: [PATCH] conversion Message -> MSG moved to msgparser --- .../MSGViewer/factory/MessageSaver.java | 2 +- .../factory/msg/lib/MSTimeConvert.java | 26 +--- .../factory/msg/properties/PropPtypTime.java | 24 --- .../src/test/resources/issue129/test.eml | 142 ------------------ msgparser/pom.xml | 12 ++ .../java/com/auxilii/msgparser/Message.java | 14 -- .../com/auxilii/msgparser}/MsgContainer.java | 13 +- .../com/auxilii/msgparser}/MsgWriter.java | 3 +- .../msgparser}/entries/BinaryEntry.java | 6 +- .../msgparser}/entries/BodyHtmlEntry.java | 2 +- .../msgparser}/entries/BodyTextEntry.java | 2 +- .../entries/CompressedRTFEntry.java | 2 +- .../msgparser}/entries/EntryStreamEntry.java | 2 +- .../msgparser}/entries/GuidStreamEntry.java | 2 +- .../msgparser}/entries/HeadersEntry.java | 2 +- .../msgparser}/entries/MessageClassEntry.java | 4 +- .../msgparser}/entries/StringStreamEntry.java | 2 +- .../entries/StringUTF16SubstgEntry.java | 6 +- .../msgparser}/entries/SubStorageEntry.java | 4 +- .../msgparser}/entries/SubjectEntry.java | 2 +- .../properties/PropPtypByteArray.java | 2 +- .../properties/PropPtypInteger32.java | 2 +- .../msgparser}/properties/PropPtypString.java | 2 +- .../msgparser/properties/PropPtypTime.java | 42 ++++++ .../msgparser}/properties/PropType.java | 2 +- .../com/auxilii/msgparser}/MsgWriterTest.java | 38 ++--- 26 files changed, 100 insertions(+), 260 deletions(-) delete mode 100644 MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropPtypTime.java delete mode 100644 MSGViewer/src/test/resources/issue129/test.eml rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/MsgContainer.java (96%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/MsgWriter.java (87%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/entries/BinaryEntry.java (75%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/entries/BodyHtmlEntry.java (77%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/entries/BodyTextEntry.java (78%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/entries/CompressedRTFEntry.java (80%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/entries/EntryStreamEntry.java (79%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/entries/GuidStreamEntry.java (78%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/entries/HeadersEntry.java (81%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/entries/MessageClassEntry.java (66%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/entries/StringStreamEntry.java (79%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/entries/StringUTF16SubstgEntry.java (83%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/entries/SubStorageEntry.java (86%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/entries/SubjectEntry.java (78%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/properties/PropPtypByteArray.java (86%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/properties/PropPtypInteger32.java (86%) rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/properties/PropPtypString.java (86%) create mode 100644 msgparser/src/main/java/com/auxilii/msgparser/properties/PropPtypTime.java rename {MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/main/java/com/auxilii/msgparser}/properties/PropType.java (92%) rename {MSGViewer/src/test/java/net/sourceforge/MSGViewer/factory/msg => msgparser/src/test/java/com/auxilii/msgparser}/MsgWriterTest.java (55%) diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/MessageSaver.java b/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/MessageSaver.java index 5205d44e..82405a46 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/MessageSaver.java +++ b/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/MessageSaver.java @@ -1,10 +1,10 @@ package net.sourceforge.MSGViewer.factory; import com.auxilii.msgparser.Message; +import com.auxilii.msgparser.MsgWriter; import net.sourceforge.MSGViewer.AttachmentRepository; import net.sourceforge.MSGViewer.factory.mbox.EMLWriterViaJavaMail; import net.sourceforge.MSGViewer.factory.mbox.MBoxWriterViaJavaMail; -import net.sourceforge.MSGViewer.factory.msg.MsgWriter; import java.io.IOException; import java.io.OutputStream; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/lib/MSTimeConvert.java b/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/lib/MSTimeConvert.java index f080bebd..39c7caa5 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/lib/MSTimeConvert.java +++ b/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/lib/MSTimeConvert.java @@ -3,39 +3,23 @@ public class MSTimeConvert { /** - * difference between 1-1-1601 and 1-1-1970 in millisecond + * difference between 1-1-1601 and 1-1-1970 in milliseconds */ public static final long MS_EPOCH_OFFSET = 11644473600000L; /** - * convert a 64 bit Integer value to a normal time field. - * MS hat here nanoseconds since 1601 + * convert a 64-bit Integer value to a normal time field. + * MS time counts hundreds of nanoseconds since 1601. * * @return the time in millis since 1970 same as System.currentTime() does * this is the value in UTC timezone! */ public static long PtypeTime2Millis(long time) { - time /= 10L; // micro - time /= 1000L; // milli + time /= 10L; // micros + time /= 1000L; // millis time -= MS_EPOCH_OFFSET; // offset since 1601 return time; } - - - /** - * convert a 64 bit Integer value to a normal time field. - * MS hat here nanoseconds since 1601 - * - * @return returns the time in nabos since 1.1.1601 - */ - public static long Millis2PtypeTime(long time) { - time += MS_EPOCH_OFFSET; // offset since 1601 - - time *= 10L; // micro - time *= 1000L; // milli - - return time; - } } diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropPtypTime.java b/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropPtypTime.java deleted file mode 100644 index 3ddcbe58..00000000 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropPtypTime.java +++ /dev/null @@ -1,24 +0,0 @@ -package net.sourceforge.MSGViewer.factory.msg.properties; - -import com.auxilii.msgparser.Pid; -import net.sourceforge.MSGViewer.factory.msg.lib.MSTimeConvert; - -import static com.auxilii.msgparser.Ptyp.PtypTime; - -public class PropPtypTime extends PropType { - private final long value; - - /** - * @param id id of the property - * @param value in milliseconds since 1.1.1970 - */ - public PropPtypTime(Pid id, long value) { - super(id, PtypTime); - this.value = MSTimeConvert.Millis2PtypeTime(value); - } - - @Override - protected long getPropertiesContent() { - return value; - } -} diff --git a/MSGViewer/src/test/resources/issue129/test.eml b/MSGViewer/src/test/resources/issue129/test.eml deleted file mode 100644 index dca8b85f..00000000 --- a/MSGViewer/src/test/resources/issue129/test.eml +++ /dev/null @@ -1,142 +0,0 @@ -X-Mozilla-Status: 0001 -X-Mozilla-Status2: 00000000 -X-Mozilla-Keys: -X-Mozilla-Status: 0001 -X-Mozilla-Status2: 00000000 -Message-Id: -Date: Sun, 4 Sep 2022 17:50:19 +0200 -Mime-Version: 1.0 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 - Thunderbird/102.2.0 -Content-Language: fr-FR -To: lbroquet -From: =?UTF-8?Q?Lo=c3=afc_Broquet?= -X-Enigmail-Draft-Status: N00201 -X-Mozilla-Draft-Info: internal/draft; vcard=0; receipt=0; DSN=0; uuencode=0; - attachmentreminder=0; deliveryformat=0 -X-Identity-Key: id1 -Fcc: mailbox://lbroquet@pop.sfr.fr/Sent -Subject: test127 -Content-Type: multipart/mixed; boundary="------------3EjuttzkEubrckLt8973XLoZ" -References: <41e56d31-9ce0-a484-ac0e-3922bdf960fe@neuf.fr> - ---------------3EjuttzkEubrckLt8973XLoZ -Content-Type: multipart/mixed; boundary="------------RzZrRuhmKtyPWjzdEcFTEj3w"; - protected-headers="v1" -Subject: test127 -From: =?UTF-8?Q?Lo=c3=afc_Broquet?= -To: lbroquet -Message-ID: <41e56d31-9ce0-a484-ac0e-3922bdf960fe@neuf.fr> - ---------------RzZrRuhmKtyPWjzdEcFTEj3w -Content-Type: multipart/related; - boundary="------------QGtU7DJaJN0liDSiSzu0P1Ib" - ---------------QGtU7DJaJN0liDSiSzu0P1Ib -Content-Type: text/html; charset=UTF-8 -Content-Transfer-Encoding: 7bit - - - - - - test127 - - -

Embedded image

-

Tokien smoking - pipe

-
- - ---------------QGtU7DJaJN0liDSiSzu0P1Ib -Content-Type: image/gif; name="tolk.gif" -Content-Disposition: inline; filename="tolk.gif" -Content-Id: -Content-Transfer-Encoding: base64 - -R0lGODlhVQBVAPcAAAAAAAEBAQICAgMDAwQEBAUFBQYGBgcHBwgICAkJCQoKCgsLCwwMDA0N -DQ4ODg8PDxAQEBERERISEhMTExQUFBUVFRYWFhcXFxgYGBkZGRoaGhsbGxwcHB0dHR4eHh8f -HyAgICEhISIiIiMjIyQkJCUlJSYmJicnJygoKCkpKSoqKisrKywsLC0tLS4uLi8vLzAwMDEx -MTIyMjMzMzQ0NDU1NTY2Njc3Nzg4ODk5OTo6Ojs7Ozw8PD09PT4+Pj8/P0BAQEFBQUJCQkND -Q0REREVFRUZGRkdHR0hISElJSUpKSktLS0xMTE1NTU5OTk9PT1BQUFFRUVJSUlNTU1RUVFVV -VVZWVldXV1hYWFlZWVpaWltbW1xcXF1dXV5eXl9fX2BgYGFhYWJiYmNjY2RkZGVlZWZmZmdn -Z2hoaGlpaWpqamtra2xsbG1tbW5ubm9vb3BwcHFxcXJycnNzc3R0dHV1dXZ2dnd3d3h4eHl5 -eXp6ent7e3x8fH19fX5+fn9/f4CAgIGBgYKCgoODg4SEhIWFhYaGhoeHh4iIiImJiYqKiouL -i4yMjI2NjY6Ojo+Pj5CQkJGRkZKSkpOTk5SUlJWVlZaWlpeXl5iYmJmZmZqampubm5ycnJ2d -nZ6enp+fn6CgoKGhoaKioqOjo6SkpKWlpaampqenp6ioqKmpqaqqqqurq6ysrK2tra6urq+v -r7CwsLGxsbKysrOzs7S0tLW1tba2tre3t7i4uLm5ubq6uru7u7y8vL29vb6+vr+/v8DAwMHB -wcLCwsPDw8TExMXFxcbGxsfHx8jIyMnJycrKysvLy8zMzM3Nzc7Ozs/Pz9DQ0NHR0dLS0tPT -09TU1NXV1dbW1tfX19jY2NnZ2dra2tvb29zc3N3d3d7e3t/f3+Dg4OHh4eLi4uPj4+Tk5OXl -5ebm5ufn5+jo6Onp6erq6uvr6+zs7O3t7e7u7u/v7/Dw8PHx8fLy8vPz8/T09PX19fb29vf3 -9/j4+Pn5+fr6+vv7+/z8/P39/f7+/v///ywAAAAAVQBVAAAI/wC/VBEo0JKsTIAG5hAhIoUI -IQQHKoRoMBPCO4AwaswIqGJHWbI4arTEceDGjSQxSiQ4MmHEL5ZAIVSYIkUOITlyvrxZJabF -jCMxWgR2DRjReEjjFV1KFNjBTHcqQgVk6OnUkyQtvux58M6XhTZxCsGZQ2DCsh9/3okqc+i1 -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 -nnlqqt8pmsKJfQEBADs= - ---------------QGtU7DJaJN0liDSiSzu0P1Ib-- - ---------------RzZrRuhmKtyPWjzdEcFTEj3w-- - ---------------3EjuttzkEubrckLt8973XLoZ-- diff --git a/msgparser/pom.xml b/msgparser/pom.xml index ee99cfe6..900ba709 100644 --- a/msgparser/pom.xml +++ b/msgparser/pom.xml @@ -36,5 +36,17 @@ 5.10.3 test + + com.google.jimfs + jimfs + 1.3.0 + test + + + org.assertj + assertj-core + 3.25.3 + test + diff --git a/msgparser/src/main/java/com/auxilii/msgparser/Message.java b/msgparser/src/main/java/com/auxilii/msgparser/Message.java index 56377c17..1dcfdffc 100644 --- a/msgparser/src/main/java/com/auxilii/msgparser/Message.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/Message.java @@ -58,10 +58,6 @@ public class Message { private static final String DATE_HEADER_KEY = "date:"; public static final DateTimeFormatter DATE_TIME_FORMATTER = new DateTimeFormatterBuilder().appendPattern("[EEE, ]d MMM y HH:mm[:ss] Z").toFormatter(Locale.US); - /** - * The message class as defined in the .msg file. - */ - private String messageClass = "IPM.Note"; /** * The message Id. */ @@ -143,9 +139,6 @@ public void addRecipient(RecipientEntry recipient) { void setProperty(Property property) { this.properties.add(property); switch (property.getPid()) { - case PidTagMessageClass: - this.setMessageClass((String) property.getValue()); - break; case PidTagInternetMessageId: this.setMessageId((String) property.getValue()); break; @@ -362,13 +355,6 @@ private void setDisplayBcc(String displayBcc) { this.displayBcc = displayBcc; } - /** - * @param messageClass the messageClass to set - */ - private void setMessageClass(String messageClass) { - this.messageClass = messageClass; - } - /** * @return the messageId */ diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/MsgContainer.java b/msgparser/src/main/java/com/auxilii/msgparser/MsgContainer.java similarity index 96% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/MsgContainer.java rename to msgparser/src/main/java/com/auxilii/msgparser/MsgContainer.java index e208beaf..a598c9af 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/MsgContainer.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/MsgContainer.java @@ -1,15 +1,12 @@ -package net.sourceforge.MSGViewer.factory.msg; +package com.auxilii.msgparser; -import com.auxilii.msgparser.Message; -import com.auxilii.msgparser.Ptyp; -import com.auxilii.msgparser.RecipientEntry; import com.auxilii.msgparser.attachment.Attachment; import com.auxilii.msgparser.attachment.FileAttachment; import com.auxilii.msgparser.attachment.MsgAttachment; -import net.sourceforge.MSGViewer.factory.msg.entries.*; -import net.sourceforge.MSGViewer.factory.msg.properties.PropPtypInteger32; -import net.sourceforge.MSGViewer.factory.msg.properties.PropPtypTime; -import net.sourceforge.MSGViewer.factory.msg.properties.PropType; +import com.auxilii.msgparser.entries.*; +import com.auxilii.msgparser.properties.PropPtypInteger32; +import com.auxilii.msgparser.properties.PropPtypTime; +import com.auxilii.msgparser.properties.PropType; import org.apache.poi.poifs.filesystem.DirectoryEntry; import java.io.ByteArrayInputStream; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/MsgWriter.java b/msgparser/src/main/java/com/auxilii/msgparser/MsgWriter.java similarity index 87% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/MsgWriter.java rename to msgparser/src/main/java/com/auxilii/msgparser/MsgWriter.java index 078b136f..c1ba170c 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/MsgWriter.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/MsgWriter.java @@ -1,6 +1,5 @@ -package net.sourceforge.MSGViewer.factory.msg; +package com.auxilii.msgparser; -import com.auxilii.msgparser.Message; import org.apache.poi.poifs.filesystem.DirectoryNode; import org.apache.poi.poifs.filesystem.POIFSFileSystem; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/BinaryEntry.java b/msgparser/src/main/java/com/auxilii/msgparser/entries/BinaryEntry.java similarity index 75% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/BinaryEntry.java rename to msgparser/src/main/java/com/auxilii/msgparser/entries/BinaryEntry.java index ca3dc568..2f19e8f5 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/BinaryEntry.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/entries/BinaryEntry.java @@ -1,8 +1,8 @@ -package net.sourceforge.MSGViewer.factory.msg.entries; +package com.auxilii.msgparser.entries; import com.auxilii.msgparser.Pid; -import net.sourceforge.MSGViewer.factory.msg.properties.PropPtypByteArray; -import net.sourceforge.MSGViewer.factory.msg.properties.PropType; +import com.auxilii.msgparser.properties.PropPtypByteArray; +import com.auxilii.msgparser.properties.PropType; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/BodyHtmlEntry.java b/msgparser/src/main/java/com/auxilii/msgparser/entries/BodyHtmlEntry.java similarity index 77% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/BodyHtmlEntry.java rename to msgparser/src/main/java/com/auxilii/msgparser/entries/BodyHtmlEntry.java index bc16f478..e2df67d2 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/BodyHtmlEntry.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/entries/BodyHtmlEntry.java @@ -1,4 +1,4 @@ -package net.sourceforge.MSGViewer.factory.msg.entries; +package com.auxilii.msgparser.entries; import static com.auxilii.msgparser.Pid.PidTagHtml; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/BodyTextEntry.java b/msgparser/src/main/java/com/auxilii/msgparser/entries/BodyTextEntry.java similarity index 78% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/BodyTextEntry.java rename to msgparser/src/main/java/com/auxilii/msgparser/entries/BodyTextEntry.java index 21776bab..cbfd0e90 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/BodyTextEntry.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/entries/BodyTextEntry.java @@ -1,4 +1,4 @@ -package net.sourceforge.MSGViewer.factory.msg.entries; +package com.auxilii.msgparser.entries; import static com.auxilii.msgparser.Pid.PidTagBody; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/CompressedRTFEntry.java b/msgparser/src/main/java/com/auxilii/msgparser/entries/CompressedRTFEntry.java similarity index 80% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/CompressedRTFEntry.java rename to msgparser/src/main/java/com/auxilii/msgparser/entries/CompressedRTFEntry.java index c88e30e8..2f7d63f7 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/CompressedRTFEntry.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/entries/CompressedRTFEntry.java @@ -1,4 +1,4 @@ -package net.sourceforge.MSGViewer.factory.msg.entries; +package com.auxilii.msgparser.entries; import static com.auxilii.msgparser.Pid.PidTagRtfCompressed; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/EntryStreamEntry.java b/msgparser/src/main/java/com/auxilii/msgparser/entries/EntryStreamEntry.java similarity index 79% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/EntryStreamEntry.java rename to msgparser/src/main/java/com/auxilii/msgparser/entries/EntryStreamEntry.java index a9e241d4..013278c2 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/EntryStreamEntry.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/entries/EntryStreamEntry.java @@ -1,4 +1,4 @@ -package net.sourceforge.MSGViewer.factory.msg.entries; +package com.auxilii.msgparser.entries; import static com.auxilii.msgparser.Pid.PidTagEntryStream; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/GuidStreamEntry.java b/msgparser/src/main/java/com/auxilii/msgparser/entries/GuidStreamEntry.java similarity index 78% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/GuidStreamEntry.java rename to msgparser/src/main/java/com/auxilii/msgparser/entries/GuidStreamEntry.java index 178eec9b..95d6e0b2 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/GuidStreamEntry.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/entries/GuidStreamEntry.java @@ -1,4 +1,4 @@ -package net.sourceforge.MSGViewer.factory.msg.entries; +package com.auxilii.msgparser.entries; import static com.auxilii.msgparser.Pid.PidTagGuidStream; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/HeadersEntry.java b/msgparser/src/main/java/com/auxilii/msgparser/entries/HeadersEntry.java similarity index 81% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/HeadersEntry.java rename to msgparser/src/main/java/com/auxilii/msgparser/entries/HeadersEntry.java index cc345c55..0b30aedd 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/HeadersEntry.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/entries/HeadersEntry.java @@ -1,4 +1,4 @@ -package net.sourceforge.MSGViewer.factory.msg.entries; +package com.auxilii.msgparser.entries; import static com.auxilii.msgparser.Pid.PidTagTransportMessageHeaders; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/MessageClassEntry.java b/msgparser/src/main/java/com/auxilii/msgparser/entries/MessageClassEntry.java similarity index 66% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/MessageClassEntry.java rename to msgparser/src/main/java/com/auxilii/msgparser/entries/MessageClassEntry.java index 8e515b7c..347b5052 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/MessageClassEntry.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/entries/MessageClassEntry.java @@ -1,9 +1,9 @@ -package net.sourceforge.MSGViewer.factory.msg.entries; +package com.auxilii.msgparser.entries; import static com.auxilii.msgparser.Pid.PidTagMessageClass; public class MessageClassEntry extends StringUTF16SubstgEntry { - public static final String IPM_NOTE = "IPM.Note"; + private static final String IPM_NOTE = "IPM.Note"; public MessageClassEntry() { super(PidTagMessageClass, IPM_NOTE); diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/StringStreamEntry.java b/msgparser/src/main/java/com/auxilii/msgparser/entries/StringStreamEntry.java similarity index 79% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/StringStreamEntry.java rename to msgparser/src/main/java/com/auxilii/msgparser/entries/StringStreamEntry.java index 2c6f0a80..b0a8e25f 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/StringStreamEntry.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/entries/StringStreamEntry.java @@ -1,4 +1,4 @@ -package net.sourceforge.MSGViewer.factory.msg.entries; +package com.auxilii.msgparser.entries; import static com.auxilii.msgparser.Pid.PidTagStringStream; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/StringUTF16SubstgEntry.java b/msgparser/src/main/java/com/auxilii/msgparser/entries/StringUTF16SubstgEntry.java similarity index 83% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/StringUTF16SubstgEntry.java rename to msgparser/src/main/java/com/auxilii/msgparser/entries/StringUTF16SubstgEntry.java index fce8566c..602c7c0a 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/StringUTF16SubstgEntry.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/entries/StringUTF16SubstgEntry.java @@ -1,8 +1,8 @@ -package net.sourceforge.MSGViewer.factory.msg.entries; +package com.auxilii.msgparser.entries; import com.auxilii.msgparser.Pid; -import net.sourceforge.MSGViewer.factory.msg.properties.PropPtypString; -import net.sourceforge.MSGViewer.factory.msg.properties.PropType; +import com.auxilii.msgparser.properties.PropPtypString; +import com.auxilii.msgparser.properties.PropType; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/SubStorageEntry.java b/msgparser/src/main/java/com/auxilii/msgparser/entries/SubStorageEntry.java similarity index 86% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/SubStorageEntry.java rename to msgparser/src/main/java/com/auxilii/msgparser/entries/SubStorageEntry.java index 9cc5e7e1..0822323e 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/SubStorageEntry.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/entries/SubStorageEntry.java @@ -1,8 +1,8 @@ -package net.sourceforge.MSGViewer.factory.msg.entries; +package com.auxilii.msgparser.entries; import com.auxilii.msgparser.Pid; import com.auxilii.msgparser.Ptyp; -import net.sourceforge.MSGViewer.factory.msg.properties.PropType; +import com.auxilii.msgparser.properties.PropType; import org.apache.poi.poifs.filesystem.DirectoryEntry; import java.io.IOException; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/SubjectEntry.java b/msgparser/src/main/java/com/auxilii/msgparser/entries/SubjectEntry.java similarity index 78% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/SubjectEntry.java rename to msgparser/src/main/java/com/auxilii/msgparser/entries/SubjectEntry.java index a0d8e63c..d088500c 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/entries/SubjectEntry.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/entries/SubjectEntry.java @@ -1,4 +1,4 @@ -package net.sourceforge.MSGViewer.factory.msg.entries; +package com.auxilii.msgparser.entries; import static com.auxilii.msgparser.Pid.PidTagSubject; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropPtypByteArray.java b/msgparser/src/main/java/com/auxilii/msgparser/properties/PropPtypByteArray.java similarity index 86% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropPtypByteArray.java rename to msgparser/src/main/java/com/auxilii/msgparser/properties/PropPtypByteArray.java index 0564a2e1..f816940f 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropPtypByteArray.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/properties/PropPtypByteArray.java @@ -1,4 +1,4 @@ -package net.sourceforge.MSGViewer.factory.msg.properties; +package com.auxilii.msgparser.properties; import com.auxilii.msgparser.Pid; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropPtypInteger32.java b/msgparser/src/main/java/com/auxilii/msgparser/properties/PropPtypInteger32.java similarity index 86% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropPtypInteger32.java rename to msgparser/src/main/java/com/auxilii/msgparser/properties/PropPtypInteger32.java index 62ab948f..cccc9fe8 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropPtypInteger32.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/properties/PropPtypInteger32.java @@ -1,4 +1,4 @@ -package net.sourceforge.MSGViewer.factory.msg.properties; +package com.auxilii.msgparser.properties; import com.auxilii.msgparser.Pid; diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropPtypString.java b/msgparser/src/main/java/com/auxilii/msgparser/properties/PropPtypString.java similarity index 86% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropPtypString.java rename to msgparser/src/main/java/com/auxilii/msgparser/properties/PropPtypString.java index d756d69f..e83d5162 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropPtypString.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/properties/PropPtypString.java @@ -1,4 +1,4 @@ -package net.sourceforge.MSGViewer.factory.msg.properties; +package com.auxilii.msgparser.properties; import com.auxilii.msgparser.Pid; diff --git a/msgparser/src/main/java/com/auxilii/msgparser/properties/PropPtypTime.java b/msgparser/src/main/java/com/auxilii/msgparser/properties/PropPtypTime.java new file mode 100644 index 00000000..60e03cf4 --- /dev/null +++ b/msgparser/src/main/java/com/auxilii/msgparser/properties/PropPtypTime.java @@ -0,0 +1,42 @@ +package com.auxilii.msgparser.properties; + +import com.auxilii.msgparser.Pid; + +import static com.auxilii.msgparser.Ptyp.PtypTime; + +public class PropPtypTime extends PropType { + /** + * difference between 1-1-1601 and 1-1-1970 in milliseconds + */ + private static final long MS_EPOCH_OFFSET = 11644473600000L; + private final long value; + + /** + * @param id id of the property + * @param value in milliseconds since 1.1.1970 + */ + public PropPtypTime(Pid id, long value) { + super(id, PtypTime); + this.value = millis2PtypTime(value); + } + + @Override + protected long getPropertiesContent() { + return value; + } + + /** + * convert a 64-bit Integer value to an MS time field. + * MS time counts hundreds of nanoseconds since 1601. + * + * @return returns the time in 100 nanos since 1.1.1601 + */ + private static long millis2PtypTime(long time) { + time += MS_EPOCH_OFFSET; // offset since 1601 in millis + + time *= 1000L; // micros + time *= 10L; // 100 nanos + + return time; + } +} diff --git a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropType.java b/msgparser/src/main/java/com/auxilii/msgparser/properties/PropType.java similarity index 92% rename from MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropType.java rename to msgparser/src/main/java/com/auxilii/msgparser/properties/PropType.java index 5051a072..ac1dd3e1 100644 --- a/MSGViewer/src/main/java/net/sourceforge/MSGViewer/factory/msg/properties/PropType.java +++ b/msgparser/src/main/java/com/auxilii/msgparser/properties/PropType.java @@ -1,4 +1,4 @@ -package net.sourceforge.MSGViewer.factory.msg.properties; +package com.auxilii.msgparser.properties; import com.auxilii.msgparser.Pid; import com.auxilii.msgparser.Ptyp; diff --git a/MSGViewer/src/test/java/net/sourceforge/MSGViewer/factory/msg/MsgWriterTest.java b/msgparser/src/test/java/com/auxilii/msgparser/MsgWriterTest.java similarity index 55% rename from MSGViewer/src/test/java/net/sourceforge/MSGViewer/factory/msg/MsgWriterTest.java rename to msgparser/src/test/java/com/auxilii/msgparser/MsgWriterTest.java index f4d95de1..0115cde6 100644 --- a/MSGViewer/src/test/java/net/sourceforge/MSGViewer/factory/msg/MsgWriterTest.java +++ b/msgparser/src/test/java/com/auxilii/msgparser/MsgWriterTest.java @@ -1,9 +1,7 @@ -package net.sourceforge.MSGViewer.factory.msg; +package com.auxilii.msgparser; -import com.auxilii.msgparser.Message; +import com.auxilii.msgparser.attachment.FileAttachment; import com.google.common.jimfs.Jimfs; -import net.sourceforge.MSGViewer.ModuleLauncher; -import net.sourceforge.MSGViewer.factory.MessageParser; import org.apache.poi.poifs.filesystem.DirectoryNode; import org.apache.poi.poifs.filesystem.DocumentEntry; import org.apache.poi.poifs.filesystem.DocumentInputStream; @@ -11,39 +9,23 @@ import org.junit.jupiter.api.Test; import java.io.OutputStream; -import java.net.URI; import java.nio.charset.StandardCharsets; import java.nio.file.FileSystem; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Objects; import static org.assertj.core.api.Assertions.assertThat; class MsgWriterTest { - @Test - void testWrite() throws Exception { - ModuleLauncher.BaseConfigureLogging(); - - try (FileSystem fileSystem = Jimfs.newFileSystem()) { - Path testOut = fileSystem.getPath("test_out.msg"); - try (OutputStream outputStream = Files.newOutputStream(testOut)) { - Message msg = givenMessage("/danke.msg"); - new MsgWriter(msg).write(outputStream); - } - assertThat(Files.isRegularFile(testOut)).isTrue(); - } - } + private static final String CONTENT_ID = "part1.HRgTI02d.mjRZp5Gh@neuf.fr"; @Test void issue129() throws Exception { - ModuleLauncher.BaseConfigureLogging(); - try (FileSystem fileSystem = Jimfs.newFileSystem()) { Path testOut = fileSystem.getPath("test_out.msg"); try (OutputStream outputStream = Files.newOutputStream(testOut)) { - Message msg = givenMessage("/issue129/test.eml"); + Message msg = givenMessage(); new MsgWriter(msg).write(outputStream); } @@ -53,14 +35,18 @@ void issue129() throws Exception { DocumentEntry contentId = (DocumentEntry) attachment.getEntry("__substg1.0_3712001F"); try (DocumentInputStream stream = new DocumentInputStream(contentId)) { String contentIdValue = new String(stream.readAllBytes(), StandardCharsets.UTF_16LE); - assertThat(contentIdValue).isEqualTo("part1.HRgTI02d.mjRZp5Gh@neuf.fr"); + assertThat(contentIdValue).isEqualTo(CONTENT_ID); } } } } - private static Message givenMessage(String name) throws Exception { - URI uri = Objects.requireNonNull(MsgWriterTest.class.getResource(name)).toURI(); - return new MessageParser(Path.of(uri)).parseMessage(); + private static Message givenMessage() { + Message message = new Message(); + FileAttachment attachment = new FileAttachment(); + attachment.setContentId(CONTENT_ID); + attachment.setData(new byte[0]); + message.addAttachment(attachment); + return message; } }