Compare commits
18 commits
Author | SHA1 | Date | |
---|---|---|---|
fc80fc9b84 | |||
43d21deeed | |||
926aa582dc | |||
f3f4ec51d2 | |||
62f36dbdc2 | |||
347d9fc451 | |||
3fde0f4f08 | |||
db406adfdc | |||
941b4c5614 | |||
16beb10a54 | |||
0377c6282a | |||
ad4391caea | |||
fbda98805f | |||
174dd557e5 | |||
33dd722770 | |||
fc32b34095 | |||
8311d16354 | |||
ed8c9c446e |
26 changed files with 515 additions and 256 deletions
|
@ -8,13 +8,13 @@ on:
|
|||
jobs:
|
||||
lint-and-typing:
|
||||
runs-on: docker
|
||||
container: nikolaik/python-nodejs:python3.11-nodejs21
|
||||
container: forgejo.neshweb.net/ci-docker-images/python-neshweb:3.11
|
||||
steps:
|
||||
- name: Checkout source code
|
||||
uses: https://code.forgejo.org/actions/checkout@v3
|
||||
- name: Install packages
|
||||
run: |
|
||||
pip install -e .[lint,typing] -q --disable-pip-version-check -q
|
||||
pip install -e .[lint,typing] -q --disable-pip-version-check -q --no-cache-dir -q
|
||||
python -m pip list --format=columns --disable-pip-version-check
|
||||
- name: Run pylint
|
||||
run: |
|
||||
|
@ -28,12 +28,12 @@ jobs:
|
|||
build-artifacts:
|
||||
needs: ["lint-and-typing"]
|
||||
runs-on: docker
|
||||
container: nikolaik/python-nodejs:python3.11-nodejs21
|
||||
container: forgejo.neshweb.net/ci-docker-images/python-neshweb:3.11
|
||||
steps:
|
||||
- name: Checkout source code
|
||||
uses: https://code.forgejo.org/actions/checkout@v3
|
||||
- name: Install packages
|
||||
run: pip install build
|
||||
run: pip install build --no-cache-dir -q
|
||||
- name: Build package
|
||||
run: python -m build
|
||||
- name: Save build artifacts
|
||||
|
@ -45,7 +45,7 @@ jobs:
|
|||
publish-artifacts:
|
||||
needs: ["build-artifacts"]
|
||||
runs-on: docker
|
||||
container: nikolaik/python-nodejs:python3.11-nodejs21
|
||||
container: forgejo.neshweb.net/ci-docker-images/python-neshweb:3.11
|
||||
steps:
|
||||
- name: Downloading static site artifacts
|
||||
uses: actions/download-artifact@v3
|
||||
|
@ -53,7 +53,7 @@ jobs:
|
|||
name: packages
|
||||
path: dist
|
||||
- name: Install Dependencies
|
||||
run: pip install twine
|
||||
run: pip install twine --no-cache-dir -q
|
||||
- name: Upload package to registry
|
||||
run: python -m twine upload --repository-url ${{ secrets.REPOSITORY_URL }} -u ${{ secrets.TWINE_DEPLOY_USER }} -p ${{ secrets.TWINE_DEPLOY_PASSWORD }} dist/*
|
||||
|
||||
|
|
|
@ -5,13 +5,13 @@ on:
|
|||
jobs:
|
||||
pylint:
|
||||
runs-on: docker
|
||||
container: nikolaik/python-nodejs:python3.11-nodejs21
|
||||
container: forgejo.neshweb.net/ci-docker-images/python-neshweb:3.11
|
||||
steps:
|
||||
- name: Checkout source code
|
||||
uses: https://code.forgejo.org/actions/checkout@v3
|
||||
- name: Install packages
|
||||
run: |
|
||||
pip install -e .[lint] -q --disable-pip-version-check -q
|
||||
pip install -e .[lint] --disable-pip-version-check --no-cache-dir -q
|
||||
python -m pip list --format=columns --disable-pip-version-check
|
||||
- name: Run pylint
|
||||
run: |
|
||||
|
@ -20,13 +20,13 @@ jobs:
|
|||
|
||||
mypy:
|
||||
runs-on: docker
|
||||
container: nikolaik/python-nodejs:python3.11-nodejs21
|
||||
container: forgejo.neshweb.net/ci-docker-images/python-neshweb:3.11
|
||||
steps:
|
||||
- name: Checkout source code
|
||||
uses: https://code.forgejo.org/actions/checkout@v3
|
||||
- name: Install packages
|
||||
run: |
|
||||
pip install -e .[typing] -q --disable-pip-version-check -q
|
||||
pip install -e .[typing] --disable-pip-version-check --no-cache-dir -q
|
||||
python -m pip list --format=columns --disable-pip-version-check
|
||||
- name: Run mypy
|
||||
run: |
|
||||
|
|
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -1,7 +1,10 @@
|
|||
# Dev environment
|
||||
*venv/
|
||||
.vscode/
|
||||
*out*/
|
||||
assets/
|
||||
|
||||
# python files
|
||||
__pycache__/
|
||||
*.egg-info/
|
||||
*.egg-info/
|
||||
.mypy_cache/
|
||||
|
|
68
README.md
Normal file
68
README.md
Normal file
|
@ -0,0 +1,68 @@
|
|||
# skyeweave
|
||||
|
||||
Easily generate any FGO expression sheets from an id
|
||||
|
||||
> Developed by [Firq](https://firq.dev/) and powered by the [AtlasAcademy API](https://atlasacademy.io/)
|
||||
|
||||
## Installation
|
||||
|
||||
The CLI can be installed by using `pip`. Python >= 3.10 is required.
|
||||
|
||||
```shell
|
||||
pip install --extra-index-url https://forgejo.neshweb.net/api/packages/Firq/pypi/simple/ skyeweave
|
||||
```
|
||||
|
||||
Note: Specifying the additional index of `forgejo.neshweb.net` is necessary, as I don't host my packages on PyPI. Using `--extra-index-url` is necessary as the
|
||||
specified depencencies are not hosted on that index.
|
||||
|
||||
## Usage
|
||||
|
||||
### commandline
|
||||
|
||||
`skyeweave` is primarily a CLI application.
|
||||
|
||||
The following options are available:
|
||||
|
||||
- `--help` / `-h`: Shows helpful information about the other arguments
|
||||
- `--version`: Shows the version number
|
||||
- `--output`: Sets the output file path. This can be a relative path (`./out` or an absolute path `C:/files/out`)
|
||||
- `--id`: Specify a servantId or charaId. This will skip the user prompt afterwards (useful in CI applications)
|
||||
- `--filter`: Specify which spritesheets will actually be used. Useful if you want multiple spritesheets, but not all
|
||||
- `--timeout`: Sets the timeout for any requests towards the Atlas Academy API. The default is 10 seconds
|
||||
- `--no-cache`: Clear cache for this id, keeping all other files
|
||||
- `--reset`: Delete any already downloaded assets
|
||||
- `--quiet` / `-q`: Mute the output and hide progress bars
|
||||
|
||||
Typical usage:
|
||||
|
||||
```plain
|
||||
skyeweave --output out --id 70
|
||||
```
|
||||
|
||||
This would generate the expressions for Scathach (Servant Id 70) in the folder out, using subfolders to better separate the outputs of multiple runs.
|
||||
|
||||
### python scripts [EXPERIMENTAL]
|
||||
|
||||
`skyeweave` can also be used in other Python scripts.
|
||||
|
||||
```python
|
||||
from skyeweave import compose
|
||||
|
||||
compose(70)
|
||||
```
|
||||
|
||||
This feature will be expanded upon in future releases.
|
||||
|
||||
## Issues / Support
|
||||
|
||||
If there are any issues with `skyeweave`, feel free to reach out to me using the AtlasAcademy discord (`#dev-corner`) or create an issue in this repo.
|
||||
|
||||
If you want to help me debug when an issue occurs, set the environment variable `SKYEWEAVE_STDOUT_LEVEL` to `debug` and send me a copy of the log
|
||||
|
||||
Example on Windows:
|
||||
|
||||
```shell
|
||||
$env:SKYEWEAVE_STDOUT_LEVEL="debug"
|
||||
|
||||
skyeweave --output out --id 70 > log.log
|
||||
```
|
|
@ -1,2 +0,0 @@
|
|||
import importlib.metadata
|
||||
__version__ = importlib.metadata.version(__package__ or "atlasimagecomposer")
|
|
@ -1,47 +0,0 @@
|
|||
import requests
|
||||
|
||||
from ..config import Paths, ExpressionDefaults, AtlasDefaults
|
||||
|
||||
|
||||
def fetch_image(servantid: str, imageid: str):
|
||||
atlasurl = f"https://static.atlasacademy.io/{AtlasDefaults.REGION}/CharaFigure/{imageid}/{imageid}_merged.png"
|
||||
|
||||
savefolder = Paths.IMAGES / servantid
|
||||
if not savefolder.is_dir():
|
||||
savefolder.mkdir()
|
||||
filelocation = savefolder / f"{imageid}.png"
|
||||
|
||||
with open(filelocation, 'wb') as handle:
|
||||
response = requests.get(atlasurl, stream=True, timeout=10)
|
||||
if not response.ok:
|
||||
print(response)
|
||||
for block in response.iter_content(1024):
|
||||
if not block:
|
||||
break
|
||||
handle.write(block)
|
||||
|
||||
def fetch_info(servantid: str):
|
||||
atlasurl = f"https://api.atlasacademy.io/basic/{AtlasDefaults.REGION}/servant/{servantid}?lang=en"
|
||||
|
||||
response = requests.get(atlasurl, timeout=10)
|
||||
if not response.ok:
|
||||
print(response)
|
||||
|
||||
data = response.json()
|
||||
print(f"Fetching data and sprites for {data['name']} (ID: {servantid})")
|
||||
|
||||
def fetch_data(servantid: str):
|
||||
fetch_info(servantid)
|
||||
atlasurl = f"https://api.atlasacademy.io/raw/{AtlasDefaults.REGION}/servant/{servantid}?lore=false&expand=true&lang=en"
|
||||
|
||||
response = requests.get(atlasurl, timeout=10)
|
||||
if not response.ok:
|
||||
print(response)
|
||||
|
||||
data = response.json()
|
||||
return {
|
||||
str(spritesheet["id"]): {
|
||||
"faceSize": spritesheet["extendData"].get("faceSize", ExpressionDefaults.faceSize),
|
||||
"position": (spritesheet["faceX"], spritesheet["faceY"])
|
||||
} for spritesheet in data["mstSvtScript"]
|
||||
}
|
|
@ -1,118 +0,0 @@
|
|||
import math
|
||||
import pathlib
|
||||
import sys
|
||||
from typing import Tuple
|
||||
|
||||
import numpy as np
|
||||
from PIL import Image
|
||||
from tqdm.contrib import itertools as tqdm_itertools
|
||||
|
||||
from .atlas import fetch_data, fetch_image
|
||||
from ..config import ExpressionDefaults, Paths
|
||||
|
||||
def compose():
|
||||
Paths.IMAGES.mkdir(exist_ok=True)
|
||||
Paths.OUTPUT.mkdir(exist_ok=True)
|
||||
|
||||
servantid = input("Enter servant ID: ")
|
||||
try:
|
||||
t = int(servantid)
|
||||
if t <= 0:
|
||||
raise ValueError
|
||||
except ValueError:
|
||||
print("Servant ID has to be a valid integer above 0")
|
||||
sys.exit(1)
|
||||
sprites = fetch_data(servantid)
|
||||
|
||||
for sprite in sprites:
|
||||
fetch_image(servantid, sprite)
|
||||
|
||||
path = Paths.IMAGES / servantid
|
||||
for f in path.iterdir():
|
||||
process_sprite(f, sprites[f.stem]["position"], sprites[f.stem]["faceSize"], servantid)
|
||||
print(f"Files have been saved at: {(Paths.OUTPUT / servantid).absolute()}")
|
||||
|
||||
|
||||
def override_expressions(expressions: Image.Image, facesize: int) -> Tuple[Image.Image, int]:
|
||||
exp_w, exp_h = expressions.size
|
||||
composites, offset, floating_offset = [], facesize / 5, 0
|
||||
per_composite = (ExpressionDefaults.faceSize * 4) // facesize
|
||||
|
||||
# Why ..........
|
||||
composite_count = math.ceil((exp_h - 1280) / (offset + facesize * per_composite)) + 1
|
||||
|
||||
# Remove top offset
|
||||
expressions = expressions.crop((0, 256, exp_w, exp_h))
|
||||
|
||||
for count in range(0, composite_count):
|
||||
# width_topleft, height_topleft, width_botright, height_botright
|
||||
composites.append((0, 3 * count * facesize + floating_offset, exp_w, (3 * count + 3) * facesize + floating_offset - 1 ))
|
||||
floating_offset += offset
|
||||
|
||||
# Create new expression image, then add all compositions to it
|
||||
overrides = Image.new("RGBA", (exp_w, facesize * composite_count * 3), (255, 0, 0, 0))
|
||||
for idx, c in enumerate(composites):
|
||||
crop = expressions.crop(c)
|
||||
pos = (0, idx * 3 * facesize)
|
||||
overrides.paste(crop, pos, crop)
|
||||
|
||||
# Override expressions sheet
|
||||
return overrides.copy(), per_composite
|
||||
|
||||
|
||||
# pylint: disable=too-many-locals
|
||||
def process_sprite(filepath: pathlib.Path, position: tuple, facesize: int, servantid: str):
|
||||
im = Image.open(filepath)
|
||||
width, height = im.size
|
||||
|
||||
main_sprite = im.crop((0, 0, width, 768))
|
||||
save_sprite(main_sprite, servantid, filepath.stem)
|
||||
expressions = im.crop((0, 768, width, height))
|
||||
|
||||
expressionwidth, expressionheight = expressions.size
|
||||
rows = expressionheight // facesize
|
||||
expressions_p_row = expressionwidth // facesize
|
||||
|
||||
exp_per_row = 4
|
||||
|
||||
if facesize != ExpressionDefaults.faceSize:
|
||||
expressions, exp_per_row = override_expressions(expressions, facesize)
|
||||
|
||||
for x, y in tqdm_itertools.product(range(0, rows), range(0, expressions_p_row, 1), ascii="-="):
|
||||
img = generate_sprite(main_sprite, expressions, x, y, position, facesize)
|
||||
if img is not None:
|
||||
save_sprite(img, servantid, filepath.stem, (x, y, exp_per_row))
|
||||
|
||||
def is_empty(img: Image.Image):
|
||||
data = np.asarray(img.crop((96, 96, 160, 160)).convert('LA'))
|
||||
np.reshape(data, (-1, 1))
|
||||
_, count_unique = np.unique(data, return_counts=True)
|
||||
if count_unique.size < 10:
|
||||
return True
|
||||
return False
|
||||
|
||||
# pylint: disable=too-many-arguments
|
||||
def generate_sprite(sprite: Image.Image, expressions: Image.Image, row: int, col: int, position: tuple, facesize: int) -> Image.Image | None:
|
||||
area = (
|
||||
col * facesize,
|
||||
row * facesize,
|
||||
(col + 1) * facesize - 1,
|
||||
(row + 1) * facesize - 1
|
||||
)
|
||||
|
||||
expression = expressions.crop(area)
|
||||
if is_empty(expression):
|
||||
return None
|
||||
|
||||
composition = sprite.copy()
|
||||
composition.paste(expression, position, expression)
|
||||
return composition
|
||||
|
||||
def save_sprite(image: Image.Image, folder: str, name: str, rowcol: tuple | None = None):
|
||||
savefolder = Paths.OUTPUT / folder
|
||||
if not savefolder.is_dir():
|
||||
savefolder.mkdir()
|
||||
postfix = f"_{rowcol[0] * rowcol[2] + rowcol[1] + 1}" if rowcol is not None else "_0"
|
||||
outfile = savefolder / f"{name}{postfix}.png"
|
||||
with open(outfile, 'wb') as file:
|
||||
image.save(file)
|
|
@ -1,45 +0,0 @@
|
|||
import argparse
|
||||
import pathlib
|
||||
import sys
|
||||
|
||||
from .. import __version__
|
||||
from ..backend import compose
|
||||
from ..config import Paths
|
||||
|
||||
|
||||
# pylint: disable=too-few-public-methods
|
||||
class Arguments(argparse.Namespace):
|
||||
"""
|
||||
Default Arguments when calling the CLI
|
||||
"""
|
||||
output: str
|
||||
|
||||
def parse_arguments():
|
||||
"""
|
||||
Create a parser and parse the arguments of sys.argv based on the Arguments Namespace
|
||||
Returns arguments and extra arguments separately
|
||||
"""
|
||||
parser = argparse.ArgumentParser(
|
||||
prog="atlasimagecomposer",
|
||||
description="CLI tool to automatically generate expression sheets for servants",)
|
||||
|
||||
parser.add_argument("--output", action="store", type=str, default=None, dest="output", help="Set the output location. This can be an absolute or relative path")
|
||||
parser.add_argument("--version", action="version", version=f"atlasimagecomposer {__version__}")
|
||||
|
||||
args = Arguments()
|
||||
args, extra_args = parser.parse_known_args(sys.argv[1:], namespace=args)
|
||||
return args, extra_args
|
||||
|
||||
def welcome():
|
||||
print("-------------------------------------------------")
|
||||
print(" Welcome to the FGO Sprite loader and composer ")
|
||||
print(" developed by Firq ")
|
||||
print("-------------------------------------------------")
|
||||
|
||||
def run():
|
||||
args, _ = parse_arguments()
|
||||
if args.output:
|
||||
Paths.OUTPUT = pathlib.Path(args.output)
|
||||
|
||||
welcome()
|
||||
compose()
|
|
@ -1 +0,0 @@
|
|||
from .config import AtlasDefaults, ExpressionDefaults, Paths
|
|
@ -1,13 +0,0 @@
|
|||
# pylint: disable=too-few-public-methods
|
||||
import pathlib
|
||||
|
||||
class Paths:
|
||||
_root = pathlib.Path(__file__).parents[1]
|
||||
IMAGES = _root / ".temp"
|
||||
OUTPUT = _root / ".out"
|
||||
|
||||
class ExpressionDefaults:
|
||||
faceSize = 256
|
||||
|
||||
class AtlasDefaults:
|
||||
REGION = "JP"
|
|
@ -1,33 +1,23 @@
|
|||
[project]
|
||||
name = "atlasimagecomposer"
|
||||
version = "0.1.0-a.5"
|
||||
dependencies = [
|
||||
"numpy~=2.0.1",
|
||||
"pillow~=10.4.0",
|
||||
"requests~=2.32.3",
|
||||
"tqdm~=4.66.5",
|
||||
]
|
||||
name = "skyeweave"
|
||||
version = "1.0.0-c.2"
|
||||
requires-python = ">= 3.10"
|
||||
authors = [{name = "Firq", email = "firelp42@gmail.com"}]
|
||||
maintainers = [{name = "Firq", email = "firelp42@gmail.com"}]
|
||||
description = "Tool to manage requests for supports"
|
||||
description = "Easily generate any FGO expression sheets from an id"
|
||||
classifiers = [
|
||||
"Development Status :: 3 - Alpha",
|
||||
"Development Status :: 5 - Production/Stable",
|
||||
"Programming Language :: Python :: 3",
|
||||
"Programming Language :: Python :: 3.10",
|
||||
"Programming Language :: Python :: 3.11",
|
||||
"Programming Language :: Python :: 3.12",
|
||||
]
|
||||
|
||||
[project.scripts]
|
||||
atlasimagecomposer = "atlasimagecomposer.cli.cli:run"
|
||||
|
||||
[tool.setuptools.packages.find]
|
||||
where = ["."]
|
||||
include = ["atlasimagecomposer*"]
|
||||
|
||||
[tool.setuptools.package-data]
|
||||
"*" = ["py.typed"]
|
||||
dependencies = [
|
||||
"pillow~=10.4.0",
|
||||
"requests~=2.32.3",
|
||||
"tqdm~=4.66.5",
|
||||
]
|
||||
|
||||
[project.optional-dependencies]
|
||||
lint = [
|
||||
|
@ -39,18 +29,31 @@ typing = [
|
|||
"types-requests~=2.32.0",
|
||||
]
|
||||
|
||||
[project.scripts]
|
||||
skyeweave = "skyeweave.cli:run"
|
||||
|
||||
[tool.setuptools.packages.find]
|
||||
where = ["."]
|
||||
include = ["skyeweave*"]
|
||||
|
||||
[tool.setuptools.package-data]
|
||||
"*" = ["py.typed"]
|
||||
|
||||
[tool.pylint."MAIN"]
|
||||
disable = [
|
||||
"line-too-long",
|
||||
"missing-module-docstring",
|
||||
"missing-function-docstring",
|
||||
"missing-class-docstring",
|
||||
"logging-fstring-interpolation",
|
||||
]
|
||||
ignore-paths="test/*"
|
||||
|
||||
[tool.mypy]
|
||||
python_version = "3.11"
|
||||
warn_return_any = true
|
||||
warn_unused_configs = true
|
||||
exclude = [ "test" ]
|
||||
|
||||
[build-system]
|
||||
requires = ["setuptools >= 61.0"]
|
||||
|
|
5
skyeweave/__init__.py
Normal file
5
skyeweave/__init__.py
Normal file
|
@ -0,0 +1,5 @@
|
|||
import importlib.metadata
|
||||
|
||||
__version__ = importlib.metadata.version(__package__ or "skyeweave")
|
||||
|
||||
from .service import compose
|
1
skyeweave/cli/__init__.py
Normal file
1
skyeweave/cli/__init__.py
Normal file
|
@ -0,0 +1 @@
|
|||
from .cli import run
|
94
skyeweave/cli/cli.py
Normal file
94
skyeweave/cli/cli.py
Normal file
|
@ -0,0 +1,94 @@
|
|||
import argparse
|
||||
import logging
|
||||
import pathlib
|
||||
import sys
|
||||
from typing import List
|
||||
|
||||
from .. import __version__
|
||||
from ..service import compose
|
||||
from ..config import AtlasAPIConfig, LoggingConfig, PathConfig
|
||||
from ..utils import rmdir, disable_tqdm
|
||||
|
||||
LOGGER = logging.getLogger(LoggingConfig.NAME)
|
||||
|
||||
# pylint: disable=too-few-public-methods
|
||||
class CLIArguments(argparse.Namespace):
|
||||
"""
|
||||
Default Arguments when calling the CLI
|
||||
"""
|
||||
output: str
|
||||
id: int
|
||||
reset: bool
|
||||
nocache: bool
|
||||
filter: List[str]
|
||||
timeout: int
|
||||
quiet: bool
|
||||
|
||||
def parse_arguments(arguments):
|
||||
"""
|
||||
Create a parser and parse the arguments of sys.argv based on the Arguments Namespace
|
||||
Returns arguments and extra arguments separately
|
||||
"""
|
||||
parser = argparse.ArgumentParser(
|
||||
prog="skyeweave",
|
||||
description="CLI tool to automatically generate expression sheets for servants",
|
||||
epilog="If there are any issues during execution, it helps to clear the cache from time to time")
|
||||
|
||||
parser.add_argument("--version", action="version", version=f"skyeweave {__version__}")
|
||||
parser.add_argument("--output", action="store", type=str, default=None, dest="output", help="Set the output location. This can be an absolute or relative path")
|
||||
parser.add_argument("--id", action="store", type=int, default=None, dest="id", help="Set the servantId/charaId - Skips user prompt when provided")
|
||||
parser.add_argument("--filter", action="extend", nargs="+", dest="filter", help='SSpecify which spritesheets will actually be used (one or more charaIds)')
|
||||
parser.add_argument("--timeout", action="store", type=int, default=None, dest="timeout", help="Set the timeout for all requests towards AtlasAcademy (default: 10s)")
|
||||
parser.add_argument("--no-cache", action="store_true", default=False, dest="nocache", help="Clear cache for this id, keeping all other files")
|
||||
parser.add_argument("--reset", action="store_true", default=False, dest="reset", help="Delete any already downloaded assets")
|
||||
parser.add_argument("--quiet", "-q", action="store_true", default=False, dest="quiet", help="Mute output and hide progress bars")
|
||||
|
||||
return parser.parse_known_args(arguments, namespace=CLIArguments)
|
||||
|
||||
def __welcome():
|
||||
print("-------------------------------------------")
|
||||
print(" Welcome to skyeweave, an expression sheet ")
|
||||
print(" composer developed by Firq ")
|
||||
print("-------------------------------------------")
|
||||
|
||||
def validate_id(input_id: None | str) -> int:
|
||||
input_id = input_id or input("Enter servantId or charaId: ")
|
||||
|
||||
try:
|
||||
if int(input_id) <= 0:
|
||||
raise ValueError
|
||||
except ValueError:
|
||||
LOGGER.error("Servant ID has to be a valid integer above 0")
|
||||
sys.exit(1)
|
||||
|
||||
return int(input_id)
|
||||
|
||||
def run():
|
||||
args, _ = parse_arguments(sys.argv[1:])
|
||||
if args.output:
|
||||
PathConfig.OUTPUT = pathlib.Path(args.output)
|
||||
if args.timeout and args.timeout >= 0:
|
||||
AtlasAPIConfig.TIMEOUT = args.timeout
|
||||
if args.quiet:
|
||||
disable_tqdm()
|
||||
LOGGER.disabled = True
|
||||
else:
|
||||
__welcome()
|
||||
|
||||
input_id = validate_id(args.id)
|
||||
|
||||
if args.nocache:
|
||||
cachepath = PathConfig.IMAGES / str(input_id)
|
||||
if input_id > 10000:
|
||||
cachepath = PathConfig.IMAGES / "manual" / str(input_id)
|
||||
if cachepath.exists():
|
||||
rmdir(cachepath)
|
||||
LOGGER.info("Successfully cleared cached assets")
|
||||
else:
|
||||
LOGGER.info("No cache to clear was found, continuing")
|
||||
|
||||
if args.reset and PathConfig.IMAGES.exists():
|
||||
rmdir(PathConfig.IMAGES)
|
||||
LOGGER.info("Successfully reset local storage")
|
||||
|
||||
compose(input_id, args.filter)
|
1
skyeweave/config/__init__.py
Normal file
1
skyeweave/config/__init__.py
Normal file
|
@ -0,0 +1 @@
|
|||
from .config import AtlasAPIConfig, ExpressionDefaults, LoggingConfig, PathConfig
|
22
skyeweave/config/config.py
Normal file
22
skyeweave/config/config.py
Normal file
|
@ -0,0 +1,22 @@
|
|||
# pylint: disable=too-few-public-methods
|
||||
import os
|
||||
import pathlib
|
||||
|
||||
class LoggingConfig:
|
||||
_level = os.environ.get("SKYEWEAVE_STDOUT_LEVEL", "info")
|
||||
LEVEL = int(_level) if _level.isdigit() else _level.upper()
|
||||
NAME = "skyeweave"
|
||||
|
||||
class PathConfig:
|
||||
_root = pathlib.Path(__file__).parents[1]
|
||||
IMAGES = _root / ".temp"
|
||||
OUTPUT = pathlib.Path.cwd() / "output"
|
||||
|
||||
class ExpressionDefaults:
|
||||
FACESIZE = 256
|
||||
SHEETSIZE = 1024
|
||||
|
||||
class AtlasAPIConfig:
|
||||
REGION = "JP"
|
||||
TIMEOUT = 10
|
||||
MST_SVT_JSON = "https://git.atlasacademy.io/atlasacademy/fgo-game-data/raw/branch/JP/master/mstSvtScript.json"
|
126
skyeweave/service/atlas.py
Normal file
126
skyeweave/service/atlas.py
Normal file
|
@ -0,0 +1,126 @@
|
|||
import logging
|
||||
from typing import Annotated, List, NotRequired, Tuple, TypedDict
|
||||
import requests
|
||||
|
||||
from ..config import AtlasAPIConfig, PathConfig, ExpressionDefaults, LoggingConfig
|
||||
|
||||
LOGGER = logging.getLogger(LoggingConfig.NAME)
|
||||
|
||||
class SpritesheetData(TypedDict):
|
||||
facesize: Tuple[int, int]
|
||||
position: Tuple[int, int]
|
||||
|
||||
class ExtendData(TypedDict):
|
||||
faceSizeRect: NotRequired[Annotated[List[int], 2]]
|
||||
faceSize: NotRequired[int]
|
||||
|
||||
def fetch_config(chara_id: str) -> SpritesheetData:
|
||||
url = f"https://api.atlasacademy.io/raw/JP/svtScript?charaId={chara_id}"
|
||||
|
||||
LOGGER.debug(f"Loading data for {url}")
|
||||
response = requests.get(url, timeout=AtlasAPIConfig.TIMEOUT)
|
||||
LOGGER.debug(f"{response.status_code} - {response.text}")
|
||||
if not response.ok:
|
||||
raise ValueError()
|
||||
|
||||
resp_data = response.json()[0]
|
||||
extend_data: ExtendData = resp_data["extendData"]
|
||||
|
||||
if "faceSizeRect" in extend_data:
|
||||
facesize: Tuple[int, int] = tuple(extend_data["faceSizeRect"]) # type: ignore
|
||||
else:
|
||||
facesize = tuple(2 * [ extend_data.get("faceSize", ExpressionDefaults.FACESIZE) ]) # type: ignore
|
||||
|
||||
position: tuple[int, int] = (resp_data["faceX"], resp_data["faceY"])
|
||||
|
||||
returndata: SpritesheetData = {
|
||||
"facesize": facesize,
|
||||
"position": position
|
||||
}
|
||||
|
||||
LOGGER.debug(returndata)
|
||||
return returndata
|
||||
|
||||
def fetch_mstsvtjson():
|
||||
url = AtlasAPIConfig.MST_SVT_JSON
|
||||
filelocation = PathConfig.IMAGES / "mstsvt.json"
|
||||
|
||||
if filelocation.exists():
|
||||
LOGGER.info("Found cached asset for mstsvt.json")
|
||||
return
|
||||
|
||||
LOGGER.debug(f"Loading data for {url}")
|
||||
with open(filelocation, 'wb') as handle:
|
||||
response = requests.get(url, stream=True, timeout=AtlasAPIConfig.TIMEOUT)
|
||||
status = response.status_code
|
||||
LOGGER.debug(f"{response.status_code} - {response.text}")
|
||||
if status != 200:
|
||||
raise ValueError("Could not fetch mstsvnt.json from atlas - please check your network connection")
|
||||
for block in response.iter_content(1024):
|
||||
if not block:
|
||||
break
|
||||
handle.write(block)
|
||||
|
||||
def fetch_expression_sheets(basefolder: str, imageid: str):
|
||||
atlasurl_base = f"https://static.atlasacademy.io/{AtlasAPIConfig.REGION}/CharaFigure/{imageid}"
|
||||
|
||||
savefolder = PathConfig.IMAGES / basefolder / str(imageid)
|
||||
if not savefolder.is_dir():
|
||||
savefolder.mkdir(exist_ok=True, parents=True)
|
||||
|
||||
idx, status = 0, 200
|
||||
|
||||
while status == 200:
|
||||
filelocation = savefolder / f"{idx}.png"
|
||||
|
||||
postfix = ""
|
||||
if idx == 1:
|
||||
postfix = "f"
|
||||
elif idx > 1:
|
||||
postfix = f"f{idx}"
|
||||
|
||||
if filelocation.exists():
|
||||
LOGGER.info(f"Found cached asset for {imageid}{postfix}.png")
|
||||
idx += 1
|
||||
continue
|
||||
|
||||
filename = f"{imageid}{postfix}.png"
|
||||
atlasurl = f"{atlasurl_base}/{filename}"
|
||||
|
||||
LOGGER.debug(f"Loading data for {atlasurl}")
|
||||
with open(filelocation, 'wb') as handle:
|
||||
response = requests.get(atlasurl, stream=True, timeout=AtlasAPIConfig.TIMEOUT)
|
||||
status = response.status_code
|
||||
LOGGER.debug(f"{response.status_code} - {response.text}")
|
||||
if status != 200:
|
||||
continue
|
||||
for block in response.iter_content(1024):
|
||||
if not block:
|
||||
break
|
||||
handle.write(block)
|
||||
LOGGER.info(f"Finished downloading {filename}")
|
||||
idx += 1
|
||||
p = savefolder / f"{idx}.png"
|
||||
p.unlink(missing_ok=True)
|
||||
|
||||
return savefolder
|
||||
|
||||
|
||||
def fetch_data(servantid: int) -> List[str]:
|
||||
atlasurl = f"https://api.atlasacademy.io/nice/{AtlasAPIConfig.REGION}/servant/{servantid}?lore=false&lang=en"
|
||||
|
||||
LOGGER.debug(f"Loading data for {atlasurl}")
|
||||
response = requests.get(atlasurl, timeout=AtlasAPIConfig.TIMEOUT)
|
||||
LOGGER.debug(f"{response.status_code}")
|
||||
if not response.ok:
|
||||
LOGGER.debug(f"{response.status_code} - {response.text}")
|
||||
raise ValueError(f"{response.status_code} - {response.text}")
|
||||
|
||||
responsedata = response.json()
|
||||
svtname = responsedata["name"]
|
||||
charascripts: List[dict[str, str]] = responsedata["charaScripts"]
|
||||
chara_ids: List[str] = [chara["id"] for chara in charascripts]
|
||||
|
||||
LOGGER.debug(chara_ids)
|
||||
LOGGER.info(f"{svtname} ({servantid}) - {len(chara_ids)} charaIds")
|
||||
return chara_ids
|
116
skyeweave/service/compose.py
Normal file
116
skyeweave/service/compose.py
Normal file
|
@ -0,0 +1,116 @@
|
|||
import logging
|
||||
import pathlib
|
||||
from typing import List, Optional
|
||||
from collections import Counter
|
||||
|
||||
from PIL import Image
|
||||
from tqdm.contrib import itertools as tqdm_itertools
|
||||
|
||||
from ..config import PathConfig, LoggingConfig
|
||||
from .atlas import SpritesheetData, fetch_data, fetch_expression_sheets, fetch_config
|
||||
|
||||
LOGGER = logging.getLogger(LoggingConfig.NAME)
|
||||
|
||||
def compose(input_id: int, filters: Optional[List[str]] = None):
|
||||
PathConfig.IMAGES.mkdir(exist_ok=True)
|
||||
PathConfig.OUTPUT.mkdir(exist_ok=True)
|
||||
|
||||
if input_id < 10000:
|
||||
chara_ids = fetch_data(input_id)
|
||||
savefolder = PathConfig.OUTPUT / str(input_id)
|
||||
else:
|
||||
LOGGER.info(f"Processing manually uploaded charaId {input_id}")
|
||||
savefolder = PathConfig.OUTPUT / "manual"
|
||||
chara_ids = [str(input_id)]
|
||||
|
||||
if not savefolder.is_dir():
|
||||
savefolder.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
if filters is not None:
|
||||
chara_ids = [ v for v in chara_ids if v in filters ]
|
||||
LOGGER.debug(chara_ids)
|
||||
|
||||
for char_id in chara_ids:
|
||||
expfolder = fetch_expression_sheets(savefolder.stem, char_id)
|
||||
config = fetch_config(char_id)
|
||||
process_sprite(expfolder, config, savefolder)
|
||||
|
||||
LOGGER.info(f"Files have been saved at: {savefolder.absolute()}")
|
||||
|
||||
|
||||
def calculate_counts(width: int, height: int, facesize: tuple[int, int]):
|
||||
rowcount, colcount = height // facesize[1], width // facesize[0]
|
||||
LOGGER.debug(f"{height} | {facesize[1]} --> {rowcount}")
|
||||
LOGGER.debug(f"{width} | {facesize[0]} --> {colcount}")
|
||||
return rowcount, colcount
|
||||
|
||||
def gen_main_sprite(folder: pathlib.Path):
|
||||
image = Image.open(folder / "0.png")
|
||||
width, height = image.size
|
||||
LOGGER.debug(f"Main sprite ({folder}): {width}:{height}")
|
||||
return image.crop((0, 0, width, height - 256))
|
||||
|
||||
def process_sprite(images_folder: pathlib.Path, configdata: SpritesheetData, outputfolder: pathlib.Path):
|
||||
main_sprite = gen_main_sprite(images_folder)
|
||||
image_idx = save_sprite(main_sprite, outputfolder, f"{images_folder.stem}")
|
||||
|
||||
for i in images_folder.iterdir():
|
||||
LOGGER.debug(f"Idx: {image_idx}")
|
||||
initial_row = 0
|
||||
expressions = Image.open(i)
|
||||
|
||||
rowcount, colcount = calculate_counts(*expressions.size, configdata["facesize"])
|
||||
|
||||
if i.name == "0.png" and 256 < configdata["facesize"][1]:
|
||||
continue
|
||||
|
||||
if i.name == "0.png":
|
||||
initial_row = rowcount - 1
|
||||
|
||||
for x, y in tqdm_itertools.product(range(initial_row, rowcount), range(0, colcount), ascii="-=", desc=f"[PROG] [{LoggingConfig.NAME}]", bar_format="{desc} {percentage:3.0f}% |{bar}|"):
|
||||
img = generate_sprite(main_sprite, expressions, x, y, configdata)
|
||||
if img is not None:
|
||||
image_idx = save_sprite(img, outputfolder, f"{images_folder.stem}", image_idx)
|
||||
LOGGER.debug(f"{x}/{y} - {'Invalid' if img is None else 'Valid'} image")
|
||||
|
||||
|
||||
def generate_sprite(main_sprite: Image.Image, expressions: Image.Image, row: int, col: int, configdata: SpritesheetData) -> Image.Image | None:
|
||||
position, facesize = configdata["position"], configdata["facesize"]
|
||||
roi = (
|
||||
col * facesize[0],
|
||||
row * facesize[1],
|
||||
(col + 1) * facesize[0],
|
||||
(row + 1) * facesize[1]
|
||||
)
|
||||
LOGGER.debug(roi)
|
||||
expression = expressions.crop(roi)
|
||||
|
||||
if is_empty(expression):
|
||||
LOGGER.debug("Image empty")
|
||||
return None
|
||||
|
||||
mask = Image.new("RGBA", (facesize[0], facesize[1]), (255,255,255,255))
|
||||
composition = main_sprite.copy()
|
||||
composition.paste(expression, position, mask)
|
||||
return composition
|
||||
|
||||
|
||||
def save_sprite(image: Image.Image, outputfolder: pathlib.Path, name: str, idx: int = 0) -> int:
|
||||
savefolder = outputfolder / name
|
||||
if not savefolder.is_dir():
|
||||
savefolder.mkdir()
|
||||
outfile = savefolder / f"{idx}.png"
|
||||
|
||||
with open(outfile, 'wb') as file:
|
||||
image.save(file)
|
||||
|
||||
return idx + 1
|
||||
|
||||
def is_empty(img: Image.Image):
|
||||
w, h = img.size
|
||||
croparea = (w * 0.375, h * 0.375, w * 0.625, h * 0.625 )
|
||||
data = Counter(img.crop(croparea).convert('LA').getdata())
|
||||
LOGGER.debug(f"Counts: {len(data)}")
|
||||
if len(data) < 6:
|
||||
return True
|
||||
return False
|
2
skyeweave/utils/__init__.py
Normal file
2
skyeweave/utils/__init__.py
Normal file
|
@ -0,0 +1,2 @@
|
|||
from .filesystem import rmdir
|
||||
from .logger import LOGGER, disable_tqdm
|
14
skyeweave/utils/filesystem.py
Normal file
14
skyeweave/utils/filesystem.py
Normal file
|
@ -0,0 +1,14 @@
|
|||
import pathlib
|
||||
|
||||
def rmdir(directory: pathlib.Path):
|
||||
"""
|
||||
Recursively deletes all files and folders in a given directory
|
||||
|
||||
From: https://stackoverflow.com/a/49782093 (thanks mitch)
|
||||
"""
|
||||
for item in directory.iterdir():
|
||||
if item.is_dir():
|
||||
rmdir(item)
|
||||
else:
|
||||
item.unlink()
|
||||
directory.rmdir()
|
27
skyeweave/utils/logger.py
Normal file
27
skyeweave/utils/logger.py
Normal file
|
@ -0,0 +1,27 @@
|
|||
# pylint: disable=import-outside-toplevel
|
||||
import logging
|
||||
import sys
|
||||
|
||||
from ..config import LoggingConfig
|
||||
|
||||
def disable_tqdm():
|
||||
from tqdm import tqdm
|
||||
from functools import partialmethod
|
||||
tqdm.__init__ = partialmethod(tqdm.__init__, disable=True)
|
||||
|
||||
def __init_logger():
|
||||
if LoggingConfig.LEVEL == "DEBUG":
|
||||
disable_tqdm()
|
||||
|
||||
default_logger = logging.getLogger(LoggingConfig.NAME)
|
||||
default_logger.setLevel(LoggingConfig.LEVEL)
|
||||
|
||||
default_handler = logging.StreamHandler(stream=sys.stdout)
|
||||
default_formatter = logging.Formatter('[%(levelname)s] [%(name)s] %(message)s')
|
||||
|
||||
default_handler.setFormatter(default_formatter)
|
||||
default_logger.addHandler(default_handler)
|
||||
|
||||
return default_logger
|
||||
|
||||
LOGGER = __init_logger()
|
3
test.py
Normal file
3
test.py
Normal file
|
@ -0,0 +1,3 @@
|
|||
from skyeweave import compose
|
||||
|
||||
compose(70)
|
Loading…
Reference in a new issue