wi1-bot 1.4.13__py3-none-any.whl → 2.0.1__py3-none-any.whl

wi1_bot/config.py

@@ -1,6 +1,6 @@
 import os
 import pathlib
-from typing import TypedDict
+from typing import NotRequired, TypedDict
 
 import yaml
 
@@ -39,65 +39,27 @@ class PushoverConfig(TypedDict):
     devices: str
 
 
-# FIXME: python 3.11 supports typing.NotRequired (PEP 655)
-
-# from typing import NotRequired
-
-# class DiscordConfig(TypedDict):
-#     bot_token: str
-#     channel_id: int
-#     admin_id: int
-#     bot_presence: NotRequired[str]
-#     quotas: NotRequired[dict[int, float]]
-
-
-# class TranscodingProfile(TypedDict):
-#     video_codec: NotRequired[str]
-#     video_bitrate: NotRequired[int]
-#     audio_codec: NotRequired[str]
-#     audio_channels: NotRequired[int]
-#     audio_bitrate: NotRequired[str]
-
-
-# class TranscodingConfig(TypedDict):
-#     profiles: dict[str, TranscodingProfile]
-#     hwaccel: NotRequired[str]
-
-
-# class Config(TypedDict):
-#     radarr: ArrConfig
-#     sonarr: ArrConfig
-#     discord: DiscordConfig
-#     pushover: NotRequired[PushoverConfig]
-#     transcoding: NotRequired[TranscodingConfig]
-
-
-class DiscordConfigOptional(TypedDict, total=False):
-    bot_presence: str
-    quotas: dict[int, float]
-
-
-class DiscordConfig(DiscordConfigOptional):
+class DiscordConfig(TypedDict):
     bot_token: str
     channel_id: int
     admin_id: int
+    bot_presence: NotRequired[str]
+    quotas: NotRequired[dict[int, float]]
 
 
-class TranscodingProfile(TypedDict, total=False):
-    copy_all_streams: bool
-    video_codec: str
-    video_bitrate: int
-    audio_codec: str
-    audio_channels: int
-    audio_bitrate: str
-
-
-class TranscodingConfigOptional(TypedDict, total=False):
-    hwaccel: str  # optional
+class TranscodingProfile(TypedDict):
+    video_codec: NotRequired[str]
+    video_bitrate: NotRequired[int]
+    audio_codec: NotRequired[str]
+    audio_channels: NotRequired[int]
+    audio_bitrate: NotRequired[str]
+    copy_all_streams: NotRequired[bool]
+    languages: NotRequired[str]
 
 
-class TranscodingConfig(TranscodingConfigOptional):
+class TranscodingConfig(TypedDict):
     profiles: dict[str, TranscodingProfile]
+    hwaccel: NotRequired[str]
 
 
 class RemotePathMapping(TypedDict):
@@ -105,25 +67,18 @@ class RemotePathMapping(TypedDict):
     local: str
 
 
-class GeneralConfigOptional(TypedDict, total=False):
-    log_dir: str
-    remote_path_mappings: list[RemotePathMapping]
-
-
-class GeneralConfig(GeneralConfigOptional):
-    pass
-
-
-class ConfigOptional(TypedDict, total=False):
-    general: GeneralConfig  # optional
-    pushover: PushoverConfig  # optional
-    transcoding: TranscodingConfig  # optional
+class GeneralConfig(TypedDict):
+    log_dir: NotRequired[str]
+    remote_path_mappings: NotRequired[list[RemotePathMapping]]
 
 
-class Config(ConfigOptional):
+class Config(TypedDict):
+    general: NotRequired[GeneralConfig]  # optional
     radarr: ArrConfig
     sonarr: ArrConfig
     discord: DiscordConfig
+    pushover: NotRequired[PushoverConfig]
+    transcoding: NotRequired[TranscodingConfig]
 
 
 with open(_config_path, "r") as f:

wi1_bot/webhook.py

@@ -66,20 +66,13 @@ def on_download(req: dict[str, Any]) -> None:
 
     quality_options = config["transcoding"]["profiles"][quality_profile]
 
