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

self.path shouldn't be None #167

Merged
merged 4 commits into from
Oct 15, 2024
Merged

self.path shouldn't be None #167

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb49234
remove direct imports for consistency since os is imported anyway and…
Apr 17, 2023
1f89422
ignore files generated during build
Apr 17, 2023
c2d4abd
don't overwrite self.path after it was already normalized
Apr 17, 2023
ec6fdff
Remove .gitignore noise
acdha Oct 15, 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
29 changes: 12 additions & 17 deletions bagit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from collections import defaultdict
from datetime import date
from functools import partial
from os.path import abspath, isdir, isfile, join

try:
from importlib.metadata import version
Expand Down Expand Up @@ -278,7 +277,7 @@ class Bag(object):
valid_files = ["bagit.txt", "fetch.txt"]
valid_directories = ["data"]

def __init__(self, path=None):
def __init__(self, path):
super(Bag, self).__init__()
self.tags = {}
self.info = {}
Expand All @@ -300,12 +299,8 @@ def __init__(self, path=None):

self.algorithms = []
self.tag_file_name = None
self.path = abspath(path)
if path:
# if path ends in a path separator, strip it off
if path[-1] == os.sep:
self.path = path[:-1]
self._open()
self.path = os.path.abspath(path)
self._open()

def __str__(self):
# FIXME: develop a more informative string representation for a Bag
Expand All @@ -329,7 +324,7 @@ def _open(self):
# the required version and encoding.
bagit_file_path = os.path.join(self.path, "bagit.txt")

if not isfile(bagit_file_path):
if not os.path.isfile(bagit_file_path):
raise BagError(_("Expected bagit.txt does not exist: %s") % bagit_file_path)

self.tags = tags = _load_tag_file(bagit_file_path)
Expand Down Expand Up @@ -378,13 +373,13 @@ def _open(self):
def manifest_files(self):
for filename in ["manifest-%s.txt" % a for a in CHECKSUM_ALGOS]:
f = os.path.join(self.path, filename)
if isfile(f):
if os.path.isfile(f):
yield f

def tagmanifest_files(self):
for filename in ["tagmanifest-%s.txt" % a for a in CHECKSUM_ALGOS]:
f = os.path.join(self.path, filename)
if isfile(f):
if os.path.isfile(f):
yield f

def compare_manifests_with_fs(self):
Expand Down Expand Up @@ -558,7 +553,7 @@ def fetch_entries(self):

fetch_file_path = os.path.join(self.path, "fetch.txt")

if isfile(fetch_file_path):
if os.path.isfile(fetch_file_path):
with open_text_file(
fetch_file_path, "r", encoding=self.encoding
) as fetch_file:
Expand Down Expand Up @@ -744,7 +739,7 @@ def _validate_structure(self):
def _validate_structure_payload_directory(self):
data_dir_path = os.path.join(self.path, "data")

if not isdir(data_dir_path):
if not os.path.isdir(data_dir_path):
raise BagValidationError(
_("Expected data directory %s does not exist") % data_dir_path
)
Expand Down Expand Up @@ -1284,14 +1279,14 @@ def make_manifests(data_dir, processes, algorithms=DEFAULT_CHECKSUMS, encoding="


def _make_tagmanifest_file(alg, bag_dir, encoding="utf-8"):
tagmanifest_file = join(bag_dir, "tagmanifest-%s.txt" % alg)
tagmanifest_file = os.path.join(bag_dir, "tagmanifest-%s.txt" % alg)
LOGGER.info(_("Creating %s"), tagmanifest_file)

checksums = []
for f in _find_tag_files(bag_dir):
if re.match(r"^tagmanifest-.+\.txt$", f):
continue
with open(join(bag_dir, f), "rb") as fh:
with open(os.path.join(bag_dir, f), "rb") as fh:
m = hashlib.new(alg)
while True:
block = fh.read(HASH_BLOCK_SIZE)
Expand All @@ -1301,7 +1296,7 @@ def _make_tagmanifest_file(alg, bag_dir, encoding="utf-8"):
checksums.append((m.hexdigest(), f))

with open_text_file(
join(bag_dir, tagmanifest_file), mode="w", encoding=encoding
os.path.join(bag_dir, tagmanifest_file), mode="w", encoding=encoding
) as tagmanifest:
for digest, filename in checksums:
tagmanifest.write("%s %s\n" % (digest, filename))
Expand All @@ -1317,7 +1312,7 @@ def _find_tag_files(bag_dir):
if filename.startswith("tagmanifest-"):
continue
# remove everything up to the bag_dir directory
p = join(dir_name, filename)
p = os.path.join(dir_name, filename)
yield os.path.relpath(p, bag_dir)


Expand Down