Code refactoring

This commit is contained in:
jpk 2023-06-26 10:28:22 +02:00
parent e053b0d578
commit ab440db3a5
5 changed files with 185 additions and 10 deletions

162
.gitignore vendored Normal file
View File

@ -0,0 +1,162 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class
# C extensions
*.so
# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST
# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec
# Installer logs
pip-log.txt
pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/
# Translations
*.mo
*.pot
# Django stuff:
local_settings.py
db.sqlite3
db.sqlite3-journal
# Flask stuff:
instance/
.webassets-cache
# Scrapy stuff:
.scrapy
# Sphinx documentation
docs/_build/
# PyBuilder
.pybuilder/
target/
# Jupyter Notebook
.ipynb_checkpoints
# IPython
profile_default/
ipython_config.py
# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version
# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock
# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock
# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/
# Celery stuff
celerybeat-schedule
celerybeat.pid
# SageMath parsed files
*.sage.py
# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/
# Spyder project settings
.spyderproject
.spyproject
# Rope project settings
.ropeproject
# mkdocs documentation
/site
# mypy
.mypy_cache/
.dmypy.json
dmypy.json
# Pyre type checker
.pyre/
# pytype static type analyzer
.pytype/
# Cython debug symbols
cython_debug/
# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
# ignore historical data rebuilds
data_history/

View File

@ -5,9 +5,10 @@ from dataclasses import asdict, dataclass
from datetime import timedelta
from pathlib import Path
from git import Repo
from icecream import ic
from .lib.repo import commit_changes
@dataclass
class AccountStats:
@ -51,3 +52,6 @@ for account in accounts:
with open(account_dir / "stats.json", "w", encoding="utf-8") as fd:
json.dump(asdict(account_stats), fd)
commit_changes(f"Updated statistics on {timestamp}")

View File

@ -5,9 +5,10 @@ from datetime import datetime
from pathlib import Path
import requests
from git import Repo
from icecream import ic
from .lib.repo import commit_changes
BASE_URL = "https://d4armory.io/api"
@ -53,11 +54,4 @@ for account in accounts:
json.dump({"timestamp": str(fetch_timestamp)}, fd)
repo = Repo()
for untracked in repo.untracked_files:
untracked_file = Path(untracked)
ic(untracked_file)
if str(untracked_file).startswith("data/"):
repo.index.add(untracked_file)
if len(repo.index.diff("HEAD")) > 0:
repo.index.commit(f"Update {fetch_datetime}")
commit_changes(f"Data fetched on {fetch_datetime}")

View File

15
d4armorystash/lib/repo.py Normal file
View File

@ -0,0 +1,15 @@
from pathlib import Path
from git import Repo
from icecream import ic
def commit_changes(message: str) -> None:
repo = Repo()
for untracked in repo.untracked_files:
untracked_file = Path(untracked)
ic(untracked_file)
if str(untracked_file).startswith("data/"):
repo.index.add(untracked_file)
if len(repo.index.diff("HEAD")) > 0:
repo.index.commit(message)