tworzenie listy wykonawców i albumów

Kepka · Kepka · commit e5ea30b9af2b · 2022-05-10T12:36:04.000+02:00
diff --git a/OOP/albums.txt b/OOP/albums.txt
@@ -122,6 +122,18 @@ Aerosmith	Permanent Vacation	1987	Angel
 Aerosmith	Permanent Vacation	1987	Permanent Vacation
 Aerosmith	Permanent Vacation	1987	I'm Down
 Aerosmith	Permanent Vacation	1987	The Movie
+ZZ Top	Antenna	1994	Pincushion
+ZZ Top	Antenna	1994	Breakaway
+ZZ Top	Antenna	1994	World Of Swirl
+ZZ Top	Antenna	1994	Fuzzbox Voodoo
+ZZ Top	Antenna	1994	Girl In A T-Shirt
+ZZ Top	Antenna	1994	Antenna Head
+ZZ Top	Antenna	1994	PCH
+ZZ Top	Antenna	1994	Cherry Red
+ZZ Top	Antenna	1994	Cover Your Rig
+ZZ Top	Antenna	1994	Lizard Life
+ZZ Top	Antenna	1994	Deal Goin' Down
+ZZ Top	Antenna	1994	Everything
 Aerosmith	Gems	1988	Rats in the Cellar
 Aerosmith	Gems	1988	Lick and a Promise
 Aerosmith	Gems	1988	Chip Away the Stone
@@ -654,18 +666,6 @@ ZZ Top	Recycler	1990	Give It Up
 ZZ Top	Recycler	1990	2000 Blues
 ZZ Top	Recycler	1990	Burger Man
 ZZ Top	Recycler	1990	Doubleback
-ZZ Top	Antenna	1994	Pincushion
-ZZ Top	Antenna	1994	Breakaway
-ZZ Top	Antenna	1994	World Of Swirl
-ZZ Top	Antenna	1994	Fuzzbox Voodoo
-ZZ Top	Antenna	1994	Girl In A T-Shirt
-ZZ Top	Antenna	1994	Antenna Head
-ZZ Top	Antenna	1994	PCH
-ZZ Top	Antenna	1994	Cherry Red
-ZZ Top	Antenna	1994	Cover Your Rig
-ZZ Top	Antenna	1994	Lizard Life
-ZZ Top	Antenna	1994	Deal Goin' Down
-ZZ Top	Antenna	1994	Everything
 ZZ Top	Mescalero	2003	Mescalero
 ZZ Top	Mescalero	2003	Two Ways To Play
 ZZ Top	Mescalero	2003	Alley-gator
diff --git a/OOP/checkfile.txt b/OOP/checkfile.txt
@@ -202,6 +202,77 @@ Aerosmith	Just Push Play	2001	Drop Dead Gorgeous
 Aerosmith	Just Push Play	2001	Light Inside
 Aerosmith	Just Push Play	2001	Avant Garden
 Aerosmith	Just Push Play	2001	Face
