ModerateWinGuy/BDFR_Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for file naming
formatting_check / formatting_check (push) Failing after 6s
Details
Python Test / test (.sh, ubuntu-latest, 3.9) (push) Failing after 16s
Details
Python Test / test (.ps1, windows-latest, 3.9) (push) Has been cancelled
Details
Python Test / test (.sh, macos-latest, 3.9) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
ModerateWinGuy
2026-07-14 21:11:24 +12:00
parent 8f8e2c744d
commit f3dc8e46fd
16 changed files with 236 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web_interface/app/main.py
+5
View File
@@ -527,6 +527,11 @@ async def create_download_with_bdfr_api(download_type: str, name: str, **kwargs)
progress_callbacks=[callback]
)
elif download_type == "user":
# Set auth token in the BDFR manager if provided
if auth_token:
bdfr_manager.auth_token = auth_token
logger.info(f"[DEBUG] Set auth token in BDFR manager for user download")
bdfr_download_id = bdfr_manager.download_user(
name,
limit=kwargs.get('limit'),
web_interface/app/scheduled_tasks.py
+34 -36
View File
@@ -486,15 +486,19 @@ async def get_queue_status():
)
class UserDownloadRequest(BaseModel):
limit: int = Field(default=25, ge=1, le=1000)
sort: str = Field(default="hot")
download_mode: str = Field(default="download", pattern="^(download|archive|clone)$")
run_now: bool = Field(default=False)
run_time: str = Field(default="02:00", pattern="^([01]?[0-9]|2[0-3]):[0-5][0-9]$")
timezone: str = Field(default="UTC")
auth_state: Optional[str] = None
@router.post("/create-likes", response_model=ScheduledTaskResponse, status_code=status.HTTP_201_CREATED)
async def create_likes_task(
limit: int = 25,
sort: str = "hot",
download_mode: str = "download",
run_now: bool = False,
run_time: str = "02:00",
timezone: str = "UTC",
auth_state: str = None,
request: UserDownloadRequest,
db: Session = Depends(get_db)
):
"""
@@ -502,14 +506,14 @@ async def create_likes_task(
"""
try:
# Get current username from auth
if not auth_state:
if not request.auth_state:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail="Authentication required"
)
oauth_manager = get_oauth_manager()
auth_status = oauth_manager.get_auth_status(auth_state)
auth_status = oauth_manager.get_auth_status(request.auth_state)
if not auth_status["authenticated"]:
raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
@@ -521,15 +525,15 @@ async def create_likes_task(
# Validate timezone
try:
pytz.timezone(timezone)
pytz.timezone(request.timezone)
except pytz.exceptions.UnknownTimeZoneError:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail=f"Invalid timezone: {timezone}"
detail=f"Invalid timezone: {request.timezone}"
)
# Parse run_time
hour, minute = map(int, run_time.split(':'))
hour, minute = map(int, request.run_time.split(':'))
run_time_obj = time_type(hour=hour, minute=minute)
# Create task
@@ -538,16 +542,16 @@ async def create_likes_task(
enabled=True,
source_type="user",
source_name=username,
download_mode=download_mode,
limit=limit,
sort=sort,
download_mode=request.download_mode,
limit=request.limit,
sort=request.sort,
time_filter="day",
no_dupes=True,
simple_check=False,
schedule_frequency="daily",
run_time=run_time_obj,
timezone=timezone,
auth_state=auth_state,
timezone=request.timezone,
auth_state=request.auth_state,
upvoted=True,
saved=False
)
@@ -564,7 +568,7 @@ async def create_likes_task(
schedule_task(task)
# If run_now is True, queue it immediately
if run_now:
if request.run_now:
await task_queue.add_task(task.id, priority=1)
logger.info(f"Created likes task {task.id}: {task.name}")
@@ -584,13 +588,7 @@ async def create_likes_task(
@router.post("/create-saved", response_model=ScheduledTaskResponse, status_code=status.HTTP_201_CREATED)
async def create_saved_task(
limit: int = 25,
sort: str = "hot",
download_mode: str = "download",
run_now: bool = False,
run_time: str = "02:00",
timezone: str = "UTC",
auth_state: str = None,
request: UserDownloadRequest,
db: Session = Depends(get_db)
):
"""
@@ -598,14 +596,14 @@ async def create_saved_task(
"""
try:
# Get current username from auth
if not auth_state:
if not request.auth_state:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail="Authentication required"
)
oauth_manager = get_oauth_manager()
auth_status = oauth_manager.get_auth_status(auth_state)
auth_status = oauth_manager.get_auth_status(request.auth_state)
if not auth_status["authenticated"]:
raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
@@ -617,15 +615,15 @@ async def create_saved_task(
# Validate timezone
try:
pytz.timezone(timezone)
pytz.timezone(request.timezone)
except pytz.exceptions.UnknownTimeZoneError:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail=f"Invalid timezone: {timezone}"
detail=f"Invalid timezone: {request.timezone}"
)
# Parse run_time
hour, minute = map(int, run_time.split(':'))
hour, minute = map(int, request.run_time.split(':'))
run_time_obj = time_type(hour=hour, minute=minute)
# Create task
@@ -634,16 +632,16 @@ async def create_saved_task(
enabled=True,
source_type="user",
source_name=username,
download_mode=download_mode,
limit=limit,
sort=sort,
download_mode=request.download_mode,
limit=request.limit,
sort=request.sort,
time_filter="day",
no_dupes=True,
simple_check=False,
schedule_frequency="daily",
run_time=run_time_obj,
timezone=timezone,
auth_state=auth_state,
timezone=request.timezone,
auth_state=request.auth_state,
upvoted=False,
saved=True
)
@@ -660,7 +658,7 @@ async def create_saved_task(
schedule_task(task)
# If run_now is True, queue it immediately
if run_now:
if request.run_now:
await task_queue.add_task(task.id, priority=1)
logger.info(f"Created saved task {task.id}: {task.name}")
web_interface/app/scheduler.py
+8 -1
View File
@@ -231,8 +231,15 @@ async def execute_scheduled_task(task_id: str):
# For user downloads, set submitted appropriately
if task.source_type == 'user':
# For likes or saved, don't download submitted posts
# For likes or saved, still need authentication but don't download submitted posts
# Set submitted=False when downloading upvoted or saved posts
kwargs['submitted'] = not (task.upvoted or task.saved)
# Ensure auth_state is passed for user downloads requiring authentication
if task.upvoted or task.saved:
logger.info(f"User download task {task_id} requires authentication for {'likes' if task.upvoted else 'saved'} posts")
if not task.auth_state:
logger.warning(f"Task {task_id} needs authentication but no auth_state provided")
# Create download using existing API
download_id = await create_download_with_bdfr_api(
web_interface/data/scheduled_tasks.db
BIN
View File
Binary file not shown.
web_interface/data/scheduler_jobs.db
BIN
View File
Binary file not shown.
web_interface/templates/index.html
+91 -78
View File
@@ -1,11 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>BDFR Web Interface</title>
<link rel="stylesheet" href="/static/css/style.css">
</head>
<body>
<div class="container">
<header>
@@ -22,89 +24,93 @@
</div>
<div class="auth-actions">
<button id="loginBtn" class="btn btn-small btn-outline">🔐 Login with Reddit</button>
<button id="logoutBtn" class="btn btn-small btn-outline" style="display: none;">🚪 Logout</button>
<button id="logoutBtn" class="btn btn-small btn-outline" style="display: none;">🚪
Logout</button>
</div>
</div>
</div>
</header>
<!-- User Downloads Section -->
<section class="user-downloads-section" id="userDownloadsSection" style="display: none;">
<div class="form-container-unified">
<div class="form-card-unified">
<h2>📥 My Downloads</h2>
<p>Download your liked and saved posts from Reddit.</p>
<main>
<!-- User Downloads Section -->
<section class="user-downloads-section" id="userDownloadsSection" style="display: none;">
<div class="form-container-unified">
<div class="form-card-unified">
<h2>📥 My Downloads</h2>
<p>Download your liked and saved posts from Reddit.</p>
<!-- Download Mode Selection -->
<div class="form-section">
<h4>🎯 Download Mode</h4>
<div class="radio-group mode-radio-group">
<label class="radio-label mode-option" data-tooltip="Download media files (images, videos, gifs) from posts">
<input type="radio" name="user_download_mode" value="download" checked>
<span class="radio-custom"></span>
<span class="mode-label">
<strong>Download</strong>
<small>Media files only</small>
</span>
</label>
<label class="radio-label mode-option" data-tooltip="Save post metadata (title, author, comments) as JSON/XML without downloading media">
<input type="radio" name="user_download_mode" value="archive">
<span class="radio-custom"></span>
<span class="mode-label">
<strong>Archive</strong>
<small>Metadata only</small>
</span>
</label>
<label class="radio-label mode-option" data-tooltip="Download media files AND save metadata - complete backup of posts">
<input type="radio" name="user_download_mode" value="clone">
<span class="radio-custom"></span>
<span class="mode-label">
<strong>Clone</strong>
<small>Media + Metadata</small>
</span>
</label>
</div>
</div>
<!-- Scheduling Options -->
<div class="form-section">
<h4>⏰ Scheduling</h4>
<div class="radio-group">
<label class="radio-label">
<input type="radio" name="user_schedule_type" value="now" checked>
<span class="radio-custom"></span>
Run Now
</label>
<label class="radio-label">
<input type="radio" name="user_schedule_type" value="scheduled">
<span class="radio-custom"></span>
Schedule for Later
</label>
<!-- Download Mode Selection -->
<div class="form-section">
<h4>🎯 Download Mode</h4>
<div class="radio-group mode-radio-group">
<label class="radio-label mode-option"
data-tooltip="Download media files (images, videos, gifs) from posts">
<input type="radio" name="user_download_mode" value="download" checked>
<span class="radio-custom"></span>
<span class="mode-label">
<strong>Download</strong>
<small>Media files only</small>
</span>
</label>
<label class="radio-label mode-option"
data-tooltip="Save post metadata (title, author, comments) as JSON/XML without downloading media">
<input type="radio" name="user_download_mode" value="archive">
<span class="radio-custom"></span>
<span class="mode-label">
<strong>Archive</strong>
<small>Metadata only</small>
</span>
</label>
<label class="radio-label mode-option"
data-tooltip="Download media files AND save metadata - complete backup of posts">
<input type="radio" name="user_download_mode" value="clone">
<span class="radio-custom"></span>
<span class="mode-label">
<strong>Clone</strong>
<small>Media + Metadata</small>
</span>
</label>
</div>
</div>
<!-- Scheduled Options (shown when Schedule for Later is selected) -->
<div id="userScheduleOptions" class="schedule-options" style="display: none;">
<div class="form-group">
<label for="userRunTime">Run Time (24-hour format):</label>
<input type="time" id="userRunTime" name="user_run_time" value="02:00">
<small class="form-help">Time to run the download daily (in your local timezone)</small>
<!-- Scheduling Options -->
<div class="form-section">
<h4>⏰ Scheduling</h4>
<div class="radio-group">
<label class="radio-label">
<input type="radio" name="user_schedule_type" value="now" checked>
<span class="radio-custom"></span>
Run Now
</label>
<label class="radio-label">
<input type="radio" name="user_schedule_type" value="scheduled">
<span class="radio-custom"></span>
Schedule for Later
</label>
</div>
<!-- Scheduled Options (shown when Schedule for Later is selected) -->
<div id="userScheduleOptions" class="schedule-options" style="display: none;">
<div class="form-group">
<label for="userRunTime">Run Time (24-hour format):</label>
<input type="time" id="userRunTime" name="user_run_time" value="02:00">
<small class="form-help">Time to run the download daily (in your local
timezone)</small>
</div>
</div>
</div>
<!-- Action Buttons -->
<div class="form-section">
<h4>🚀 Actions</h4>
<div class="user-actions">
<button id="downloadLikesBtn" class="btn btn-primary">❤️ Download My Likes</button>
<button id="downloadSavedBtn" class="btn btn-primary">⭐ Download My Saved Posts</button>
</div>
</div>
</div>
<!-- Action Buttons -->
<div class="form-section">
<h4>🚀 Actions</h4>
<div class="user-actions">
<button id="downloadLikesBtn" class="btn btn-primary">❤️ Download My Likes</button>
<button id="downloadSavedBtn" class="btn btn-primary">⭐ Download My Saved Posts</button>
</div>
</div>
</div>
</div>
</section>
<main>
</section>
<!-- Unified Download Form Section -->
<section class="download-section">
<div class="form-container-unified">
@@ -115,7 +121,8 @@
<div class="form-section mode-section">
<h4>🎯 Download Mode</h4>
<div class="radio-group mode-radio-group">
<label class="radio-label mode-option" data-tooltip="Download media files (images, videos, gifs) from posts">
<label class="radio-label mode-option"
data-tooltip="Download media files (images, videos, gifs) from posts">
<input type="radio" name="download_mode" value="download" checked>
<span class="radio-custom"></span>
<span class="mode-label">
@@ -123,7 +130,8 @@
<small>Media files only</small>
</span>
</label>
<label class="radio-label mode-option" data-tooltip="Save post metadata (title, author, comments) as JSON/XML without downloading media">
<label class="radio-label mode-option"
data-tooltip="Save post metadata (title, author, comments) as JSON/XML without downloading media">
<input type="radio" name="download_mode" value="archive">
<span class="radio-custom"></span>
<span class="mode-label">
@@ -131,7 +139,8 @@
<small>Metadata only</small>
</span>
</label>
<label class="radio-label mode-option" data-tooltip="Download media files AND save metadata - complete backup of posts">
<label class="radio-label mode-option"
data-tooltip="Download media files AND save metadata - complete backup of posts">
<input type="radio" name="download_mode" value="clone">
<span class="radio-custom"></span>
<span class="mode-label">
@@ -162,7 +171,8 @@
<!-- Source Name Input -->
<div class="form-group">
<label for="sourceName" id="sourceNameLabel">Subreddit Name:</label>
<input type="text" id="sourceName" name="source_name" placeholder="e.g., python, machinelearning" required>
<input type="text" id="sourceName" name="source_name"
placeholder="e.g., python, machinelearning" required>
<small class="form-help" id="sourceNameHelp">Enter subreddit name without 'r/'</small>
</div>
@@ -239,13 +249,15 @@
<div id="scheduleOptions" class="schedule-options" style="display: none;">
<div class="form-group">
<label for="taskName">Task Name:</label>
<input type="text" id="taskName" name="task_name" placeholder="e.g., Daily Python Posts">
<input type="text" id="taskName" name="task_name"
placeholder="e.g., Daily Python Posts">
<small class="form-help">A friendly name to identify this scheduled task</small>
</div>
<div class="form-group">
<label for="runTime">Run Time (24-hour format):</label>
<input type="time" id="runTime" name="run_time" value="02:00">
<small class="form-help">Time to run the download daily (in your local timezone)</small>
<small class="form-help">Time to run the download daily (in your local
timezone)</small>
</div>
</div>
</div>
@@ -320,10 +332,11 @@
</main>
<footer>
<p>&copy; 2024 BDFR Web Interface. Powered by FastAPI.</p>
<p>&copy; 2025 BDFR Web Interface. Powered by FastAPI.</p>
</footer>
</div>
<script src="/static/js/app.js"></script>
</body>
</html>