Skip to content

Fix worker registering trashed bags #17

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
louisradtke wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix worker registering trashed bags #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4517bf3
Fix worker registering trashed bags
louisradtke Apr 21, 2022
cf524f0
Explicitly setting in_trash=False when registering bag
louisradtke Apr 21, 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
12 changes: 11 additions & 1 deletion rbb_tools/src/rbb_tools/commands/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ def register_bag_file(api, store_name, file):
bag.topics=[]
bag.products=[]
bag.extraction_failure = False
bag.in_trash = False

api.put_bag_meta(store_name, bag.name, bag)

Expand All @@ -64,7 +65,8 @@ def command(store_name, api):
return

try:
bags = api.list_bags(store_name)
bags = api.list_bags(store_name, in_trash=False)
trashed_bags = api.list_bags(store_name, in_trash=True)
except Exception as e:
print("Reason: " + str(e))
return
Expand All @@ -74,11 +76,19 @@ def command(store_name, api):
info = store.list_file(bag.store_data)
bags_by_name[info.get_path()] = bag

trashed_bags_by_name = {}
for bag in trashed_bags:
info = store.list_file(bag.store_data)
trashed_bags_by_name[info.get_path()] = bag

store_files = store.list_files()
for file in store_files:
if file.get_name()[-3:] != "bag":
continue

if file.get_path() in trashed_bags_by_name:
continue

if not file.get_path() in bags_by_name:
print("NEW: %s at %s" % (file.get_save_name(), file.get_path()))
register_bag_file(api, store_info.name, file)
Expand Down