+ZZ Top	Antenna	1994	Pincushion
+ZZ Top	Antenna	1994	Breakaway
+ZZ Top	Antenna	1994	World Of Swirl
+ZZ Top	Antenna	1994	Fuzzbox Voodoo
+ZZ Top	Antenna	1994	Girl In A T-Shirt
+ZZ Top	Antenna	1994	Antenna Head
+ZZ Top	Antenna	1994	PCH
+ZZ Top	Antenna	1994	Cherry Red
+ZZ Top	Antenna	1994	Cover Your Rig
+ZZ Top	Antenna	1994	Lizard Life
+ZZ Top	Antenna	1994	Deal Goin' Down
+ZZ Top	Antenna	1994	Everything
+ZZ Top	Rio Grande Mud	1972	Francine
+ZZ Top	Rio Grande Mud	1972	Just Got Paid
+ZZ Top	Rio Grande Mud	1972	Mushmouth Shoutin
+ZZ Top	Rio Grande Mud	1972	Ko Ko Blue
+ZZ Top	Rio Grande Mud	1972	Chevrolet
+ZZ Top	Rio Grande Mud	1972	Apologies To Pearly
+ZZ Top	Rio Grande Mud	1972	Bar-B-Q
+ZZ Top	Rio Grande Mud	1972	Sure Got Cold After The Rain Fell
+ZZ Top	Rio Grande Mud	1972	Whiskey'n Mama
+ZZ Top	Rio Grande Mud	1972	Down Brownie
+ZZ Top	Tres Hombres	1973	Waitin' For The Bus
+ZZ Top	Tres Hombres	1973	Jesus Just Left Chicago
+ZZ Top	Tres Hombres	1973	Beer Drinkers & Hell Raisers
+ZZ Top	Tres Hombres	1973	Master Of Sparks
+ZZ Top	Tres Hombres	1973	Hot, Blue And Righteous
+ZZ Top	Tres Hombres	1973	Move Me On Down The Line
+ZZ Top	Tres Hombres	1973	Precious And Grace
+ZZ Top	Tres Hombres	1973	La Grange
+ZZ Top	Tres Hombres	1973	Sheik
+ZZ Top	Tres Hombres	1973	Have You Heard
+ZZ Top	Tres Hombres	1973	Waitin' For The Bus (Live) (Bonus)
+ZZ Top	Tres Hombres	1973	Jesus Just Left Chicago (Live) (Bonus)
+ZZ Top	Tres Hombres	1973	La Grange (Live) (Bonus)
+ZZ Top	Degüello	1979	I Thank You
+ZZ Top	Degüello	1979	She Loves My Automobile
+ZZ Top	Degüello	1979	I'm Bad I'm Nationwide
+ZZ Top	Degüello	1979	A Fool For Your Stockings
+ZZ Top	Degüello	1979	Manic Mechanic
+ZZ Top	Degüello	1979	Dust My Broom
+ZZ Top	Degüello	1979	Lowdown In The Street
+ZZ Top	Degüello	1979	Hi Fi Mama
+ZZ Top	Degüello	1979	Cheap Sunglasses
+ZZ Top	Degüello	1979	Esther Be The One
+ZZ Top	Recycler	1990	Concrete And Steel
+ZZ Top	Recycler	1990	Lovething
+ZZ Top	Recycler	1990	Penthouse Eyes
+ZZ Top	Recycler	1990	Tell It
+ZZ Top	Recycler	1990	My Head's In Mississippi
+ZZ Top	Recycler	1990	Decision Or Collision
+ZZ Top	Recycler	1990	Give It Up
+ZZ Top	Recycler	1990	2000 Blues
+ZZ Top	Recycler	1990	Burger Man
+ZZ Top	Recycler	1990	Doubleback
+ZZ Top	Mescalero	2003	Mescalero
+ZZ Top	Mescalero	2003	Two Ways To Play
+ZZ Top	Mescalero	2003	Alley-gator
+ZZ Top	Mescalero	2003	Buck Nekkid
+ZZ Top	Mescalero	2003	Goin' So Good
+ZZ Top	Mescalero	2003	Me So Stupid
+ZZ Top	Mescalero	2003	Piece
+ZZ Top	Mescalero	2003	Punk Ass Boyfriend
+ZZ Top	Mescalero	2003	Stackin' Paper
+ZZ Top	Mescalero	2003	What Would You Do
+ZZ Top	Mescalero	2003	What It Is Kid
+ZZ Top	Mescalero	2003	Que Lastima
+ZZ Top	Mescalero	2003	Tramp
+ZZ Top	Mescalero	2003	Crunchy
+ZZ Top	Mescalero	2003	Dusted
+ZZ Top	Mescalero	2003	Liquor
 Alice Cooper	Welcome To My Nightmare	1975	Welcome To My Nightmare
 Alice Cooper	Welcome To My Nightmare	1975	Devil's Food
 Alice Cooper	Welcome To My Nightmare	1975	The Black Widow
@@ -611,74 +682,3 @@ Yngwie Malmsteen	Rising Force	1984	Icarus Dream Suite Opus 4
 Yngwie Malmsteen	Rising Force	1984	As Above So Below
 Yngwie Malmsteen	Rising Force	1984	Little Savage
 Yngwie Malmsteen	Rising Force	1984	Farewell
