V1.3.0

Author: TheElementalOfDestruction

CHANGELOG.md

@@ -1,3 +1,6 @@
+**v1.3.0**
+* Upgraded to `extract-msg` version 0.35.0. Named properties viewer has been updated to reflect the new form.
+
 **v1.2.7**
 * Fixed typo that prevented named properties on attachments from being viewed if they were a stream.
 * Removed debug prints that accidentally made it into the release.

README.rst

@@ -77,8 +77,8 @@ Credits
 .. |License: GPL v3| image:: https://img.shields.io/badge/License-GPLv3-blue.svg
    :target: LICENSE.txt
 
-.. |PyPI3| image:: https://img.shields.io/badge/pypi-1.2.7-blue.svg
-   :target: https://pypi.org/project/msg-explorer/1.2.7/
+.. |PyPI3| image:: https://img.shields.io/badge/pypi-1.3.0-blue.svg
+   :target: https://pypi.org/project/msg-explorer/1.3.0/
 
 .. |PyPI2| image:: https://img.shields.io/badge/python-3.6+-brightgreen.svg
    :target: https://www.python.org/downloads/release/python-367/

msg_explorer/__init__.py

@@ -27,8 +27,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 __author__ = 'Destiny Peterson'
-__date__ = '2022-07-04'
-__version__ = '1.2.7'
+__date__ = '2022-07-11'
+__version__ = '1.3.0'
 
 # When this module is imported, we should try to compile the forms. They only
 # compile when they are outdated.

msg_explorer/named_properties_viewer.py

@@ -50,8 +50,9 @@ def loadNamed(self):
         self.ui.tableNamedProperties.setRowCount(len(self.__named))
         self.ui.tableNamedProperties.setSortingEnabled(False)
         for index, key in enumerate(self.__named):
-            self.ui.tableNamedProperties.setItem(index, 0, QTableWidgetItem(key))
-            self.ui.tableNamedProperties.setItem(index, 1, NamedPIDItem(str(self.__named[key].namedPropertyID)))
+            self.ui.tableNamedProperties.setItem(index, 0, QTableWidgetItem(key[0]))
+            self.ui.tableNamedProperties.setItem(index, 1, QTableWidgetItem(key[1]))
+            self.ui.tableNamedProperties.setItem(index, 2, NamedPIDItem(str(self.__named[key].namedPropertyID)))
         self.ui.tableNamedProperties.setSortingEnabled(True)
 
     @Slot()
@@ -77,9 +78,9 @@ def msgOpened(self, msgFile):
 
     @Slot(int, int)
     def _cellDoubleClicked(self, row, column):
-        if self.ui.tableNamedProperties.item(row, 2).data(0) == '[Stream]':
+        if self.ui.tableNamedProperties.item(row, 3).data(0) == '[Stream]':
             name = self.ui.tableNamedProperties.item(row, 0).data(0)
-            code = 0x8000 + int(self.ui.tableNamedProperties.item(row, 1).data(0))
+            code = 0x8000 + int(self.ui.tableNamedProperties.item(row, 2).data(0))
             if self.ui.comboBoxInstance.currentText() == 'MSG File':
                 start = ['']
             else:
@@ -111,16 +112,17 @@ def _comboBoxChanged(self, entry):
 
             self.ui.tableNamedProperties.setSortingEnabled(False)
             for index in range(self.ui.tableNamedProperties.rowCount()):
-                key = self.ui.tableNamedProperties.item(index, 0).data(0)
+                key = (self.ui.tableNamedProperties.item(index, 0).data(0),
+                       self.ui.tableNamedProperties.item(index, 1).data(0))
                 # We need to figure out what to display for the data.
                 data = getData(self.__named[key])
                 if isinstance(data, (int, float, bool, None.__class__)):
                     # This helps to shortcut a bunch of properties.
-                    self.ui.tableNamedProperties.setItem(index, 2, QTableWidgetItem(utils.dataToString(data)))
+                    self.ui.tableNamedProperties.setItem(index, 3, QTableWidgetItem(utils.dataToString(data)))
                 elif isinstance(data, (bytes, list, tuple)) or getStream(f'__substg1.0_{self.__named[key].propertyStreamID}')[0]:
-                    self.ui.tableNamedProperties.setItem(index, 2, QTableWidgetItem('[Stream]'))
+                    self.ui.tableNamedProperties.setItem(index, 3, QTableWidgetItem('[Stream]'))
                 else:
-                    self.ui.tableNamedProperties.setItem(index, 2, QTableWidgetItem(utils.dataToString(data)))
+                    self.ui.tableNamedProperties.setItem(index, 3, QTableWidgetItem(utils.dataToString(data)))
             self.ui.tableNamedProperties.setSortingEnabled(True)
 
 

msg_explorer/ui/named_properties_viewer.ui

@@ -36,6 +36,11 @@
        <string>Property ID</string>
       </property>
      </column>
+     <column>
+      <property name="text">
+       <string>Property Set GUID</string>
+      </property>
+     </column>
      <column>
       <property name="text">
        <string>Named PID</string>

requirements.txt

@@ -1,4 +1,4 @@
 
 # First level requirements
-extract-msg>=0.33.0, <0.35.0
+extract-msg>=0.35.1, <0.36.0
 PySide6>=6.3.0