From 221669530c49638dc9ee5efc760bd9bccd76b160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Voituret?= <fvoituret@deezer.com>
Date: Fri, 8 Jan 2021 16:31:18 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=8A=20=20restore=20input=20argument=20?=
 =?UTF-8?q?with=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spleeter/__main__.py | 10 ++++++++--
 spleeter/options.py  | 14 +++++++++-----
 spleeter/py.typed    |  0
 3 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 spleeter/py.typed

diff --git a/spleeter/__main__.py b/spleeter/__main__.py
index 0c71e09..f252b17 100644
--- a/spleeter/__main__.py
+++ b/spleeter/__main__.py
@@ -19,7 +19,7 @@ from itertools import product
 from glob import glob
 from os.path import join
 from pathlib import Path
-from typing import Container, Dict, List
+from typing import Container, Dict, List, Optional
 
 from . import SpleeterError
 from .options import *
@@ -89,7 +89,8 @@ def train(
 
 @spleeter.command()
 def separate(
-        files: List[Path] = AudioInputOptions,
+        deprecated_file: Optional[str] = AudioInputOption,
+        files: List[Path] = AudioInputArgument,
         adapter: str = AudioAdapterOption,
         bitrate: str = AudioBitrateOption,
         codec: Codec = AudioCodecOption,
@@ -108,6 +109,11 @@ def separate(
     from .separator import Separator
 
     configure_logger(verbose)
+    if deprecated_file is not None:
+        logger.error(
+            '⚠️ -i option is not supported anymore, audio files must be supplied '
+            'using input argument instead (see spleeter separate --help)')
+        raise Exit(20)
     audio_adapter: AudioAdapter = AudioAdapter.get(adapter)
     separator: Separator = Separator(
         params_filename,
diff --git a/spleeter/options.py b/spleeter/options.py
index 4660e19..a014ee2 100644
--- a/spleeter/options.py
+++ b/spleeter/options.py
@@ -8,17 +8,15 @@ from os.path import join
 
 from .audio import Codec, STFTBackend
 
-from typer import Option
-from typer.models import OptionInfo
+from typer import Argument, Option
+from typer.models import ArgumentInfo, OptionInfo
 
 __email__ = 'spleeter@deezer.com'
 __author__ = 'Deezer Research'
 __license__ = 'MIT License'
 
-AudioInputOptions: OptionInfo = Option(
+AudioInputArgument: ArgumentInfo = Argument(
     ...,
-    '--inputs',
-    '-i',
     help='List of input audio file path',
     exists=True,
     file_okay=True,
@@ -26,6 +24,12 @@ AudioInputOptions: OptionInfo = Option(
     readable=True,
     resolve_path=True)
 
+AudioInputOption: OptionInfo = Option(
+    None,
+    '--inputs',
+    '-i',
+    help='(DEPRECATED) placeholder for deprecated input option')
+
 AudioAdapterOption: OptionInfo = Option(
     'spleeter.audio.ffmpeg.FFMPEGProcessAudioAdapter',
     '--adapter',
diff --git a/spleeter/py.typed b/spleeter/py.typed
new file mode 100644
index 0000000..e69de29