Correct external view counts
diff --git a/changelog.md b/changelog.md
index e8e298b..28162f1 100644
--- a/changelog.md
+++ b/changelog.md
@@ -16,6 +16,7 @@ All notable changes to this media player project.
- Added an **Upkeeping** section to the admin dashboard for batch maintenance actions.
- Added per-video local view counts, external provider view counts, total public view counts, and configurable public statistics display.
- Added upkeep actions to correct external view counts in batches.
+- Added an upkeep action to correct catalogue order from video publish dates so newer dated videos appear first.
- Added public search for published videos.
- Added configurable URL rewriting, defaulting to `/v/`, `/all`, and `/search/`.
- Added a configurable homepage live section with a Videos/Live toggle and default Stream.Place embed support.
@@ -28,6 +29,7 @@ All notable changes to this media player project.
- Public display settings now control per-video counts, total counts, and page statistics.
- Admin video creation and editing now attempt to fill blank metadata from external media information.
- The main player now chooses between local media playback, direct remote media playback, and provider embeds based on stored source data.
+- Catalogue ordering now uses publish date as a tie-breaker after stored sort order.
- README documentation now reflects the current remote URL, provider embed, live section, view count, and pretty URL behavior.
### Fixed
diff --git a/includes/db.php b/includes/db.php
index 7d164f1..2dd8c7c 100644
--- a/includes/db.php
+++ b/includes/db.php
@@ -56,6 +56,7 @@ function get_db(): PDO {
CREATE INDEX IF NOT EXISTS idx_videos_published ON videos(published);
CREATE INDEX IF NOT EXISTS idx_videos_sort ON videos(sort_order, id);
+ CREATE INDEX IF NOT EXISTS idx_videos_created ON videos(created_at, id);
CREATE INDEX IF NOT EXISTS idx_videos_title ON videos(title);
CREATE INDEX IF NOT EXISTS idx_sources_video ON video_sources(video_id);
");
@@ -768,6 +769,42 @@ function media_correct_external_view_counts(int $limit = 25): array {
return media_restore_external_view_counts($limit);
}
+function media_catalogue_order_candidate_count(): int {
+ return (int)get_db()->query("SELECT COUNT(*) FROM videos")->fetchColumn();
+}
+
+function media_correct_catalogue_sort_order(): array {
+ $db = get_db();
+ $videos = $db->query("
+ SELECT id, sort_order
+ FROM videos
+ ORDER BY datetime(created_at) DESC, created_at DESC, id DESC
+ ")->fetchAll();
+
+ $result = [
+ 'checked' => count($videos),
+ 'updated' => 0,
+ ];
+ if (!$videos) return $result;
+
+ $stmt = $db->prepare("UPDATE videos SET sort_order=?, updated_at=datetime('now') WHERE id=?");
+ $db->beginTransaction();
+ try {
+ foreach ($videos as $index => $video) {
+ $sort_order = $index * 10;
+ if ((int)$video['sort_order'] === $sort_order) continue;
+ $stmt->execute([$sort_order, (int)$video['id']]);
+ $result['updated']++;
+ }
+ $db->commit();
+ } catch (Throwable $e) {
+ $db->rollBack();
+ throw $e;
+ }
+
+ return $result;
+}
+
function media_youtube_source_url_for_video(int $video_id): string {
$stmt = get_db()->prepare("
SELECT source_url
@@ -1436,7 +1473,7 @@ function get_videos_paginated(int $page, int $per_page, bool $published_only = t
LEFT JOIN video_sources vs ON vs.video_id = v.id
$where
GROUP BY v.id
- ORDER BY v.sort_order ASC, v.id DESC
+ ORDER BY v.sort_order ASC, datetime(v.created_at) DESC, v.created_at DESC, v.id DESC
LIMIT :limit OFFSET :offset
");
foreach ($bind as $key => $value) $rows->bindValue($key, $value);
diff --git a/index.php b/index.php
index 16dea3b..2c6e175 100644
--- a/index.php
+++ b/index.php
@@ -16,7 +16,7 @@ $video = $slug ? get_video_by_slug($slug) : null;
// Latest video as default if none specified
if (!$video) {
$db = get_db();
- $latest = $db->query("SELECT slug FROM videos WHERE published=1 ORDER BY sort_order ASC, id DESC LIMIT 1")->fetch();
+ $latest = $db->query("SELECT slug FROM videos WHERE published=1 ORDER BY sort_order ASC, datetime(created_at) DESC, created_at DESC, id DESC LIMIT 1")->fetch();
if ($latest) $video = get_video_by_slug($latest['slug']);
}