Skip to content

BaseCrawler fix #1058

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

Merged
emmetaobrien merged 2 commits into from
Mar 23, 2026
Merged

BaseCrawler fix #1058

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75ea912
BaseCrawler
kongtiaowang Mar 23, 2026
06210f4
fix block
kongtiaowang Mar 23, 2026
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: 45 additions & 4 deletions scripts/Crawlers/BaseCrawler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,14 +326,47 @@ def run(self):
modified = True
commit_msg = "Created " + dataset_description["title"]
else: # Dataset already existing locally
self.repo.git.checkout("-f", branch_name)
try:
# Try normal checkout first
self.repo.git.checkout("-f", branch_name)
except git.exc.GitCommandError as e:
if "filter-process" in str(e):
self.repo.git.execute(
[
"git",
"-c",
"filter.annex.process=",
"checkout",
"-f",
branch_name,
]
)
else:
raise

try:
self.repo.git.merge("-n", "--no-verify", "master")
except Exception as e:
print(f"Error while merging master into {branch_name}: {e}")
print("Skipping this dataset")
self.repo.git.merge("--abort")
self.repo.git.checkout("-f", "master")
try:
# Use the same safe checkout to go back to master
self.repo.git.checkout("-f", "master")
except git.exc.GitCommandError as e:
if "filter-process" in str(e):
self.repo.git.execute(
[
"git",
"-c",
"filter.annex.process=",
"checkout",
"-f",
"master",
]
)
else:
raise
continue

modified = self.update_if_necessary(
Expand Down Expand Up @@ -379,7 +412,7 @@ def run(self):
)
d.save()
d.publish(to="origin")
commit_msg = "Updated " + dataset_description["title"]
commit_msg = "Updated " + dataset_description["title"]

# If modification detected in dataset, push to branch and create PR
if modified:
Expand All @@ -392,7 +425,15 @@ def run(self):
print(e)

# Go back to master
self.repo.git.checkout("master")
try:
self.repo.git.checkout("master")
except git.exc.GitCommandError as e:
if "filter-process" in str(e):
self.repo.git.execute(
["git", "-c", "filter.annex.process=", "checkout", "master"]
)
else:
raise

def _add_github_repo_description(self, repo_title, dataset_description):
url = "https://api.github.com/repos/{}/{}".format(
Expand Down
Loading