Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions lib/models/items/chapters_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ import 'dart:convert';
import 'dart:io';
import 'dart:typed_data';

import 'package:fladder/models/items/trick_play_model.dart';
import 'package:flutter/material.dart';

import 'package:cached_network_image/cached_network_image.dart';
import 'package:collection/collection.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';

import 'package:fladder/jellyfin/jellyfin_open_api.swagger.dart' as dto;
Expand All @@ -17,11 +19,13 @@ class Chapter {
final String imageUrl;
final Uint8List? imageData;
final Duration startPosition;
final TrickPlayModel? trickplayFallback;
Chapter({
required this.name,
required this.imageUrl,
this.imageData,
required this.startPosition,
this.trickplayFallback,
});

ImageProvider get imageProvider {
Expand All @@ -42,24 +46,29 @@ class Chapter {
}
}

static List<Chapter> chaptersFromInfo(String itemId, List<dto.ChapterInfo> chapters, Ref ref) {
return chapters
.mapIndexed((index, element) => Chapter(
name: element.name ?? "",
imageUrl: ref.read(imageUtilityProvider).getChapterUrl(itemId, index),
startPosition: Duration(milliseconds: (element.startPositionTicks ?? 0) ~/ 10000)))
.toList();
static List<Chapter> chaptersFromInfo(
String itemId, List<dto.ChapterInfo> chapters, TrickPlayModel? trickplay, Ref ref) {
return chapters.mapIndexed((index, element) {
final startPosition = Duration(milliseconds: (element.startPositionTicks ?? 0) ~/ 10000);
return Chapter(
name: element.name ?? "",
imageUrl: ref.read(imageUtilityProvider).getChapterUrl(itemId, index),
startPosition: startPosition,
trickplayFallback: trickplay);
}).toList();
}

Chapter copyWith({
String? name,
String? imageUrl,
Duration? startPosition,
TrickPlayModel? trickplayFallback,
}) {
return Chapter(
name: name ?? this.name,
imageUrl: imageUrl ?? this.imageUrl,
startPosition: startPosition ?? this.startPosition,
trickplayFallback: trickplayFallback ?? this.trickplayFallback,
);
}

Expand All @@ -82,10 +91,28 @@ class Chapter {
String toJson() => json.encode(toMap());

factory Chapter.fromJson(String source) => Chapter.fromMap(json.decode(source));

Future<bool> isImageValidWithCache({CacheManager? preferredCacheManager}) async {
try {
final cacheManager = preferredCacheManager ?? CustomCacheManager.instance;
final file = await cacheManager.getSingleFile(imageUrl);
return file.existsSync();
} catch (e) {
return false;
}
}
}

extension ChapterExtension on List<Chapter> {
Chapter? getChapterFromDuration(Duration duration) {
return lastWhereOrNull((element) => element.startPosition < duration);
}

Future<bool> allChapterImagesValidWithCache({CacheManager? preferredCacheManager}) async {
if (isEmpty) return false;
for (var element in this) {
if (!await element.isImageValidWithCache(preferredCacheManager: preferredCacheManager)) return false;
}
return true;
}
}
7 changes: 6 additions & 1 deletion lib/models/items/episode_model.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'dart:collection';

import 'package:fladder/models/items/trick_play_model.dart';
import 'package:flutter/material.dart';

import 'package:collection/collection.dart';
Expand Down Expand Up @@ -214,6 +215,10 @@ class EpisodeModel extends ItemStreamModel with EpisodeModelMappable {
);
}

final trickPlayMap =
(item.trickplay != null && item.trickplay!.isNotEmpty) ? TrickPlayModel.toTrickPlayMap(item.trickplay!) : null;
final singleTrickPlayModel = trickPlayMap?.values.lastOrNull;

return EpisodeModel(
seriesName: item.seriesName,
name: item.name ?? "",
Expand All @@ -224,7 +229,7 @@ class EpisodeModel extends ItemStreamModel with EpisodeModelMappable {
parentId: item.seriesId,
playlistId: item.playlistItemId,
dateAired: item.premiereDate,
chapters: Chapter.chaptersFromInfo(item.id ?? "", item.chapters ?? [], ref),
chapters: Chapter.chaptersFromInfo(item.id ?? "", item.chapters ?? [], singleTrickPlayModel, ref),
images: ImagesData.fromBaseItem(item, ref),
primaryRatio: item.primaryImageAspectRatio,
season: item.parentIndexNumber ?? 0,
Expand Down
7 changes: 6 additions & 1 deletion lib/models/items/movie_model.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// ignore_for_file: public_member_api_docs, sort_constructors_first

import 'package:fladder/models/items/trick_play_model.dart';
import 'package:flutter/material.dart';

import 'package:dart_mappable/dart_mappable.dart';
Expand Down Expand Up @@ -126,6 +127,10 @@ class MovieModel extends ItemStreamModel with MovieModelMappable {
);
}

final trickPlayMap =
(item.trickplay != null && item.trickplay!.isNotEmpty) ? TrickPlayModel.toTrickPlayMap(item.trickplay!) : null;
final singleTrickPlayModel = trickPlayMap?.values.lastOrNull;

return MovieModel(
name: item.name ?? "",
id: item.id ?? "",
Expand All @@ -139,7 +144,7 @@ class MovieModel extends ItemStreamModel with MovieModelMappable {
originalTitle: item.originalTitle ?? "",
images: ImagesData.fromBaseItem(item, ref),
primaryRatio: item.primaryImageAspectRatio,
chapters: Chapter.chaptersFromInfo(item.id ?? "", item.chapters ?? [], ref),
chapters: Chapter.chaptersFromInfo(item.id ?? "", item.chapters ?? [], singleTrickPlayModel, ref),
premiereDate: item.premiereDate ?? DateTime.now(),
parentImages: ImagesData.fromBaseItemParent(item, ref),
canDelete: item.canDelete,
Expand Down
13 changes: 8 additions & 5 deletions lib/models/items/overview_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ class OverviewModel with OverviewModelMappable {
}

factory OverviewModel.fromBaseItemDto(BaseItemDto item, Ref? ref) {
final trickPlayItem = item.trickplay;
final trickPlayMap =
(item.trickplay != null && item.trickplay!.isNotEmpty) ? TrickPlayModel.toTrickPlayMap(item.trickplay!) : null;
final singleTrickPlayModel = trickPlayMap?.values.lastOrNull;

return OverviewModel(
runTime: item.runTimeDuration,
yearAired: item.productionYear,
Expand All @@ -68,10 +71,10 @@ class OverviewModel with OverviewModelMappable {
communityRating: item.communityRating,
tags: item.tags ?? [],
dateAdded: item.dateCreated,
trickPlayInfo:
trickPlayItem != null && trickPlayItem.isNotEmpty ? TrickPlayModel.toTrickPlayMap(trickPlayItem) : null,
chapters:
(ref != null && item.id != null) ? Chapter.chaptersFromInfo(item.id ?? "", item.chapters ?? [], ref) : null,
trickPlayInfo: trickPlayMap,
chapters: (ref != null && item.id != null)
? Chapter.chaptersFromInfo(item.id ?? "", item.chapters ?? [], singleTrickPlayModel, ref)
: null,
studios: item.studios?.map((e) => Studio(id: e.id ?? "", name: e.name ?? "")).toList() ?? [],
genreItems: item.genreItems?.map((e) => GenreItems(id: e.id ?? "", name: e.name ?? "")).toList() ?? [],
externalUrls: ExternalUrls.fromDto(item.externalUrls ?? []),
Expand Down
18 changes: 18 additions & 0 deletions lib/models/items/trick_play_model.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import 'dart:ui';

import 'package:fladder/util/custom_cache_manager.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:freezed_annotation/freezed_annotation.dart';

part 'trick_play_model.freezed.dart';
Expand Down Expand Up @@ -38,6 +40,22 @@ abstract class TrickPlayModel with _$TrickPlayModel {
);
}

Future<bool> allImagesValidWithCache({CacheManager? preferredCacheManager}) async {
if (images.isEmpty) return false;
try {
final cacheManager = preferredCacheManager ?? CustomCacheManager.instance;
for (var imageUrl in images) {
FileInfo? fileInfo = await cacheManager.getFileFromCache(imageUrl);

fileInfo ??= await cacheManager.downloadFile(imageUrl);
if (!fileInfo.file.existsSync()) return false;
}
return true;
} catch (e) {
return false;
}
}

static Map<String, TrickPlayModel> toTrickPlayMap(Map<String, dynamic> map) {
Map<String, TrickPlayModel> newMap = {};
final firstMap = (((map.entries.first as MapEntry).value as Map<String, dynamic>));
Expand Down
14 changes: 13 additions & 1 deletion lib/providers/items/episode_details_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,19 @@ class EpisodeDetailsProvider extends StateNotifier<EpisodeDetailModel> {

if (episodes.body == null) return null;

final episode = (await api.usersUserIdItemsItemIdGet(itemId: item.id)).bodyOrThrow as EpisodeModel;
var episode = (await api.usersUserIdItemsItemIdGet(itemId: item.id)).bodyOrThrow as EpisodeModel;

if (episode.chapters.any((c) => c.trickplayFallback?.images.isEmpty ?? true)) {
final trickPlay = (await api.getTrickPlay(item: episode, ref: ref))?.body;
if (trickPlay != null && trickPlay.images.isNotEmpty) {
final newChapters = episode.chapters
.map((chapter) => chapter.copyWith(
trickplayFallback: trickPlay,
))
.toList();
episode = episode.copyWith(chapters: newChapters);
}
}

state = state.copyWith(
series: seriesResponse.bodyOrThrow as SeriesModel,
Expand Down
29 changes: 22 additions & 7 deletions lib/providers/items/movies_details_provider.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'dart:developer';

import 'package:chopper/chopper.dart';
import 'package:fladder/models/items/chapters_model.dart';
import 'package:logging/logging.dart' as logging;
import 'package:riverpod_annotation/riverpod_annotation.dart';

Expand Down Expand Up @@ -80,14 +81,28 @@ class MovieDetails extends _$MovieDetails {
}
}

List<Chapter>? newChapters;
if (state?.chapters.any((c) => c.trickplayFallback?.images.isEmpty ?? true) ?? true) {
final trickPlay = (await api.getTrickPlay(item: state, ref: ref))?.body;
if (trickPlay != null && trickPlay.images.isNotEmpty) {
newChapters = state!.chapters
.map((chapter) => chapter.copyWith(
trickplayFallback: trickPlay,
))
.toList();
}
}

state = newState.copyWith(
related: related.body,
seerrRelated: seerrRelated,
seerrRecommended: seerrRecommended,
overview: state?.overview.copyWith(
seerrUrl: seerrUrl,
),
specialFeatures: specialFeatureModel);
related: related.body,
seerrRelated: seerrRelated,
seerrRecommended: seerrRecommended,
overview: state?.overview.copyWith(
seerrUrl: seerrUrl,
),
specialFeatures: specialFeatureModel,
chapters: newChapters ?? state?.chapters,
);
return null;
} catch (e) {
return null;
Expand Down
Loading
Loading