Skip to content

Commit

Permalink
feat: sort yt playlists
Browse files Browse the repository at this point in the history 
and smol fix while importing
  • Loading branch information
@MSOB7YY
MSOB7YY committed Jan 1, 2024
1 parent 0e02c15 commit 7a4f21e
Show file tree
Hide file tree
Showing 4 changed files with 125 additions and 4 deletions.
14 changes: 14 additions & 0 deletions lib/controller/settings_controller.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ class SettingsController {
final RxBool genreSortReversed = false.obs;
final Rx<GroupSortType> playlistSort = GroupSortType.dateModified.obs;
final RxBool playlistSortReversed = false.obs;
final Rx<GroupSortType> ytPlaylistSort = GroupSortType.dateModified.obs;
final RxBool ytPlaylistSortReversed = true.obs;
final RxInt indexMinDurationInSec = 5.obs;
final RxInt indexMinFileSizeInB = (100 * 1024).obs;
final RxList<TrackSearchFilter> trackSearchFilter = [
Expand Down Expand Up @@ -367,6 +369,8 @@ class SettingsController {
genreSortReversed.value = json['genreSortReversed'] ?? genreSortReversed.value;
playlistSort.value = GroupSortType.values.getEnum(json['playlistSort']) ?? playlistSort.value;
playlistSortReversed.value = json['playlistSortReversed'] ?? playlistSortReversed.value;
ytPlaylistSort.value = GroupSortType.values.getEnum(json['ytPlaylistSort']) ?? ytPlaylistSort.value;
ytPlaylistSortReversed.value = json['ytPlaylistSortReversed'] ?? ytPlaylistSortReversed.value;
indexMinDurationInSec.value = json['indexMinDurationInSec'] ?? indexMinDurationInSec.value;
indexMinFileSizeInB.value = json['indexMinFileSizeInB'] ?? indexMinFileSizeInB.value;

Expand Down Expand Up @@ -597,6 +601,8 @@ class SettingsController {
'genreSortReversed': genreSortReversed.value,
'playlistSort': playlistSort.value.convertToString,
'playlistSortReversed': playlistSortReversed.value,
'ytPlaylistSort': ytPlaylistSort.value.convertToString,
'ytPlaylistSortReversed': ytPlaylistSortReversed.value,
'indexMinDurationInSec': indexMinDurationInSec.value,
'indexMinFileSizeInB': indexMinFileSizeInB.value,
'trackSearchFilter': trackSearchFilter.mapped((e) => e.convertToString),
Expand Down Expand Up @@ -776,6 +782,8 @@ class SettingsController {
bool? genreSortReversed,
GroupSortType? playlistSort,
bool? playlistSortReversed,
GroupSortType? ytPlaylistSort,
bool? ytPlaylistSortReversed,
bool? displayThirdRow,
bool? displayThirdItemInEachRow,
String? trackTileSeparator,
Expand Down Expand Up @@ -1063,6 +1071,12 @@ class SettingsController {
if (playlistSortReversed != null) {
this.playlistSortReversed.value = playlistSortReversed;
}
if (ytPlaylistSort != null) {
this.ytPlaylistSort.value = ytPlaylistSort;
}
if (ytPlaylistSortReversed != null) {
this.ytPlaylistSortReversed.value = ytPlaylistSortReversed;
}
if (displayThirdRow != null) {
this.displayThirdRow.value = displayThirdRow;
}
Expand Down
13 changes: 10 additions & 3 deletions lib/youtube/controller/youtube_import_controller.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ class YoutubeImportController {
Future<int> importPlaylists(String playlistsDirectoryPath) async {
isImportingPlaylists.value = true;
final res = await _parsePlaylistsFiles.thready(playlistsDirectoryPath);
if (res.isEmpty) {
isImportingPlaylists.value = false;
return 0;
}

final completer = Completer<void>();
res.loop((playlist, index) {
Expand Down Expand Up @@ -138,9 +142,12 @@ class YoutubeImportController {

final playlistsMetadata = <String, _YTPlaylistDetails>{};

final plMetaFile = File("$dirPath/playlists.csv");
if (plMetaFile.existsSync()) {
files.remove(plMetaFile);
// final plMetaFile = File("$dirPath/playlists.csv");
final plMetaFileIndex = files.indexWhere((element) => element.path.endsWith('/playlists.csv'));
final plMetaFile = plMetaFileIndex == -1 ? null : files[plMetaFileIndex];

if (plMetaFile != null && plMetaFile is File) {
files.removeAt(plMetaFileIndex);
try {
final plLines = plMetaFile.readAsLinesSync();
plLines.removeAt(0);
Expand Down
40 changes: 39 additions & 1 deletion lib/youtube/controller/youtube_playlist_controller.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import 'package:playlist_manager/module/playlist_id.dart';
import 'package:playlist_manager/playlist_manager.dart';

import 'package:namida/class/video.dart';
import 'package:namida/controller/settings_controller.dart';
import 'package:namida/core/constants.dart';
import 'package:namida/core/enums.dart';
import 'package:namida/core/extensions.dart';
import 'package:namida/core/translations/language.dart';
import 'package:namida/youtube/class/youtube_id.dart';
Expand Down Expand Up @@ -87,6 +89,42 @@ class YoutubePlaylistController extends PlaylistManager<YoutubeID> {
);
}

void sortYTPlaylists({GroupSortType? sortBy, bool? reverse}) {
sortBy ??= settings.ytPlaylistSort.value;
reverse ??= settings.ytPlaylistSortReversed.value;

final playlistList = playlistsMap.entries.toList();
void sortThis(Comparable Function(MapEntry<String, GeneralPlaylist<YoutubeID>> p) comparable) =>
reverse! ? playlistList.sortByReverse(comparable) : playlistList.sortBy(comparable);

switch (sortBy) {
case GroupSortType.title:
sortThis((p) => p.key.toLowerCase());
break;
case GroupSortType.creationDate:
sortThis((p) => p.value.creationDate);
break;
case GroupSortType.modifiedDate:
sortThis((p) => p.value.modifiedDate);
break;
case GroupSortType.numberOfTracks:
sortThis((p) => p.value.tracks.length);
break;
case GroupSortType.shuffle:
playlistList.shuffle();
break;

default:
null;
}

playlistsMap
..clear()
..addEntries(playlistList);

settings.save(ytPlaylistSort: sortBy, ytPlaylistSortReversed: reverse);
}

Future<void> prepareAllPlaylists() async => await super.prepareAllPlaylistsFile();

@override
Expand Down Expand Up @@ -167,5 +205,5 @@ class YoutubePlaylistController extends PlaylistManager<YoutubeID> {
}

@override
void sortPlaylists() {}
void sortPlaylists() => sortYTPlaylists();
}
62 changes: 62 additions & 0 deletions lib/youtube/youtube_playlists_view.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:namida/controller/settings_controller.dart';
import 'package:namida/core/enums.dart';
import 'package:namida/core/namida_converter_ext.dart';
import 'package:playlist_manager/module/playlist_id.dart';

import 'package:namida/controller/navigator_controller.dart';
Expand Down Expand Up @@ -240,6 +243,65 @@ class YoutubePlaylistsView extends StatelessWidget {
title: "${lang.PLAYLISTS} - ${YoutubePlaylistController.inst.playlistsMap.length}",
icon: Broken.music_library_2,
trailing: const SizedBox(),
subtitleWidget: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
NamidaPopupWrapper(
useRootNavigator: false,
children: [
Obx(
() {
final playlistSort = settings.ytPlaylistSort.value;
return Column(
children: [
ListTileWithCheckMark(
active: settings.ytPlaylistSortReversed.value,
onTap: () => YoutubePlaylistController.inst.sortYTPlaylists(reverse: !settings.ytPlaylistSortReversed.value),
),
...[
GroupSortType.title,
GroupSortType.creationDate,
GroupSortType.modifiedDate,
GroupSortType.numberOfTracks,
GroupSortType.shuffle,
].map(
(e) => SmallListTile(
title: e.toText(),
active: playlistSort == e,
onTap: () => YoutubePlaylistController.inst.sortYTPlaylists(sortBy: e),
),
),
],
);
},
),
],
child: NamidaInkWell(
child: Obx(
() => Text(
settings.ytPlaylistSort.value.toText(),
style: context.textTheme.displaySmall?.copyWith(
color: context.theme.colorScheme.secondary,
),
),
),
),
),
const SizedBox(width: 4.0),
NamidaInkWell(
onTap: () {
YoutubePlaylistController.inst.sortYTPlaylists(reverse: !settings.ytPlaylistSortReversed.value);
},
child: Obx(
() => Icon(
settings.ytPlaylistSortReversed.value ? Broken.arrow_up_3 : Broken.arrow_down_2,
size: 16.0,
color: context.theme.colorScheme.secondary,
),
),
),
],
),
),
),
),
Expand Down

0 comments on commit 7a4f21e

Please sign in to comment.