Verified Commit 2b8ea539 authored by Jakob Moser's avatar Jakob Moser
Browse files

Make API more narrow

parent b31a0e27

karaokatalog/deduplicate/__main__.py

+1 −1
Changes for karaokatalog/deduplicate/__main__.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ if __name__ == "__main__": 
    logging.info("Library loaded")



    logging.info("Finding duplicates (songs with identical title and artist)")

    duplicates = find_duplicates(library)

    duplicates = find_duplicates(library.songs)

    logging.info("Duplicates found")



    logging.info("Finding exact duplicates (files are 100% identical)")

karaokatalog/deduplicate/find_duplicates.py

+2 −3
Changes for karaokatalog/deduplicate/find_duplicates.py: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -3,13 +3,12 @@ from collections.abc import Mapping, Sequence 


from tqdm import tqdm



from karaokatalog.Library import Library

from karaokatalog.Song import Artist, Song, Title



type TitleAndArtist = tuple[Title, Artist]





def find_duplicates(l: Library) -> Mapping[TitleAndArtist, Sequence[Song]]:

def find_duplicates(songs: Sequence[Song]) -> Mapping[TitleAndArtist, Sequence[Song]]:

    """

    Find all song duplicates, i.e., all songs with the same title and same artist.
@@ -24,7 +23,7 @@ def find_duplicates(l: Library) -> Mapping[TitleAndArtist, Sequence[Song]]: 
        list

    )



    for song in tqdm(l.songs, unit=" songs"):

    for song in tqdm(songs, unit=" songs"):

        songs_by_title_and_artist[(song.title, song.artist)].append(song)



    return {