Skip to content

Commit cb9a6dd

Browse files
v1.2.1
1 parent a96a4ca commit cb9a6dd

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
**v1.2.1**
2+
* Expanded range of compatible extract-msg versions.
3+
* Fixed bugs that prevented properly properties.
4+
15
**v1.2.0**
26
* Updated to new version set of extract-msg (>=0.33.0, <0.34.0). Version 0.32.0 was skipped intentionally due to some issues in the code as well as to prioritize the release of version 0.33.0.
37
* Fixed issue where double clicking attachments no longer worked (forgot to update the type checks to use the enum).

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ Credits
7777
.. |License: GPL v3| image:: https://img.shields.io/badge/License-GPLv3-blue.svg
7878
:target: LICENSE.txt
7979

80-
.. |PyPI3| image:: https://img.shields.io/badge/pypi-1.2.0-blue.svg
81-
:target: https://pypi.org/project/msg-explorer/1.2.0/
80+
.. |PyPI3| image:: https://img.shields.io/badge/pypi-1.2.1-blue.svg
81+
:target: https://pypi.org/project/msg-explorer/1.2.1/
8282

8383
.. |PyPI2| image:: https://img.shields.io/badge/python-3.6+-brightgreen.svg
8484
:target: https://www.python.org/downloads/release/python-367/

msg_explorer/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
# along with this program. If not, see <http://www.gnu.org/licenses/>.
2828

2929
__author__ = 'Destiny Peterson'
30-
__date__ = '2022-06-08'
31-
__version__ = '1.2.0'
30+
__date__ = '2022-06-12'
31+
__version__ = '1.2.1'
3232

3333
# When this module is imported, we should try to compile the forms. They only
3434
# compile when they are outdated.

msg_explorer/stream_viewer.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
class StreamViewer(QtWidgets.QWidget):
1616
def __init__(self, parent = None):
1717
super().__init__(parent)
18-
18+
1919
self.ui = Ui_StreamViewer()
2020
self.ui.setupUi(self)
2121
self.__msg = None
@@ -86,14 +86,17 @@ def openStream(self, name, prefix = True):
8686
return self.openStream(name[:-1] + [name[-1][:-9]])
8787

8888
self.ui.pageHexViewer.loadHexData(self.__msg._getStream(name, False))
89-
self.ui.labelStreamName.setText('/'.join(name))
89+
# Make sure the path we use is local to the current file.
90+
self.ui.labelStreamName.setText('/'.join(name[self.__msg.prefixLen:]))
9091
# Now determine how to load the rest of the data.
9192
if name[-1] == '__properties_version1.0':
9293
_type = 'prop'
9394
source = self.__msg
94-
path = copy.copy(name)
95+
# Second part is to cut out the prefix for traversal.
96+
path = name[self.__msg.prefixLen:]
9597
# This is necessary for some operations.
9698
currentPath = []
99+
97100
try:
98101
while len(path) > 1:
99102
if path[0].startswith('__attach'):
@@ -111,7 +114,7 @@ def openStream(self, name, prefix = True):
111114
except Exception as e:
112115
utils.displayException(e)
113116
return
114-
props = source.mainProperties if isinstance(self.__msg, extract_msg.msg.MSGFile) else source.props
117+
props = source.mainProperties if isinstance(source, extract_msg.msg.MSGFile) else source.props
115118
self.ui.pageParsedProperties.loadProperties(props)
116119
else:
117120
_type = name[-1][-4:]

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
# First level requirements
3-
extract-msg>=0.33.0, <0.34.0
3+
extract-msg>=0.33.0, <0.35.0
44
PySide6>=6.3.0

0 commit comments

Comments
 (0)