Skip to content

Commit

Permalink
Merge pull request #651 from zurdi15/fix/aditonal_content_tab
Browse files Browse the repository at this point in the history
Fixed aditional content tab
  • Loading branch information
zurdi15 authored Feb 9, 2024
2 parents 79b430f + 663e9dd commit 1e88569
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 9 deletions.
24 changes: 22 additions & 2 deletions backend/alembic/versions/0014_asset_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,12 @@ def upgrade() -> None:
)
batch_op.add_column(sa.Column("igdb_metadata", mysql.JSON(), nullable=True))
batch_op.add_column(sa.Column("platform_id", sa.Integer(), nullable=False))
batch_op.alter_column(
"revision",
existing_type=mysql.VARCHAR(length=20),
type_=sa.String(length=100),
existing_nullable=True,
)

# Move data around
with op.batch_alter_table("roms", schema=None) as batch_op:
Expand Down Expand Up @@ -212,7 +218,11 @@ def upgrade() -> None:
# Cleanup roms table
with op.batch_alter_table("roms", schema=None) as batch_op:
batch_op.create_foreign_key(
"fk_platform_id_roms", "platforms", ["platform_id"], ["id"], ondelete="CASCADE"
"fk_platform_id_roms",
"platforms",
["platform_id"],
["id"],
ondelete="CASCADE",
)
batch_op.drop_column("file_size")
batch_op.drop_column("file_size_units")
Expand Down Expand Up @@ -244,7 +254,11 @@ def downgrade() -> None:

with op.batch_alter_table("roms", schema=None) as batch_op:
batch_op.create_foreign_key(
"fk_platform_roms", "platforms", ["platform_slug"], ["slug"], ondelete="CASCADE"
"fk_platform_roms",
"platforms",
["platform_slug"],
["slug"],
ondelete="CASCADE",
)
batch_op.execute(
"update roms inner join platforms on roms.platform_id = platforms.id set roms.platform_slug = platforms.slug"
Expand Down Expand Up @@ -277,6 +291,12 @@ def downgrade() -> None:
batch_op.drop_column("igdb_metadata")
batch_op.drop_column("file_size_bytes")
batch_op.drop_column("file_name_no_ext")
batch_op.alter_column(
"revision",
existing_type=sa.String(length=100),
type_=mysql.VARCHAR(length=20),
existing_nullable=True,
)

with op.batch_alter_table("platforms", schema=None) as batch_op:
batch_op.add_column(
Expand Down
2 changes: 1 addition & 1 deletion backend/models/rom.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Rom(BaseModel):
path_cover_l: str = Column(Text, default="")
url_cover: str = Column(Text, default="", doc="URL to cover image stored in IGDB")

revision: str = Column(String(20))
revision: str = Column(String(100))
regions: JSON = Column(JSON, default=[])
languages: JSON = Column(JSON, default=[])
tags: JSON = Column(JSON, default=[])
Expand Down
4 changes: 2 additions & 2 deletions backend/watcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ def on_any_event(self, event):
if event.src_path.endswith(".DS_Store"):
return

# Ignore modified events
if event.event_type == "modified":
# Ignore some event types
if event.event_type in ["modified", "opened", "closed"]:
return

event_src = event.src_path.split(path)[-1]
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/views/Details/Base.vue
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ watch(
<v-tab
v-if="
mdAndDown &&
(rom.igdb_metadata?.expansions || rom.igdb_metadata?.dlcs)
((rom.igdb_metadata?.expansions ?? []).length > 0 ||
(rom.igdb_metadata?.dlcs ?? []).length > 0)
"
value="additionalcontent"
rounded="0"
Expand All @@ -178,9 +179,9 @@ watch(
<v-tab
v-if="
smAndDown &&
(rom.igdb_metadata?.remakes ||
rom.igdb_metadata?.remasters ||
rom.igdb_metadata?.expanded_games)
((rom.igdb_metadata?.remakes ?? []).length > 0 ||
(rom.igdb_metadata?.remasters ?? []).length > 0 ||
(rom.igdb_metadata?.expanded_games ?? []).length > 0)
"
value="relatedgames"
rounded="0"
Expand Down

0 comments on commit 1e88569

Please sign in to comment.