Spaces:
Running
Running
Update watcher.py
Browse files- watcher.py +13 -1
watcher.py
CHANGED
|
@@ -99,6 +99,7 @@ def normalize_quality(option):
|
|
| 99 |
"8k": "4320",
|
| 100 |
"4320": "4320",
|
| 101 |
}
|
|
|
|
| 102 |
|
| 103 |
if option in quality_map:
|
| 104 |
return quality_map[option]
|
|
@@ -379,7 +380,17 @@ def main():
|
|
| 379 |
continue
|
| 380 |
|
| 381 |
quality_opt = normalize_quality(option)
|
| 382 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 383 |
youtube_url = f"https://www.youtube.com/watch?v={video_id}"
|
| 384 |
send_to_channel(f"{video_id} のダウンロードを開始します。")
|
| 385 |
|
|
@@ -422,6 +433,7 @@ def main():
|
|
| 422 |
m = re.match(r"(\d+)p", selected_video["quality"])
|
| 423 |
if m:
|
| 424 |
q = m.group(1)
|
|
|
|
| 425 |
try:
|
| 426 |
merged_url = merge_video_on_server(
|
| 427 |
selected_video["url"],
|
|
|
|
| 99 |
"8k": "4320",
|
| 100 |
"4320": "4320",
|
| 101 |
}
|
| 102 |
+
|
| 103 |
|
| 104 |
if option in quality_map:
|
| 105 |
return quality_map[option]
|
|
|
|
| 380 |
continue
|
| 381 |
|
| 382 |
quality_opt = normalize_quality(option)
|
| 383 |
+
valid_options = ["144", "240", "360", "480", "720", "1080", "1440", "2160", "4320", "4k", "8k", "2k", "a", "f"]
|
| 384 |
+
|
| 385 |
+
if option and quality_opt not in valid_options:
|
| 386 |
+
send_to_channel(
|
| 387 |
+
"不明な画質、または予期しない形式でした。\n"
|
| 388 |
+
"「144、240、360、480、720、1080、2k(1440でも可)、4k(2160でも可)、8k(4320でも可)、\n"
|
| 389 |
+
"a(結合処理は行わない)、f(最大画質)」の画質にのみ対応しています。\n"
|
| 390 |
+
"動画のURLの後にスペースを入れてそれらを指定してください。\n"
|
| 391 |
+
"指定されていない場合は720を使用します。\n"
|
| 392 |
+
"(今回は720pを使用します)"
|
| 393 |
+
)
|
| 394 |
youtube_url = f"https://www.youtube.com/watch?v={video_id}"
|
| 395 |
send_to_channel(f"{video_id} のダウンロードを開始します。")
|
| 396 |
|
|
|
|
| 433 |
m = re.match(r"(\d+)p", selected_video["quality"])
|
| 434 |
if m:
|
| 435 |
q = m.group(1)
|
| 436 |
+
send_to_channel(f"{q}pで音声との結合を開始しました。")
|
| 437 |
try:
|
| 438 |
merged_url = merge_video_on_server(
|
| 439 |
selected_video["url"],
|