-ZZ Top	Rio Grande Mud	1972	Francine
-ZZ Top	Rio Grande Mud	1972	Just Got Paid
-ZZ Top	Rio Grande Mud	1972	Mushmouth Shoutin
-ZZ Top	Rio Grande Mud	1972	Ko Ko Blue
-ZZ Top	Rio Grande Mud	1972	Chevrolet
-ZZ Top	Rio Grande Mud	1972	Apologies To Pearly
-ZZ Top	Rio Grande Mud	1972	Bar-B-Q
-ZZ Top	Rio Grande Mud	1972	Sure Got Cold After The Rain Fell
-ZZ Top	Rio Grande Mud	1972	Whiskey'n Mama
-ZZ Top	Rio Grande Mud	1972	Down Brownie
-ZZ Top	Tres Hombres	1973	Waitin' For The Bus
-ZZ Top	Tres Hombres	1973	Jesus Just Left Chicago
-ZZ Top	Tres Hombres	1973	Beer Drinkers & Hell Raisers
-ZZ Top	Tres Hombres	1973	Master Of Sparks
-ZZ Top	Tres Hombres	1973	Hot, Blue And Righteous
-ZZ Top	Tres Hombres	1973	Move Me On Down The Line
-ZZ Top	Tres Hombres	1973	Precious And Grace
-ZZ Top	Tres Hombres	1973	La Grange
-ZZ Top	Tres Hombres	1973	Sheik
-ZZ Top	Tres Hombres	1973	Have You Heard
-ZZ Top	Tres Hombres	1973	Waitin' For The Bus (Live) (Bonus)
-ZZ Top	Tres Hombres	1973	Jesus Just Left Chicago (Live) (Bonus)
-ZZ Top	Tres Hombres	1973	La Grange (Live) (Bonus)
-ZZ Top	Degüello	1979	I Thank You
-ZZ Top	Degüello	1979	She Loves My Automobile
-ZZ Top	Degüello	1979	I'm Bad I'm Nationwide
-ZZ Top	Degüello	1979	A Fool For Your Stockings
-ZZ Top	Degüello	1979	Manic Mechanic
-ZZ Top	Degüello	1979	Dust My Broom
-ZZ Top	Degüello	1979	Lowdown In The Street
-ZZ Top	Degüello	1979	Hi Fi Mama
-ZZ Top	Degüello	1979	Cheap Sunglasses
-ZZ Top	Degüello	1979	Esther Be The One
-ZZ Top	Recycler	1990	Concrete And Steel
-ZZ Top	Recycler	1990	Lovething
-ZZ Top	Recycler	1990	Penthouse Eyes
-ZZ Top	Recycler	1990	Tell It
-ZZ Top	Recycler	1990	My Head's In Mississippi
-ZZ Top	Recycler	1990	Decision Or Collision
-ZZ Top	Recycler	1990	Give It Up
-ZZ Top	Recycler	1990	2000 Blues
-ZZ Top	Recycler	1990	Burger Man
-ZZ Top	Recycler	1990	Doubleback
-ZZ Top	Antenna	1994	Pincushion
-ZZ Top	Antenna	1994	Breakaway
-ZZ Top	Antenna	1994	World Of Swirl
-ZZ Top	Antenna	1994	Fuzzbox Voodoo
-ZZ Top	Antenna	1994	Girl In A T-Shirt
-ZZ Top	Antenna	1994	Antenna Head
-ZZ Top	Antenna	1994	PCH
-ZZ Top	Antenna	1994	Cherry Red
-ZZ Top	Antenna	1994	Cover Your Rig
-ZZ Top	Antenna	1994	Lizard Life
-ZZ Top	Antenna	1994	Deal Goin' Down
-ZZ Top	Antenna	1994	Everything
-ZZ Top	Mescalero	2003	Mescalero
-ZZ Top	Mescalero	2003	Two Ways To Play
-ZZ Top	Mescalero	2003	Alley-gator
-ZZ Top	Mescalero	2003	Buck Nekkid
-ZZ Top	Mescalero	2003	Goin' So Good
-ZZ Top	Mescalero	2003	Me So Stupid
-ZZ Top	Mescalero	2003	Piece
-ZZ Top	Mescalero	2003	Punk Ass Boyfriend
-ZZ Top	Mescalero	2003	Stackin' Paper
-ZZ Top	Mescalero	2003	What Would You Do
-ZZ Top	Mescalero	2003	What It Is Kid
-ZZ Top	Mescalero	2003	Que Lastima
-ZZ Top	Mescalero	2003	Tramp
-ZZ Top	Mescalero	2003	Crunchy
-ZZ Top	Mescalero	2003	Dusted
-ZZ Top	Mescalero	2003	Liquor
diff --git a/OOP/song.py b/OOP/song.py
@@ -3,7 +3,7 @@ class Song:
 
     Attributes:
         title (str): The title of the song
-        artist (Artist): An artist object representing the songs creator.
+        artist (str): Name of the songs creator.
         duration (int): The duration of the song in seconds.  May be zero
     """
 
@@ -12,14 +12,19 @@ def __init__(self, title, artist, duration=0):
         self.artist = artist
         self.duration = duration
 
+    def get_title(self):
+        return self.title
+
+    name = property(get_title)
+
 
 class Album:
     """ Class to represent an Album, using it's track list
 
     Attributes:
         name (str): The name of the album.
         year (int): The year was album was released.
