Skip to content

Added file closing functionality and added another unicode validation #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added file closing functionality and added another unicode validation #14

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e85b2ba
Removed format changes
malun22 Dec 8, 2021
936bdc7
Added context ability
malun22 Dec 8, 2021
4d156fb
Updated Readme and made magic temporarily
malun22 Dec 9, 2021
5617539
Removed Format Changes again
malun22 Dec 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions pygbx/gbx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ def __init__(self, obj):
self.root_parser = ByteReader(obj)

self.magic = self.root_parser.read(3, '3s')
try:
self.magic.decode('utf-8')
Copy link
Owner

@donadigo donadigo Dec 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because magic is used only temporarily in the constructor, drop self and reuse it:

magic = self.root_parser.read(3, '3s')
try:
    magic = magic.decode('utf-8')
except:
    raise GbxLoadError(f'obj is not a valid Gbx data: can not decode unicode')

if magic != 'GBX':
   ...

Copy link
Author

@malun22 malun22 Dec 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good one. Pushed another version, which includes this change.

except:
raise GbxLoadError(f'obj is not a valid Gbx data: can not decode unicode')

if self.magic.decode('utf-8') != 'GBX':
raise GbxLoadError(f'obj is not a valid Gbx data: magic string is incorrect')
self.version = self.root_parser.read(2, 'H')
Expand Down Expand Up @@ -135,6 +140,17 @@ def __init__(self, obj):
bp = ByteReader(self.data)
self._read_node(self.class_id, -1, bp)

def __enter__(self):
return self

def __exit__(self, exception_type, exception_value, exception_traceback):
self.close()

"""Closes the current file connection."""
def close(self):
if self.f:
self.f.close()

def __read_sub_folder(self):
num_sub_folders = self.root_parser.read_uint32()
for folder in range(num_sub_folders):
Expand Down