Skip to content

fix car.csv bug #2

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 2 commits into
base: main
Choose a base branch
from
Open

fix car.csv bug #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d44c366
format code
Mar 31, 2022
00f03a8
Merge pull request #14 from sonic-chain/main
flyworker Mar 31, 2022
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
49 changes: 24 additions & 25 deletions task_sender/swan_task_sender.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,31 +142,30 @@ def go_generate_car(_deal_list: List[OfflineDeal], target_dir) -> List[OfflineDe
car_file_path = os.path.join(target_dir, row["playload_cid"] +'.car')
piececid = row["piece_cid"]
car_file_name = row["playload_cid"] +'.car'
break

# no piece_cid generated. use data_cid instead
data_cid=datacid
piece_cid = piececid
# _deal.piece_cid = piece_cid
# _deal.data_cid = data_cid
# _deal.car_file_size = os.path.getsize(car_file_path)
if _deal.car_file_md5:
car_md5 = checksum(car_file_path)

csv_data = {
'car_file_name': car_file_name,
'car_file_path': car_file_path,
'piece_cid': piece_cid,
'data_cid': data_cid,
'car_file_size': os.path.getsize(car_file_path),
'car_file_md5': car_md5,
'source_file_name': _deal.source_file_name,
'source_file_path': _deal.source_file_path,
'source_file_size': _deal.source_file_size,
'source_file_md5': _deal.source_file_md5,
'car_file_url': ''
}
csv_writer.writerow(csv_data)

# no piece_cid generated. use data_cid instead
data_cid=datacid
piece_cid = piececid
# _deal.piece_cid = piece_cid
# _deal.data_cid = data_cid
# _deal.car_file_size = os.path.getsize(car_file_path)
if _deal.car_file_md5:
car_md5 = checksum(car_file_path)

csv_data = {
'car_file_name': car_file_name,
'car_file_path': car_file_path,
'piece_cid': piece_cid,
'data_cid': data_cid,
'car_file_size': os.path.getsize(car_file_path),
'car_file_md5': car_md5,
'source_file_name': _deal.source_file_name,
'source_file_path': _deal.source_file_path,
'source_file_size': _deal.source_file_size,
'source_file_md5': _deal.source_file_md5,
'car_file_url': ''
}
csv_writer.writerow(csv_data)

logging.info("Car files output dir: " + target_dir)
logging.info("Please upload car files to web server or ipfs server.")
Expand Down