-        artist: (Artist): The artist responsible for the album. If not specified,
+        artist: (str): The name of the artist responsible for the album. If not specified,
         the artist will default to an artist with the name "Various Artists".
         tracks (List[Song]):  A list of the songs on the album.
 
@@ -31,7 +36,7 @@ def __init__(self, name, year, artist=None):
         self.name = name
         self.year = year
         if artist is None:
-            self.artist = Artist("Various Artists")
+            self.artist = "Various Artists"
         else:
             self.artist = artist
 
@@ -41,15 +46,18 @@ def add_song(self, song, position=None):
         """Adds a song to the track list
 
         Args:
-            song (Song): A song to add.
+            song (Song): The title of a song to add.
             position (Optional[int]): If specified, the song will be added to that position
                 in the track list - inserting it between other songs if necessary.
                 Otherwise, the song will be added to the end of the list.
         """
-        if position is None:
-            self.tracks.append(song)
-        else:
-            self.tracks.insert(position, song)
+        song_found = find_object(song, self.tracks)
+        if song_found is None:
+            song_found = Song(song, self.artist)
+            if position is None:
+                self.tracks.append(song_found)
+            else:
+                self.tracks.insert(position, song_found)
 
 
 class Artist:
@@ -78,10 +86,37 @@ def add_album(self, album):
         """
         self.albums.append(album)
 
+    def add_song(self, name, year, title):
+        """Add a new song to the collection of albums
+
+        This method will add a song to an album in the collection.
+        A new album will be created in the collection if it doesn't already exist.
+
+        Args:
+            name (str): The name of the album
+            year (int): The year the album was produced
+            title (str): The title of the song
+        """
+        album_found = find_object(name, self.albums)
+        if album_found is None:
+            print(name + " not found")
+            album_found = Album(name, year, self.name)
+            self.add_album(album_found)
+        else:
+            print("Found album" + name)
+
+        album_found.add_song(title)
+
+
+def find_object(field, object_list):
+    """Check 'object_list' to see if an object with a 'name' attribute equal to 'field' exists, return it if so."""
+    for item in object_list:
+        if item.name == field:
+            return item
+    return None
+
 
 def load_data():
-    new_artist = None
-    new_album = None
     artist_list = []
 
     with open("albums.txt", "r") as albums:
@@ -91,34 +126,12 @@ def load_data():
             year_field = int(year_field)
             print("{}:{}:{}:{}".format(artist_field, album_field, year_field, song_field))
 
+            new_artist = find_object(artist_field, artist_list)
             if new_artist is None:
                 new_artist = Artist(artist_field)
-            elif new_artist.name != artist_field:
-                # We've just read details for a new artist
-                # store the current album in the currents artists collection then create a new artist object
-                new_artist.add_album(new_album)
                 artist_list.append(new_artist)
-                new_artist = Artist(artist_field)
-                new_album = None
-
-            if new_album is None:
-                new_album = Album(album_field, year_field, new_artist)
-            elif new_album.name != album_field:
-                # We've just read a new album for the current artist
-                # store the current album in the artist's collection then create a new album object
-                new_artist.add_album(new_album)
-                new_album = Album(album_field, year_field, new_artist)
-
-            # create a new song object and add it to the current album's collection
-            new_song = Song(song_field, new_artist)
-            new_album.add_song(new_song)
-
-        # After read the last line of the text file, we will have an artist and album that haven't
-        #  been store - process them now
-        if new_artist is not None:
-            if new_album is not None:
-                new_artist.add_album(new_album)
-            artist_list.append(new_artist)
+
+            new_artist.add_song(album_field, year_field, song_field)
 
     return artist_list
 
@@ -129,7 +142,7 @@ def create_checkfile(artist_list):
         for new_artist in artist_list:
             for new_album in new_artist.albums:
                 for new_song in new_album.tracks:
-                    print("{0.name}\t{1.name}\t{1.year}\t{2.title}".format(new_artist, new_album, new_song),
+                    print("{0.name}\t{1.name}\t{1.year}\t{2.name}".format(new_artist, new_album, new_song),
                           file=checkfile)
 
 
@@ -138,4 +151,3 @@ def create_checkfile(artist_list):
     print("There are {} artists".format(len(artists)))
 
     create_checkfile(artists)
-
diff --git a/OOP/song_old.py b/OOP/song_old.py
