From fedbbe31d75f093b371124ab640117951bd4345c Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 18 May 2023 17:25:33 -0600 Subject: [PATCH] Changing default Survival tag to Primitive. --- alembic/versions/3b6918aeca4b_file_group.py | 6 +++--- modules/archive/__init__.py | 1 + modules/archive/models.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/alembic/versions/3b6918aeca4b_file_group.py b/alembic/versions/3b6918aeca4b_file_group.py index 021bc9f9..70470f18 100644 --- a/alembic/versions/3b6918aeca4b_file_group.py +++ b/alembic/versions/3b6918aeca4b_file_group.py @@ -122,15 +122,15 @@ def upgrade(): ('Nuclear', '#0dff00'), ('Pests', '#050068'), ('Power', '#D837FF'), + ('Primitive', '#A18A62'), ('Radio', '#134cbb'), ('Schooling', '#6d752e'), ('Security', '#333333'), ('Shelter', '#625641'), ('Social', '#490c73'), - ('Survival', '#A18A62'), ('Tools', '#f0d730'), - ('Water', '#291BC2'), - ('WROL', '#4700ab') + ('WROL', '#4700ab'), + ('Water', '#291BC2') ''') session.execute('UPDATE wrolpi_flag SET refresh_complete = false') diff --git a/modules/archive/__init__.py b/modules/archive/__init__.py index 115774ff..a186223b 100644 --- a/modules/archive/__init__.py +++ b/modules/archive/__init__.py @@ -159,6 +159,7 @@ async def archive_modeler(): with slow_logger(1, f'Modeling archive took %(elapsed)s seconds: {file_group}', logger__=logger): if archive: + archive: Archive try: archive_id = archive.id archive.validate() diff --git a/modules/archive/models.py b/modules/archive/models.py index d7ce84a7..41a2a015 100644 --- a/modules/archive/models.py +++ b/modules/archive/models.py @@ -224,13 +224,13 @@ class Archive(Base, ModelHelper): self.domain_id = domain.id if domain else None def apply_singlefile_title(self): - """Get the title from the Singlefile, if its missing.""" + """Get the title from the Singlefile, if it's missing.""" from modules.archive.lib import get_title_from_html if self.singlefile_path and not self.file_group.title: self.file_group.title = get_title_from_html(self.singlefile_path.read_text()) def validate(self): - """Fill in any missing data about this Archive from it's files.""" + """Fill in any missing data about this Archive from its files.""" try: self.read_readability_data() self.read_singlefile_data()