Tendokyu/artemis
1
0
Fork 0
mirror of synced 2025-02-13 00:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

hardened ui against the db not being upgraded or importer not being ran

Browse Source
This commit is contained in:
daydensteve 2024-11-08 09:17:12 -05:00
parent 954bd565d3
commit eb18ad22b8
4 changed files with 103 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
titles/chuni/frontend.py
View File

@ -353,122 +353,134 @@ class ChuniFrontend(FE_Base):
async def get_available_map_icons(self, version: int, profile: Row) -> (List[dict], int): async def get_available_map_icons(self, version: int, profile: Row) -> (List[dict], int):
items = dict() items = dict()
rows = await self.data.static.get_map_icons(version) rows = await self.data.static.get_map_icons(version)
if rows: if rows is None:
force_unlocked = self.game_cfg.mods.forced_item_unlocks("map_icons") return (items, 0) # can only happen with old db
user_map_icons = [] force_unlocked = self.game_cfg.mods.forced_item_unlocks("map_icons")
if not force_unlocked:
user_map_icons = await self.data.item.get_items(profile.user, ItemKind.MAP_ICON.value)
user_map_icons = [icon["itemId"] for icon in user_map_icons] + [profile.mapIconId]
for row in rows: user_map_icons = []
if force_unlocked or row["defaultHave"] or row["mapIconId"] in user_map_icons: if not force_unlocked:
item = dict() user_map_icons = await self.data.item.get_items(profile.user, ItemKind.MAP_ICON.value)
item["id"] = row["mapIconId"] user_map_icons = [icon["itemId"] for icon in user_map_icons] + [profile.mapIconId]
item["name"] = row["name"]
item["iconPath"] = path.splitext(row["iconPath"])[0] + ".png" for row in rows:
items[row["mapIconId"]] = item if force_unlocked or row["defaultHave"] or row["mapIconId"] in user_map_icons:
item = dict()
item["id"] = row["mapIconId"]
item["name"] = row["name"]
item["iconPath"] = path.splitext(row["iconPath"])[0] + ".png"
items[row["mapIconId"]] = item
return (items, len(rows)) return (items, len(rows))
async def get_available_system_voices(self, version: int, profile: Row) -> (List[dict], int): async def get_available_system_voices(self, version: int, profile: Row) -> (List[dict], int):
items = dict() items = dict()
rows = await self.data.static.get_system_voices(version) rows = await self.data.static.get_system_voices(version)
if rows: if rows is None:
force_unlocked = self.game_cfg.mods.forced_item_unlocks("system_voices") return (items, 0) # can only happen with old db
force_unlocked = self.game_cfg.mods.forced_item_unlocks("system_voices")
user_system_voices = [] user_system_voices = []
if not force_unlocked: if not force_unlocked:
user_system_voices = await self.data.item.get_items(profile.user, ItemKind.SYSTEM_VOICE.value) user_system_voices = await self.data.item.get_items(profile.user, ItemKind.SYSTEM_VOICE.value)
user_system_voices = [icon["itemId"] for icon in user_system_voices] + [profile.voiceId] user_system_voices = [icon["itemId"] for icon in user_system_voices] + [profile.voiceId]
for row in rows: for row in rows:
if force_unlocked or row["defaultHave"] or row["voiceId"] in user_system_voices: if force_unlocked or row["defaultHave"] or row["voiceId"] in user_system_voices:
item = dict() item = dict()
item["id"] = row["voiceId"] item["id"] = row["voiceId"]
item["name"] = row["name"] item["name"] = row["name"]
item["imagePath"] = path.splitext(row["imagePath"])[0] + ".png" item["imagePath"] = path.splitext(row["imagePath"])[0] + ".png"
items[row["voiceId"]] = item items[row["voiceId"]] = item
return (items, len(rows)) return (items, len(rows))
async def get_available_nameplates(self, version: int, profile: Row) -> (List[dict], int): async def get_available_nameplates(self, version: int, profile: Row) -> (List[dict], int):
items = dict() items = dict()
rows = await self.data.static.get_nameplates(version) rows = await self.data.static.get_nameplates(version)
if rows: if rows is None:
force_unlocked = self.game_cfg.mods.forced_item_unlocks("nameplates") return (items, 0) # can only happen with old db
user_nameplates = [] force_unlocked = self.game_cfg.mods.forced_item_unlocks("nameplates")
if not force_unlocked:
user_nameplates = await self.data.item.get_items(profile.user, ItemKind.NAMEPLATE.value)
user_nameplates = [item["itemId"] for item in user_nameplates] + [profile.nameplateId]
for row in rows: user_nameplates = []
if force_unlocked or row["defaultHave"] or row["nameplateId"] in user_nameplates: if not force_unlocked:
item = dict() user_nameplates = await self.data.item.get_items(profile.user, ItemKind.NAMEPLATE.value)
item["id"] = row["nameplateId"] user_nameplates = [item["itemId"] for item in user_nameplates] + [profile.nameplateId]
item["name"] = row["name"]
item["texturePath"] = path.splitext(row["texturePath"])[0] + ".png" for row in rows:
items[row["nameplateId"]] = item if force_unlocked or row["defaultHave"] or row["nameplateId"] in user_nameplates:
item = dict()
item["id"] = row["nameplateId"]
item["name"] = row["name"]
item["texturePath"] = path.splitext(row["texturePath"])[0] + ".png"
items[row["nameplateId"]] = item
return (items, len(rows)) return (items, len(rows))
async def get_available_trophies(self, version: int, profile: Row) -> (List[dict], int): async def get_available_trophies(self, version: int, profile: Row) -> (List[dict], int):
items = dict() items = dict()
rows = await self.data.static.get_trophies(version) rows = await self.data.static.get_trophies(version)
if rows: if rows is None:
force_unlocked = self.game_cfg.mods.forced_item_unlocks("trophies") return (items, 0) # can only happen with old db
force_unlocked = self.game_cfg.mods.forced_item_unlocks("trophies")
user_trophies = [] user_trophies = []
if not force_unlocked: if not force_unlocked:
user_trophies = await self.data.item.get_items(profile.user, ItemKind.TROPHY.value) user_trophies = await self.data.item.get_items(profile.user, ItemKind.TROPHY.value)
user_trophies = [item["itemId"] for item in user_trophies] + [profile.trophyId] user_trophies = [item["itemId"] for item in user_trophies] + [profile.trophyId]
for row in rows: for row in rows:
if force_unlocked or row["defaultHave"] or row["trophyId"] in user_trophies: if force_unlocked or row["defaultHave"] or row["trophyId"] in user_trophies:
item = dict() item = dict()
item["id"] = row["trophyId"] item["id"] = row["trophyId"]
item["name"] = row["name"] item["name"] = row["name"]
item["rarity"] = row["rareType"] item["rarity"] = row["rareType"]
items[row["trophyId"]] = item items[row["trophyId"]] = item
return (items, len(rows)) return (items, len(rows))
async def get_available_characters(self, version: int, profile: Row) -> (List[dict], int): async def get_available_characters(self, version: int, profile: Row) -> (List[dict], int):
items = dict() items = dict()
rows = await self.data.static.get_characters(version) rows = await self.data.static.get_characters(version)
if rows: if rows is None:
force_unlocked = self.game_cfg.mods.forced_item_unlocks("character_icons") return (items, 0) # can only happen with old db
user_characters = [] force_unlocked = self.game_cfg.mods.forced_item_unlocks("character_icons")
if not force_unlocked:
user_characters = await self.data.item.get_characters(profile.user) user_characters = []
user_characters = [chara["characterId"] for chara in user_characters] + [profile.characterId, profile.charaIllustId] if not force_unlocked:
user_characters = await self.data.item.get_characters(profile.user)
user_characters = [chara["characterId"] for chara in user_characters] + [profile.characterId, profile.charaIllustId]
for row in rows: for row in rows:
if force_unlocked or row["defaultHave"] or row["characterId"] in user_characters: if force_unlocked or row["defaultHave"] or row["characterId"] in user_characters:
item = dict() item = dict()
item["id"] = row["characterId"] item["id"] = row["characterId"]
item["name"] = row["name"] item["name"] = row["name"]
item["iconPath"] = path.splitext(row["imagePath3"])[0] + ".png" item["iconPath"] = path.splitext(row["imagePath3"])[0] + ".png"
items[row["characterId"]] = item items[row["characterId"]] = item
return (items, len(rows)) return (items, len(rows))
async def get_available_avatar_items(self, version: int, category: AvatarCategory, user_unlocked_items: List[int]) -> (List[dict], int): async def get_available_avatar_items(self, version: int, category: AvatarCategory, user_unlocked_items: List[int]) -> (List[dict], int):
items = dict() items = dict()
rows = await self.data.static.get_avatar_items(version, category.value) rows = await self.data.static.get_avatar_items(version, category.value)
if rows: if rows is None:
force_unlocked = self.game_cfg.mods.forced_item_unlocks("avatar_accessories") return (items, 0) # can only happen with old db
for row in rows: force_unlocked = self.game_cfg.mods.forced_item_unlocks("avatar_accessories")
if force_unlocked or row["defaultHave"] or row["avatarAccessoryId"] in user_unlocked_items:
item = dict() for row in rows:
item["id"] = row["avatarAccessoryId"] if force_unlocked or row["defaultHave"] or row["avatarAccessoryId"] in user_unlocked_items:
item["name"] = row["name"] item = dict()
item["iconPath"] = path.splitext(row["iconPath"])[0] + ".png" item["id"] = row["avatarAccessoryId"]
item["texturePath"] = path.splitext(row["texturePath"])[0] + ".png" item["name"] = row["name"]
items[row["avatarAccessoryId"]] = item item["iconPath"] = path.splitext(row["iconPath"])[0] + ".png"
item["texturePath"] = path.splitext(row["texturePath"])[0] + ".png"
items[row["avatarAccessoryId"]] = item
return (items, len(rows)) return (items, len(rows))

