Compare commits
6 Commits
master
...
5f78ac6a1a
| Author | SHA1 | Date | |
|---|---|---|---|
| 5f78ac6a1a | |||
| 2beb54f219 | |||
| f546c9fbb7 | |||
| 667b06fe4a | |||
| 033d9dd167 | |||
| 7a97e1f23d |
35
.gitignore
vendored
35
.gitignore
vendored
@@ -1,13 +1,34 @@
|
|||||||
*.pyc
|
# --- python bytecode ---
|
||||||
*.org
|
|
||||||
*.ps1
|
|
||||||
.env
|
|
||||||
#*
|
|
||||||
.#*
|
|
||||||
__pycache__/
|
__pycache__/
|
||||||
|
*.py[cod]
|
||||||
|
*$py.class
|
||||||
|
|
||||||
|
# --- virtual environments ---
|
||||||
|
.venv/
|
||||||
venv/
|
venv/
|
||||||
|
env/
|
||||||
|
|
||||||
|
# --- environment files ---
|
||||||
|
.env
|
||||||
|
.env.*
|
||||||
|
*.local
|
||||||
|
|
||||||
|
# --- emacs ---
|
||||||
|
*~
|
||||||
|
\#*\#
|
||||||
|
.\#*
|
||||||
|
*.elc
|
||||||
|
|
||||||
|
# --- project private data ---
|
||||||
|
/private/
|
||||||
archive/
|
archive/
|
||||||
config/
|
|
||||||
downloads/
|
downloads/
|
||||||
data.json
|
data.json
|
||||||
|
|
||||||
|
# --- django ---
|
||||||
|
db.sqlite3
|
||||||
|
staticfiles/
|
||||||
|
media/
|
||||||
|
|
||||||
|
# --- misc ---
|
||||||
|
.DS_Store
|
||||||
24
agents.md
Normal file
24
agents.md
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
# agent rules
|
||||||
|
|
||||||
|
## priorities
|
||||||
|
- optimize for simplicity, boringness, and long-term maintainability
|
||||||
|
- prefer minimal diffs; avoid refactors unless required for the active task
|
||||||
|
|
||||||
|
## tech stack
|
||||||
|
- python
|
||||||
|
- file storage: json and csv, no sqlite or databases
|
||||||
|
- assume local virtual env is available and accessible
|
||||||
|
- do not add new dependencies unless explicitly approved; if unavoidable, document justification in the active task notes
|
||||||
|
|
||||||
|
## workflow
|
||||||
|
- work on ONE task at a time unless explicitly instructed otherwise
|
||||||
|
- at the start of work, state the task id you are executing
|
||||||
|
- do not start work unless a task id is specified; if missing, choose the earliest unchecked task and say so
|
||||||
|
- propose incremental steps
|
||||||
|
- always include basic tests for core logic
|
||||||
|
- add assumptions and questions along-the-way to the ** notes section under the active task
|
||||||
|
- when you complete a task:
|
||||||
|
- mark it [X] in pm/tasks.org
|
||||||
|
- fill in evidence with commit hash + commands run
|
||||||
|
- never mark complete unless acceptance criteria are met
|
||||||
|
- include date and time (HH:MM)
|
||||||
21
pm/task-sample.org
Normal file
21
pm/task-sample.org
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
#+title: Task Log
|
||||||
|
#+updated: [2026-03-31 Tue 16:03]
|
||||||
|
|
||||||
|
Use the template below, which should be a top-level org-mode header.
|
||||||
|
|
||||||
|
* [ ] M.m.m: Task Title (# commits)
|
||||||
|
description of the task
|
||||||
|
** pm notes: amplifying information
|
||||||
|
|
||||||
|
** Acceptance Criteria
|
||||||
|
1. Criterion
|
||||||
|
- expanded data
|
||||||
|
2. Criterion
|
||||||
|
|
||||||
|
** evidence
|
||||||
|
- commit: abc123, bcd234
|
||||||
|
- tests:
|
||||||
|
- datetime: [2026-03-18 Wed 14:15]
|
||||||
|
|
||||||
|
** notes
|
||||||
|
- explanation of work done, decisions made, reasoning
|
||||||
138
pm/tasks-v2.org
Normal file
138
pm/tasks-v2.org
Normal file
@@ -0,0 +1,138 @@
|
|||||||
|
#+title: Task Log
|
||||||
|
#+updated: [2026-03-31 Tue 16:03]
|
||||||
|
|
||||||
|
* youdis v2 goals:
|
||||||
|
1. Separate backend from frontend
|
||||||
|
2. Offload auth
|
||||||
|
3. Ensure auto nightly builds
|
||||||
|
4. Default output format supports plex browsing youtube channels as "tv shows"
|
||||||
|
5. Facilitate multiple GUI inbounds: Discord, Zulip, XMPP
|
||||||
|
|
||||||
|
* [ ] 2.0.0: define architecture (2-4)
|
||||||
|
define the target architecture for a private backend yt-dlp worker with thin chat frontends
|
||||||
|
** pm notes:
|
||||||
|
- keep this iterative. the point is to choose the shape and seam, not prematurely implement infra. likely decisions include backend framework, request/status model, and how thin the discord shim should be.
|
||||||
|
- goal is simple, private, maintainable deployment
|
||||||
|
- avoid auth, queues, or persistence beyond clear & immediate needs
|
||||||
|
|
||||||
|
** Acceptance Criteria
|
||||||
|
1. document the target architecture at a high level
|
||||||
|
- backend owns yt-dlp execution and job state
|
||||||
|
- frontends own chat-specific UX
|
||||||
|
2. identify key decisions still open
|
||||||
|
- backend choice
|
||||||
|
- service seam/endpoints
|
||||||
|
- status/progress model
|
||||||
|
3. capture enough structure to begin implementation
|
||||||
|
- repo/component layout is sketched
|
||||||
|
- next implementation task is unblocked
|
||||||
|
|
||||||
|
** evidence
|
||||||
|
- commit:
|
||||||
|
- tests:
|
||||||
|
- datetime:
|
||||||
|
|
||||||
|
** notes
|
||||||
|
|
||||||
|
* [ ] 2.0.1: build backend yt-dlp worker (3)
|
||||||
|
create the minimal backend/service skeleton and establish a working yt-dlp baseline with clean hooks for future frontends
|
||||||
|
** pm notes
|
||||||
|
- foundation; don't need the full finished service here, just the basic shape plus enough real yt-dlp execution to validate the seam and build on it.
|
||||||
|
- keep single-job semantics
|
||||||
|
- prioritize inspectable behavior over polish
|
||||||
|
|
||||||
|
** Acceptance Criteria
|
||||||
|
1. create the backend/service skeleton
|
||||||
|
- app/module layout exists
|
||||||
|
- core request path is stubbed or minimally working
|
||||||
|
2. establish a working yt-dlp baseline
|
||||||
|
- archive behavior is preserved
|
||||||
|
- output path behavior is preserved or intentionally updated
|
||||||
|
- use yt-dlp .conf and set reasonable default
|
||||||
|
3. expose basic hooks/interfaces for future frontends
|
||||||
|
- submit/request path exists
|
||||||
|
- status/progress hook exists
|
||||||
|
- basic health/version visibility exists
|
||||||
|
|
||||||
|
** evidence
|
||||||
|
- commit:
|
||||||
|
- tests:
|
||||||
|
- datetime:
|
||||||
|
|
||||||
|
** notes
|
||||||
|
|
||||||
|
* [ ] 2.0.2: update discord bot to use new backend (3)
|
||||||
|
update the discord bot into a thin frontend that talks to the backend and verify the flow end to end
|
||||||
|
** pm notes
|
||||||
|
- this is the first real frontend proof. once this works cleanly, zulip/xmpp should mostly be adapter work rather than downloader rewrites.
|
||||||
|
- keep discord logic thin; no auth
|
||||||
|
- do not duplicate yt-dlp behavior in the bot
|
||||||
|
|
||||||
|
** Acceptance Criteria
|
||||||
|
1. discord bot submits requests to backend
|
||||||
|
- command/input handling works
|
||||||
|
- acceptance/busy/failure responses are clear
|
||||||
|
2. discord bot relays useful backend status
|
||||||
|
- progress reporting works at a basic level
|
||||||
|
- completion/failure/skipped outcomes are surfaced
|
||||||
|
3. backend-discord flow is tested end to end
|
||||||
|
- valid request path tested
|
||||||
|
- busy or conflict behavior tested
|
||||||
|
- failure path tested
|
||||||
|
|
||||||
|
** evidence
|
||||||
|
- commit:
|
||||||
|
- tests:
|
||||||
|
- datetime:
|
||||||
|
|
||||||
|
** notes
|
||||||
|
|
||||||
|
* [ ] 2.0.3: remove deprecated discord-bot functionality (2)
|
||||||
|
delete or retire legacy bot behaviors that no longer fit once the backend split is in place
|
||||||
|
** pm notes
|
||||||
|
- only remove this after the new path works. this is cleanup, not pioneering work.
|
||||||
|
- favor deletion over compatibility shims
|
||||||
|
- keep operator controls only if still useful
|
||||||
|
|
||||||
|
** Acceptance Criteria
|
||||||
|
1. remove obsolete auth/user-management behavior
|
||||||
|
- old user persistence and commands are removed
|
||||||
|
- backend-facing flow no longer depends on them
|
||||||
|
2. remove obsolete downloader/runtime logic from bot
|
||||||
|
- bot no longer owns yt-dlp execution
|
||||||
|
- dead code paths are deleted
|
||||||
|
3. leave the bot in a coherent state
|
||||||
|
- remaining commands reflect actual supported behavior
|
||||||
|
- deprecated artifacts are clearly removed or marked
|
||||||
|
|
||||||
|
** evidence
|
||||||
|
- commit:
|
||||||
|
- tests:
|
||||||
|
- datetime:
|
||||||
|
|
||||||
|
** notes
|
||||||
|
|
||||||
|
* [ ] 2.0.5: fix automation and build pipeline (3)
|
||||||
|
repair and simplify the build/update/deploy path so it matches the new backend-plus-frontend structure
|
||||||
|
** pm notes
|
||||||
|
- this should come after architecture and discord integration stabilize. no point polishing the pipeline for the wrong shape.
|
||||||
|
- optimize for simple manual ops first
|
||||||
|
- stop here after pipeline is sane
|
||||||
|
|
||||||
|
** Acceptance Criteria
|
||||||
|
1. align build artifacts with the new structure
|
||||||
|
- docker/build scripts reflect current components
|
||||||
|
- runtime assumptions are consistent
|
||||||
|
2. review old automation artifacts
|
||||||
|
- stale runner/update/restart logic is removed or updated
|
||||||
|
- manual update/rebuild flow is clear
|
||||||
|
3. confirm deployment path works
|
||||||
|
- local or unraid deployment is validated
|
||||||
|
- pipeline is understandable enough to maintain
|
||||||
|
|
||||||
|
** evidence
|
||||||
|
- commit:
|
||||||
|
- tests:
|
||||||
|
- datetime:
|
||||||
|
|
||||||
|
** notes
|
||||||
123
pm/tasks.org
Normal file
123
pm/tasks.org
Normal file
@@ -0,0 +1,123 @@
|
|||||||
|
#+title: Youdis Task Log
|
||||||
|
#+updated: [2026-03-31 Tue 08:00]
|
||||||
|
|
||||||
|
* [X] 1.1.1: stabilize youdis core bot behavior (estimate 3 commits)
|
||||||
|
refactor the current `youdis.py` flow so authorization, download execution, and user feedback are correct and predictable without changing the product shape. keep this narrowly scoped to correctness and maintainability; do not redesign into a queueing platform yet. preserve archive-first behavior and dm status updates; do not add new infrastructure dependencies and prefer boring explicit state over clever concurrency.
|
||||||
|
|
||||||
|
** acceptance criteria
|
||||||
|
1. initialize and load `/config/users.json` safely in all cases
|
||||||
|
- create parent dirs before touch/open
|
||||||
|
- ensure `authorized_users` always has a valid default
|
||||||
|
- normalize stored ids to a single type
|
||||||
|
2. fix command-path correctness for `/youtube`, `/adduser`, and `/removeuser`
|
||||||
|
- authorized users can successfully invoke downloads
|
||||||
|
- add/remove user commands persist changes correctly
|
||||||
|
- remove broken/incomplete code paths
|
||||||
|
3. duplicate prevention relies on archive.txt
|
||||||
|
|
||||||
|
** pm notes
|
||||||
|
|
||||||
|
** evidence
|
||||||
|
- commit: 033d9dd
|
||||||
|
- tests: ~python3 -m py_compile ./youdis.py~
|
||||||
|
- datetime: [2026-03-31 Tue 13:28]
|
||||||
|
|
||||||
|
** notes
|
||||||
|
- store Discord user ids as strings in `users.json`
|
||||||
|
- duplicate prevention should continue to rely on `archive.txt`, not inferred hook errors
|
||||||
|
|
||||||
|
* [X] 1.1.2: remove global mutable download state and define single-job semantics (estimate 2 commits)
|
||||||
|
eliminate shared mutable hook state and make concurrent behavior explicit, even if the initial policy is just "one active job at a time." don't build a scheduler; ok if simplest outcome is single active job with clear busy message. cancellation can be coarse if yt-dlp/process boundaries make graceful stop annoying
|
||||||
|
|
||||||
|
** acceptance criteria
|
||||||
|
1. improve runtime handling for downloads
|
||||||
|
- replace brittle thread/join pattern with a simpler async-safe execution path
|
||||||
|
- catch and report real yt-dlp failures
|
||||||
|
- avoid misleading "already exists" error assumptions
|
||||||
|
2. progress reporting is isolated per request
|
||||||
|
- no module-level mutable title state shared across jobs
|
||||||
|
- hooks derive state from request-local context
|
||||||
|
3. active-job behavior is explicit
|
||||||
|
- either reject a second request while busy or implement a minimal tracked active job
|
||||||
|
- user-facing response explains current behavior
|
||||||
|
4. `/interrupt` is either implemented minimally or downgraded honestly
|
||||||
|
- no fake command implying cancellation works when it does not
|
||||||
|
- command behavior matches implementation
|
||||||
|
|
||||||
|
** evidence
|
||||||
|
- commit: 667b06f
|
||||||
|
- tests: ~python3 -m py_compile /home/user/proj/youdis/youdis.py~
|
||||||
|
- datetime: [2026-03-31 Tue 14:00]
|
||||||
|
|
||||||
|
** notes
|
||||||
|
- verify slash-command response patterns against the `interactions` library while touching runtime flow
|
||||||
|
|
||||||
|
* [ ] 1.1.3: move static yt-dlp behavior into config and shrink python surface area (estimate 2 commits)
|
||||||
|
shift stable downloader options into `default-yt-dlp.conf` so the bot code only handles dynamic inputs and orchestration. optimize for inspectability and low-friction manual ops. keep output naming durable enough for plex/plain-file use. avoid duplicating config values across code and conf.
|
||||||
|
|
||||||
|
** acceptance criteria
|
||||||
|
1. separate static vs dynamic yt-dlp options cleanly
|
||||||
|
- stable defaults live in `default-yt-dlp.conf`
|
||||||
|
- python injects only request-specific/runtime values
|
||||||
|
2. preserve archive and output behavior
|
||||||
|
- `archive.txt` remains the duplicate-prevention mechanism
|
||||||
|
- output paths remain stable and browseable
|
||||||
|
3. document config ownership
|
||||||
|
- clarify which settings belong in config vs code
|
||||||
|
- make future yt-dlp tuning possible without major python edits
|
||||||
|
|
||||||
|
** evidence
|
||||||
|
- commit:
|
||||||
|
- tests:
|
||||||
|
- datetime:
|
||||||
|
|
||||||
|
** notes
|
||||||
|
|
||||||
|
* [ ] 1.1.4: simplify image/build/update workflow around manual ops (estimate 3 commits)
|
||||||
|
reduce repo cruft from the gitea-runner/nightly-update experiment and replace it with explicit manual update/rebuild mechanics.
|
||||||
|
|
||||||
|
** acceptance criteria
|
||||||
|
1. define a manual update path for yt-dlp and app image lifecycle
|
||||||
|
- document or script manual `git pull`, rebuild, and redeploy
|
||||||
|
- remove or quarantine brittle auto-update assumptions
|
||||||
|
2. review and simplify `update-ytdlp.sh`, workflow yaml, and weekly restart artifacts
|
||||||
|
- keep only artifacts that serve the current manual-ops model
|
||||||
|
- delete or mark deprecated anything tied to abandoned automation paths
|
||||||
|
3. retain unraid deployment viability
|
||||||
|
- container can still be rebuilt and redeployed cleanly on jeeves
|
||||||
|
- resulting flow is understandable without rereading old ci experiments
|
||||||
|
|
||||||
|
- pm note: weekly restart is presumed suspect until proven necessary
|
||||||
|
|
||||||
|
** evidence
|
||||||
|
- commit:
|
||||||
|
- tests:
|
||||||
|
- datetime:
|
||||||
|
|
||||||
|
** notes
|
||||||
|
- do not let runner/workflow complexity dominate a small bot
|
||||||
|
- prefer explicit version pinning or manual binary refresh over magical nightlies
|
||||||
|
|
||||||
|
* [ ] 1.1.5: clean up packaging/deployment artifacts for unraid consumption (estimate 2 commits)
|
||||||
|
make the dockerfile, run script, and unraid-ca template consistent with the refactored app so deployment is less of a ritual ordeal.
|
||||||
|
|
||||||
|
** acceptance criteria
|
||||||
|
1. align docker/runtime assumptions
|
||||||
|
- paths like `/config` and `/downloads` are consistent across code, scripts, and container metadata
|
||||||
|
- env vars are documented and validated
|
||||||
|
2. review deployment artifacts for drift
|
||||||
|
- `dockerfile`, `run-youdis.sh`, and `unraid-ca-template.xml` reflect current behavior
|
||||||
|
- remove stale references and dead assumptions
|
||||||
|
3. make fresh deployment understandable
|
||||||
|
- a new deploy on unraid is possible without reconstructing tribal knowledge from old files
|
||||||
|
|
||||||
|
- pm note: this is packaging polish after core correctness, not before
|
||||||
|
|
||||||
|
** evidence
|
||||||
|
- commit:
|
||||||
|
- tests:
|
||||||
|
- datetime:
|
||||||
|
|
||||||
|
** notes
|
||||||
|
- keep container surface area small
|
||||||
|
- optimize for “future me can redeploy this without cursing past me too hard”
|
||||||
210
youdis.py
210
youdis.py
@@ -16,43 +16,100 @@ import asyncio
|
|||||||
import threading
|
import threading
|
||||||
|
|
||||||
userFile = Path('/config/users.json')
|
userFile = Path('/config/users.json')
|
||||||
userFile.touch(exist_ok=True)
|
userFile.parent.mkdir(exist_ok=True, parents=True)
|
||||||
|
|
||||||
bot = interactions.Client(intents=interactions.Intents.DEFAULT,default_scope=2147491904)
|
bot = interactions.Client(intents=interactions.Intents.DEFAULT,default_scope=2147491904)
|
||||||
|
|
||||||
userFile.parent.mkdir(exist_ok=True, parents=True)
|
def save_authorized_users(authorized_users):
|
||||||
try:
|
with open(userFile, 'w') as f:
|
||||||
with open(userFile, 'x') as f:
|
json.dump({'authorized_users': authorized_users}, f)
|
||||||
print(f'users.json not found; saving to {userFile}')
|
|
||||||
except FileExistsError:
|
|
||||||
with open(userFile, 'r') as f:
|
|
||||||
authorized_users = json.load(f).get('authorized_users')
|
|
||||||
print(f'authorized_users:{authorized_users}')
|
|
||||||
|
|
||||||
title = ''
|
def load_authorized_users():
|
||||||
|
if not userFile.exists():
|
||||||
|
save_authorized_users([])
|
||||||
|
print(f'users.json not found; saving to {userFile}')
|
||||||
|
return []
|
||||||
|
|
||||||
|
try:
|
||||||
|
with open(userFile, 'r') as f:
|
||||||
|
data = json.load(f)
|
||||||
|
except (json.JSONDecodeError, OSError):
|
||||||
|
save_authorized_users([])
|
||||||
|
print(f'users.json invalid; resetting {userFile}')
|
||||||
|
return []
|
||||||
|
|
||||||
|
authorized_users = data.get('authorized_users', [])
|
||||||
|
if not isinstance(authorized_users, list):
|
||||||
|
authorized_users = []
|
||||||
|
|
||||||
|
authorized_users = [str(user_id) for user_id in authorized_users]
|
||||||
|
save_authorized_users(authorized_users)
|
||||||
|
print(f'authorized_users:{authorized_users}')
|
||||||
|
return authorized_users
|
||||||
|
|
||||||
|
authorized_users = load_authorized_users()
|
||||||
|
|
||||||
|
active_job_lock = threading.Lock()
|
||||||
|
active_job = None
|
||||||
|
|
||||||
async def send_message(ctx, message):
|
async def send_message(ctx, message):
|
||||||
await ctx.author.send(message)
|
await ctx.author.send(message)
|
||||||
|
|
||||||
|
def claim_active_job(job):
|
||||||
|
global active_job
|
||||||
|
with active_job_lock:
|
||||||
|
if active_job is not None:
|
||||||
|
return active_job
|
||||||
|
active_job = job
|
||||||
|
return None
|
||||||
|
|
||||||
|
def get_active_job():
|
||||||
|
with active_job_lock:
|
||||||
|
return active_job
|
||||||
|
|
||||||
|
def clear_active_job(job):
|
||||||
|
global active_job
|
||||||
|
with active_job_lock:
|
||||||
|
if active_job is job:
|
||||||
|
active_job = None
|
||||||
|
|
||||||
def download_video(url, options):
|
def download_video(url, options):
|
||||||
with yt_dlp.YoutubeDL(options) as ydl:
|
with yt_dlp.YoutubeDL(options) as ydl:
|
||||||
ydl.download(url)
|
ydl.download(url)
|
||||||
|
|
||||||
def create_hook(ctx,loop):
|
def create_hook(ctx, loop, cancel_event):
|
||||||
|
seen_updates = set()
|
||||||
|
|
||||||
def hook(d):
|
def hook(d):
|
||||||
global title
|
if cancel_event.is_set():
|
||||||
|
raise yt_dlp.utils.DownloadCancelled('download canceled by /interrupt')
|
||||||
|
|
||||||
status = d.get('status')
|
status = d.get('status')
|
||||||
if status == 'error':
|
info = d.get('info_dict') or {}
|
||||||
msg = f'error; video probably already exists, have you checked archive.txt'
|
|
||||||
asyncio.run_coroutine_threadsafe(send_message(ctx,msg),loop)
|
if status not in {'downloading', 'finished'}:
|
||||||
elif d.get('info_dict').get('title') != title:
|
return
|
||||||
title = d.get('info_dict').get('title')
|
|
||||||
playlist_index = d.get('info_dict').get('playlist_index')
|
filename = d.get('filename') or info.get('_filename') or info.get('title')
|
||||||
playlist_count = d.get('info_dict').get('playlist_count')
|
update_key = (status, filename)
|
||||||
filename = d.get('filename')
|
if update_key in seen_updates:
|
||||||
url = d.get('info_dict').get('webpage_url')
|
return
|
||||||
msg = f'{status} {playlist_index} of {playlist_count}: {filename} <{url}>'
|
|
||||||
|
seen_updates.add(update_key)
|
||||||
|
playlist_index = info.get('playlist_index')
|
||||||
|
playlist_count = info.get('playlist_count')
|
||||||
|
url = info.get('webpage_url')
|
||||||
|
|
||||||
|
prefix = status
|
||||||
|
if playlist_index and playlist_count:
|
||||||
|
prefix = f'{status} {playlist_index} of {playlist_count}'
|
||||||
|
|
||||||
|
msg = f'{prefix}: {filename}'
|
||||||
|
if url:
|
||||||
|
msg = f'{msg} <{url}>'
|
||||||
|
|
||||||
asyncio.run_coroutine_threadsafe(send_message(ctx, msg), loop)
|
asyncio.run_coroutine_threadsafe(send_message(ctx, msg), loop)
|
||||||
|
|
||||||
return hook
|
return hook
|
||||||
|
|
||||||
@interactions.slash_command(name="youtube",description="download video from youtube to server")
|
@interactions.slash_command(name="youtube",description="download video from youtube to server")
|
||||||
@@ -64,9 +121,29 @@ def create_hook(ctx,loop):
|
|||||||
)
|
)
|
||||||
async def youtube(ctx: interactions.SlashContext, url:str):
|
async def youtube(ctx: interactions.SlashContext, url:str):
|
||||||
print(f'{ctx.author.id} requested {url}')
|
print(f'{ctx.author.id} requested {url}')
|
||||||
|
# check that user is authorized
|
||||||
|
if str(ctx.author.id) not in authorized_users:
|
||||||
|
if ctx.author.id == 127831327012683776:
|
||||||
|
await ctx.author.send('potato stop')
|
||||||
|
await ctx.author.send('you are not authorized to use this command. message my owner to be added.')
|
||||||
|
return
|
||||||
|
|
||||||
loop = asyncio.get_running_loop()
|
loop = asyncio.get_running_loop()
|
||||||
hook = create_hook(ctx,loop)
|
cancel_event = threading.Event()
|
||||||
msg = ''
|
hook = create_hook(ctx, loop, cancel_event)
|
||||||
|
job = {
|
||||||
|
'requester_id': str(ctx.author.id),
|
||||||
|
'request_url': url,
|
||||||
|
'cancel_event': cancel_event,
|
||||||
|
}
|
||||||
|
existing_job = claim_active_job(job)
|
||||||
|
if existing_job:
|
||||||
|
await ctx.author.send(
|
||||||
|
f'already downloading for <@{existing_job["requester_id"]}>. '
|
||||||
|
'single-job mode is enabled right now; try again after it finishes.'
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
# use api_to_cli and paste cli options to get the output you need
|
# use api_to_cli and paste cli options to get the output you need
|
||||||
yoptions = {
|
yoptions = {
|
||||||
'format':'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best',
|
'format':'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best',
|
||||||
@@ -82,35 +159,39 @@ async def youtube(ctx: interactions.SlashContext, url:str):
|
|||||||
'outtmpl': '%(uploader)s/%(playlist_title)s/%(playlist_index)s%(playlist_index& - )s%(title)s.%(ext)s',
|
'outtmpl': '%(uploader)s/%(playlist_title)s/%(playlist_index)s%(playlist_index& - )s%(title)s.%(ext)s',
|
||||||
'outtmpl_na_placeholder':'',
|
'outtmpl_na_placeholder':'',
|
||||||
}
|
}
|
||||||
# check that user is authorized
|
await ctx.channel.send(f'Downloading from <{url}>. Status updates via DM. Single-job mode is enabled.')
|
||||||
if ctx.author.id not in authorized_users:
|
|
||||||
if ctx.author.id == 127831327012683776:
|
try:
|
||||||
await ctx.author.send('potato stop')
|
await asyncio.to_thread(download_video, url, yoptions)
|
||||||
await ctx.author.send('you are not authorized to use this command. message my owner to be added.')
|
except yt_dlp.utils.DownloadCancelled as exc:
|
||||||
return
|
print(f'download canceled: {exc}')
|
||||||
|
await ctx.author.send(f'download canceled: {exc}')
|
||||||
|
except yt_dlp.utils.DownloadError as exc:
|
||||||
|
print(f'download failed: {exc}')
|
||||||
|
await ctx.author.send(f'download failed: {exc}')
|
||||||
|
except Exception as exc:
|
||||||
|
print(f'unexpected download failure: {exc}')
|
||||||
|
await ctx.author.send(f'unexpected download failure: {exc}')
|
||||||
else:
|
else:
|
||||||
await ctx.channel.send(f'Downloading from <{url}>. Status updates via DM.')
|
await ctx.author.send(f'download complete for <{url}>')
|
||||||
#await ctx.defer() #if you need up to 15m to respond
|
finally:
|
||||||
|
clear_active_job(job)
|
||||||
# 1/2 - download in separate thread, else progress_hook blocks downstream async ctx.send
|
|
||||||
download_thread = threading.Thread(target=download_video, args=(url,yoptions))
|
|
||||||
download_thread.start()
|
|
||||||
await asyncio.to_thread(download_thread.join)
|
|
||||||
|
|
||||||
# 2/2 - replace the above with this next try:
|
|
||||||
#try:
|
|
||||||
# await asyncio.to_thread(download_video, url, yoptions)
|
|
||||||
#except Exception as e:
|
|
||||||
# print(f"download failed: {e}")
|
|
||||||
# await ctx.author.send(f"download failed: {str(e)}")
|
|
||||||
|
|
||||||
|
|
||||||
@interactions.slash_command(name="interrupt",description="cancel current job")
|
@interactions.slash_command(name="interrupt",description="cancel current job")
|
||||||
@interactions.check(interactions.is_owner())
|
@interactions.check(interactions.is_owner())
|
||||||
async def _interrupt(ctx):
|
async def _interrupt(ctx):
|
||||||
# interrupt here
|
job = get_active_job()
|
||||||
print('interrupting current job - not implemented')
|
if not job:
|
||||||
await ctx.author.send('interrupting current job - not implemented')
|
await ctx.author.send('no active download to interrupt')
|
||||||
|
return
|
||||||
|
|
||||||
|
job['cancel_event'].set()
|
||||||
|
print(f'interrupt requested for {job["request_url"]}')
|
||||||
|
await ctx.author.send(
|
||||||
|
f'interrupt requested for <{job["request_url"]}>; '
|
||||||
|
'cancellation is coarse and will stop on the next yt-dlp progress update'
|
||||||
|
)
|
||||||
|
|
||||||
@interactions.slash_command(name="adduser",description="authorize target user")
|
@interactions.slash_command(name="adduser",description="authorize target user")
|
||||||
@interactions.slash_option(
|
@interactions.slash_option(
|
||||||
@@ -121,12 +202,14 @@ async def _interrupt(ctx):
|
|||||||
)
|
)
|
||||||
@interactions.check(interactions.is_owner())
|
@interactions.check(interactions.is_owner())
|
||||||
async def _adduser(ctx: interactions.SlashContext, user:interactions.OptionType.USER):
|
async def _adduser(ctx: interactions.SlashContext, user:interactions.OptionType.USER):
|
||||||
if str(user.id) not in authorized_users:
|
user_id = str(user.id)
|
||||||
authorized_users.append(str(user.id))
|
if user_id not in authorized_users:
|
||||||
with open(userFile,'w') as f: #overwrite file - fix later if other params come up
|
authorized_users.append(user_id)
|
||||||
json.dump({'authorized_users':authorized_users})
|
save_authorized_users(authorized_users)
|
||||||
print('react:checkmark')
|
print(f'authorized {user_id}')
|
||||||
await ctx.message.add_reaction('✅')
|
await ctx.author.send(f'authorized {user.mention}')
|
||||||
|
else:
|
||||||
|
await ctx.author.send(f'{user.mention} is already authorized')
|
||||||
|
|
||||||
@interactions.slash_command(name="removeuser",description="deauthorize target user")
|
@interactions.slash_command(name="removeuser",description="deauthorize target user")
|
||||||
@interactions.slash_option(
|
@interactions.slash_option(
|
||||||
@@ -137,19 +220,14 @@ async def _adduser(ctx: interactions.SlashContext, user:interactions.OptionType.
|
|||||||
)
|
)
|
||||||
@interactions.check(interactions.is_owner())
|
@interactions.check(interactions.is_owner())
|
||||||
async def _removeuser(ctx: interactions.SlashContext, user:interactions.OptionType.USER):
|
async def _removeuser(ctx: interactions.SlashContext, user:interactions.OptionType.USER):
|
||||||
if str(user.id) in authorized_users:
|
user_id = str(user.id)
|
||||||
# ? ? ? fix pls
|
if user_id in authorized_users:
|
||||||
i = index(authorized_users(str(user.id)))
|
authorized_users.remove(user_id)
|
||||||
|
save_authorized_users(authorized_users)
|
||||||
# update list, rewrite json
|
print(f'deauthorized {user_id}')
|
||||||
|
await ctx.author.send(f'deauthorized {user.mention}')
|
||||||
print('react:checkmark')
|
else:
|
||||||
await ctx.message.add_reaction('✅')
|
await ctx.author.send(f'{user.mention} is not currently authorized')
|
||||||
|
|
||||||
async def dl_hook(d):
|
|
||||||
msg = f'{d["status"]} {d["filename"]}'
|
|
||||||
print(msg)
|
|
||||||
await ctx.author.send(msg)
|
|
||||||
|
|
||||||
api_token = getenv('api_token')
|
api_token = getenv('api_token')
|
||||||
if not api_token:
|
if not api_token:
|
||||||
|
|||||||
Reference in New Issue
Block a user