tibiawikisql 7.0.0__tar.gz → 7.0.2__tar.gz

{tibiawikisql-7.0.0/tibiawikisql.egg-info → tibiawikisql-7.0.2}/PKG-INFO

@@ -1,11 +1,15 @@
 Metadata-Version: 2.4
 Name: tibiawikisql
-Version: 7.0.0
+Version: 7.0.2
 Summary: Python script that generates a SQLite database from TibiaWiki articles
 Author-email: Allan Galarza <allan.galarza@gmail.com>
 Maintainer-email: Allan Galarza <allan.galarza@gmail.com>
 License: Apache 2.0
-Project-URL: Homepage, https://github.com/Galarzaa90/tibiawiki-sql
+Project-URL: Homepage, https://tibiawiki-sql.readthedocs.io/
+Project-URL: Documentation, https://tibiawiki-sql.readthedocs.io/
+Project-URL: Repository, https://github.com/Galarzaa90/tibiawiki-sql
+Project-URL: Changelog, https://tibiawiki-sql.readthedocs.io/en/stable/changelog/
+Project-URL: Docker Hub: Repo, https://hub.docker.com/repository/docker/galarzaa90/tibiawiki-sql
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -64,11 +68,11 @@ externally.
 If you integrate this into your project or use the generated data, make sure to credit [TibiaWiki](https://tibia.fandom.com) and its contributors.
 
 
-[![Build Status](https://travis-ci.org/Galarzaa90/tibiawiki-sql.svg?branch=master)](https://travis-ci.org/Galarzaa90/tibiawiki-sql)
 [![GitHub (pre-)release](https://img.shields.io/github/release/Galarzaa90/tibiawiki-sql/all.svg)](https://github.com/Galarzaa90/tibiawiki-sql/releases)
 [![PyPI](https://img.shields.io/pypi/v/tibiawikisql.svg)](https://pypi.python.org/pypi/tibiawikisql/)
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/tibiawikisql.svg)
 ![PyPI - License](https://img.shields.io/pypi/l/tibiawikisql.svg)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/tibiawikisql)
 
 ## Requirements
 * Python 3.10 or higher

{tibiawikisql-7.0.0 → tibiawikisql-7.0.2}/README.md

@@ -13,11 +13,11 @@ externally.
 If you integrate this into your project or use the generated data, make sure to credit [TibiaWiki](https://tibia.fandom.com) and its contributors.
 
 
-[![Build Status](https://travis-ci.org/Galarzaa90/tibiawiki-sql.svg?branch=master)](https://travis-ci.org/Galarzaa90/tibiawiki-sql)
 [![GitHub (pre-)release](https://img.shields.io/github/release/Galarzaa90/tibiawiki-sql/all.svg)](https://github.com/Galarzaa90/tibiawiki-sql/releases)
 [![PyPI](https://img.shields.io/pypi/v/tibiawikisql.svg)](https://pypi.python.org/pypi/tibiawikisql/)
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/tibiawikisql.svg)
 ![PyPI - License](https://img.shields.io/pypi/l/tibiawikisql.svg)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/tibiawikisql)
 
 ## Requirements
 * Python 3.10 or higher

{tibiawikisql-7.0.0 → tibiawikisql-7.0.2}/pyproject.toml

@@ -42,7 +42,11 @@ classifiers = [
 ]
 
 [project.urls]
-"Homepage" = "https://github.com/Galarzaa90/tibiawiki-sql"
+"Homepage" = "https://tibiawiki-sql.readthedocs.io/"
+"Documentation" = "https://tibiawiki-sql.readthedocs.io/"
+"Repository" = "https://github.com/Galarzaa90/tibiawiki-sql"
+"Changelog" = "https://tibiawiki-sql.readthedocs.io/en/stable/changelog/"
+"Docker Hub: Repo" = "https://hub.docker.com/repository/docker/galarzaa90/tibiawiki-sql"
 
 [project.scripts]
 tibiawikisql = "tibiawikisql.__main__:cli"

{tibiawikisql-7.0.0 → tibiawikisql-7.0.2}/tibiawikisql/__init__.py

@@ -4,4 +4,4 @@ __author__ = "Allan Galarza"
 __copyright__ = "Copyright 2025 Allan Galarza"
 
 __license__ = "Apache 2.0"
-__version__ = "7.0.0"
+__version__ = "7.0.2"

{tibiawikisql-7.0.0 → tibiawikisql-7.0.2}/tibiawikisql/models/item.py

@@ -3,7 +3,7 @@ from typing import Any
 
 import pydantic
 from pydantic import BaseModel, Field
-from pypika import Parameter, Query, Table
+from pypika import Parameter, Query, Table, functions as fn
 from typing_extensions import Self
 
 from tibiawikisql.api import WikiEntry
@@ -384,7 +384,7 @@ class Key(WikiEntry, WithStatus, WithVersion, RowModel, table=ItemKeyTable):
     """The key's number."""
     item_id: int | None = None
     """The article id of the item this key is based on."""
-    material: str | None = None
+    material: str
     """The key's material."""
     location: str | None
     """The key's location."""
@@ -425,7 +425,7 @@ class Key(WikiEntry, WithStatus, WithVersion, RowModel, table=ItemKeyTable):
                 (
                     Query.from_(item_table)
                     .select(item_table.article_id)
-                    .where(item_table.title == Parameter(":material"))
+                    .where(item_table.title == fn.Concat(Parameter(":material"), ' Key'))
                 ),
                 Parameter(":material"),
                 Parameter(":location"),

{tibiawikisql-7.0.0 → tibiawikisql-7.0.2}/tibiawikisql/parsers/item.py

@@ -49,6 +49,7 @@ class ItemParser(BaseParser):
 
     item_attributes: ClassVar = {
         "level": "levelrequired",
+        "vocation": "vocrequired",
         "attack": "attack",
         "defense": "defense",
         "defense_modifier": "defensemod",
@@ -95,6 +96,7 @@ class ItemParser(BaseParser):
         "upgrade_classification": "upgradeclass",
         "is_rotatable": "rotatable",
         "augments": "augments",
+        "elemental_bond": "elementalbond",
     }
 
     @classmethod

{tibiawikisql-7.0.0 → tibiawikisql-7.0.2}/tibiawikisql/schema.py

@@ -302,9 +302,9 @@ class ItemKeyTable(Table, table_name="item_key"):
     article_id = Column(Integer, primary_key=True)
     title = Column(Text, unique=True)
     number = Column(Integer, unique=True)
-    item_id = Column(ForeignKey(Integer, "item", "article_id"), index=True)
+    item_id = Column(ForeignKey(Integer, "item", "article_id"), index=True, nullable=False)
     name = Column(Text)
-    material = Column(Text)
+    material = Column(Text, nullable=False)
     location = Column(Text)
     origin = Column(Text)
     notes = Column(Text)

{tibiawikisql-7.0.0 → tibiawikisql-7.0.2/tibiawikisql.egg-info}/PKG-INFO

@@ -1,11 +1,15 @@
 Metadata-Version: 2.4
 Name: tibiawikisql
-Version: 7.0.0
+Version: 7.0.2
 Summary: Python script that generates a SQLite database from TibiaWiki articles
 Author-email: Allan Galarza <allan.galarza@gmail.com>
 Maintainer-email: Allan Galarza <allan.galarza@gmail.com>
 License: Apache 2.0
-Project-URL: Homepage, https://github.com/Galarzaa90/tibiawiki-sql
+Project-URL: Homepage, https://tibiawiki-sql.readthedocs.io/
+Project-URL: Documentation, https://tibiawiki-sql.readthedocs.io/
+Project-URL: Repository, https://github.com/Galarzaa90/tibiawiki-sql
+Project-URL: Changelog, https://tibiawiki-sql.readthedocs.io/en/stable/changelog/
+Project-URL: Docker Hub: Repo, https://hub.docker.com/repository/docker/galarzaa90/tibiawiki-sql
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -64,11 +68,11 @@ externally.
 If you integrate this into your project or use the generated data, make sure to credit [TibiaWiki](https://tibia.fandom.com) and its contributors.
 
 
-[![Build Status](https://travis-ci.org/Galarzaa90/tibiawiki-sql.svg?branch=master)](https://travis-ci.org/Galarzaa90/tibiawiki-sql)
 [![GitHub (pre-)release](https://img.shields.io/github/release/Galarzaa90/tibiawiki-sql/all.svg)](https://github.com/Galarzaa90/tibiawiki-sql/releases)
 [![PyPI](https://img.shields.io/pypi/v/tibiawikisql.svg)](https://pypi.python.org/pypi/tibiawikisql/)
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/tibiawikisql.svg)
 ![PyPI - License](https://img.shields.io/pypi/l/tibiawikisql.svg)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/tibiawikisql)
 
 ## Requirements
 * Python 3.10 or higher