7
titles/chuni/templates/chuni_avatar.jinja
View File

@ -124,6 +124,12 @@
{% endif %} {% endif %}
</div> </div>
{% if wears|length == 0 or faces|length == 0 or heads|length == 0 or skins|length == 0 or items|length == 0 or fronts|length == 0 or backs|length == 0 %}
<script>
// Server DB lacks necessary info. Maybe importer never got ran for this verison?
document.getElementById("name_wear").innerHTML = "Server DB needs upgraded or is not populated with necessary data";
</script>
{% else %}
<script> <script>
{% include 'titles/chuni/templates/scripts/collapsibles.js' %} {% include 'titles/chuni/templates/scripts/collapsibles.js' %}
@ -298,5 +304,6 @@ for (const type of types) {
// Expand the first collapsible so the user can get the gist of it. // Expand the first collapsible so the user can get the gist of it.
Collapsibles.expandFirst(); Collapsibles.expandFirst();
</script> </script>
{% endif %}
{% endblock content %} {% endblock content %}

4
titles/chuni/templates/chuni_index.jinja
View File

@ -72,11 +72,11 @@
{% if cur_version >= 6 %} <!-- MAP ICON and SYSTEM VOICE introduced in AMAZON --> {% if cur_version >= 6 %} <!-- MAP ICON and SYSTEM VOICE introduced in AMAZON -->
<tr> <tr>
<td>Map Icon:</td> <td>Map Icon:</td>
<td><div id="map-icon-name">{{ map_icons[profile.mapIconId]["name"] }}</div></td> <td><div id="map-icon-name">{{ map_icons[profile.mapIconId]["name"] if map_icons|length > 0 else "Server DB needs upgraded or is not populated with necessary data" }}</div></td>
</tr> </tr>
<tr> <tr>
<td>System Voice:</td> <td>System Voice:</td>
<td><div id="system-voice-name">{{ system_voices[profile.voiceId]["name"] }}</div></td> <td><div id="system-voice-name">{{ system_voices[profile.voiceId]["name"] if system_voices|length > 0 else "Server DB needs upgraded or is not populated with necessary data" }}</div></td>
</tr> </tr>
{% endif %} {% endif %}
</table> </table>

8
titles/chuni/templates/chuni_userbox.jinja
View File

@ -91,6 +91,12 @@
{% endif %} {% endif %}
</div> </div>
{% if nameplates|length == 0 or characters|length == 0 %}
<script>
// Server DB lacks necessary info. Maybe importer never got ran for this verison?
document.getElementById("name_nameplate").innerHTML = "Server DB needs upgraded or is not populated with necessary data";
</script>
{% else %}
<script> <script>
{% include 'titles/chuni/templates/scripts/collapsibles.js' %} {% include 'titles/chuni/templates/scripts/collapsibles.js' %}
@ -252,5 +258,5 @@ for (const type of types) {
Collapsibles.expandAll(); Collapsibles.expandAll();
</script> </script>
{% endif %}
{% endblock content %} {% endblock content %}