Skip to content

Commit

Permalink
fix(radarr): match file details to web GUI
Browse files Browse the repository at this point in the history
  • Loading branch information
@JagandeepBrar
JagandeepBrar committed Mar 4, 2022
1 parent 81ae993 commit a42aa41
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 76 deletions.
12 changes: 12 additions & 0 deletions assets/localization/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,16 @@
"radarr.AddMovieAndSearch": "Add + Search",
"radarr.Alphabetical": "Alphabetical",
"radarr.Approved": "Approved",
"radarr.Audio": "Audio",
"radarr.Automatic": "Automatic",
"radarr.AvailabilityUnknown": "Availability Unknown",
"radarr.AvailableIn": "Available in {}",
"radarr.AvailableToday": "Available Today",
"radarr.BackupDatabase": "Backup Database",
"radarr.BitDepth": "Bit Depth",
"radarr.Channels": "Channels",
"radarr.CinemaDateUnknown": "Cinema Date Unknown",
"radarr.Codec": "Codec",
"radarr.Configure": "Configure",
"radarr.Copy": "Copy",
"radarr.CopyFull": "Hardlink/Copy Files",
Expand All @@ -317,10 +321,12 @@
"radarr.Discover": "Discover",
"radarr.DownloadFailed": "Download Failed",
"radarr.DownloadIgnored": "Download Ignored",
"radarr.DynamicRange": "Dynamic Range",
"radarr.EditMovie": "Edit Movie",
"radarr.FailedToAddTag": "Failed to Add Tag",
"radarr.FileBrowser": "File Browser…",
"radarr.FilterCatalogue": "Filter Catalogue",
"radarr.FPS": "FPS",
"radarr.GrabbedFrom": "Grabbed from {}",
"radarr.History": "History",
"radarr.HistoryDescription": "View Recent Activity",
Expand Down Expand Up @@ -357,6 +363,7 @@
"radarr.NoResultsFound": "No Results Found",
"radarr.NoSubdirectoriesFound": "No Subdirectories Found",
"radarr.NoSummaryIsAvailable": "No summary is available.",
"radarr.Other": "Other",
"radarr.ParentDirectory": "Parent Directory",
"radarr.PhysicalRelease": "Physical Release",
"radarr.Quality": "Quality",
Expand All @@ -370,9 +377,11 @@
"radarr.Released": "Released",
"radarr.ReleasedToday": "Released Today",
"radarr.RemoveMovie": "Remove Movie",
"radarr.Resolution": "Resolution",
"radarr.RootFolder": "Root Folder",
"radarr.Runtime": "Runtime",
"radarr.RunRSSSync": "Run RSS Sync",
"radarr.ScanType": "Scan Type",
"radarr.Search": "Search",
"radarr.SearchAllMissing": "Search All Missing",
"radarr.SearchFor": "Search for {}",
Expand All @@ -384,7 +393,9 @@
"radarr.SortCatalogue": "Sort Catalogue",
"radarr.StartSearchFor": "Start Search For…",
"radarr.StartSearchForMissingMovie": "Start search for missing movie",
"radarr.Streams": "Streams",
"radarr.Studio": "Studio",
"radarr.Subtitles": "Subtitles",
"radarr.SystemStatus": "System Status",
"radarr.SystemStatusDescription": "System Status & Disk Space",
"radarr.Tags": "Tags",
Expand All @@ -395,6 +406,7 @@
"radarr.Upcoming": "Upcoming",
"radarr.UpdateLibrary": "Update Library",
"radarr.UpdateMovie": "Update Movie",
"radarr.Video": "Video",
"radarr.ViewWebGUI": "View Web GUI",
"radarr.Wanted": "Wanted",
"radarr.Weight": "Weight",
Expand Down
31 changes: 15 additions & 16 deletions lib/modules/radarr/api/src/models/movie/movie_file.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,45 @@ import '../../../utilities.dart';

part 'movie_file.g.dart';

/// Model for a movies' file information
@JsonSerializable(explicitToJson: true, includeIfNull: false)
@JsonSerializable()
class RadarrMovieFile {
@JsonKey(name: 'movieId')
@JsonKey()
int? movieId;

@JsonKey(name: 'relativePath')
@JsonKey()
String? relativePath;

@JsonKey(name: 'path')
@JsonKey()
String? path;

@JsonKey(name: 'size')
@JsonKey()
int? size;

@JsonKey(
name: 'dateAdded',
toJson: RadarrUtilities.dateTimeToJson,
fromJson: RadarrUtilities.dateTimeFromJson)
toJson: RadarrUtilities.dateTimeToJson,
fromJson: RadarrUtilities.dateTimeFromJson,
)
DateTime? dateAdded;