-    # python 3.11: TranscodingProfile and typing.LiteralString
-    def get_key(d: Any, k: str) -> Any:
-        try:
-            return d[k]
-        except KeyError:
-            return None
-
-    copy_all_streams = get_key(quality_options, "copy_all_streams")
-    languages = get_key(quality_options, "languages")
-    video_codec = get_key(quality_options, "video_codec")
-    video_bitrate = get_key(quality_options, "video_bitrate")
-    audio_codec = get_key(quality_options, "audio_codec")
-    audio_channels = get_key(quality_options, "audio_channels")
-    audio_bitrate = get_key(quality_options, "audio_bitrate")
+    copy_all_streams = quality_options.get("copy_all_streams", None)
+    languages = quality_options.get("languages", None)
+    video_codec = quality_options.get("video_codec", None)
+    video_bitrate = quality_options.get("video_bitrate", None)
+    audio_codec = quality_options.get("audio_codec", None)
+    audio_channels = quality_options.get("audio_channels", None)
+    audio_bitrate = quality_options.get("audio_bitrate", None)
 
     transcoder.queue.add(
         path=str(path),

{wi1_bot-1.4.13.dist-info → wi1_bot-2.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wi1-bot
-Version: 1.4.13
+Version: 2.0.1
 Summary: Discord bot for Radarr/Sonarr integration
 Project-URL: Homepage, https://github.com/wthueb/wi1-bot
 Author-email: William Huebner <wilhueb@gmail.com>
@@ -8,8 +8,8 @@ License-Expression: MIT
 License-File: LICENSE
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
-Requires-Python: >=3.10
+Classifier: Programming Language :: Python :: 3.11
+Requires-Python: >=3.11
 Requires-Dist: discord-py==2.3.2
 Requires-Dist: flask==3.0.2
 Requires-Dist: mongoengine==0.29.1
@@ -35,13 +35,14 @@ A Discord bot to integrate [Radarr](https://radarr.video/) & [Sonarr](https://so
 3. `pip install -e .[dev]`
 4. `pre-commit install`
 
-Requires Python >=3.10.
+Requires Python >=3.11.
 
 ### TODO
 
 - use sqlite
 - dynamically copy streams
   - i.e. if mov_text in input, -c:s srt
+  - https://github.com/HaveAGitGat/Tdarr_Plugins/blob/aef12f3c65905f5fc7d045b1a96ddc6a58dc55e7/FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.ts#L77
 - https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
 - link discord user to overseerr user
 - https://github.com/kkroening/ffmpeg-python

{wi1_bot-1.4.13.dist-info → wi1_bot-2.0.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 wi1_bot/__init__.py,sha256=dYlvBffClqwInBRSxSAoJHuujuh4yuPderFR4n7Odko,161
-wi1_bot/config.py,sha256=AtzOXvCeat_lb-w_Wy37XyWIpV3LmKh38OGigluJ2nM,3139
+wi1_bot/config.py,sha256=ndL3BxiOpXiDQGYNEIPtuusekS25miPFQrEphINxnsQ,2226
 wi1_bot/push.py,sha256=6EwQ1eXcJnQimAi0dOm1_t7Am056zob-1-EOkytGZWg,783
-wi1_bot/webhook.py,sha256=11rzmxhXnDeXWlgEnOLh26WP79rLeG71HaDvKUXuUcA,3665
+wi1_bot/webhook.py,sha256=xTN_-Ivdt1ANJFWkhF4W8csyqwfBNH33d-eWbsWOPS4,3482
 wi1_bot/arr/__init__.py,sha256=-6UE81yY6OhD6-nbLindChE_HlwsNRuL8JijUmo_Q6k,149
 wi1_bot/arr/download.py,sha256=02AYFglnFdWSG8xj_TaJc6l2wjybyhUW6F97CnoyUFw,1381
 wi1_bot/arr/episode.py,sha256=0K_auUYwkBBd_Ludc4-4z7lSW8HRQ3mchFQ7FR10JSU,1041
@@ -23,8 +23,8 @@ wi1_bot/scripts/transcode_item.py,sha256=21MeeIZ9wIRhAY-FOEgOdPsg6YOLlSUj59r8NkT
 wi1_bot/transcoder/__init__.py,sha256=B4xr82UtIFc3tyy_MEZdZKMukYW0yejPnfsGowaTIM0,105
 wi1_bot/transcoder/transcode_queue.py,sha256=W7r2I7OD8QuxseCEb7_ddOvYXiBBLmKLvCs2IgJJ92I,1856
 wi1_bot/transcoder/transcoder.py,sha256=2wIgDPkrrXcrSjA1HpYGd0RX5wonw1zfltJqGzCaorM,9163
-wi1_bot-1.4.13.dist-info/METADATA,sha256=yjnHN9HH8j8SYx13ZPrhG1AoCnrisOjCh9Iz-2Wt-AI,3475
-wi1_bot-1.4.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-wi1_bot-1.4.13.dist-info/entry_points.txt,sha256=pF5EawAQsUNMHs5exynpNdRq9g4dODg-RaPkx2MyYLU,184
-wi1_bot-1.4.13.dist-info/licenses/LICENSE,sha256=6V4_mQoPoLJl77_WMsQRQMDG2mnIhDUdfCmMkqM9Qwc,1072
-wi1_bot-1.4.13.dist-info/RECORD,,
+wi1_bot-2.0.1.dist-info/METADATA,sha256=bfPmddao9hTXv6WmyqiJP4kN06dFLAA8TMnle7LDWo8,3663
+wi1_bot-2.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+wi1_bot-2.0.1.dist-info/entry_points.txt,sha256=pF5EawAQsUNMHs5exynpNdRq9g4dODg-RaPkx2MyYLU,184
+wi1_bot-2.0.1.dist-info/licenses/LICENSE,sha256=6V4_mQoPoLJl77_WMsQRQMDG2mnIhDUdfCmMkqM9Qwc,1072
+wi1_bot-2.0.1.dist-info/RECORD,,