v1.2.6

Author: TheElementalOfDestruction

.gitignore

@@ -60,6 +60,7 @@ Thumbs.db
 *.opensdf
 *.vcxproj
 *vcxproj.*
+.vs
 
 # MinGW generated files
 *.Debug

CHANGELOG.md

@@ -1,3 +1,7 @@
+**v1.2.6**
+* Fixed bugs in named property viewer.
+* Fixed a bug where sorting caused various tables to display incorrectly (forgot to turn off sorting while editing them and turn it back on afterwards).
+
 **v1.2.5**
 * Fixed issue that cause the multiple viewer to not clear it's data.
 

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.5-blue.svg
-   :target: https://pypi.org/project/msg-explorer/1.2.5/
+.. |PyPI3| image:: https://img.shields.io/badge/pypi-1.2.6-blue.svg
+   :target: https://pypi.org/project/msg-explorer/1.2.6/
 
 .. |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-06-23'
-__version__ = '1.2.5'
+__date__ = '2022-06-25'
+__version__ = '1.2.6'
 
 # When this module is imported, we should try to compile the forms. They only
 # compile when they are outdated.

msg_explorer/attachments_browser.py

@@ -42,21 +42,23 @@ def msgOpened(self, msgFile):
         self.ui.tableAttachments.setRowCount(totalAttachments)
         indexPostfix = ' (Regular)' if self.__isSigned else ''
         count = 0
+        self.ui.tableAttachments.setSortingEnabled(False)
         for index, att in enumerate(msgFile._rawAttachments if self.__isSigned else msgFile.attachments):
             self.ui.tableAttachments.setItem(index, 0, QTableWidgetItem(str(index) + indexPostfix))
             if isinstance(att, extract_msg.Attachment):
                 self.ui.tableAttachments.setItem(index, 1, QTableWidgetItem("OK"))
-                self.ui.tableAttachments.setItem(index, 2, QTableWidgetItem(att.shortFilename))
-                self.ui.tableAttachments.setItem(index, 3, QTableWidgetItem(att.longFilename))
-                self.ui.tableAttachments.setItem(index, 4, QTableWidgetItem(att.cid))
-                self.ui.tableAttachments.setItem(index, 5, QTableWidgetItem(att.mimetype))
-                self.ui.tableAttachments.setItem(index, 6, QTableWidgetItem("Not Rendered" if att.renderingPosition and att.renderingPosition == 0xFFFFFFFF else str(att.renderingPosition)))
             elif isinstance(att, extract_msg.attachment.BrokenAttachment):
                 self.ui.tableAttachments.setItem(index, 1, QTableWidgetItem("Broken"))
             elif isinstance(att, extract_msg.attachment.UnsupportedAttachment):
                 self.ui.tableAttachments.setItem(index, 1, QTableWidgetItem("Unsupported"))
             else:
                 self.ui.tableAttachments.setItem(index, 1, QTableWidgetItem("Unknown Type"))
+            self.ui.tableAttachments.setItem(index, 2, QTableWidgetItem(att.shortFilename))
+            self.ui.tableAttachments.setItem(index, 3, QTableWidgetItem(att.longFilename))
+            self.ui.tableAttachments.setItem(index, 4, QTableWidgetItem(att.cid))
+            print(att.mimetype)
+            self.ui.tableAttachments.setItem(index, 5, QTableWidgetItem(att.mimetype))
+            self.ui.tableAttachments.setItem(index, 6, QTableWidgetItem("Not Rendered" if att.renderingPosition and att.renderingPosition == 0xFFFFFFFF else str(att.renderingPosition)))
             count += 1
         if self.__isSigned:
             # If it's signed, also display the regular attachments.
@@ -67,6 +69,8 @@ def msgOpened(self, msgFile):
                 self.ui.tableAttachments.setItem(count + index, 3, QTableWidgetItem(att.name))
                 self.ui.tableAttachments.setItem(count + index, 5, QTableWidgetItem(att.mimetype))
 
+        self.ui.tableAttachments.setSortingEnabled(True)
+
     @Slot(int, int)
     def _cellDoubleClicked(self, row : int, column : int):
         """

msg_explorer/named_properties_viewer.py

@@ -1,15 +1,21 @@
 # This Python file uses the following encoding: utf-8
+import logging
+
 import extract_msg
 
 from PySide6 import QtCore
 from PySide6 import QtWidgets
 from PySide6.QtCore import Signal, SIGNAL, Slot, SLOT
-from PySide6.QtWidgets import QTableWidgetItem
+from PySide6.QtWidgets import QMessageBox, QTableWidgetItem
 
 from . import utils
 from .ui.ui_named_properties_viewer import Ui_NamedPropertiesViewer
 
 
+logger = logging.getLogger(__name__)
+logger.addHandler(logging.NullHandler())
+
+
 class NamedPIDItem(QTableWidgetItem):
     """
     Little bit of a hack to force the Named PID column to sort properly.
@@ -42,14 +48,18 @@ def loadNamed(self):
         property, not the data.
         """
         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))
+            #print(self.__named[key].namedPropertyID)
             self.ui.tableNamedProperties.setItem(index, 1, NamedPIDItem(str(self.__named[key].namedPropertyID)))
+        self.ui.tableNamedProperties.setSortingEnabled(True)
 
     @Slot()
     def msgClosed(self):
         self.ui.comboBoxInstance.clear()
         self.ui.tableNamedProperties.clearContents()
+        self.ui.tableNamedProperties.setRowCount(0)
         self.__msg = None
         self.__named = None
         self.__attachments = None
@@ -80,6 +90,7 @@ def _cellDoubleClicked(self, row, column):
             # path to give to the signal.
             for _type in extract_msg.constants.PTYPES:
                 start[-1] = f'__substg1.0_{code:04X}{_type:04X}'
+                logger.info(f'Checking for named property stream at {start}')
                 if self.__msg.exists(start):
                     return self.namedPropertySelected.emit(start)
             else:
@@ -99,6 +110,7 @@ def _comboBoxChanged(self, entry):
                 getData = attachment.namedProperties.get
                 getStream = attachment._getTypedStream
 
+            self.ui.tableNamedProperties.setSortingEnabled(False)
             for index in range(self.ui.tableNamedProperties.rowCount()):
                 key = self.ui.tableNamedProperties.item(index, 0).data(0)
                 # We need to figure out what to display for the data.
@@ -110,6 +122,7 @@ def _comboBoxChanged(self, entry):
                     self.ui.tableNamedProperties.setItem(index, 2, QTableWidgetItem('[Stream]'))
                 else:
                     self.ui.tableNamedProperties.setItem(index, 2, QTableWidgetItem(utils.dataToString(data)))
+            self.ui.tableNamedProperties.setSortingEnabled(True)