jackc/slop-farmer-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new pass at properly handling related report models

Browse Source
This commit is contained in:
Jack Case
2025-10-29 14:33:02 +00:00
parent 9c07870cb7
commit e420a31127
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
slopserver/db.py
View File

@@ -34,27 +34,31 @@ def insert_slop(urls: list[ParseResult], engine: Engine, user: User | None = Non
if not domain in existing_dict: if not domain in existing_dict:
# create a new domain object and paths # create a new domain object and paths
new_domain = Domain(domain_name=domain, paths=list()) new_domain = Domain(domain_name=domain, paths=list())
new_domain.paths = [Path(path=path) for path in paths] new_paths = list()
for path in paths:
new_path = Path(path=path)
if user:
new_path.reports = list().append(Report(path=new_path, user=user, timestamp=datetime.now()))
new_paths.append(new_path)
new_domain.paths = new_paths
session.add(new_domain) session.add(new_domain)
if user:
for path in new_domain.paths:
new_report = Report(path_id=path.id, user_id=user.id)
session.add(new_report)
else: else:
existing_domain = existing_dict[domain] existing_domain = existing_dict[domain]
existing_paths = set((path.path for path in existing_domain.paths)) existing_paths = dict({path.path: path for path in existing_domain.paths})
for path in paths: for path in paths:
if not path in existing_paths: if not path in existing_paths:
new_path = Path(path=path) new_path = Path(path=path)
if user:
new_path.reports = list().append(Report(path=new_path, user=user, timestamp=datetime.now()))
existing_domain.paths.append(new_path) existing_domain.paths.append(new_path)
session.add(new_path) session.add(new_path)
session.flush([new_path])
session.refresh(new_path) else:
# domain and path exist, append to the path's reports
if user: if user:
new_report = Report( existing_path = existing_paths.get(path)
path_id=new_path.id, user_id=user.id, timestamp=datetime.now()) existing_path.reports.append(Report(path=new_path, user=user, timestamp=datetime.now()))
session.add(new_report)
session.commit() session.commit()