Skip to content
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

Jump to bottom

Compatibility with cstruct v4 #26

Merged
merged 2 commits into from
Jun 4, 2024
Merged

Compatibility with cstruct v4 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5115f7
Compatibility with cstruct v4
Schamper May 24, 2024
6140cb7
Use a dev extra instead of installing with --pre
pyrco May 30, 2024
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
7 changes: 3 additions & 4 deletions dissect/fat/c_exfat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from dissect import cstruct
from dissect.cstruct import cstruct

c_exfat_def = """
exfat_def = """
enum entry_types : uint8 {
allocation_bitmap = 0x81,
upcase_table = 0x82,
Expand Down Expand Up @@ -139,8 +139,7 @@
"""

# default endianess is LE so we keep it that way.
c_exfat = cstruct.cstruct()
c_exfat.load(c_exfat_def)
c_exfat = cstruct().load(exfat_def)

EOC = 0xFFFFFFFF # indicates end of cluster chain
FID = 0xFFFFFFF8 # indicates start of FAT
Expand Down
7 changes: 3 additions & 4 deletions dissect/fat/c_fat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from dissect import cstruct
from dissect.cstruct import cstruct

# https://ogris.de/fatrepair/fat.c
c_fat_def = """
fat_def = """
#define ATTR_READ_ONLY 0x01
#define ATTR_HIDDEN 0x02
#define ATTR_SYSTEM 0x04
Expand Down Expand Up @@ -90,8 +90,7 @@
};
""" # noqa: E501

c_fat = cstruct.cstruct()
c_fat.load(c_fat_def)
c_fat = cstruct().load(fat_def)

Fattype = c_fat.Fattype

Expand Down
10 changes: 8 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ classifiers = [
"Topic :: Utilities",
]
dependencies = [
"dissect.cstruct>=3.0.dev,<4.0.dev",
"dissect.util>=3.0.dev,<4.0.dev",
"dissect.cstruct>=4.dev,<5",
"dissect.util>=3,<4",
]
dynamic = ["version"]

Expand All @@ -35,6 +35,12 @@ homepage = "https://dissect.tools"
documentation = "https://docs.dissect.tools/en/latest/projects/dissect.fat"
repository = "https://github.com/fox-it/dissect.fat"

[project.optional-dependencies]
dev = [
"dissect.cstruct>=4.0.dev,<5.0.dev",
"dissect.util>=3.0.dev,<4.0.dev",
]

[tool.black]
line-length = 120

Expand Down
1 change: 1 addition & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ minversion = 4.4.3
requires = virtualenv>=20.16.6

[testenv]
extras = dev
deps =
pytest
pytest-cov
Expand Down