Skip to content

Commit

Permalink
Check if tinify is available
Browse files Browse the repository at this point in the history
  • Loading branch information
Guts committed Aug 28, 2023
1 parent 49c7bd7 commit a957ad6
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
12 changes: 11 additions & 1 deletion geotribu_cli/images/images_optimizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
from pathlib import Path

# package
from geotribu_cli.__about__ import __package_name__
from geotribu_cli.console import console
from geotribu_cli.constants import GeotribuDefaults
from geotribu_cli.images.optim_tinify import optimize_with_tinify
from geotribu_cli.images.optim_tinify import TINIFY_INSTALLED, optimize_with_tinify
from geotribu_cli.utils.check_path import check_path
from geotribu_cli.utils.start_uri import open_uri
from geotribu_cli.utils.str2bool import str2bool
Expand Down Expand Up @@ -109,6 +110,15 @@ def run(args: argparse.Namespace):

# check Tinify API KEY
if args.tool_to_use == "tinypng":
if not TINIFY_INSTALLED:
logger.critical(
"Tinify n'est pas installé, le service ne peut donc pas être utilisé. "
"Pour l'utiliser, installer l'outil avec les dépendances "
f"supplémentaires : pip install {__package_name__}[img-remote] ou "
f"pip install {__package_name__}[all]"
)
sys.exit(1)

if not getenv("TINIFY_API_KEY"):
logger.critical(
"La clé d'API de Tinify n'est pas configurée en variable "
Expand Down
7 changes: 6 additions & 1 deletion geotribu_cli/images/optim_tinify.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@
from urllib.parse import unquote, urlsplit

# 3rd party
import tinify
try:
import tinify

TINIFY_INSTALLED = True
except ImportError:
TINIFY_INSTALLED = False

# package
from geotribu_cli.constants import GeotribuDefaults
Expand Down

0 comments on commit a957ad6

Please sign in to comment.