Skip to content

Allow for comment lines starting with '#' in databases #987

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
SpiralBrad wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow for comment lines starting with '#' in databases #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions build_pack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,13 +221,14 @@ def parse_database(target_database, drop_initial_directory):
number_of_entries = 0
with open(target_database, "r") as target_database:
for line in target_database:
hash_sha256, filename, _, _, hash_crc = line.strip().split("\t")[0:5]
number_of_entries += 1
if drop_initial_directory:
first_level, filename = filename.split("/", 1)
filename = os.path.normpath(filename)
db[hash_sha256].append(filename)
db[hash_crc].append(filename)
if not line.startswith("#"): # allows for comment lines starting with '#' in databases
hash_sha256, filename, _, _, hash_crc = line.strip().split("\t")[0:5]
number_of_entries += 1
if drop_initial_directory:
first_level, filename = filename.split("/", 1)
filename = os.path.normpath(filename)
db[hash_sha256].append(filename)
db[hash_crc].append(filename)
return db, number_of_entries


Expand Down
13 changes: 7 additions & 6 deletions verify_pack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,15 @@ def parse_database(target_database, drop_initial_directory):
number_of_entries = 0
with open(target_database, "r") as target_database:
for line in target_database:
hash_sha256, filename, other_hash = line.strip().split("\t", 2)
number_of_entries += 1
if not line.startswith("#"): # allows for comment lines starting with '#' in databases
hash_sha256, filename, other_hash = line.strip().split("\t", 2)
number_of_entries += 1

if drop_initial_directory:
first_level, filename = filename.split("/", 1)
if drop_initial_directory:
first_level, filename = filename.split("/", 1)

filename = os.path.normpath(filename)
db[hash_sha256].append(filename)
filename = os.path.normpath(filename)
db[hash_sha256].append(filename)

return db, number_of_entries

Expand Down