@JsonKey(name: 'quality')
@JsonKey()
RadarrMovieFileQuality? quality;

@JsonKey(name: 'customFormats')
@JsonKey()
List<RadarrCustomFormat>? customFormats;

@JsonKey(name: 'mediaInfo')
@JsonKey()
RadarrMovieFileMediaInfo? mediaInfo;

@JsonKey(name: 'qualityCutoffNotMet')
@JsonKey()
bool? qualityCutoffNotMet;

@JsonKey(name: 'languages')
@JsonKey()
List<RadarrLanguage>? languages;

@JsonKey(name: 'edition')
@JsonKey()
String? edition;

@JsonKey(name: 'id')
@JsonKey()
int? id;

RadarrMovieFile({
Expand Down
37 changes: 18 additions & 19 deletions lib/modules/radarr/api/src/models/movie/movie_file_media_info.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,51 @@ import 'package:json_annotation/json_annotation.dart';

part 'movie_file_media_info.g.dart';

/// Store details about the language of the movie.
@JsonSerializable(explicitToJson: true, includeIfNull: false)
@JsonSerializable()
class RadarrMovieFileMediaInfo {
@JsonKey(name: 'audioAdditionalFeatures')
String? audioAdditionalFeatures;

@JsonKey(name: 'audioBitrate')
@JsonKey()
int? audioBitrate;

@JsonKey(name: 'audioChannels')
@JsonKey()
double? audioChannels;

@JsonKey(name: 'audioCodec')
@JsonKey()
String? audioCodec;

@JsonKey(name: 'audioLanguages')
@JsonKey()
String? audioLanguages;

@JsonKey(name: 'audioStreamCount')
@JsonKey()
int? audioStreamCount;

@JsonKey(name: 'videoBitDepth')
@JsonKey()
int? videoBitDepth;

@JsonKey(name: 'videoBitrate')
@JsonKey()
int? videoBitrate;

@JsonKey(name: 'videoCodec')
@JsonKey()
String? videoCodec;

@JsonKey(name: 'videoFps')
@JsonKey()
String? videoDynamicRangeType;

@JsonKey()
double? videoFps;

@JsonKey(name: 'resolution')
@JsonKey()
String? resolution;

@JsonKey(name: 'runTime')
@JsonKey()
String? runTime;

@JsonKey(name: 'scanType')
@JsonKey()
String? scanType;

@JsonKey(name: 'subtitles')
@JsonKey()
String? subtitles;

RadarrMovieFileMediaInfo({
this.audioAdditionalFeatures,
this.audioBitrate,
this.audioChannels,
this.audioCodec,
Expand All @@ -58,6 +56,7 @@ class RadarrMovieFileMediaInfo {
this.videoBitDepth,
this.videoBitrate,
this.videoCodec,
this.videoDynamicRangeType,
this.videoFps,
this.resolution,
this.runTime,
Expand Down
26 changes: 9 additions & 17 deletions lib/modules/radarr/core/extensions/radarr_movie_file_media_info.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ extension LunaRadarrMovieFileMediaInfo on RadarrMovieFileMediaInfo {
return LunaUI.TEXT_EMDASH;
}

String get lunaVideoBitrate {
if (videoBitrate != null)
return '${videoBitrate.lunaBytesToString(bytes: false)}/s';
String? get lunaVideoCodec {
if (videoCodec != null && videoCodec!.isNotEmpty) return videoCodec;
return LunaUI.TEXT_EMDASH;
}

String? get lunaVideoCodec {
if (videoCodec != null && videoCodec!.isNotEmpty) return videoCodec;
String get lunaVideoDynamicRange {
if (videoDynamicRangeType != null) return videoDynamicRangeType!;
return LunaUI.TEXT_EMDASH;
}

Expand All @@ -28,12 +27,6 @@ extension LunaRadarrMovieFileMediaInfo on RadarrMovieFileMediaInfo {
return LunaUI.TEXT_EMDASH;
}

String get lunaAudioBitrate {
if (audioBitrate != null)
return '${audioBitrate.lunaBytesToString(bytes: false)}/s';
return LunaUI.TEXT_EMDASH;
}

String get lunaAudioChannels {
if (audioChannels != null) return audioChannels.toString();
return LunaUI.TEXT_EMDASH;
Expand All @@ -44,12 +37,6 @@ extension LunaRadarrMovieFileMediaInfo on RadarrMovieFileMediaInfo {
return LunaUI.TEXT_EMDASH;
}

String? get lunaAudioAdditionalFeatures {
if (audioAdditionalFeatures != null && audioAdditionalFeatures!.isNotEmpty)
return audioAdditionalFeatures;
return LunaUI.TEXT_EMDASH;
}

String? get lunaAudioLanguages {
if (audioLanguages != null && audioLanguages!.isNotEmpty)
return audioLanguages;
Expand All @@ -66,6 +53,11 @@ extension LunaRadarrMovieFileMediaInfo on RadarrMovieFileMediaInfo {
return LunaUI.TEXT_EMDASH;
}

String? get lunaScanType {
if (scanType != null) return scanType;
return LunaUI.TEXT_EMDASH;
}

String? get lunaSubtitles {
if (subtitles != null && subtitles!.isNotEmpty) return subtitles;
return LunaUI.TEXT_EMDASH;
Expand Down
44 changes: 20 additions & 24 deletions lib/modules/radarr/routes/movie_details/widgets/files_file_block.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,69 +93,65 @@ class _State extends State<RadarrMovieDetailsFilesFileBlock> {
context: context,
builder: (context) => LunaListViewModal(
children: [
const LunaHeader(text: 'Video'),
LunaHeader(text: 'radarr.Video'.tr()),
LunaTableCard(
content: [
LunaTableContent(
title: 'bit depth',
title: 'radarr.BitDepth'.tr(),
body: widget.file.mediaInfo?.lunaVideoBitDepth,
),
LunaTableContent(
title: 'bitrate',
body: widget.file.mediaInfo?.lunaVideoBitrate,
title: 'radarr.Codec'.tr(),
body: widget.file.mediaInfo?.lunaVideoCodec,
),
LunaTableContent(
title: 'codec',
body: widget.file.mediaInfo?.lunaVideoCodec,
title: 'radarr.DynamicRange'.tr(),
body: widget.file.mediaInfo?.lunaVideoDynamicRange,
),
LunaTableContent(
title: 'fps',
title: 'radarr.FPS'.tr(),
body: widget.file.mediaInfo?.lunaVideoFps,
),
LunaTableContent(
title: 'resolution',
title: 'radarr.Resolution'.tr(),
body: widget.file.mediaInfo?.lunaVideoResolution,
),
],
),
const LunaHeader(text: 'Audio'),
LunaHeader(text: 'radarr.Audio'.tr()),
LunaTableCard(
content: [
LunaTableContent(
title: 'bitrate',
body: widget.file.mediaInfo?.lunaAudioBitrate,
),
LunaTableContent(
title: 'channels',
title: 'radarr.Channels'.tr(),
body: widget.file.mediaInfo?.lunaAudioChannels,
),
LunaTableContent(
title: 'codec',
title: 'radarr.Codec'.tr(),
body: widget.file.mediaInfo?.lunaAudioCodec,
),
LunaTableContent(
title: 'features',
body: widget.file.mediaInfo?.lunaAudioAdditionalFeatures,
),
LunaTableContent(
title: 'languages',
title: 'radarr.Languages'.tr(),
body: widget.file.mediaInfo?.lunaAudioLanguages,
),
LunaTableContent(
title: 'streams',
title: 'radarr.Streams'.tr(),
body: widget.file.mediaInfo?.lunaAudioStreamCount,
),
],
),
const LunaHeader(text: 'Other'),
LunaHeader(text: 'radarr.Other'.tr()),
LunaTableCard(
content: [
LunaTableContent(
title: 'runtime',
title: 'radarr.Runtime'.tr(),
body: widget.file.mediaInfo?.lunaRunTime,
),
LunaTableContent(
title: 'subtitles',
title: 'radarr.ScanType'.tr(),
body: widget.file.mediaInfo?.lunaScanType,
),
LunaTableContent(
title: 'radarr.Subtitles'.tr(),
body: widget.file.mediaInfo?.lunaSubtitles,
),
],
Expand Down

0 comments on commit a42aa41

Please sign in to comment.