diff --git a/api/funkwhale_api/music/migrations/0061_migrate_libraries_to_playlist.py b/api/funkwhale_api/music/migrations/0061_migrate_libraries_to_playlist.py index 5c703a324..71362abfd 100644 --- a/api/funkwhale_api/music/migrations/0061_migrate_libraries_to_playlist.py +++ b/api/funkwhale_api/music/migrations/0061_migrate_libraries_to_playlist.py @@ -164,14 +164,16 @@ def check_succefull_migration(apps, schema_editor): raise Exception( f"Incoherent playlist database state : all local playlists do not have lib or too many libs" ) - elif actor.libraries.count() - 3 != not_build_in_libs or ( - hasattr(actor, "channel") and actor.libraries.count() > 1 + elif ( + not hasattr(actor, "channel") + and actor.libraries.count() - 3 != not_build_in_libs + or (hasattr(actor, "channel") and actor.libraries.count() > 1) ): raise Exception( f"Incoherent library database state, check for errors in log and share them to the funkwhale team. Migration was abordted to prevent data loss.\ actor libs = {actor.libraries.count()} and acto not built-in lib = {not_build_in_libs} \ and acto pl ={actor.playlists.count()} and not channel lib = {actor.libraries.filter(channel__isnull=False).count()} \ - and actor.nae = {actor.name}" + and actor.name = {actor.name}" ) for playlist in Playlist.objects.all(): if not federation_utils.is_local(playlist.fid): diff --git a/api/funkwhale_api/playlists/migrations/0009_playlist_library.py b/api/funkwhale_api/playlists/migrations/0009_playlist_library.py index 88f8b0c40..2457d551c 100644 --- a/api/funkwhale_api/playlists/migrations/0009_playlist_library.py +++ b/api/funkwhale_api/playlists/migrations/0009_playlist_library.py @@ -20,9 +20,7 @@ def create_playlist_libraries(apps, schema_editor): playlist_with_lib_count = 0 for playlist in Playlist.objects.all(): - if not federation_utils.is_local(playlist.fid) or not federation_utils.is_local( - playlist.actor.fid - ): + if not federation_utils.is_local(playlist.actor.fid): continue library = playlist.library if not library: