Compare commits

..
6 Commits
Author SHA1 Message Date
RarDog af00cb8179 fix: resolve video misclassification when filename contains 'audio' and remove legacy Kemono/Coomer providers
Build and Release / Build Windows x64 (push) Has been cancelled
Build and Release / Build macOS (push) Has been cancelled
2026-09-05 15:35:41 +03:00
RarDog 5e3efb0da9 feat: add audio playback support (MP3/WAV/FLAC) and fix attachment loading in creator posts
Build and Release / Build Windows x64 (push) Has been cancelled
Build and Release / Build macOS (push) Has been cancelled
2026-09-05 15:16:08 +03:00
RarDog 2dad5e9c82 docs: adjust vibe coding disclaimer wording 2026-09-05 14:42:47 +03:00
RarDog aba8ceb13c docs: add Vibe Coding disclaimer to English and Russian READMEs 2026-09-05 14:40:46 +03:00
RarDog 5fba08cd01 docs: add English README and preserve Russian README_RU with language switcher 2026-09-05 14:22:58 +03:00
RarDog d5916e01b5 fix(artists): resolve double keyboard inset and white square bug during search (v3.5.2)
Build and Release / Build Windows x64 (push) Has been cancelled
Build and Release / Build macOS (push) Has been cancelled
2026-09-05 13:16:00 +03:00
21 changed files with 1494 additions and 805 deletions
+96 -76
View File
@@ -1,3 +1,7 @@
<p align="center">
<strong>English</strong> • <a href="README_RU.md">Русский</a>
</p>
# 💎 Prisma # 💎 Prisma
<p align="center"> <p align="center">
@@ -5,124 +9,127 @@
</p> </p>
<p align="center"> <p align="center">
<strong>Современный кроссплатформенный клиент для Booru и Creator-архивов нового поколения</strong><br> <strong>A modern, next-generation cross-platform client for Booru imageboards and Creator archives</strong><br>
Плавный Pinterest-стиль, интеграция Pawchive 2.0, двусторонняя синхронизация, интеллектуальное автообновление и воспроизведение медиа без задержек. Smooth Pinterest-style masonry feed, Pawchive 2.0 two-way synchronization, intelligent in-app updates, dynamic aspect ratio detection, and buttery-smooth media playback.
</p> </p>
<p align="center"> <p align="center">
<a href="https://github.com/RarDog/Prisma/releases"><img src="https://img.shields.io/badge/Version-3.4.1-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.4.1" /></a> <a href="https://github.com/RarDog/Prisma/releases"><img src="https://img.shields.io/badge/Version-3.5.4-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.5.4" /></a>
<img src="https://img.shields.io/badge/Flutter-3.47+-02569B?style=for-the-badge&logo=flutter&logoColor=white" alt="Flutter" /> <img src="https://img.shields.io/badge/Flutter-3.47+-02569B?style=for-the-badge&logo=flutter&logoColor=white" alt="Flutter" />
<img src="https://img.shields.io/badge/Platform-Android%20%7C%20Linux%20%7C%20Windows-00C853?style=for-the-badge" alt="Platforms" /> <img src="https://img.shields.io/badge/Platform-Android%20%7C%20Linux%20%7C%20Windows%20%7C%20macOS-00C853?style=for-the-badge" alt="Platforms" />
<a href="https://github.com/RarDog/Prisma/wiki"><img src="https://img.shields.io/badge/Wiki-Documentation-FF6F00?style=for-the-badge&logo=gitbook&logoColor=white" alt="Wiki" /></a> <a href="https://github.com/RarDog/Prisma/wiki"><img src="https://img.shields.io/badge/Wiki-Documentation-FF6F00?style=for-the-badge&logo=gitbook&logoColor=white" alt="Wiki" /></a>
<img src="https://img.shields.io/badge/License-MIT-blue?style=for-the-badge" alt="License MIT" /> <img src="https://img.shields.io/badge/License-MIT-blue?style=for-the-badge" alt="License MIT" />
</p> </p>
--- ---
## 🚀 Что нового в Prisma 3.0 (Major Release) ## 🚀 What's New in Prisma 3.5
### 🎨 Дизайн 2.0 ### 🎨 Design 2.0 & Interface Optimization
- **Современный визуальный стиль**: Полный переход на squircle-карточки, адаптивную цветовую палитру и улучшенную Material You динамическую тему. - **Modern Visual Style**: Squircle cards, adaptive dynamic Material You color palette, and refined glassmorphic surfaces.
- **Интеллектуальный Action Dock 2.0**: Компактный док ключевых действий под контентом с быстрым доступом к скачиванию, шерингу, тегам и инфо. - **Intelligent Action Dock 2.0**: Compact quick-action dock placed beneath posts for one-tap downloading, sharing, tag inspection, and source viewing.
- **Плавные анимации и микро-взаимодействия**: Открытие медиа с эффектом Hero, интерактивное листание свайпами и анимированный лайк по двойному тапу. - **Smooth Animations & Micro-Interactions**: Hero media transitions, interactive drag gestures, and animated double-tap likes.
- **Keyboard-Adaptive Layout**: Floating action buttons and navigation dock automatically minimize when the on-screen keyboard appears; search lists support dismiss-on-scroll.
### 🐾 Глубокая интеграция Pawchive 2.0 ### 🐾 Deep Pawchive 2.0 Integration
- **Мульти-аккаунты**: Поддержка авторизации по логину и паролю, а также прямому вводу `Session Cookie`. - **Flexible Authentication**: Sign in via username/password or direct `Session Cookie`.
- **Двусторонняя синхронизация (Two-Way Sync)**: Автоматическая синхронизация избранного между локальной базой Prisma и профилем Pawchive. Новые авторы с сервера добавляются в приложение, а локальные авторы выгружаются на сервер в один тап. - **Two-Way Synchronization**: Automatically synchronize your favorites between Prisma's local database and your Pawchive account. Local creators can be pushed to the server with a single tap.
- **Моментальная синхронизация**: При нажатии кнопки «В избранное» у любого автора (Fanbox, Patreon, Fantia, Boosty, Gumroad, DLsite, Discord) статус синхронизируется с сервером на лету. - **Instant Cloud Sync**: Favoriting any creator across Patreon, Fanbox, Fantia, Boosty, Gumroad, DLsite, or Discord synchronizes with the server in real-time.
### 🎬 Умный медиаплеер и определение разрешения ### 🎬 Smart Media Player & Dimension Detection
- **Ленивое вычисление габаритов (1920×1080 и др.)**: Определение точного разрешения картинок и видео без полной предварительной загрузки тяжелых файлов. - **Lazy Dimension Resolution**: Instant 1920×1080 (and custom) aspect-ratio discovery without needing to pre-download large media files.
- **Автоповорот в полноэкранном режиме**: Видеоплеер автоматически ориентирует экран (альбомный или портретный режим) в зависимости от аспектного соотношения медиа. - **Fullscreen Auto-Orientation**: Video player automatically adjusts screen orientation (landscape or portrait) to match the media's native aspect ratio.
### 📦 Разделение APK и умное автообновление по ABI ### 📦 Split APKs & ABI-Aware Auto-Updates
- Сборка облегчённых APK с разделением по архитектурам процессора (`arm64-v8a`, `armeabi-v7a`, `x86_64`). - Optimized per-ABI APK builds (`arm64-v8a`, `armeabi-v7a`, `x86_64`) for drastically reduced package sizes.
- Встроенная система обновлений автоматически определяет архитектуру вашего Android-устройства и скачивает только нужный APK, экономя трафик и ускоряя загрузку. - Built-in update engine automatically detects the device CPU architecture and fetches only the required binary.
--- ---
## 📚 Документация и Вики (Руководство пользователя) ## 📚 Documentation & User Guides
Подробные иллюстрированные руководства доступны в **[Prisma Wiki](https://github.com/RarDog/Prisma/wiki)** и прямо в репозитории: Comprehensive illustrated documentation is available in the **[Prisma Wiki](https://github.com/RarDog/Prisma/wiki)**:
- 🚀 **[Быстрый старт и установка](docs/wiki/Getting-Started.md)** — выбор правильного APK под процессор, запуск на Linux. - 🚀 **[Getting Started & Installation](docs/wiki/Getting-Started.md)** — Selecting the proper APK for your device architecture, running on Linux, Windows, or macOS.
- 🌐 **[Провайдеры контента](docs/wiki/Providers.md)** — особенности Booru (Gelbooru, Rule34, Realbooru, e621) и архивов Pawchive. - 🌐 **[Content Providers](docs/wiki/Providers.md)** — Using Booru sources (Gelbooru, Rule34, Realbooru, e621) and Pawchive creator archives.
- 🔍 **[Умный поиск и теги](docs/wiki/Search-and-Tags.md)** — оператор `and`, общие модификаторы и подсказки за 0 мс. - 🔍 **[Smart Search & Tags](docs/wiki/Search-and-Tags.md)** — `and` operators, syntax modifiers, and 0 ms autocomplete.
- 🐾 **[Интеграция с Pawchive](docs/wiki/Pawchive-Sync.md)** — вход по паролю/куки, двусторонняя синхронизация и выгрузка авторов. - 🐾 **[Pawchive Integration](docs/wiki/Pawchive-Sync.md)** — Login, session cookies, two-way sync, and creator cloud exports.
- 🎬 **[Медиаплеер и просмотр](docs/wiki/Media-Viewer.md)** — жесты, автоповорот видео, разрешение 1920×1080 и Action Dock 2.0. - 🎬 **[Media Viewer & Player](docs/wiki/Media-Viewer.md)** — Gesture navigation, automatic rotation, and Action Dock 2.0.
- 💾 **[Офлайн-режим и загрузки](docs/wiki/Offline-and-Downloads.md)** — Sync Hub, шаблоны папок и сохранение оригиналов. - 💾 **[Offline Mode & Downloads](docs/wiki/Offline-and-Downloads.md)** — Sync Hub, directory naming templates, and original quality preservation.
- 🛡️ **[Черный список и фильтрация](docs/wiki/Safety-and-Blacklist.md)** — настройка Blacklist, Safe Mode и очистка кэша. - 🛡️ **[Safety & Blacklist](docs/wiki/Safety-and-Blacklist.md)** — Custom blacklist rules, Safe Mode, and cache management.
- ❓ **[Часто задаваемые вопросы (FAQ)](docs/wiki/FAQ.md)** — автообновление, звук в видео и решение проблем. - ❓ **[Frequently Asked Questions (FAQ)](docs/wiki/FAQ.md)** — Troubleshooting, updater, audio playback, and common solutions.
--- ---
## ✨ Ключевые возможности ## ✨ Key Features
- **📱 Плавная лента в стиле Pinterest**: Masonry-сетка с переключением режима отображения (Masonry, 1:1 Сетка, Компактный список). - **📱 Pinterest-Style Masonry Feed**: Staggered grid layout with instant mode switching (Masonry, 1:1 Square Grid, Compact List).
- **💾 Офлайн 2.0 и Sync Hub**: Просмотр фото и видео прямо из локального хранилища без запросов в сеть, аналитика занятого места и пакетная выгрузка. - **💾 Offline 2.0 & Sync Hub**: Browse saved media directly from local storage with zero network requests, storage analytics, and batch export.
- **🔍 Поиск 2.0 с операторами**: Быстрые подсказки тегов со скоростью отклика 0 мс, оператор `and` для мульти-поиска, фильтры `type:video`, `rating:safe`. - **🔍 Search 2.0**: Instant tag autocomplete, multi-tag queries with `and`, and modifiers such as `type:video` or `rating:safe`.
- **🛡️ Продвинутый Blacklist / Whitelist**: Фильтрация нежелательного контента по тегам, категориям, рейтингу и минимальному score. - **🛡️ Advanced Blacklist / Whitelist**: Filter undesirable content by tags, categories, age ratings, or minimum score thresholds.
- **📁 Умный менеджер загрузок**: Шаблоны поддиректорий (`{Artist}`, `{Provider}`, `{Service}`, `{ID}`, `{Date}`) для аккуратного архива. - **📁 Smart Download Manager**: Flexible directory and filename templates (`{Artist}`, `{Provider}`, `{Service}`, `{ID}`, `{Date}`).
- **🌑 AMOLED Pure Black**: Истинно черный фон для максимальной энергоэффективности на OLED/AMOLED дисплеях. - **🌑 AMOLED Pure Black**: True deep black background optimized for OLED/AMOLED display power efficiency.
--- ---
## 🌐 Поддерживаемые провайдеры ## 🌐 Supported Providers
| Провайдер | Тип API | Поддерживаемый контент | | Provider | API Type | Supported Content |
|---|---|---| |---|---|---|
| **Pawchive** | REST API v1 | Patreon, Pixiv Fanbox, Fantia, Boosty, Gumroad, DLsite, Discord | | **Pawchive** | REST API v1 | Patreon, Pixiv Fanbox, Fantia, Boosty, Gumroad, DLsite, Discord |
| **Gelbooru** | JSON / XML API | Аниме-арты, теги, авторы, рейтинги | | **Gelbooru** | JSON / XML API | Anime artworks, tag taxonomy, creator profiles, ratings |
| **Rule34** | Booru API | Огромная база booru-контента, видео и GIF | | **Rule34** | Booru API | Expansive booru database, animated WebM/MP4 and GIF |
| **Realbooru** | Scraper / API | Фотосессии и реалистичный контент | | **Realbooru** | Scraper / API | Cosplay photography and realistic media |
| **e621 / e926** | REST JSON API | Фурри- и антро-арт с богатейшей таксономией тегов | | **e621 / e926** | REST JSON API | Furry and anthropomorphic art with granular tag search |
--- ---
## 📥 Загрузка (Скачать сборки) ## 📥 Downloads & Releases
Релизы доступны на странице **[GitHub Releases](https://github.com/RarDog/Prisma/releases)**. Pre-compiled production releases are available on the **[GitHub Releases](https://github.com/RarDog/Prisma/releases)** page.
| Платформа | Архитектура | Формат | Описание | | Platform | Architecture | Format | Notes |
|---|---|---|---| |---|---|---|---|
| **Android** | `arm64-v8a` | `.apk` | Оптимизировано для современных смартфонов (64-bit) | | **Android** | `arm64-v8a` | `.apk` | Recommended for all modern 64-bit Android smartphones |
| **Android** | `armeabi-v7a` | `.apk` | Для более старых Android-устройств (32-bit) | | **Android** | `armeabi-v7a` | `.apk` | Legacy 32-bit Android devices |
| **Android** | `x86_64` | `.apk` | Для эмуляторов Android и x86-планшетов | | **Android** | `x86_64` | `.apk` | Android emulators, Chromebooks & x86 tablets |
| **Linux** | `x86_64` | `.tar.gz` | Портативный архив для Linux-дистрибутивов | | **Linux** | `x86_64` | `.tar.gz` | Portable standalone package for Linux distributions |
| **Windows** | `x64` | `.zip` / `.exe` | Портативная и установочная сборка для Windows 10/11 | | **Windows** | `x64` | `.zip` | Portable release for Windows 10 & 11 |
| **macOS** | `Universal` | `.zip` | Portable build for macOS |
--- ---
## 🛠️ Сборка из исходников ## 🛠️ Building from Source
### Требования ### Prerequisites
- **Flutter SDK**: `>= 3.22.0` (Dart `>= 3.4.0`) - **Flutter SDK**: `>= 3.22.0` (Dart `>= 3.4.0`)
- **Android SDK**: Build-Tools & Platform-Tools (для Android) - **Android SDK**: Build-Tools & Platform-Tools (for Android targets)
- **Linux**: `clang`, `cmake`, `ninja-build`, `pkg-config`, `libgtk-3-dev` - **Linux**: `clang`, `cmake`, `ninja-build`, `pkg-config`, `libgtk-3-dev`
- **Windows**: Visual Studio 2022 с компонентом «Desktop development with C++» - **Windows**: Visual Studio 2022 with "Desktop development with C++"
- **macOS**: Xcode 15+
### Быстрый старт ### Quick Start
```bash ```bash
# Клонирование репозитория # Clone repository
git clone https://github.com/RarDog/Prisma.git git clone https://github.com/RarDog/Prisma.git
cd Prisma cd Prisma
# Установка зависимостей # Fetch dependencies
flutter pub get flutter pub get
# Проверка анализатора и запуск тестов # Run static analysis and tests
flutter analyze flutter analyze
flutter test flutter test
# Запуск в режиме разработки # Launch in debug mode
flutter run flutter run
``` ```
### Сборка релизных пакетов ### Building Release Packages
```bash ```bash
# Android (раздельные APK по архитектурам) # Android (Split APKs by ABI)
flutter build apk --release --split-per-abi flutter build apk --release --split-per-abi
# Linux (Desktop bundle) # Linux (Desktop bundle)
@@ -130,43 +137,56 @@ flutter build linux --release
# Windows (Desktop bundle) # Windows (Desktop bundle)
flutter build windows --release flutter build windows --release
# macOS (Desktop bundle)
flutter build macos --release
``` ```
--- ---
## 🏛️ Архитектура проекта ## 🏛️ Project Architecture
```text ```text
lib/ lib/
├── app/ # Роутер (GoRouter), темы, локализация (RU/EN), анимации ├── app/ # Routing (GoRouter), theme configuration, l10n (EN/RU), animations
├── backend/ ├── backend/
│ ├── di/ # Внедрение зависимостей (Riverpod providers) │ ├── di/ # Riverpod dependency injection & providers
│ ├── models/ # Post, ArtistProfile, PawchiveAccount, AppSettings │ ├── models/ # Post, ArtistProfile, PawchiveAccount, AppSettings
│ ├── providers/ # Клиенты API (Gelbooru, Rule34, Pawchive, e621) │ ├── providers/ # API integrations (Gelbooru, Rule34, Pawchive, e621)
│ ├── repositories/ # Локальная база данных Isar и кэширование │ ├── repositories/ # Local Isar database storage & cache layer
│ └── services/ # Сервисы: PawchiveSync, Feed, Search, Downloads, Updates │ └── services/ # Core services: PawchiveSync, Feed, Search, Downloads, Updates
├── core/ # Сетевой клиент (Dio), база данных, утилиты ├── core/ # Network client (Dio), database engine, utilities
├── features/ # Модули экранов: feed, post, artists, favorites, settings ├── features/ # Feature screens: feed, post, artists, favorites, settings
└── shared/widgets/ # Переиспользуемые компоненты (PostCard, MasonryGrid, Dock) └── shared/widgets/ # Reusable UI components (PostCard, MasonryGrid, Dock)
``` ```
--- ---
## 🔒 Безопасность и конфиденциальность ## 🔒 Privacy & Security
- **100% локальное хранение**: Вся история, закладки, локальные авторы и конфигурации хранятся только в вашей локальной базе на устройстве. - **100% On-Device Storage**: Your browsing history, bookmarks, favorite creators, and credentials stay strictly on your device.
- **Никакой телеметрии**: Prisma не собирает аналитику, не отправляет логи и уважает вашу приватность. - **Zero Telemetry**: No background tracking, no third-party analytic SDKs, and no user profiling.
- **Прямое соединение**: Запросы отправляются напрямую к выбранным API без прокси-серверов посредников. - **Direct Network Requests**: Communication occurs directly between your client and selected provider endpoints without intermediary proxies.
--- ---
## 👥 Разработчики ## 👥 Authors & Credits
<p align="center"> <p align="center">
<strong>Разработчики:</strong> <a href="https://github.com/RarDog">RarDog</a> & <a href="https://deepmind.google/technologies/gemini/">Antigravity (Gemini)</a> <strong>Authors:</strong> <a href="https://github.com/RarDog">RarDog</a> & <a href="https://deepmind.google/technologies/gemini/">Antigravity (Gemini)</a>
</p> </p>
<p align="center"> <p align="center">
<a href="https://github.com/RarDog"><img src="https://img.shields.io/badge/Developer-RarDog-blue?style=for-the-badge&logo=github&logoColor=white" alt="RarDog" /></a> <a href="https://github.com/RarDog"><img src="https://img.shields.io/badge/Developer-RarDog-blue?style=for-the-badge&logo=github&logoColor=white" alt="RarDog" /></a>
<a href="https://deepmind.google/technologies/gemini/"><img src="https://img.shields.io/badge/AI%20Pair-Antigravity%20(Gemini)-8A2BE2?style=for-the-badge&logo=google&logoColor=white" alt="Antigravity" /></a> <a href="https://deepmind.google/technologies/gemini/"><img src="https://img.shields.io/badge/AI%20Pair-Antigravity%20(Gemini)-8A2BE2?style=for-the-badge&logo=google&logoColor=white" alt="Antigravity" /></a>
</p> </p>
---
## ⚠️ Disclaimer & Vibe Coding
> [!NOTE]
> This project is 100% **vibe coding** built in tandem with an AI coding partner. I have zero background in Dart and Flutter — this project is built for personal use out of pure enthusiasm.
>
> Although every build is personally and thoroughly tested in daily use before being published, the codebase may still contain quirks, bugs, or sub-optimal patterns. This is a passion project built for personal fun and convenience, which means development could slow down or be abandoned at any moment without prior notice. Community contributions, advice, and pull requests are always welcome!
+192
View File
@@ -0,0 +1,192 @@
<p align="center">
<a href="README.md">English</a> • <strong>Русский</strong>
</p>
# 💎 Prisma
<p align="center">
<img src="android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" width="128" height="128" alt="Prisma Logo" style="border-radius: 28px; box-shadow: 0 10px 30px rgba(0,0,0,0.35);" />
</p>
<p align="center">
<strong>Современный кроссплатформенный клиент для Booru и Creator-архивов нового поколения</strong><br>
Плавный Pinterest-стиль, интеграция Pawchive 2.0, двусторонняя синхронизация, интеллектуальное автообновление и воспроизведение медиа без задержек.
</p>
<p align="center">
<a href="https://github.com/RarDog/Prisma/releases"><img src="https://img.shields.io/badge/Version-3.5.4-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.5.4" /></a>
<img src="https://img.shields.io/badge/Flutter-3.47+-02569B?style=for-the-badge&logo=flutter&logoColor=white" alt="Flutter" />
<img src="https://img.shields.io/badge/Platform-Android%20%7C%20Linux%20%7C%20Windows%20%7C%20macOS-00C853?style=for-the-badge" alt="Platforms" />
<a href="https://github.com/RarDog/Prisma/wiki"><img src="https://img.shields.io/badge/Wiki-Documentation-FF6F00?style=for-the-badge&logo=gitbook&logoColor=white" alt="Wiki" /></a>
<img src="https://img.shields.io/badge/License-MIT-blue?style=for-the-badge" alt="License MIT" />
</p>
---
## 🚀 Что нового в Prisma 3.5
### 🎨 Дизайн 2.0 и оптимизация интерфейса
- **Современный визуальный стиль**: Полный переход на squircle-карточки, адаптивную цветовую палитру и улучшенную Material You динамическую тему.
- **Интеллектуальный Action Dock 2.0**: Компактный док ключевых действий под контентом с быстрым доступом к скачиванию, шерингу, тегам и инфо.
- **Плавные анимации и микро-взаимодействия**: Открытие медиа с эффектом Hero, интерактивное листание свайпами и анимированный лайк по двойному тапу.
- **Умная работа с экранной клавиатурой**: Автоматическое скрытие плавающих элементов при вводе и закрытие клавиатуры при прокрутке списков.
### 🐾 Глубокая интеграция Pawchive 2.0
- **Мульти-аккаунты**: Поддержка авторизации по логину и паролю, а также прямому вводу `Session Cookie`.
- **Двусторонняя синхронизация (Two-Way Sync)**: Автоматическая синхронизация избранного между локальной базой Prisma и профилем Pawchive. Новые авторы с сервера добавляются в приложение, а локальные авторы выгружаются на сервер в один тап.
- **Моментальная синхронизация**: При нажатии кнопки «В избранное» у любого автора (Fanbox, Patreon, Fantia, Boosty, Gumroad, DLsite, Discord) статус синхронизируется с сервером на лету.
### 🎬 Умный медиаплеер и определение разрешения
- **Ленивое вычисление габаритов (1920×1080 и др.)**: Определение точного разрешения картинок и видео без полной предварительной загрузки тяжелых файлов.
- **Автоповорот в полноэкранном режиме**: Видеоплеер автоматически ориентирует экран (альбомный или портретный режим) в зависимости от аспектного соотношения медиа.
### 📦 Разделение APK и умное автообновление по ABI
- Сборка облегчённых APK с разделением по архитектурам процессора (`arm64-v8a`, `armeabi-v7a`, `x86_64`).
- Встроенная система обновлений автоматически определяет архитектуру вашего Android-устройства и скачивает только нужный APK, экономя трафик и ускоряя загрузку.
---
## 📚 Документация и Вики (Руководство пользователя)
Подробные иллюстрированные руководства доступны в **[Prisma Wiki](https://github.com/RarDog/Prisma/wiki)** и прямо в репозитории:
- 🚀 **[Быстрый старт и установка](docs/wiki/Getting-Started.md)** — выбор правильного APK под процессор, запуск на Linux, Windows и macOS.
- 🌐 **[Провайдеры контента](docs/wiki/Providers.md)** — особенности Booru (Gelbooru, Rule34, Realbooru, e621) и архивов Pawchive.
- 🔍 **[Умный поиск и теги](docs/wiki/Search-and-Tags.md)** — оператор `and`, общие модификаторы и подсказки за 0 мс.
- 🐾 **[Интеграция с Pawchive](docs/wiki/Pawchive-Sync.md)** — вход по паролю/куки, двусторонняя синхронизация и выгрузка авторов.
- 🎬 **[Медиаплеер и просмотр](docs/wiki/Media-Viewer.md)** — жесты, автоповорот видео, разрешение 1920×1080 и Action Dock 2.0.
- 💾 **[Офлайн-режим и загрузки](docs/wiki/Offline-and-Downloads.md)** — Sync Hub, шаблоны папок и сохранение оригиналов.
- 🛡️ **[Черный список и фильтрация](docs/wiki/Safety-and-Blacklist.md)** — настройка Blacklist, Safe Mode и очистка кэша.
- ❓ **[Часто задаваемые вопросы (FAQ)](docs/wiki/FAQ.md)** — автообновление, звук в видео и решение проблем.
---
## ✨ Ключевые возможности
- **📱 Плавная лента в стиле Pinterest**: Masonry-сетка с переключением режима отображения (Masonry, 1:1 Сетка, Компактный список).
- **💾 Офлайн 2.0 и Sync Hub**: Просмотр фото и видео прямо из локального хранилища без запросов в сеть, аналитика занятого места и пакетная выгрузка.
- **🔍 Поиск 2.0 с операторами**: Быстрые подсказки тегов со скоростью отклика 0 мс, оператор `and` для мульти-поиска, фильтры `type:video`, `rating:safe`.
- **🛡️ Продвинутый Blacklist / Whitelist**: Фильтрация нежелательного контента по тегам, категориям, рейтингу и минимальному score.
- **📁 Умный менеджер загрузок**: Шаблоны поддиректорий (`{Artist}`, `{Provider}`, `{Service}`, `{ID}`, `{Date}`) для аккуратного архива.
- **🌑 AMOLED Pure Black**: Истинно черный фон для максимальной энергоэффективности на OLED/AMOLED дисплеях.
---
## 🌐 Поддерживаемые провайдеры
| Провайдер | Тип API | Поддерживаемый контент |
|---|---|---|
| **Pawchive** | REST API v1 | Patreon, Pixiv Fanbox, Fantia, Boosty, Gumroad, DLsite, Discord |
| **Gelbooru** | JSON / XML API | Аниме-арты, теги, авторы, рейтинги |
| **Rule34** | Booru API | Огромная база booru-контента, видео и GIF |
| **Realbooru** | Scraper / API | Фотосессии и реалистичный контент |
| **e621 / e926** | REST JSON API | Фурри- и антро-арт с богатейшей таксономией тегов |
---
## 📥 Загрузка (Скачать сборки)
Релизы доступны на странице **[GitHub Releases](https://github.com/RarDog/Prisma/releases)**.
| Платформа | Архитектура | Формат | Описание |
|---|---|---|---|
| **Android** | `arm64-v8a` | `.apk` | Оптимизировано для современных смартфонов (64-bit) |
| **Android** | `armeabi-v7a` | `.apk` | Для более старых Android-устройств (32-bit) |
| **Android** | `x86_64` | `.apk` | Для эмуляторов Android и x86-планшетов |
| **Linux** | `x86_64` | `.tar.gz` | Портативный архив для Linux-дистрибутивов |
| **Windows** | `x64` | `.zip` | Портативная сборка для Windows 10/11 |
| **macOS** | `Universal` | `.zip` | Сборка для macOS |
---
## 🛠️ Сборка из исходников
### Требования
- **Flutter SDK**: `>= 3.22.0` (Dart `>= 3.4.0`)
- **Android SDK**: Build-Tools & Platform-Tools (для Android)
- **Linux**: `clang`, `cmake`, `ninja-build`, `pkg-config`, `libgtk-3-dev`
- **Windows**: Visual Studio 2022 с компонентом «Desktop development with C++»
- **macOS**: Xcode 15+
### Быстрый старт
```bash
# Клонирование репозитория
git clone https://github.com/RarDog/Prisma.git
cd Prisma
# Установка зависимостей
flutter pub get
# Проверка анализатора и запуск тестов
flutter analyze
flutter test
# Запуск в режиме разработки
flutter run
```
### Сборка релизных пакетов
```bash
# Android (раздельные APK по архитектурам)
flutter build apk --release --split-per-abi
# Linux (Desktop bundle)
flutter build linux --release
# Windows (Desktop bundle)
flutter build windows --release
# macOS (Desktop bundle)
flutter build macos --release
```
---
## 🏛️ Архитектура проекта
```text
lib/
├── app/ # Роутер (GoRouter), темы, локализация (RU/EN), анимации
├── backend/
│ ├── di/ # Внедрение зависимостей (Riverpod providers)
│ ├── models/ # Post, ArtistProfile, PawchiveAccount, AppSettings
│ ├── providers/ # Клиенты API (Gelbooru, Rule34, Pawchive, e621)
│ ├── repositories/ # Локальная база данных Isar и кэширование
│ └── services/ # Сервисы: PawchiveSync, Feed, Search, Downloads, Updates
├── core/ # Сетевой клиент (Dio), база данных, утилиты
├── features/ # Модули экранов: feed, post, artists, favorites, settings
└── shared/widgets/ # Переиспользуемые компоненты (PostCard, MasonryGrid, Dock)
```
---
## 🔒 Безопасность и конфиденциальность
- **100% локальное хранение**: Вся история, закладки, локальные авторы и конфигурации хранятся только в вашей локальной базе на устройстве.
- **Никакой телеметрии**: Prisma не собирает аналитику, не отправляет логи и уважает вашу приватность.
- **Прямое соединение**: Запросы отправляются напрямую к выбранным API без прокси-серверов посредников.
---
## 👥 Разработчики
<p align="center">
<strong>Разработчики:</strong> <a href="https://github.com/RarDog">RarDog</a> & <a href="https://deepmind.google/technologies/gemini/">Antigravity (Gemini)</a>
</p>
<p align="center">
<a href="https://github.com/RarDog"><img src="https://img.shields.io/badge/Developer-RarDog-blue?style=for-the-badge&logo=github&logoColor=white" alt="RarDog" /></a>
<a href="https://deepmind.google/technologies/gemini/"><img src="https://img.shields.io/badge/AI%20Pair-Antigravity%20(Gemini)-8A2BE2?style=for-the-badge&logo=google&logoColor=white" alt="Antigravity" /></a>
</p>
---
## ⚠️ Важное примечание / Vibe Coding
> [!NOTE]
> Этот проект — чистый **vibe coding** в связке с AI-ассистентом. Я полный ноль в Dart и Flutter, проект пишется для себя на чистом энтузиазме.
>
> Несмотря на то, что каждое обновление лично и тщательно тестируется перед релизом, приложение может содержать баги, шероховатости или неоптимальные решения. Проект создаётся для души и личного удобства, поэтому разработка может быть замедлена или заброшена в любой момент. Пулл-реквесты, советы и помощь сообщества всегда приветствуются!
+2 -2
View File
@@ -1,3 +1,3 @@
const appDisplayVersion = '3.5.1'; const appDisplayVersion = '3.5.4';
const appBuildNumber = 77; const appBuildNumber = 80;
const appReleaseChannel = 'Stable'; const appReleaseChannel = 'Stable';
+28
View File
@@ -1,4 +1,32 @@
const prismaChangelog = [ const prismaChangelog = [
PrismaChange(
version: '3.5.4',
title: 'Исправление распознавания MP4-видео и отключение устаревших сервисов Kemono/Coomer',
bullets: [
'Устранена ошибка классификации видео: файлы MP4, содержащие слово «audio» в имени файла или параметрах запроса, больше не распознаются как аудио и корректно воспроизводятся как полноценное видео.',
'Точное определение расширений: внедрён строгий парсинг расширений файлов, исключающий ложные срабатывания при определении типа медиа.',
'Удаление устаревших провайдеров Kemono и Coomer: окончательно удалены неработающие сервисы Kemono и Coomer из списка провайдеров и настроек (основным источником артистов является Pawchive).',
],
),
PrismaChange(
version: '3.5.3',
title: 'Поддержка аудиозаписей (MP3/WAV/FLAC) и исправление загрузки медиа у авторов',
bullets: [
'Полноценная поддержка аудио: добавлено воспроизведение MP3, M4A, WAV, FLAC, OGG, AAC и OPUS файлов авторов (Patreon, Fanbox и др.).',
'Встроенный аудиопроигрыватель: карточка с анимированной пластинкой/обложкой, таймлайном, перемоткой на 10 сек, повтором и регулятором громкости.',
'Устранение ошибки 404 у миниатюр: исправлена попытка загрузки несуществующих эскизов для аудио и видео с Pawchive, из-за чего файлы отображались как битые.',
'Фильтр аудиозаписей: во вкладке артиста добавлен фильтр «Аудио», позволяющий мгновенно находить все треки и голосовые посты автора.',
],
),
PrismaChange(
version: '3.5.2',
title: 'Исправление наложения клавиатуры и поиска авторов',
bullets: [
'Устранена ошибка выдвижения белого прямоугольника: исправлен конфликт двойного учета клавиатурного отступа (double viewInsets) во вложенных скаффолдах.',
'Корректная видимость авторов: карточки артистов больше не сжимаются и остаются полностью видимыми и прокручиваемыми при вводе запроса.',
'Улучшенное поведение интерфейса: плавающая кнопка настроек и нижняя панель скрываются при открытии клавиатуры, добавлен свайп для скрытия клавиатуры при прокрутке.',
],
),
PrismaChange( PrismaChange(
version: '3.5.1', version: '3.5.1',
title: 'Улучшение панели поиска и фильтров авторов в Liquid Glass', title: 'Улучшение панели поиска и фильтров авторов в Liquid Glass',
-625
View File
@@ -1,625 +0,0 @@
import 'package:dio/dio.dart';
import '../../core/http/dio_client.dart';
import '../models/artist_announcement.dart';
import '../models/artist_link.dart';
import '../models/artist_profile.dart';
import '../models/artist_tag.dart';
import '../models/artist_work_query.dart';
import '../models/post.dart';
import '../models/post_comment.dart';
import '../models/provider_health.dart';
import '../models/top_period_filter.dart';
import '../services/cloud_link_extractor.dart';
import 'content_provider.dart';
class KemonoProvider
implements ContentProvider, ArtistProvider, CommentProvider {
KemonoProvider({
required this.id,
required this.name,
required this.baseUrl,
required DioClient dioClient,
Map<String, String> queryParameters = const {},
}) : _dio = dioClient.dio,
_creatorDio = Dio(
BaseOptions(
baseUrl: queryParameters['creator_api_base'] ??
'https://kemono-api.mbaharip.com',
connectTimeout: const Duration(seconds: 15),
receiveTimeout: const Duration(seconds: 20),
headers: const {
'Accept': 'application/json',
'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
},
),
);
@override
final String id;
@override
final String name;
@override
final String baseUrl;
final Dio _dio;
final Dio _creatorDio;
bool get _isCoomer =>
id.toLowerCase().contains('coomer') ||
baseUrl.toLowerCase().contains('coomer');
@override
Future<List<Post>> searchPosts({
required List<String> tags,
required int page,
int limit = 50,
String? rating,
TopPeriodFilter topPeriod = TopPeriodFilter.none,
}) async {
return const [];
}
@override
Future<Post?> getPost(String id) async => null;
@override
Future<ProviderHealth> checkHealth() async {
final startedAt = DateTime.now();
try {
await _creatorDio.get<dynamic>(
_creatorPath(),
queryParameters: {'page': 1, 'itemsPerPage': 1},
);
return ProviderHealth(
providerId: id,
status: ProviderStatus.online,
pingMs: DateTime.now().difference(startedAt).inMilliseconds,
lastCheckedAt: DateTime.now(),
apiVersion: _isCoomer ? 'coomer-artists' : 'kemono-artists',
);
} catch (error) {
return ProviderHealth(
providerId: id,
status: ProviderStatus.offline,
pingMs: DateTime.now().difference(startedAt).inMilliseconds,
lastCheckedAt: DateTime.now(),
errorMessage: error.toString(),
apiVersion: _isCoomer ? 'coomer-artists' : 'kemono-artists',
);
}
}
@override
Future<List<ArtistProfile>> listArtists({
String? service,
List<String>? services,
String? query,
int page = 1,
int limit = 30,
}) async {
final effectiveService =
services != null && services.length == 1 ? services.first : service;
List<ArtistProfile> list;
try {
final response = await _creatorDio.get<dynamic>(
effectiveService == null || effectiveService.isEmpty
? _creatorPath()
: '${_creatorPath()}/$effectiveService',
queryParameters: {
'page': page,
'itemsPerPage': limit.clamp(1, 100),
if (query != null && query.trim().isNotEmpty) 'keyword': query.trim(),
},
);
list = _rankArtists(_artistsFromResponse(response.data), query ?? '');
} catch (_) {
list = await _listArtistsFromPublicApi(
service: effectiveService,
query: query,
page: page,
limit: limit,
);
}
if (services != null && services.isNotEmpty) {
final sSet = services.map((s) => s.toLowerCase()).toSet();
list = list.where((a) => sSet.contains(a.service.toLowerCase())).toList();
}
return list;
}
@override
Future<List<ArtistProfile>> searchArtists(
String query, {
String? service,
List<String>? services,
int page = 1,
int limit = 30,
}) {
return listArtists(
service: service,
services: services,
query: query,
page: page,
limit: limit,
);
}
@override
Future<List<Post>> getArtistPosts({
required ArtistWorkQuery query,
int page = 0,
int limit = 50,
}) async {
Object? lastError;
final paths = [
'/api/v1/${query.service}/user/${query.artistId}/posts',
'/api/v1/${query.service}/user/${query.artistId}',
];
for (final apiBase in _apiBaseCandidates()) {
for (final path in paths) {
try {
final response = await _getFromApiBase<dynamic>(
apiBase,
path,
queryParameters: {'o': page * limit},
);
final posts = _postItems(response.data);
final mapped = <Post>[];
for (final post in posts.whereType<Map>()) {
mapped.addAll(_postsFromArtistPost(
Map<String, dynamic>.from(post),
query: query,
mediaBaseUrl: apiBase,
));
}
if (mapped.isNotEmpty || posts.isEmpty) {
mapped.sort((a, b) => b.createdAt.compareTo(a.createdAt));
return mapped.take(limit).toList(growable: false);
}
} catch (error) {
lastError = error;
}
}
}
throw StateError(
'$name artist works are unavailable right now. Try again later. '
'${_shortError(lastError)}',
);
}
@override
Future<List<PostComment>> getArtistPostComments(
String service,
String artistId,
String postId,
) async {
Object? lastError;
final path = '/api/v1/$service/user/$artistId/post/$postId/comments';
for (final apiBase in _apiBaseCandidates()) {
try {
final response = await _getFromApiBase<dynamic>(apiBase, path);
return _commentsFromResponse(response.data, postId);
} catch (error) {
lastError = error;
}
}
throw StateError(
'$name comments are unavailable right now. ${_shortError(lastError)}',
);
}
@override
Future<List<PostComment>> getComments(String postId) async {
final parts = postId.split(':');
if (parts.length < 4) return const [];
return getArtistPostComments(parts[0], parts[1], parts[2]);
}
@override
Future<List<ArtistTag>> getArtistTags(
String service, String artistId) async =>
const [];
@override
Future<List<ArtistLink>> getArtistLinks(
String service, String artistId) async =>
const [];
@override
Future<List<ArtistAnnouncement>> getArtistAnnouncements(
String service, String artistId) async {
final path = '/api/v1/$service/user/$artistId/announcements';
for (final apiBase in _apiBaseCandidates()) {
try {
final response = await _getFromApiBase<dynamic>(apiBase, path);
final items = response.data;
if (items is List) {
return items
.whereType<Map>()
.map((item) =>
ArtistAnnouncement.fromJson(Map<String, dynamic>.from(item)))
.toList(growable: false);
}
} catch (_) {}
}
return const [];
}
String _creatorPath() => _isCoomer ? '/coomer' : '/kemono';
List<ArtistProfile> _artistsFromResponse(dynamic data) {
final items = data is Map ? data['data'] : data;
if (items is! List) return const [];
return items
.whereType<Map>()
.map((item) {
final json = Map<String, dynamic>.from(item);
final service = (json['service'] ?? '').toString();
final artistId =
(json['id'] ?? json['creator_id'] ?? json['user_id'] ?? '')
.toString();
final name = (json['name'] ??
json['display_name'] ??
json['username'] ??
artistId)
.toString();
final rawAvatar = (json['avatar'] ??
json['icon'] ??
json['image'] ??
json['avatar_url'] ??
'')
.toString();
return ArtistProfile(
id: artistId,
providerId: id,
service: service,
name: name,
displayName: name,
avatarUrl: _absoluteUrl(rawAvatar) ?? _iconUrl(service, artistId),
updatedAt: _dateFromAny(json['updated']),
postCount: (json['post_count'] as num?)?.toInt(),
url: '$baseUrl/$service/user/$artistId',
);
})
.where((artist) => artist.id.isNotEmpty)
.toList(growable: false);
}
Future<List<ArtistProfile>> _listArtistsFromPublicApi({
String? service,
String? query,
required int page,
required int limit,
}) async {
Object? lastError;
dynamic data;
for (final apiBase in _apiBaseCandidates()) {
try {
final response =
await _getFromApiBase<dynamic>(apiBase, '/api/v1/creators.txt');
data = response.data;
break;
} catch (error) {
lastError = error;
}
}
if (data == null) {
throw StateError(
'$name artist index is unavailable right now. ${_shortError(lastError)}',
);
}
final queryText = (query ?? '').trim().toLowerCase();
final offset = (page - 1).clamp(0, 999999) * limit;
final items = _artistsFromResponse({'data': data})
.where((artist) =>
(service == null || service.isEmpty || artist.service == service) &&
(queryText.isEmpty ||
artist.displayName.toLowerCase().contains(queryText) ||
artist.id.toLowerCase().contains(queryText)))
.toList(growable: false);
final ranked = _rankArtists(items, queryText);
return ranked.skip(offset).take(limit).toList(growable: false);
}
List<ArtistProfile> _rankArtists(List<ArtistProfile> artists, String query) {
final queryText = query.trim().toLowerCase();
final ranked = [...artists];
ranked.sort((a, b) {
final scoreA = _artistSearchScore(a, queryText);
final scoreB = _artistSearchScore(b, queryText);
if (scoreA != scoreB) return scoreB.compareTo(scoreA);
final updatedA = a.updatedAt ?? DateTime.fromMillisecondsSinceEpoch(0);
final updatedB = b.updatedAt ?? DateTime.fromMillisecondsSinceEpoch(0);
final updated = updatedB.compareTo(updatedA);
if (updated != 0) return updated;
final count = (b.postCount ?? 0).compareTo(a.postCount ?? 0);
if (count != 0) return count;
return a.displayName.compareTo(b.displayName);
});
return ranked;
}
int _artistSearchScore(ArtistProfile artist, String query) {
if (query.isEmpty) return 0;
final name = artist.displayName.toLowerCase();
final id = artist.id.toLowerCase();
if (name == query || id == query) return 100;
if (name.startsWith(query) || id.startsWith(query)) return 70;
if (name.contains(query) || id.contains(query)) return 40;
return 0;
}
List<dynamic> _postItems(dynamic data) {
if (data is List) return data;
if (data is Map) {
final results = data['results'];
if (results is List) return results;
final posts = data['posts'];
if (posts is List) return posts;
if (posts is Map) return _postItems(posts);
final dataItems = data['data'];
if (dataItems is List) return dataItems;
}
return const [];
}
List<Post> _postsFromArtistPost(
Map<String, dynamic> json, {
required ArtistWorkQuery query,
required String mediaBaseUrl,
}) {
final postId = (json['id'] ?? json['post_id'] ?? '').toString();
final title = (json['title'] ?? '').toString();
final published = _dateFromAny(json['published']) ??
_dateFromAny(json['added']) ??
_dateFromAny(json['edited']) ??
DateTime.fromMillisecondsSinceEpoch(0);
final postSource =
'$baseUrl/${query.service}/user/${query.artistId}/post/$postId';
final rawContent = (json['content'] ?? '').toString();
final embed = json['embed'] is Map ? Map<String, dynamic>.from(json['embed']) : null;
final cloudLinks = CloudLinkExtractor.extractLinks(
content: rawContent,
source: postSource,
embed: embed,
);
final cloudLinksJson = cloudLinks.map((e) => e.encode()).toList(growable: false);
final cleanDesc = CloudLinkExtractor.cleanCommentary(rawContent);
final files = <Map<String, dynamic>>[];
final file = json['file'];
if (file is Map && file.isNotEmpty) {
files.add(Map<String, dynamic>.from(file));
}
final attachments = json['attachments'];
if (attachments is List) {
files.addAll(attachments.whereType<Map>().map(Map<String, dynamic>.from));
}
// Support link-only posts where author uploaded files to cloud drives (MEGA, GDrive, etc.)
// or text-only posts where author wrote an announcement, status or note
if (files.isEmpty &&
(cloudLinks.isNotEmpty ||
cleanDesc.isNotEmpty ||
rawContent.trim().isNotEmpty ||
title.trim().isNotEmpty)) {
final stableId = '${query.service}:${query.artistId}:$postId:0';
final firstStreamable =
cloudLinks.where((l) => l.isStreamable).firstOrNull;
final firstLink = cloudLinks.isNotEmpty ? cloudLinks.first : null;
final fileUrl = firstStreamable?.directStreamUrl ?? firstLink?.url ?? '';
final isTextOnly = cloudLinks.isEmpty;
final tags = [
query.service,
query.artistName,
if (title.trim().isNotEmpty) title.trim(),
if (!isTextOnly) 'cloud_mirror' else 'text_post',
];
return [
Post(
id: stableId,
providerId: id,
providerName: name,
previewUrl: '',
sampleUrl: '',
fileUrl: fileUrl,
tags: tags,
rating: 'unknown',
width: 0,
height: 0,
source: postSource,
createdAt: published,
fileType: firstStreamable != null
? 'video'
: (isTextOnly ? 'text' : 'link'),
score: 0,
tagGroups: {
'artist': [query.artistName],
'meta': [query.service],
if (title.trim().isNotEmpty) 'copyright': [title.trim()],
if (cloudLinksJson.isNotEmpty) 'cloud_links': cloudLinksJson,
if (cleanDesc.isNotEmpty)
'description': [cleanDesc]
else if (rawContent.trim().isNotEmpty)
'description': [rawContent.trim()],
},
),
];
}
var index = 0;
return files
.map((file) {
final url = _mediaUrl(file, mediaBaseUrl: mediaBaseUrl);
final fileName =
(file['name'] ?? Uri.tryParse(url)?.pathSegments.last ?? '')
.toString();
final type = _fileType('$fileName $url');
final stableId =
'${query.service}:${query.artistId}:$postId:${index++}';
final tags = [
query.service,
query.artistName,
if (title.trim().isNotEmpty) title.trim(),
];
return Post(
id: stableId,
providerId: id,
providerName: name,
previewUrl: url,
sampleUrl: url,
fileUrl: url,
tags: tags,
rating: 'unknown',
width: 0,
height: 0,
source: postSource,
createdAt: published,
fileType: type,
score: 0,
tagGroups: {
'artist': [query.artistName],
'meta': [query.service],
if (title.trim().isNotEmpty) 'copyright': [title.trim()],
if (cloudLinksJson.isNotEmpty) 'cloud_links': cloudLinksJson,
if (cleanDesc.isNotEmpty) 'description': [cleanDesc],
},
);
})
.where((post) => post.fileUrl.isNotEmpty)
.toList(growable: false);
}
List<PostComment> _commentsFromResponse(dynamic data, String postId) {
final items = data is Map ? (data['comments'] ?? data['data']) : data;
if (items is! List) return const [];
return items
.whereType<Map>()
.map((item) {
final json = Map<String, dynamic>.from(item);
return PostComment(
id: (json['id'] ?? json['comment_id'] ?? '').toString(),
postId: postId,
providerId: id,
authorName: (json['author'] ??
json['username'] ??
json['user'] ??
json['creator_name'] ??
'user')
.toString(),
body: (json['content'] ?? json['body'] ?? json['comment'] ?? '')
.toString(),
createdAt: _dateFromAny(json['added']) ??
_dateFromAny(json['created_at']) ??
DateTime.fromMillisecondsSinceEpoch(0),
);
})
.where((comment) => comment.body.trim().isNotEmpty)
.toList(growable: false);
}
String _mediaUrl(
Map<String, dynamic> file, {
required String mediaBaseUrl,
}) {
final path = (file['path'] ?? file['url'] ?? '').toString();
if (path.isEmpty) return '';
final uri = Uri.tryParse(path);
if (uri != null && uri.hasScheme) return path;
if (path.startsWith('/data/')) {
return '$mediaBaseUrl$path';
}
if (path.startsWith('/')) {
return '$mediaBaseUrl/data$path';
}
return '$mediaBaseUrl/data/$path';
}
String? _iconUrl(String service, String artistId) {
if (service.isEmpty || artistId.isEmpty) return null;
final host = _isCoomer ? 'https://img.coomer.su' : 'https://img.kemono.su';
return '$host/icons/$service/$artistId';
}
String? _absoluteUrl(String value) {
final trimmed = value.trim();
if (trimmed.isEmpty) return null;
final uri = Uri.tryParse(trimmed);
if (uri != null && uri.hasScheme) return trimmed;
if (trimmed.startsWith('/')) return '$baseUrl$trimmed';
return '$baseUrl/$trimmed';
}
List<String> _apiBaseCandidates() {
final candidates = <String>[
baseUrl,
if (_isCoomer) ...[
'https://coomer.st',
'https://coomer.su',
] else ...[
'https://kemono.cr',
'https://kemono.su',
],
];
return candidates.map(_trimTrailingSlash).toSet().toList(growable: false);
}
Future<Response<T>> _getFromApiBase<T>(
String apiBase,
String path, {
Map<String, Object?> queryParameters = const {},
}) {
if (_trimTrailingSlash(apiBase) == _trimTrailingSlash(baseUrl)) {
return _dio.get<T>(path, queryParameters: queryParameters);
}
final dio = Dio(
BaseOptions(
baseUrl: apiBase,
connectTimeout: const Duration(seconds: 15),
receiveTimeout: const Duration(seconds: 25),
headers: const {
'Accept': 'application/json',
'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
},
),
);
return dio.get<T>(path, queryParameters: queryParameters);
}
String _trimTrailingSlash(String value) =>
value.endsWith('/') ? value.substring(0, value.length - 1) : value;
String _shortError(Object? error) {
if (error == null) return '';
final message = error.toString();
if (message.length <= 160) return message;
return '${message.substring(0, 160)}...';
}
String _fileType(String value) {
final lower = value.toLowerCase().split('?').first;
if (lower.endsWith('.webm') || lower.endsWith('.mp4')) return 'video';
if (lower.endsWith('.gif')) return 'gif';
if (lower.endsWith('.swf')) return 'swf';
if (lower.endsWith('.png')) return 'png';
if (lower.endsWith('.jpg') ||
lower.endsWith('.jpeg') ||
lower.endsWith('.webp')) {
return 'photo';
}
return 'unknown';
}
DateTime? _dateFromAny(dynamic value) {
if (value == null) return null;
if (value is num) {
final raw = value.toInt();
if (raw > 9999999999) return DateTime.fromMillisecondsSinceEpoch(raw);
return DateTime.fromMillisecondsSinceEpoch(raw * 1000);
}
return DateTime.tryParse(value.toString());
}
}
+99 -13
View File
@@ -414,7 +414,15 @@ class PawchiveProvider
} }
final attachments = json['attachments']; final attachments = json['attachments'];
if (attachments is List) { if (attachments is List) {
files.addAll(attachments.whereType<Map>().map(Map<String, dynamic>.from)); for (final att in attachments.whereType<Map>()) {
final m = Map<String, dynamic>.from(att);
final path = (m['path'] ?? '').toString();
if (path.isNotEmpty &&
files.any((existing) => (existing['path'] ?? '').toString() == path)) {
continue;
}
files.add(m);
}
} }
// Support link-only posts where author uploaded files to cloud drives (MEGA, GDrive, etc.) // Support link-only posts where author uploaded files to cloud drives (MEGA, GDrive, etc.)
@@ -468,6 +476,17 @@ class PawchiveProvider
]; ];
} }
// Determine if there is a cover illustration for the post
String? postCoverUrl;
for (final f in files) {
final p = (f['path'] ?? '').toString();
final n = (f['name'] ?? '').toString();
if (_isPhotoType(p, n) && p.isNotEmpty) {
postCoverUrl = _thumbnailUrl(p);
break;
}
}
var index = 0; var index = 0;
return files return files
.map((fileMap) { .map((fileMap) {
@@ -475,18 +494,26 @@ class PawchiveProvider
final fileName = (fileMap['name'] ?? '').toString(); final fileName = (fileMap['name'] ?? '').toString();
final previewOnly = fileMap['preview_only'] == true; final previewOnly = fileMap['preview_only'] == true;
final previewUrl = _thumbnailUrl(rawPath); final type = _fileTypeFor(rawPath, fileName);
final isPhoto = type == 'photo' || type == 'gif';
// img.pawchive.pw/thumbnail only generates thumbnails for images/gifs.
// Non-image files (audio, video, archive) return 404 from thumbnail server.
final previewUrl = isPhoto
? _thumbnailUrl(rawPath)
: (postCoverUrl ?? '');
final fileUrl = previewOnly final fileUrl = previewOnly
? previewUrl ? (isPhoto ? previewUrl : _fileDownloadUrl(rawPath, fileName))
: _fileDownloadUrl(rawPath, fileName); : _fileDownloadUrl(rawPath, fileName);
final type = _fileType('$fileName $rawPath');
final stableId = final stableId =
'${query.service}:${query.artistId}:$postId:${index++}'; '${query.service}:${query.artistId}:$postId:${index++}';
final tags = [ final tags = [
query.service, query.service,
query.artistName, query.artistName,
if (title.trim().isNotEmpty) title.trim(), if (title.trim().isNotEmpty) title.trim(),
if (type == 'audio') 'audio',
]; ];
return Post( return Post(
@@ -599,25 +626,84 @@ class PawchiveProvider
return '${message.substring(0, 160)}...'; return '${message.substring(0, 160)}...';
} }
String _extractExtension(String value) {
if (value.isEmpty) return '';
final clean = value.split('?').first.split('#').first.trim();
final dot = clean.lastIndexOf('.');
if (dot != -1 && dot < clean.length - 1) {
final ext = clean.substring(dot).toLowerCase();
if (ext.length <= 6) return ext;
}
return '';
}
String _fileType(String value) { String _fileType(String value) {
final lower = value.toLowerCase().split('?').first; final ext = _extractExtension(value);
if (lower.endsWith('.webm') || lower.endsWith('.mp4') || lower.endsWith('.mov')) { if (const {
'.webm',
'.mp4',
'.mov',
'.mkv',
'.avi',
'.flv',
'.wmv',
'.m4v',
'.ts',
}.contains(ext)) {
return 'video'; return 'video';
} }
if (lower.endsWith('.gif')) return 'gif'; if (const {
if (lower.endsWith('.swf')) return 'swf'; '.mp3',
if (lower.endsWith('.zip') || lower.endsWith('.rar') || lower.endsWith('.7z')) { '.m4a',
'.wav',
'.ogg',
'.flac',
'.aac',
'.opus',
'.wma',
}.contains(ext)) {
return 'audio';
}
if (ext == '.gif') return 'gif';
if (ext == '.swf') return 'swf';
if (const {
'.zip',
'.rar',
'.7z',
'.tar',
'.gz',
'.pdf',
'.txt',
}.contains(ext)) {
return 'archive'; return 'archive';
} }
if (lower.endsWith('.png') || if (const {
lower.endsWith('.jpg') || '.png',
lower.endsWith('.jpeg') || '.jpg',
lower.endsWith('.webp')) { '.jpeg',
'.webp',
'.avif',
'.bmp',
'.heic',
'.tiff',
}.contains(ext)) {
return 'photo'; return 'photo';
} }
return 'unknown'; return 'unknown';
} }
String _fileTypeFor(String path, String fileName) {
final extName = _extractExtension(fileName);
final extPath = _extractExtension(path);
final ext = extName.isNotEmpty ? extName : extPath;
return _fileType(ext);
}
bool _isPhotoType(String path, [String fileName = '']) {
final type = _fileTypeFor(path, fileName);
return type == 'photo' || type == 'gif';
}
DateTime? _dateFromAny(dynamic value) { DateTime? _dateFromAny(dynamic value) {
if (value == null) return null; if (value == null) return null;
if (value is num) { if (value is num) {
@@ -5,7 +5,6 @@ import 'custom_provider.dart';
import 'danbooru_provider.dart'; import 'danbooru_provider.dart';
import 'e621_provider.dart'; import 'e621_provider.dart';
import 'gelbooru_provider.dart'; import 'gelbooru_provider.dart';
import 'kemono_provider.dart';
import 'moebooru_provider.dart'; import 'moebooru_provider.dart';
import 'pawchive_provider.dart'; import 'pawchive_provider.dart';
import 'realbooru_html_provider.dart'; import 'realbooru_html_provider.dart';
@@ -82,15 +81,6 @@ class ProviderFactory {
dioClient: client, dioClient: client,
queryParameters: queryParameters, queryParameters: queryParameters,
); );
case 'kemono':
case 'coomer':
return KemonoProvider(
id: config.id,
name: config.name,
baseUrl: config.baseUrl,
dioClient: client,
queryParameters: queryParameters,
);
case 'pawchive': case 'pawchive':
return PawchiveProvider( return PawchiveProvider(
id: config.id, id: config.id,
+8 -3
View File
@@ -730,18 +730,23 @@ class ProviderManager {
static bool _isArtistConfig(ContentProviderConfig config) { static bool _isArtistConfig(ContentProviderConfig config) {
final type = config.apiType.toLowerCase(); final type = config.apiType.toLowerCase();
return type == 'kemono' || type == 'coomer' || type == 'pawchive'; return type == 'pawchive';
} }
static bool _isFeedConfig(ContentProviderConfig config) { static bool _isFeedConfig(ContentProviderConfig config) {
final type = config.apiType.toLowerCase(); final type = config.apiType.toLowerCase();
return type != 'kemono' && type != 'coomer'; return type != 'pawchive';
} }
static bool _isLegacyRemovedConfig(ContentProviderConfig config) { static bool _isLegacyRemovedConfig(ContentProviderConfig config) {
final id = config.id.toLowerCase(); final id = config.id.toLowerCase();
final type = config.apiType.toLowerCase(); final type = config.apiType.toLowerCase();
return id == 'cosbooru' || type == 'realbooru'; return id == 'cosbooru' ||
type == 'realbooru' ||
type == 'kemono' ||
type == 'coomer' ||
id == 'kemono' ||
id == 'coomer';
} }
} }
+112 -11
View File
@@ -80,7 +80,16 @@ class MediaUrlSelector {
]); ]);
} }
static List<String> audio(Post post) {
return _compact([
post.fileUrl,
if (_looksLikeAudioUrl(post.sampleUrl)) post.sampleUrl,
if (_looksLikeAudioUrl(post.previewUrl)) post.previewUrl,
]);
}
static bool isVideo(Post post) => _isVideo(post); static bool isVideo(Post post) => _isVideo(post);
static bool isAudio(Post post) => _isAudio(post);
static bool isGif(Post post) => _isGif(post); static bool isGif(Post post) => _isGif(post);
static List<String> _compact(Iterable<String> urls) { static List<String> _compact(Iterable<String> urls) {
@@ -91,23 +100,115 @@ class MediaUrlSelector {
.toList(growable: false); .toList(growable: false);
} }
static const _videoExtensions = {
'.mp4',
'.webm',
'.mov',
'.mkv',
'.avi',
'.flv',
'.wmv',
'.m4v',
'.ts',
};
static const _audioExtensions = {
'.mp3',
'.m4a',
'.wav',
'.ogg',
'.flac',
'.aac',
'.opus',
'.wma',
};
static String _extractExtension(String url) {
if (url.isEmpty) return '';
try {
final uri = Uri.parse(url);
final filenameParam =
uri.queryParameters['f'] ?? uri.queryParameters['filename'];
if (filenameParam != null && filenameParam.isNotEmpty) {
final cleanParam = filenameParam.split('?').first.split('#').first;
final dot = cleanParam.lastIndexOf('.');
if (dot != -1 && dot < cleanParam.length - 1) {
final ext = cleanParam.substring(dot).toLowerCase();
if (ext.length <= 6) return ext;
}
}
final path = uri.path;
final dot = path.lastIndexOf('.');
if (dot != -1 && dot < path.length - 1) {
final ext = path.substring(dot).toLowerCase();
if (ext.length <= 6) return ext;
}
} catch (_) {
// Uri parsing failed, fallback below
}
final clean = url.split('?').first.split('#').first;
final dot = clean.lastIndexOf('.');
if (dot != -1 && dot < clean.length - 1) {
final ext = clean.substring(dot).toLowerCase();
if (ext.length <= 6) return ext;
}
return '';
}
static bool _isAudio(Post post) {
final type = post.fileType.toLowerCase().trim();
if (type == 'audio') return true;
if (type == 'video' || type == 'photo' || type == 'archive' || type == 'gif') {
return false;
}
final fileExt = _extractExtension(post.fileUrl);
if (_audioExtensions.contains(fileExt)) return true;
if (_videoExtensions.contains(fileExt)) return false;
final sampleExt = _extractExtension(post.sampleUrl);
if (_audioExtensions.contains(sampleExt)) return true;
if (_videoExtensions.contains(sampleExt)) return false;
return false;
}
static bool _isVideo(Post post) { static bool _isVideo(Post post) {
final value = '${post.fileType} ${post.fileUrl}'.toLowerCase(); final type = post.fileType.toLowerCase().trim();
return value.contains('video') || if (type == 'video') return true;
value.contains('.webm') || if (type == 'audio' || type == 'photo' || type == 'archive' || type == 'gif') {
value.contains('.mp4') || return false;
value.contains('.mov'); }
final fileExt = _extractExtension(post.fileUrl);
if (_videoExtensions.contains(fileExt)) return true;
if (_audioExtensions.contains(fileExt)) return false;
final sampleExt = _extractExtension(post.sampleUrl);
if (_videoExtensions.contains(sampleExt)) return true;
if (_audioExtensions.contains(sampleExt)) return false;
return false;
} }
static bool _isGif(Post post) { static bool _isGif(Post post) {
final value = '${post.fileType} ${post.fileUrl}'.toLowerCase(); final type = post.fileType.toLowerCase().trim();
return value.contains('gif') || value.contains('.gif'); if (type == 'gif') return true;
final fileExt = _extractExtension(post.fileUrl);
if (fileExt == '.gif') return true;
final sampleExt = _extractExtension(post.sampleUrl);
return sampleExt == '.gif';
} }
static bool _looksLikeVideoUrl(String url) { static bool _looksLikeVideoUrl(String url) {
final value = url.toLowerCase(); final ext = _extractExtension(url);
return value.contains('.webm') || return _videoExtensions.contains(ext);
value.contains('.mp4') || }
value.contains('.mov');
static bool _looksLikeAudioUrl(String url) {
final ext = _extractExtension(url);
return _audioExtensions.contains(ext);
} }
} }
@@ -191,11 +191,13 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
bool _matchesTypeFilter(Post post) { bool _matchesTypeFilter(Post post) {
if (_selectedTypes.isEmpty) return true; if (_selectedTypes.isEmpty) return true;
final isVid = MediaUrlSelector.isVideo(post); final isVid = MediaUrlSelector.isVideo(post);
final isAud = MediaUrlSelector.isAudio(post);
final isGif = MediaUrlSelector.isGif(post); final isGif = MediaUrlSelector.isGif(post);
final isText = post.fileType == 'text'; final isText = post.fileType == 'text';
final isPhoto = !isVid && !isGif && !isText; final isPhoto = !isVid && !isAud && !isGif && !isText;
if (_selectedTypes.contains('video') && isVid) return true; if (_selectedTypes.contains('video') && isVid) return true;
if (_selectedTypes.contains('audio') && isAud) return true;
if (_selectedTypes.contains('gif') && isGif) return true; if (_selectedTypes.contains('gif') && isGif) return true;
if (_selectedTypes.contains('photo') && isPhoto) return true; if (_selectedTypes.contains('photo') && isPhoto) return true;
if (_selectedTypes.contains('text') && isText) return true; if (_selectedTypes.contains('text') && isText) return true;
@@ -462,10 +464,12 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
Widget _buildMediaTypeFilters() { Widget _buildMediaTypeFilters() {
final scheme = Theme.of(context).colorScheme; final scheme = Theme.of(context).colorScheme;
final audioCount = _posts.where(MediaUrlSelector.isAudio).length;
final photoCount = _posts final photoCount = _posts
.where((p) => .where((p) =>
p.fileType != 'text' && p.fileType != 'text' &&
!MediaUrlSelector.isVideo(p) && !MediaUrlSelector.isVideo(p) &&
!MediaUrlSelector.isAudio(p) &&
!MediaUrlSelector.isGif(p)) !MediaUrlSelector.isGif(p))
.length; .length;
final videoCount = _posts.where(MediaUrlSelector.isVideo).length; final videoCount = _posts.where(MediaUrlSelector.isVideo).length;
@@ -521,6 +525,27 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
}); });
}, },
), ),
if (audioCount > 0) ...[
const SizedBox(width: 8),
FilterChip(
selected: _selectedTypes.contains('audio'),
avatar: Icon(Icons.audiotrack_rounded,
size: 16,
color: _selectedTypes.contains('audio')
? scheme.onPrimaryContainer
: scheme.onSurfaceVariant),
label: Text('Аудио ($audioCount)'),
onSelected: (selected) {
setState(() {
if (selected) {
_selectedTypes.add('audio');
} else {
_selectedTypes.remove('audio');
}
});
},
),
],
const SizedBox(width: 8), const SizedBox(width: 8),
FilterChip( FilterChip(
selected: _selectedTypes.contains('gif'), selected: _selectedTypes.contains('gif'),
@@ -97,7 +97,11 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
void initState() { void initState() {
super.initState(); super.initState();
_scroll.addListener(() { _scroll.addListener(() {
if (_scroll.position.extentAfter < 500) _loadMore(); if (_scroll.hasClients &&
_scroll.position.hasContentDimensions &&
_scroll.position.extentAfter < 500) {
_loadMore();
}
}); });
} }
@@ -128,6 +132,7 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
return AdaptiveScaffold( return AdaptiveScaffold(
title: 'Artists', title: 'Artists',
resizeToAvoidBottomInset: false,
actions: [ actions: [
IconButton( IconButton(
tooltip: 'Синхронизация Pawchive', tooltip: 'Синхронизация Pawchive',
@@ -252,6 +257,8 @@ class _ArtistsScreenState extends ConsumerState<ArtistsScreen> {
: 1; : 1;
return GridView.builder( return GridView.builder(
controller: _scroll, controller: _scroll,
keyboardDismissBehavior:
ScrollViewKeyboardDismissBehavior.onDrag,
padding: padding:
const EdgeInsets.fromLTRB(16, 10, 16, 18), const EdgeInsets.fromLTRB(16, 10, 16, 18),
gridDelegate: gridDelegate:
@@ -594,6 +601,7 @@ class _ArtistsHeader extends StatelessWidget {
child: TextField( child: TextField(
controller: searchController, controller: searchController,
textInputAction: TextInputAction.search, textInputAction: TextInputAction.search,
autocorrect: false,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: isDark ? Colors.white : const Color(0xFF0F172A), color: isDark ? Colors.white : const Color(0xFF0F172A),
@@ -114,7 +114,8 @@ class PostDetailsScreen extends ConsumerWidget {
(post.previewUrl.isEmpty && (post.previewUrl.isEmpty &&
post.sampleUrl.isEmpty && post.sampleUrl.isEmpty &&
post.fileUrl.isEmpty && post.fileUrl.isEmpty &&
!MediaUrlSelector.isVideo(post)); !MediaUrlSelector.isVideo(post) &&
!MediaUrlSelector.isAudio(post));
final shouldShowCloudCard = isTextOnly final shouldShowCloudCard = isTextOnly
? post.cloudLinks.isNotEmpty ? post.cloudLinks.isNotEmpty
: (post.cloudLinks.isNotEmpty || : (post.cloudLinks.isNotEmpty ||
@@ -230,17 +231,24 @@ class PostDetailsScreen extends ConsumerWidget {
), ),
Expanded( Expanded(
child: Center( child: Center(
child: MediaUrlSelector.isVideo(post) child: (MediaUrlSelector.isVideo(post) ||
MediaUrlSelector.isAudio(post))
? ConstrainedBox( ? ConstrainedBox(
constraints: const BoxConstraints( constraints: BoxConstraints(
maxHeight: 760, maxHeight: MediaUrlSelector.isAudio(post)
? 360
: 760,
maxWidth: MediaUrlSelector.isAudio(post)
? 620
: double.infinity,
), ),
child: AspectRatio( child: AspectRatio(
aspectRatio: aspectRatio: MediaUrlSelector.isAudio(post)
(post.width > 0 && post.height > 0) ? 1.4
: ((post.width > 0 && post.height > 0)
? (post.width / post.height) ? (post.width / post.height)
.clamp(0.45, 2.4) .clamp(0.45, 2.4)
: (16 / 9), : (16 / 9)),
child: PostMediaViewer( child: PostMediaViewer(
key: ValueKey(post.cacheKey), key: ValueKey(post.cacheKey),
post: post, post: post,
@@ -433,6 +441,7 @@ class PostDetailsScreen extends ConsumerWidget {
List<Post>? feedPosts, List<Post>? feedPosts,
]) { ]) {
final isVideo = MediaUrlSelector.isVideo(post); final isVideo = MediaUrlSelector.isVideo(post);
final isAudio = MediaUrlSelector.isAudio(post);
final localMedia = final localMedia =
ref.watch(downloadedMediaByKeyProvider(post.cacheKey)).value; ref.watch(downloadedMediaByKeyProvider(post.cacheKey)).value;
final fileSizeBytes = localMedia != null final fileSizeBytes = localMedia != null
@@ -450,7 +459,8 @@ class PostDetailsScreen extends ConsumerWidget {
(post.previewUrl.isEmpty && (post.previewUrl.isEmpty &&
post.sampleUrl.isEmpty && post.sampleUrl.isEmpty &&
post.fileUrl.isEmpty && post.fileUrl.isEmpty &&
!MediaUrlSelector.isVideo(post)); !MediaUrlSelector.isVideo(post) &&
!MediaUrlSelector.isAudio(post));
final shouldShowCloudCard = isTextOnly final shouldShowCloudCard = isTextOnly
? post.cloudLinks.isNotEmpty ? post.cloudLinks.isNotEmpty
: (post.cloudLinks.isNotEmpty || : (post.cloudLinks.isNotEmpty ||
@@ -479,16 +489,20 @@ class PostDetailsScreen extends ConsumerWidget {
? null ? null
: () => : () =>
_showMobileQuickActions(context, ref, post, favoriteKeys), _showMobileQuickActions(context, ref, post, favoriteKeys),
child: isVideo child: (isVideo || isAudio)
? Center( ? Center(
child: ConstrainedBox( child: ConstrainedBox(
constraints: BoxConstraints( constraints: BoxConstraints(
maxHeight: MediaQuery.sizeOf(context).height * 0.70, maxHeight: isAudio
? 340
: MediaQuery.sizeOf(context).height * 0.70,
), ),
child: AspectRatio( child: AspectRatio(
aspectRatio: (post.width > 0 && post.height > 0) aspectRatio: isAudio
? 1.3
: ((post.width > 0 && post.height > 0)
? (post.width / post.height).clamp(0.45, 2.4) ? (post.width / post.height).clamp(0.45, 2.4)
: (16 / 9), : (16 / 9)),
child: PostMediaViewer( child: PostMediaViewer(
key: ValueKey(post.cacheKey), key: ValueKey(post.cacheKey),
post: post, post: post,
@@ -94,7 +94,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
_currentVolume = widget.initialVolume; _currentVolume = widget.initialVolume;
_imageUrls = _buildImageUrls(widget.post); _imageUrls = _buildImageUrls(widget.post);
_videoUrls = _buildVideoUrls(widget.post); _videoUrls = _buildVideoUrls(widget.post);
if (_isVideo(widget.post) && _videoUrls.isNotEmpty) { if (_isPlayableMedia(widget.post) && _videoUrls.isNotEmpty) {
_initializeVideo(); _initializeVideo();
} }
} }
@@ -111,7 +111,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
_softwareDecodingFallback = false; _softwareDecodingFallback = false;
_imageUrls = _buildImageUrls(widget.post); _imageUrls = _buildImageUrls(widget.post);
_videoUrls = _buildVideoUrls(widget.post); _videoUrls = _buildVideoUrls(widget.post);
if (_isVideo(widget.post) && _videoUrls.isNotEmpty) { if (_isPlayableMedia(widget.post) && _videoUrls.isNotEmpty) {
_initializeVideo(); _initializeVideo();
} }
} else if (oldWidget.mediaHeaders != widget.mediaHeaders) { } else if (oldWidget.mediaHeaders != widget.mediaHeaders) {
@@ -160,7 +160,38 @@ class _PostMediaViewerState extends State<PostMediaViewer>
return const _UnsupportedSwfPanel(); return const _UnsupportedSwfPanel();
} }
if (_controller != null) { if (_controller != null || _player != null) {
if (_isAudio(widget.post) && _player != null) {
return _AudioSurface(
player: _player!,
post: widget.post,
muted: _muted,
loopAudio: _loopVideo,
initialVolume: _currentVolume,
onVolumeChanged: (vol) {
_currentVolume = vol;
widget.onVolumeChanged?.call(vol);
_emitPlaybackPreferences();
},
fullscreen: widget.fullscreen,
errorMessage: _videoError,
onRetry: _retryVideo,
onToggleMute: () async {
final nextMuted = !_muted;
setState(() => _muted = nextMuted);
await _applyVolume();
_emitPlaybackPreferences();
},
onToggleLoop: () async {
final nextLoop = !_loopVideo;
setState(() => _loopVideo = nextLoop);
await _player!.setPlaylistMode(
nextLoop ? PlaylistMode.single : PlaylistMode.none,
);
_emitPlaybackPreferences();
},
);
}
if (_inFullscreen) { if (_inFullscreen) {
return ColoredBox( return ColoredBox(
color: Colors.black, color: Colors.black,
@@ -495,7 +526,9 @@ class _PostMediaViewerState extends State<PostMediaViewer>
} }
List<String> _buildVideoUrls(Post post) { List<String> _buildVideoUrls(Post post) {
final list = List<String>.from(MediaUrlSelector.video(post)); final list = _isAudio(post)
? List<String>.from(MediaUrlSelector.audio(post))
: List<String>.from(MediaUrlSelector.video(post));
final cloudStreams = post.cloudLinks final cloudStreams = post.cloudLinks
.where((l) => l.isStreamable && l.directStreamUrl != null) .where((l) => l.isStreamable && l.directStreamUrl != null)
.map((l) => l.directStreamUrl!); .map((l) => l.directStreamUrl!);
@@ -509,15 +542,16 @@ class _PostMediaViewerState extends State<PostMediaViewer>
return list; return list;
} }
bool _isAudio(Post post) => MediaUrlSelector.isAudio(post);
bool _isVideo(Post post) { bool _isVideo(Post post) {
if (_isAudio(post)) return false;
if (post.cloudLinks.any((l) => l.isStreamable)) return true; if (post.cloudLinks.any((l) => l.isStreamable)) return true;
final value = '${post.fileType} ${post.fileUrl}'.toLowerCase(); return MediaUrlSelector.isVideo(post);
return value.contains('video') ||
value.contains('.webm') ||
value.contains('.mp4') ||
value.contains('.mov');
} }
bool _isPlayableMedia(Post post) => _isVideo(post) || _isAudio(post);
bool _isSwf(Post post) { bool _isSwf(Post post) {
final value = final value =
'${post.fileType} ${post.fileUrl} ${post.sampleUrl} ${post.source ?? ''}' '${post.fileType} ${post.fileUrl} ${post.sampleUrl} ${post.source ?? ''}'
@@ -997,6 +1031,455 @@ class _CloseVideoIntent extends Intent {
const _CloseVideoIntent(); const _CloseVideoIntent();
} }
class _AudioSurface extends StatefulWidget {
const _AudioSurface({
required this.player,
required this.post,
required this.muted,
required this.loopAudio,
this.initialVolume = 100.0,
this.onVolumeChanged,
required this.fullscreen,
required this.errorMessage,
required this.onRetry,
required this.onToggleMute,
required this.onToggleLoop,
});
final Player player;
final Post post;
final bool muted;
final bool loopAudio;
final double initialVolume;
final ValueChanged<double>? onVolumeChanged;
final bool fullscreen;
final String? errorMessage;
final VoidCallback onRetry;
final VoidCallback onToggleMute;
final VoidCallback onToggleLoop;
@override
State<_AudioSurface> createState() => _AudioSurfaceState();
}
class _AudioSurfaceState extends State<_AudioSurface>
with SingleTickerProviderStateMixin {
late final AnimationController _rotationController;
StreamSubscription<Duration>? _posSub;
StreamSubscription<Duration>? _durSub;
StreamSubscription<bool>? _playSub;
StreamSubscription<bool>? _buffSub;
Duration _position = Duration.zero;
Duration _duration = Duration.zero;
bool _playing = false;
bool _buffering = false;
bool _isDragging = false;
double _dragValue = 0.0;
@override
void initState() {
super.initState();
_rotationController = AnimationController(
vsync: this,
duration: const Duration(seconds: 14),
);
_position = widget.player.state.position;
_duration = widget.player.state.duration;
_playing = widget.player.state.playing;
_buffering = widget.player.state.buffering;
if (_playing) _rotationController.repeat();
_posSub = widget.player.stream.position.listen((pos) {
if (mounted && !_isDragging) {
setState(() => _position = pos);
}
});
_durSub = widget.player.stream.duration.listen((dur) {
if (mounted) setState(() => _duration = dur);
});
_playSub = widget.player.stream.playing.listen((playing) {
if (mounted) {
setState(() => _playing = playing);
if (playing) {
_rotationController.repeat();
} else {
_rotationController.stop();
}
}
});
_buffSub = widget.player.stream.buffering.listen((buffering) {
if (mounted) setState(() => _buffering = buffering);
});
}
@override
void dispose() {
_rotationController.dispose();
_posSub?.cancel();
_durSub?.cancel();
_playSub?.cancel();
_buffSub?.cancel();
super.dispose();
}
String _formatTime(Duration d) {
final minutes = d.inMinutes;
final seconds = d.inSeconds % 60;
return '${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
}
String _deriveTitle() {
final title = (widget.post.title ?? '').trim();
if (title.isNotEmpty) return title;
final uri = Uri.tryParse(widget.post.fileUrl);
if (uri != null) {
final q = uri.queryParameters['f'];
if (q != null && q.trim().isNotEmpty) return q.trim();
final seg = uri.pathSegments.lastOrNull;
if (seg != null && seg.isNotEmpty) return seg;
}
return 'Аудиозапись';
}
void _seekRelative(int seconds) {
final target = _position + Duration(seconds: seconds);
final maxDur = _duration > Duration.zero ? _duration : target;
final clamped = Duration(
milliseconds: target.inMilliseconds.clamp(0, maxDur.inMilliseconds),
);
widget.player.seek(clamped);
}
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final title = _deriveTitle();
final artistName =
widget.post.tagGroups['artist']?.firstOrNull ?? widget.post.providerName;
final hasCover = widget.post.previewUrl.isNotEmpty &&
widget.post.previewUrl.startsWith('http');
if (widget.errorMessage != null) {
return Center(
child: Container(
margin: const EdgeInsets.all(16),
padding: const EdgeInsets.all(20),
decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainerHighest,
borderRadius: BorderRadius.circular(16),
border: Border.all(color: theme.colorScheme.error.withValues(alpha: 0.4)),
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.error_outline_rounded,
size: 40, color: theme.colorScheme.error),
const SizedBox(height: 12),
Text(
'Не удалось воспроизвести аудио',
style: theme.textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 8),
Text(
widget.errorMessage!,
textAlign: TextAlign.center,
maxLines: 3,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
),
const SizedBox(height: 16),
FilledButton.icon(
onPressed: widget.onRetry,
icon: const Icon(Icons.refresh_rounded),
label: const Text('Повторить попытку'),
),
],
),
),
);
}
final maxMs = _duration.inMilliseconds > 0
? _duration.inMilliseconds.toDouble()
: 1.0;
final currentMs = (_isDragging ? _dragValue : _position.inMilliseconds.toDouble())
.clamp(0.0, maxMs);
return Container(
width: double.infinity,
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
theme.colorScheme.surfaceContainerHighest,
theme.colorScheme.surfaceContainer,
],
),
borderRadius: BorderRadius.circular(20),
border: Border.all(
color: theme.colorScheme.outlineVariant.withValues(alpha: 0.35),
width: 0.8,
),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.25),
blurRadius: 16,
offset: const Offset(0, 4),
),
],
),
padding: const EdgeInsets.fromLTRB(20, 20, 20, 16),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
// Top Row: Vinyl / Album Art + Title + Artist
Row(
children: [
// Rotating Album Art / Vinyl
RotationTransition(
turns: _rotationController,
child: Container(
width: 64,
height: 64,
decoration: BoxDecoration(
shape: BoxShape.circle,
gradient: RadialGradient(
colors: [
theme.colorScheme.primary.withValues(alpha: 0.9),
Colors.black87,
],
),
boxShadow: [
BoxShadow(
color: theme.colorScheme.primary.withValues(alpha: 0.35),
blurRadius: 12,
offset: const Offset(0, 3),
),
],
),
child: Center(
child: hasCover
? ClipOval(
child: CachedNetworkImage(
imageUrl: widget.post.previewUrl,
width: 44,
height: 44,
fit: BoxFit.cover,
errorWidget: (_, __, ___) => Icon(
Icons.audiotrack_rounded,
color: theme.colorScheme.onPrimary,
size: 26,
),
),
)
: Container(
width: 26,
height: 26,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: theme.colorScheme.surface,
),
child: Icon(
Icons.audiotrack_rounded,
size: 16,
color: theme.colorScheme.primary,
),
),
),
),
),
const SizedBox(width: 16),
// Track & Artist Info
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(
title,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.bold,
letterSpacing: -0.2,
height: 1.25,
),
),
const SizedBox(height: 4),
Row(
children: [
Icon(
Icons.person_outline_rounded,
size: 14,
color: theme.colorScheme.onSurfaceVariant,
),
const SizedBox(width: 4),
Expanded(
child: Text(
artistName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
fontWeight: FontWeight.w600,
),
),
),
],
),
],
),
),
],
),
const SizedBox(height: 18),
// Timeline Slider
SliderTheme(
data: SliderTheme.of(context).copyWith(
trackHeight: 4.5,
thumbShape: const RoundSliderThumbShape(enabledThumbRadius: 6.5),
overlayShape: const RoundSliderOverlayShape(overlayRadius: 14),
activeTrackColor: theme.colorScheme.primary,
inactiveTrackColor:
theme.colorScheme.onSurface.withValues(alpha: 0.15),
thumbColor: theme.colorScheme.primary,
),
child: Slider(
value: currentMs,
min: 0.0,
max: maxMs,
onChanged: (val) {
setState(() {
_isDragging = true;
_dragValue = val;
});
},
onChangeEnd: (val) {
_isDragging = false;
widget.player.seek(Duration(milliseconds: val.toInt()));
},
),
),
// Time numbers: elapsed & total
Padding(
padding: const EdgeInsets.symmetric(horizontal: 8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
_formatTime(_position),
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
fontSize: 11,
fontFeatures: const [FontFeature.tabularFigures()],
),
),
if (_buffering)
SizedBox(
width: 12,
height: 12,
child: CircularProgressIndicator(
strokeWidth: 2,
color: theme.colorScheme.primary,
),
),
Text(
_formatTime(_duration),
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
fontSize: 11,
fontFeatures: const [FontFeature.tabularFigures()],
),
),
],
),
),
const SizedBox(height: 10),
// Controls Row: Loop, -10s, Play/Pause, +10s, Mute
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
IconButton(
tooltip: widget.loopAudio ? 'Повтор: включен' : 'Повтор: выключен',
icon: Icon(
widget.loopAudio ? Icons.repeat_one_rounded : Icons.repeat_rounded,
color: widget.loopAudio
? theme.colorScheme.primary
: theme.colorScheme.onSurfaceVariant,
size: 22,
),
onPressed: widget.onToggleLoop,
),
IconButton(
tooltip: 'Назад на 10 сек',
icon: const Icon(Icons.replay_10_rounded, size: 26),
color: theme.colorScheme.onSurface,
onPressed: () => _seekRelative(-10),
),
// Big Play / Pause Button
GestureDetector(
onTap: () {
if (_playing) {
widget.player.pause();
} else {
widget.player.play();
}
},
child: Container(
width: 54,
height: 54,
decoration: BoxDecoration(
color: theme.colorScheme.primary,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: theme.colorScheme.primary.withValues(alpha: 0.4),
blurRadius: 10,
offset: const Offset(0, 3),
),
],
),
child: Icon(
_playing ? Icons.pause_rounded : Icons.play_arrow_rounded,
color: theme.colorScheme.onPrimary,
size: 30,
),
),
),
IconButton(
tooltip: 'Вперед на 10 сек',
icon: const Icon(Icons.forward_10_rounded, size: 26),
color: theme.colorScheme.onSurface,
onPressed: () => _seekRelative(10),
),
IconButton(
tooltip: widget.muted ? 'Включить звук' : 'Выключить звук',
icon: Icon(
widget.muted ? Icons.volume_off_rounded : Icons.volume_up_rounded,
color: widget.muted
? theme.colorScheme.error
: theme.colorScheme.onSurfaceVariant,
size: 22,
),
onPressed: widget.onToggleMute,
),
],
),
],
),
);
}
}
class _VideoSurface extends StatefulWidget { class _VideoSurface extends StatefulWidget {
const _VideoSurface({ const _VideoSurface({
required this.player, required this.player,
@@ -288,14 +288,6 @@ class _ProviderFormScreenState extends ConsumerState<ProviderFormScreen> {
value: 'realbooru_html', value: 'realbooru_html',
child: Text('Realbooru HTML'), child: Text('Realbooru HTML'),
), ),
DropdownMenuItem(
value: 'kemono',
child: Text('Kemono Party artists'),
),
DropdownMenuItem(
value: 'coomer',
child: Text('Coomer Party artists'),
),
DropdownMenuItem( DropdownMenuItem(
value: 'custom', value: 'custom',
child: Text('Custom REST API'), child: Text('Custom REST API'),
@@ -305,16 +305,6 @@ class ProviderCard extends StatelessWidget {
Icons.pets_rounded, Icons.pets_rounded,
'e621 / e926', 'e621 / e926',
), ),
'kemono' => (
const Color(0xFFEC4899),
Icons.palette_rounded,
'Kemono',
),
'coomer' => (
const Color(0xFF06B6D4),
Icons.collections_rounded,
'Coomer',
),
_ => ( _ => (
const Color(0xFF6366F1), const Color(0xFF6366F1),
Icons.hub_rounded, Icons.hub_rounded,
@@ -9,6 +9,7 @@ class AdaptiveScaffold extends StatelessWidget {
this.titleWidget, this.titleWidget,
this.actions = const [], this.actions = const [],
this.floatingActionButton, this.floatingActionButton,
this.resizeToAvoidBottomInset = false,
super.key, super.key,
}); });
@@ -17,11 +18,13 @@ class AdaptiveScaffold extends StatelessWidget {
final Widget body; final Widget body;
final List<Widget> actions; final List<Widget> actions;
final Widget? floatingActionButton; final Widget? floatingActionButton;
final bool resizeToAvoidBottomInset;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (Responsive.isMobile(context)) { if (Responsive.isMobile(context)) {
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: resizeToAvoidBottomInset,
appBar: AppBar( appBar: AppBar(
title: titleWidget ?? Text(title), title: titleWidget ?? Text(title),
actions: actions, actions: actions,
@@ -35,6 +38,7 @@ class AdaptiveScaffold extends StatelessWidget {
); );
} }
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: resizeToAvoidBottomInset,
appBar: AppBar(title: titleWidget ?? Text(title), actions: actions), appBar: AppBar(title: titleWidget ?? Text(title), actions: actions),
body: body, body: body,
floatingActionButton: floatingActionButton, floatingActionButton: floatingActionButton,
+11 -4
View File
@@ -352,19 +352,23 @@ class _MobileShell extends StatelessWidget {
? location == '/' ? location == '/'
: location.startsWith(item.location), : location.startsWith(item.location),
); );
final bottomInset = 76.0 + MediaQuery.paddingOf(context).bottom; final isKeyboardOpen = MediaQuery.viewInsetsOf(context).bottom > 0;
final bottomInset = isKeyboardOpen
? 0.0
: 76.0 + MediaQuery.paddingOf(context).bottom;
return Scaffold( return Scaffold(
extendBody: true, extendBody: true,
body: MediaQuery( body: MediaQuery(
data: MediaQuery.of(context).copyWith( data: MediaQuery.of(context).copyWith(
viewInsets: MediaQuery.of(context).viewInsets.copyWith(bottom: 0),
padding: MediaQuery.of(context).padding.copyWith( padding: MediaQuery.of(context).padding.copyWith(
bottom: bottomInset, bottom: bottomInset,
), ),
), ),
child: child, child: child,
), ),
floatingActionButton: location == '/settings' floatingActionButton: (location == '/settings' || isKeyboardOpen)
? null ? null
: Padding( : Padding(
padding: const EdgeInsets.only(bottom: 0, right: 2), padding: const EdgeInsets.only(bottom: 0, right: 2),
@@ -374,9 +378,12 @@ class _MobileShell extends StatelessWidget {
), ),
), ),
floatingActionButtonLocation: FloatingActionButtonLocation.endFloat, floatingActionButtonLocation: FloatingActionButtonLocation.endFloat,
bottomNavigationBar: _LiquidGlassBottomBar( bottomNavigationBar: isKeyboardOpen
? null
: _LiquidGlassBottomBar(
selectedIndex: selected < 0 ? 0 : selected, selectedIndex: selected < 0 ? 0 : selected,
onDestinationSelected: (index) => context.go(items[index].location), onDestinationSelected: (index) =>
context.go(items[index].location),
items: items, items: items,
ru: ru, ru: ru,
), ),
+287 -5
View File
@@ -117,14 +117,19 @@ class _PostCardState extends ConsumerState<PostCard>
Widget build(BuildContext context) { Widget build(BuildContext context) {
final post = _resolvedPost ?? widget.post; final post = _resolvedPost ?? widget.post;
final sensitive = _isSensitive(post.rating); final sensitive = _isSensitive(post.rating);
final isAudioPost =
MediaUrlSelector.isAudio(post) || post.fileType == 'audio';
final isVideoPost = MediaUrlSelector.isVideo(post);
final isTextPost = post.fileType == 'text' || final isTextPost = post.fileType == 'text' ||
(post.previewUrl.trim().isEmpty && (post.previewUrl.trim().isEmpty &&
post.sampleUrl.trim().isEmpty && post.sampleUrl.trim().isEmpty &&
post.fileUrl.trim().isEmpty && post.fileUrl.trim().isEmpty &&
!MediaUrlSelector.isVideo(post)); !isVideoPost &&
!isAudioPost);
final aspect = post.width > 0 && post.height > 0 final aspect = post.width > 0 && post.height > 0
? post.width / post.height ? post.width / post.height
: _fallbackAspect(isTextPost ? 'text' : post.fileType); : _fallbackAspect(
isTextPost ? 'text' : (isAudioPost ? 'audio' : post.fileType));
final mobile = MediaQuery.sizeOf(context).width < 700; final mobile = MediaQuery.sizeOf(context).width < 700;
final urls = _feedUrls(post, mobile: mobile); final urls = _feedUrls(post, mobile: mobile);
final imageUrl = urls.isEmpty ? post.previewUrl : urls.first; final imageUrl = urls.isEmpty ? post.previewUrl : urls.first;
@@ -213,6 +218,18 @@ class _PostCardState extends ConsumerState<PostCard>
hovered: _hovered && !mobile, hovered: _hovered && !mobile,
); );
} }
if (isAudioPost && (imageUrl.isEmpty || !imageUrl.startsWith('http'))) {
return _AudioPostCardPreview(
post: post,
hovered: _hovered && !mobile,
);
}
if (isVideoPost && (imageUrl.isEmpty || !imageUrl.startsWith('http'))) {
return _VideoPostCardPreview(
post: post,
hovered: _hovered && !mobile,
);
}
final dpr = MediaQuery.devicePixelRatioOf(context); final dpr = MediaQuery.devicePixelRatioOf(context);
final cacheWidth = final cacheWidth =
(constraints.maxWidth * dpr).round().clamp(320, 1800); (constraints.maxWidth * dpr).round().clamp(320, 1800);
@@ -241,8 +258,14 @@ class _PostCardState extends ConsumerState<PostCard>
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.surfaceContainerHighest, .surfaceContainerHighest,
child: const Center( child: Center(
child: Icon(Icons.broken_image_rounded), child: Icon(
isVideoPost
? Icons.videocam_outlined
: (isAudioPost
? Icons.music_note_rounded
: Icons.broken_image_rounded),
),
), ),
), ),
); );
@@ -282,12 +305,15 @@ class _PostCardState extends ConsumerState<PostCard>
post.fileType.toLowerCase().contains('webm') || post.fileType.toLowerCase().contains('webm') ||
post.fileType.toLowerCase().contains('mp4') || post.fileType.toLowerCase().contains('mp4') ||
post.fileType.toLowerCase().contains('gif') || post.fileType.toLowerCase().contains('gif') ||
isAudioPost ||
isTextPost) isTextPost)
Positioned( Positioned(
right: 8, right: 8,
top: 8, top: 8,
child: _MediaBadge( child: _MediaBadge(
fileType: isTextPost ? 'text' : post.fileType, fileType: isAudioPost
? 'audio'
: (isTextPost ? 'text' : post.fileType),
), ),
), ),
Positioned( Positioned(
@@ -450,6 +476,7 @@ class _PostCardState extends ConsumerState<PostCard>
double _fallbackAspect(String fileType) { double _fallbackAspect(String fileType) {
final normalized = fileType.toLowerCase(); final normalized = fileType.toLowerCase();
if (normalized == 'text') return 0.95; if (normalized == 'text') return 0.95;
if (normalized == 'audio' || normalized.contains('mp3')) return 1.25;
if (normalized.contains('video') || normalized.contains('webm')) { if (normalized.contains('video') || normalized.contains('webm')) {
return 16 / 9; return 16 / 9;
} }
@@ -806,6 +833,14 @@ class _MediaBadge extends StatelessWidget {
String _type(String raw) { String _type(String raw) {
final value = raw.toLowerCase(); final value = raw.toLowerCase();
if (value.contains('audio') ||
value.contains('mp3') ||
value.contains('wav') ||
value.contains('flac') ||
value.contains('ogg') ||
value.contains('m4a')) {
return 'audio';
}
if (value.contains('video') || if (value.contains('video') ||
value.contains('webm') || value.contains('webm') ||
value.contains('mp4')) { value.contains('mp4')) {
@@ -817,6 +852,7 @@ class _MediaBadge extends StatelessWidget {
} }
IconData _icon(String type) => switch (type) { IconData _icon(String type) => switch (type) {
'audio' => Icons.music_note_rounded,
'video' => Icons.play_arrow_rounded, 'video' => Icons.play_arrow_rounded,
'gif' => Icons.gif_box_rounded, 'gif' => Icons.gif_box_rounded,
'text' => Icons.article_rounded, 'text' => Icons.article_rounded,
@@ -824,6 +860,7 @@ class _MediaBadge extends StatelessWidget {
}; };
String _label(String type) => switch (type) { String _label(String type) => switch (type) {
'audio' => 'AUDIO',
'video' => 'VIDEO', 'video' => 'VIDEO',
'gif' => 'GIF', 'gif' => 'GIF',
'text' => 'ТЕКСТ', 'text' => 'ТЕКСТ',
@@ -967,6 +1004,251 @@ class _TextPostCardPreview extends StatelessWidget {
} }
} }
class _AudioPostCardPreview extends StatelessWidget {
const _AudioPostCardPreview({
required this.post,
required this.hovered,
});
final Post post;
final bool hovered;
String _deriveAudioTitle() {
final title = (post.title ?? '').trim();
if (title.isNotEmpty) return title;
final uri = Uri.tryParse(post.fileUrl);
if (uri != null) {
final queryParam = uri.queryParameters['f'];
if (queryParam != null && queryParam.trim().isNotEmpty) {
return queryParam.trim();
}
final lastSeg = uri.pathSegments.lastOrNull;
if (lastSeg != null && lastSeg.isNotEmpty) {
return lastSeg;
}
}
final artist = post.tagGroups['artist']?.firstOrNull;
if (artist != null && artist.isNotEmpty) return 'Аудиозапись от $artist';
return 'Аудиозапись';
}
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final audioTitle = _deriveAudioTitle();
final artistName = post.tagGroups['artist']?.firstOrNull ?? post.providerName;
return Container(
padding: const EdgeInsets.all(14),
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
theme.colorScheme.primaryContainer.withValues(alpha: 0.85),
theme.colorScheme.surfaceContainerHighest,
],
),
border: Border.all(
color: hovered
? theme.colorScheme.primary.withValues(alpha: 0.6)
: theme.colorScheme.outlineVariant.withValues(alpha: 0.35),
width: 1,
),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Container(
width: 38,
height: 38,
decoration: BoxDecoration(
color: theme.colorScheme.primary,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: theme.colorScheme.primary.withValues(alpha: 0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Icon(
Icons.audiotrack_rounded,
size: 20,
color: theme.colorScheme.onPrimary,
),
),
const SizedBox(width: 10),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
artistName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 11,
color: theme.colorScheme.onSurfaceVariant,
fontWeight: FontWeight.w600,
),
),
Text(
'${post.createdAt.day.toString().padLeft(2, '0')}.${post.createdAt.month.toString().padLeft(2, '0')}.${post.createdAt.year}',
style: TextStyle(
fontSize: 10,
color: theme.colorScheme.onSurfaceVariant.withValues(alpha: 0.7),
),
),
],
),
),
],
),
const Spacer(),
Text(
audioTitle,
maxLines: 3,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.bold,
height: 1.25,
letterSpacing: -0.1,
),
),
const SizedBox(height: 10),
Row(
children: [
Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: theme.colorScheme.surface.withValues(alpha: 0.6),
borderRadius: BorderRadius.circular(8),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.play_circle_filled_rounded,
size: 14,
color: theme.colorScheme.primary,
),
const SizedBox(width: 4),
Text(
'Воспроизвести',
style: TextStyle(
fontSize: 10.5,
fontWeight: FontWeight.w600,
color: theme.colorScheme.onSurface,
),
),
],
),
),
],
),
],
),
);
}
}
class _VideoPostCardPreview extends StatelessWidget {
const _VideoPostCardPreview({
required this.post,
required this.hovered,
});
final Post post;
final bool hovered;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final title = (post.title ?? '').trim();
final artistName = post.tagGroups['artist']?.firstOrNull ?? post.providerName;
return Container(
padding: const EdgeInsets.all(14),
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
theme.colorScheme.surfaceContainerHighest,
theme.colorScheme.surfaceContainer,
],
),
border: Border.all(
color: hovered
? theme.colorScheme.primary.withValues(alpha: 0.6)
: theme.colorScheme.outlineVariant.withValues(alpha: 0.35),
width: 1,
),
),
child: Stack(
children: [
Center(
child: Container(
width: 52,
height: 52,
decoration: BoxDecoration(
color: theme.colorScheme.primary.withValues(alpha: 0.85),
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.3),
blurRadius: 10,
offset: const Offset(0, 3),
),
],
),
child: const Icon(
Icons.play_arrow_rounded,
size: 32,
color: Colors.white,
),
),
),
Positioned(
left: 0,
right: 0,
bottom: 0,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
if (title.isNotEmpty)
Text(
title,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.bold,
height: 1.2,
),
)
else
Text(
artistName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.bold,
),
),
],
),
),
],
),
);
}
}
class _SeenBadge extends StatelessWidget { class _SeenBadge extends StatelessWidget {
const _SeenBadge(); const _SeenBadge();
+1 -1
View File
@@ -1,7 +1,7 @@
name: gel_rule_app name: gel_rule_app
description: Local backend/core layer for a Flutter booru browser app. description: Local backend/core layer for a Flutter booru browser app.
publish_to: "none" publish_to: "none"
version: 3.5.1+77 version: 3.5.4+80
environment: environment:
sdk: ">=3.3.0 <4.0.0" sdk: ">=3.3.0 <4.0.0"
+88
View File
@@ -1,8 +1,10 @@
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:gel_rule_app/backend/models/artist_work_query.dart'; import 'package:gel_rule_app/backend/models/artist_work_query.dart';
import 'package:gel_rule_app/backend/models/content_provider_config.dart'; import 'package:gel_rule_app/backend/models/content_provider_config.dart';
import 'package:gel_rule_app/backend/models/post.dart';
import 'package:gel_rule_app/backend/providers/pawchive_provider.dart'; import 'package:gel_rule_app/backend/providers/pawchive_provider.dart';
import 'package:gel_rule_app/backend/providers/provider_factory.dart'; import 'package:gel_rule_app/backend/providers/provider_factory.dart';
import 'package:gel_rule_app/backend/utils/media_quality.dart';
import 'package:gel_rule_app/core/http/dio_client.dart'; import 'package:gel_rule_app/core/http/dio_client.dart';
void main() { void main() {
@@ -47,4 +49,90 @@ void main() {
expect(provider.id, query.providerId); expect(provider.id, query.providerId);
expect(query.artistName, 'BOKABA'); expect(query.artistName, 'BOKABA');
}); });
test('MediaUrlSelector accurately classifies audio, video and photo posts', () {
final audioPost = Post(
id: 'patreon:123:456:0',
providerId: 'pawchive',
providerName: 'Pawchive',
previewUrl: '',
sampleUrl: '',
fileUrl:
'https://file.pawchive.pw/data/ae/13/ae13adaaebee798397c5c3b07cb9690b2adc91f41815e89a3f58a447bfb56980.mp3?f=audio%20spicy%20only%204.MP3',
tags: const ['patreon', 'artist', 'audio'],
rating: 'unknown',
width: 0,
height: 0,
createdAt: DateTime.now(),
fileType: 'audio',
score: 0,
);
final videoPost = Post(
id: 'patreon:123:456:1',
providerId: 'pawchive',
providerName: 'Pawchive',
previewUrl: '',
sampleUrl: '',
fileUrl:
'https://file.pawchive.pw/data/84/b1/84b1d076dd6b59047bb699115e57c18a02f2ea08b54e4d20409692b58b7aac33.mp4',
tags: const ['patreon', 'artist'],
rating: 'unknown',
width: 1920,
height: 1080,
createdAt: DateTime.now(),
fileType: 'video',
score: 0,
);
final photoPost = Post(
id: 'patreon:123:456:2',
providerId: 'pawchive',
providerName: 'Pawchive',
previewUrl: 'https://img.pawchive.pw/thumbnail/data/c3/06/c3060ab6fa.png',
sampleUrl: 'https://img.pawchive.pw/thumbnail/data/c3/06/c3060ab6fa.png',
fileUrl: 'https://file.pawchive.pw/data/c3/06/c3060ab6fa.png',
tags: const ['patreon', 'artist'],
rating: 'unknown',
width: 1200,
height: 1600,
createdAt: DateTime.now(),
fileType: 'photo',
score: 0,
);
expect(MediaUrlSelector.isAudio(audioPost), isTrue);
expect(MediaUrlSelector.isVideo(audioPost), isFalse);
expect(MediaUrlSelector.audio(audioPost), contains(audioPost.fileUrl));
expect(MediaUrlSelector.isVideo(videoPost), isTrue);
expect(MediaUrlSelector.isAudio(videoPost), isFalse);
expect(MediaUrlSelector.isAudio(photoPost), isFalse);
expect(MediaUrlSelector.isVideo(photoPost), isFalse);
});
test('MediaUrlSelector classifies mp4 containing "audio" in query parameter as video and not audio', () {
final trickyVideoPost = Post(
id: 'patreon:123:456:3',
providerId: 'pawchive',
providerName: 'Pawchive',
previewUrl: '',
sampleUrl: '',
fileUrl:
'https://file.pawchive.pw/data/b4/65/b465cb03ab7b26c0a677db3ae43500d1ef71e3e25151f160cda244c1fb40cfae.mp4?f=nsfw%202%20-%20audio%20spicy.mp4',
tags: const ['patreon', 'artist', 'nsfw 2 - audio spicy'],
rating: 'unknown',
width: 1920,
height: 1080,
createdAt: DateTime.now(),
fileType: 'video',
score: 0,
);
expect(MediaUrlSelector.isVideo(trickyVideoPost), isTrue);
expect(MediaUrlSelector.isAudio(trickyVideoPost), isFalse);
expect(MediaUrlSelector.video(trickyVideoPost), contains(trickyVideoPost.fileUrl));
});
} }
+2 -3
View File
@@ -6,7 +6,6 @@ import 'package:gel_rule_app/backend/mappers/moebooru_mapper.dart';
import 'package:gel_rule_app/backend/mappers/rule34_mapper.dart'; import 'package:gel_rule_app/backend/mappers/rule34_mapper.dart';
import 'package:gel_rule_app/backend/models/content_provider_config.dart'; import 'package:gel_rule_app/backend/models/content_provider_config.dart';
import 'package:gel_rule_app/backend/providers/custom_provider.dart'; import 'package:gel_rule_app/backend/providers/custom_provider.dart';
import 'package:gel_rule_app/backend/providers/kemono_provider.dart';
import 'package:gel_rule_app/backend/providers/provider_factory.dart'; import 'package:gel_rule_app/backend/providers/provider_factory.dart';
import 'package:gel_rule_app/backend/providers/realbooru_html_provider.dart'; import 'package:gel_rule_app/backend/providers/realbooru_html_provider.dart';
import 'package:gel_rule_app/backend/repositories/provider_repository.dart'; import 'package:gel_rule_app/backend/repositories/provider_repository.dart';
@@ -307,7 +306,7 @@ void main() {
expect(provider, isA<RealbooruHtmlProvider>()); expect(provider, isA<RealbooruHtmlProvider>());
}); });
test('provider factory creates Kemono and Coomer artist providers', () { test('provider factory treats removed Kemono and Coomer as unsupported', () {
final now = DateTime(2026); final now = DateTime(2026);
for (final apiType in ['kemono', 'coomer']) { for (final apiType in ['kemono', 'coomer']) {
final provider = ProviderFactory().create(ContentProviderConfig( final provider = ProviderFactory().create(ContentProviderConfig(
@@ -323,7 +322,7 @@ void main() {
updatedAt: now, updatedAt: now,
)); ));
expect(provider, isA<KemonoProvider>()); expect(provider, isA<UnsupportedCustomProvider>());
} }
}); });
} }