tyler/syllabus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some code

Browse Source
This commit is contained in:
TylerCG 2025-05-12 22:31:08 -04:00
parent b2c4173676
commit 9e1c32a123
2 changed files with 33 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
app/download.py
View File

@ -134,22 +134,24 @@ class dropout():
with ArchiveOnlyYDL(dl_opts) as ydl: with ArchiveOnlyYDL(dl_opts) as ydl:
ydl.download([playlist_url]) ydl.download([playlist_url])
def show(show, season, episode_start=None): def show(show, season, specials=False, episode_start=None):
directory = f'/tv/{show}/Season {season}/' season_str = f"{int(season):02}" if not specials else "00"
if not os.path.exists(directory): directory = f"/tv/{show}/{'Specials' if specials else f'Season {season}'}"
os.makedirs(directory) os.makedirs(directory, exist_ok=True)
with open('/data/dropout.json', 'r') as json_file: with open('/data/dropout.json', 'r') as json_file:
url_mapping = json.load(json_file) url_mapping = json.load(json_file)
url = next((item['URL'] for item in url_mapping if item['SHOW'] == show), None) url = next((item['URL'] for item in url_mapping if item['SHOW'] == show), None)
if url is None: if url is None:
raise ValueError(f"Show '{show}' not found in the JSON data.") raise ValueError(f"Show '{show}' not found in the JSON data.")
playlist_url = f'{url}/season:{season}' playlist_url = f'{url}/season:{season}'
# Create match_filter # Match filter logic
filter_pattern = ( filter_pattern = (
"title !~= " "title "
f"{'~=' if specials else '!~='} "
r"'(?i).*behind.?the.?scenes.*" r"'(?i).*behind.?the.?scenes.*"
r"|.*trailer.*" r"|.*trailer.*"
r"|.*recap.*" r"|.*recap.*"
@ -163,22 +165,18 @@ class dropout():
'cookiefile': '/data/dropout.cookies.txt', 'cookiefile': '/data/dropout.cookies.txt',
} }
# Step 1: Extract playlist info # Extract playlist info
with yt_dlp.YoutubeDL(ydl_opts) as ydl: with yt_dlp.YoutubeDL(ydl_opts) as ydl:
playlist_info = ydl.extract_info(playlist_url, download=False) playlist_info = ydl.extract_info(playlist_url, download=False)
entries = playlist_info.get('entries', []) entries = playlist_info.get('entries', [])
filtered_entries = [] filtered_entries = [entry for entry in entries if match_filter(entry) is None]
for entry in entries:
if match_filter(entry) is None: # Not filtered out
filtered_entries.append(entry)
# Step 2: Download filtered entries with corrected episode numbers
episode_start = int(episode_start) if episode_start else 1 episode_start = int(episode_start) if episode_start else 1
for i, entry in enumerate(filtered_entries, start=episode_start): for i, entry in enumerate(filtered_entries, start=episode_start):
episode_number = f"{i:02}" episode_number = f"{i:02}"
filename_template = f"{show} - S{int(season):02}E{episode_number} - %(title)s.%(ext)s" filename_template = f"{show} - S{season_str}E{episode_number} - %(title)s.%(ext)s"
dl_opts = { dl_opts = {
'progress_hooks': [my_hook], 'progress_hooks': [my_hook],
@ -198,70 +196,6 @@ class dropout():
with yt_dlp.YoutubeDL(dl_opts) as ydl: with yt_dlp.YoutubeDL(dl_opts) as ydl:
ydl.download([entry['webpage_url']]) ydl.download([entry['webpage_url']])
def specials(show, season, episode_start):
directory = f'/tv/{show}/Specials/'
if not os.path.exists(directory):
os.makedirs(directory)
with open('/data/dropout.json', 'r') as json_file:
url_mapping = json.load(json_file)
url = next((item['URL'] for item in url_mapping if item['SHOW'] == show), None)
if url is None:
raise ValueError(f"Show '{show}' not found in the JSON data.")
playlist_url = f'{url}/season:{season}'
# Create match_filter
filter_pattern = (
"title ~= "
r"'(?i).*behind.?the.?scenes.*"
r"|.*trailer.*"
r"|.*recap.*"
r"|.*last.looks.*'"
)
match_filter = yt_dlp.utils.match_filter_func(filter_pattern)
ydl_opts = {
'quiet': True,
'skip_download': True,
'cookiefile': '/data/dropout.cookies.txt',
}
# Step 1: Extract playlist info
with yt_dlp.YoutubeDL(ydl_opts) as ydl:
playlist_info = ydl.extract_info(playlist_url, download=False)
entries = playlist_info.get('entries', [])
filtered_entries = []
for entry in entries:
if match_filter(entry) is None: # Not filtered out
filtered_entries.append(entry)
# Step 2: Download filtered entries with corrected episode numbers
episode_start = int(episode_start) if episode_start else 1
for i, entry in enumerate(filtered_entries, start=episode_start):
episode_number = f"{i:02}"
filename_template = f"{show} - S00E{episode_number} - %(title)s.%(ext)s"
dl_opts = {
'progress_hooks': [my_hook],
'download_archive': '/data/logs/dropout.archive.text',
'format': 'bestvideo+bestaudio/best',
'audio_quality': '256K',
'paths': {
'temp': '/temp',
'home': directory
},
'cookiefile': '/data/dropout.cookies.txt',
'writesubtitles': True,
'subtitleslangs': ['en'],
'outtmpl': filename_template,
}
with yt_dlp.YoutubeDL(dl_opts) as ydl:
ydl.download([entry['webpage_url']])
def series(force_download): def series(force_download):
json_data=[] json_data=[]
@ -302,7 +236,7 @@ class youtube():
logger.info(f'message=Received download request for {url}.') logger.info(f'message=Received download request for {url}.')
dl_ops = { dl_ops = {
'progress_hooks': [my_hook], 'progress_hooks': [my_hook],
'download_archive': '/data/logs/youtube.archive.text', 'download_archive': '/data/logs/youtube.archive.log',
'paths': { 'paths': {
'temp': '/temp', 'temp': '/temp',
'home': location 'home': location

41
app/main.py
View File

@ -131,7 +131,9 @@ async def dropout_download(
show: str = Form(...), show: str = Form(...),
season: Optional[int] = Form(None), season: Optional[int] = Form(None),
latest: bool = Form(False), latest: bool = Form(False),
archive: bool = Form(False) archive: bool = Form(False),
specials: bool = Form(False),
episode_start: Optional[int] = Form(None)
): ):
try: try:
# Resolve latest season if requested # Resolve latest season if requested
@ -157,15 +159,14 @@ async def dropout_download(
content={"status": "error", "message": "Season is required unless 'latest' is used."} content={"status": "error", "message": "Season is required unless 'latest' is used."}
) )
task_msg = f"{'Adding to archive' if archive else 'Starting download'} for show '{show}', season {season}{' specials' if specials else ''}."
task_msg = f"{'Adding to archive' if archive else 'Starting download'} for show '{show}', season {season}."
logger.info(f"message={task_msg}") logger.info(f"message={task_msg}")
# Schedule the background task # Schedule the background task
if archive: if archive:
background_tasks.add_task(download.dropout.archive, show, season) background_tasks.add_task(download.dropout.archive, show, season)
else: else:
background_tasks.add_task(download.dropout.show, show, season) background_tasks.add_task(download.dropout.show, show, season, specials, episode_start)
return JSONResponse( return JSONResponse(
status_code=200, status_code=200,
@ -174,13 +175,11 @@ async def dropout_download(
"message": ( "message": (
f"Series is being added to the completed archive for '{show}', season {season}." f"Series is being added to the completed archive for '{show}', season {season}."
if archive else if archive else
f"Series download started for '{show}', season {season}." f"Series download started for '{show}', season {season}{' specials' if specials else ''}."
) )
} }
) )
except Exception as e: except Exception as e:
logger.exception(f"Unhandled exception during /dropout/download: {e}") logger.exception(f"Unhandled exception during /dropout/download: {e}")
return JSONResponse( return JSONResponse(
@ -188,20 +187,20 @@ async def dropout_download(
content={"status": "error", "message": "An unexpected error occurred."} content={"status": "error", "message": "An unexpected error occurred."}
) )
@app.post("/dropout/download/specials", description="Downloads a seasons behind the scenes and trailers, ignores main episodes.") # @app.post("/dropout/download/specials", description="Downloads a seasons behind the scenes and trailers, ignores main episodes.")
async def dropoutDownload( # async def dropoutDownload(
background_tasks: BackgroundTasks, # background_tasks: BackgroundTasks,
show: str = Form(...), # show: str = Form(...),
season: int = Form(...), # season: int = Form(...),
episode: Optional[int] = Form(None) # episode: Optional[int] = Form(None)
): # ):
try: # try:
logger.info(f'message=Received download request for specials of season {season} of {show}.') # logger.info(f'message=Received download request for specials of season {season} of {show}.')
background_tasks.add_task(download.dropout.specials,show,season,episode) # background_tasks.add_task(download.dropout.specials,show,season,episode)
# download.dropout.show(show,season,episode) # # download.dropout.show(show,season,episode)
return JSONResponse(status_code=200, content={"status": "success", "message": "Series downloaded."}) # return JSONResponse(status_code=200, content={"status": "success", "message": "Series downloaded."})
except Exception as e: # except Exception as e:
return JSONResponse(status_code=500, content={"status": "error", "message": str(e)}) # return JSONResponse(status_code=500, content={"status": "error", "message": str(e)})
@app.post("/ydl") @app.post("/ydl")
async def ydl(background_tasks: BackgroundTasks, url: str = Form(...), location: str = Form(...)): async def ydl(background_tasks: BackgroundTasks, url: str = Form(...), location: str = Form(...)):