release(v1.8.2): media progress tracking + watched badges; PWA scaffolding; mobile switcher (closes #37)
This commit is contained in:
Ryan
135
src/controllers/MediaController.php
Normal file
135
src/controllers/MediaController.php
Normal file
@@ -0,0 +1,135 @@
|
||||
<?php
|
||||
// src/controllers/MediaController.php
|
||||
declare(strict_types=1);
|
||||
|
||||
require_once PROJECT_ROOT . '/config/config.php';
|
||||
require_once PROJECT_ROOT . '/src/models/MediaModel.php';
|
||||
require_once PROJECT_ROOT . '/src/lib/ACL.php';
|
||||
|
||||
class MediaController
|
||||
{
|
||||
private function jsonStart(): void {
|
||||
if (session_status() !== PHP_SESSION_ACTIVE) session_start();
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
set_error_handler(function ($severity, $message, $file, $line) {
|
||||
if (!(error_reporting() & $severity)) return;
|
||||
throw new ErrorException($message, 0, $severity, $file, $line);
|
||||
});
|
||||
}
|
||||
private function jsonEnd(): void { restore_error_handler(); }
|
||||
private function out($payload, int $status=200): void {
|
||||
http_response_code($status);
|
||||
echo json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||
}
|
||||
private function readJson(): array {
|
||||
$raw = file_get_contents('php://input');
|
||||
$data = json_decode($raw, true);
|
||||
return is_array($data) ? $data : [];
|
||||
}
|
||||
private function requireAuth(): ?string {
|
||||
if (empty($_SESSION['authenticated']) || $_SESSION['authenticated'] !== true) {
|
||||
$this->out(['error'=>'Unauthorized'], 401); return 'no';
|
||||
}
|
||||
return null;
|
||||
}
|
||||
private function checkCsrf(): ?string {
|
||||
$headers = function_exists('getallheaders') ? array_change_key_case(getallheaders(), CASE_LOWER) : [];
|
||||
$received = $headers['x-csrf-token'] ?? '';
|
||||
if (!isset($_SESSION['csrf_token']) || $received !== $_SESSION['csrf_token']) {
|
||||
$this->out(['error'=>'Invalid CSRF token'], 403); return 'no';
|
||||
}
|
||||
return null;
|
||||
}
|
||||
private function normalizeFolder($f): string {
|
||||
$f = trim((string)$f);
|
||||
return ($f==='' || strtolower($f)==='root') ? 'root' : $f;
|
||||
}
|
||||
private function validFolder($f): bool {
|
||||
return $f==='root' || (bool)preg_match(REGEX_FOLDER_NAME, $f);
|
||||
}
|
||||
private function validFile($f): bool {
|
||||
$f = basename((string)$f);
|
||||
return $f !== '' && (bool)preg_match(REGEX_FILE_NAME, $f);
|
||||
}
|
||||
private function enforceRead(string $folder, string $username): ?string {
|
||||
$perms = loadUserPermissions($username) ?: [];
|
||||
return ACL::canRead($username, $perms, $folder) ? null : "Forbidden";
|
||||
}
|
||||
|
||||
/** POST /api/media/updateProgress.php */
|
||||
public function updateProgress(): void {
|
||||
$this->jsonStart();
|
||||
try {
|
||||
if ($this->requireAuth()) return;
|
||||
if ($this->checkCsrf()) return;
|
||||
|
||||
$u = $_SESSION['username'] ?? '';
|
||||
$d = $this->readJson();
|
||||
$folder = $this->normalizeFolder($d['folder'] ?? 'root');
|
||||
$file = (string)($d['file'] ?? '');
|
||||
$seconds = isset($d['seconds']) ? floatval($d['seconds']) : 0.0;
|
||||
$duration = isset($d['duration']) ? floatval($d['duration']) : null;
|
||||
$completed = isset($d['completed']) ? (bool)$d['completed'] : null;
|
||||
$clear = isset($d['clear']) ? (bool)$d['clear'] : false;
|
||||
|
||||
if (!$this->validFolder($folder) || !$this->validFile($file)) {
|
||||
$this->out(['error'=>'Invalid folder/file'], 400); return;
|
||||
}
|
||||
if ($this->enforceRead($folder, $u)) { $this->out(['error'=>'Forbidden'], 403); return; }
|
||||
|
||||
if ($clear) {
|
||||
$ok = MediaModel::clearProgress($u, $folder, $file);
|
||||
$this->out(['success'=>$ok]); return;
|
||||
}
|
||||
|
||||
$row = MediaModel::saveProgress($u, $folder, $file, $seconds, $duration, $completed);
|
||||
$this->out(['success'=>true, 'state'=>$row]);
|
||||
} catch (Throwable $e) {
|
||||
error_log('MediaController::updateProgress: '.$e->getMessage());
|
||||
$this->out(['error'=>'Internal server error'], 500);
|
||||
} finally { $this->jsonEnd(); }
|
||||
}
|
||||
|
||||
/** GET /api/media/getProgress.php?folder=…&file=… */
|
||||
public function getProgress(): void {
|
||||
$this->jsonStart();
|
||||
try {
|
||||
if ($this->requireAuth()) return;
|
||||
$u = $_SESSION['username'] ?? '';
|
||||
$folder = $this->normalizeFolder($_GET['folder'] ?? 'root');
|
||||
$file = (string)($_GET['file'] ?? '');
|
||||
|
||||
if (!$this->validFolder($folder) || !$this->validFile($file)) {
|
||||
$this->out(['error'=>'Invalid folder/file'], 400); return;
|
||||
}
|
||||
if ($this->enforceRead($folder, $u)) { $this->out(['error'=>'Forbidden'], 403); return; }
|
||||
|
||||
$row = MediaModel::getProgress($u, $folder, $file);
|
||||
$this->out(['state'=>$row]);
|
||||
} catch (Throwable $e) {
|
||||
error_log('MediaController::getProgress: '.$e->getMessage());
|
||||
$this->out(['error'=>'Internal server error'], 500);
|
||||
} finally { $this->jsonEnd(); }
|
||||
}
|
||||
|
||||
/** GET /api/media/getViewedMap.php?folder=… (optional, for badges) */
|
||||
public function getViewedMap(): void {
|
||||
$this->jsonStart();
|
||||
try {
|
||||
if ($this->requireAuth()) return;
|
||||
$u = $_SESSION['username'] ?? '';
|
||||
$folder = $this->normalizeFolder($_GET['folder'] ?? 'root');
|
||||
|
||||
if (!$this->validFolder($folder)) {
|
||||
$this->out(['error'=>'Invalid folder'], 400); return;
|
||||
}
|
||||
if ($this->enforceRead($folder, $u)) { $this->out(['error'=>'Forbidden'], 403); return; }
|
||||
|
||||
$map = MediaModel::getFolderMap($u, $folder);
|
||||
$this->out(['map'=>$map]);
|
||||
} catch (Throwable $e) {
|
||||
error_log('MediaController::getViewedMap: '.$e->getMessage());
|
||||
$this->out(['error'=>'Internal server error'], 500);
|
||||
} finally { $this->jsonEnd(); }
|
||||
}
|
||||
}
|
||||
94
src/models/MediaModel.php
Normal file
94
src/models/MediaModel.php
Normal file
@@ -0,0 +1,94 @@
|
||||
<?php
|
||||
// src/models/MediaModel.php
|
||||
declare(strict_types=1);
|
||||
|
||||
require_once PROJECT_ROOT . '/config/config.php';
|
||||
require_once PROJECT_ROOT . '/src/lib/ACL.php';
|
||||
|
||||
class MediaModel
|
||||
{
|
||||
private static function baseDir(): string {
|
||||
$dir = rtrim(USERS_DIR, '/\\') . DIRECTORY_SEPARATOR . 'user_state';
|
||||
if (!is_dir($dir)) @mkdir($dir, 0775, true);
|
||||
return $dir . DIRECTORY_SEPARATOR;
|
||||
}
|
||||
|
||||
private static function filePathFor(string $username): string {
|
||||
// case-insensitive username file
|
||||
$safe = strtolower(preg_replace('/[^a-z0-9_\-\.]/i', '_', $username));
|
||||
return self::baseDir() . $safe . '_media.json';
|
||||
}
|
||||
|
||||
private static function loadState(string $username): array {
|
||||
$path = self::filePathFor($username);
|
||||
if (!file_exists($path)) return ["version"=>1, "items"=>[]];
|
||||
$json = file_get_contents($path);
|
||||
$data = json_decode($json, true);
|
||||
return (is_array($data) && isset($data['items'])) ? $data : ["version"=>1, "items"=>[]];
|
||||
}
|
||||
|
||||
private static function saveState(string $username, array $state): bool {
|
||||
$path = self::filePathFor($username);
|
||||
$tmp = $path . '.tmp';
|
||||
$ok = file_put_contents($tmp, json_encode($state, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT), LOCK_EX);
|
||||
if ($ok === false) return false;
|
||||
return @rename($tmp, $path);
|
||||
}
|
||||
|
||||
/** Save/merge a single file progress record. */
|
||||
public static function saveProgress(string $username, string $folder, string $file, float $seconds, ?float $duration, ?bool $completed): array {
|
||||
$folderKey = ($folder === '' || strtolower($folder)==='root') ? 'root' : $folder;
|
||||
$nowIso = date('c');
|
||||
|
||||
$state = self::loadState($username);
|
||||
if (!isset($state['items'][$folderKey])) $state['items'][$folderKey] = [];
|
||||
if (!isset($state['items'][$folderKey][$file])) {
|
||||
$state['items'][$folderKey][$file] = [
|
||||
"seconds" => 0,
|
||||
"duration" => $duration ?? 0,
|
||||
"completed" => false,
|
||||
"updatedAt" => $nowIso
|
||||
];
|
||||
}
|
||||
|
||||
$row =& $state['items'][$folderKey][$file];
|
||||
if ($duration !== null && $duration > 0) $row['duration'] = $duration;
|
||||
if ($seconds >= 0) $row['seconds'] = $seconds;
|
||||
if ($completed !== null) $row['completed'] = (bool)$completed;
|
||||
// auto-complete if we’re basically done
|
||||
if (!$row['completed'] && $row['duration'] > 0 && $row['seconds'] >= max(0, $row['duration'] * 0.95)) {
|
||||
$row['completed'] = true;
|
||||
}
|
||||
$row['updatedAt'] = $nowIso;
|
||||
|
||||
self::saveState($username, $state);
|
||||
return $row;
|
||||
}
|
||||
|
||||
/** Get a single file progress record. */
|
||||
public static function getProgress(string $username, string $folder, string $file): array {
|
||||
$folderKey = ($folder === '' || strtolower($folder)==='root') ? 'root' : $folder;
|
||||
$state = self::loadState($username);
|
||||
$row = $state['items'][$folderKey][$file] ?? null;
|
||||
return is_array($row) ? $row : ["seconds"=>0,"duration"=>0,"completed"=>false,"updatedAt"=>null];
|
||||
}
|
||||
|
||||
/** Folder map: filename => {seconds,duration,completed,updatedAt} */
|
||||
public static function getFolderMap(string $username, string $folder): array {
|
||||
$folderKey = ($folder === '' || strtolower($folder)==='root') ? 'root' : $folder;
|
||||
$state = self::loadState($username);
|
||||
$items = $state['items'][$folderKey] ?? [];
|
||||
return is_array($items) ? $items : [];
|
||||
}
|
||||
|
||||
/** Clear one file’s progress (e.g., “mark unviewed”). */
|
||||
public static function clearProgress(string $username, string $folder, string $file): bool {
|
||||
$folderKey = ($folder === '' || strtolower($folder)==='root') ? 'root' : $folder;
|
||||
$state = self::loadState($username);
|
||||
if (isset($state['items'][$folderKey][$file])) {
|
||||
unset($state['items'][$folderKey][$file]);
|
||||
return self::saveState($username, $state);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user