diff --git a/build.gradle b/build.gradle index 5276b945..15db7238 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ repositories { } dependencies { - implementation 'junit:junit:4.13.1', 'javazoom:jlayer:1.0.1' + implementation 'junit:junit:4.13.2', 'javazoom:jlayer:1.0.1', 'net.jthink:jaudiotagger:3.0.1' testImplementation('org.junit.jupiter:junit-jupiter:5.9.0') } @@ -16,4 +16,4 @@ test { testLogging { events "passed", "skipped", "failed" } -} +} \ No newline at end of file diff --git a/src/main/java/Database/songAccessInterface.java b/src/main/java/Database/songAccessInterface.java index 1affbb3e..083fedb1 100644 --- a/src/main/java/Database/songAccessInterface.java +++ b/src/main/java/Database/songAccessInterface.java @@ -8,9 +8,10 @@ public interface songAccessInterface { public Collection getLibrary(); /** - * @param song Song object to be saved to the database. + * @param song New Song object to be saved to the database. + * @return true iff save was successful. */ - public void saveSong(songDsData song); + public boolean saveSong(songDsData song); /** * @param id the unique int ID of a given song. diff --git a/src/main/java/Database/songDsData.java b/src/main/java/Database/songDsData.java index 593ccb9f..8963eb3a 100644 --- a/src/main/java/Database/songDsData.java +++ b/src/main/java/Database/songDsData.java @@ -1,40 +1,33 @@ package Database; - import Entities.Song; +import java.awt.image.BufferedImage; +import java.io.File; + /** * Data storage class between database class and entities. */ public class songDsData { private final Song song; - public songDsData(int id) { - // TODO: remove once class is complete - this.song = new Song(id, null, null, 0, null, null, false, null); - } - public songDsData(Song song){ this.song = song; } - public songDsData(String[] data){ - //TODO: Implementation for use when reading in from csv. - // temporary constructor to avoid null exception in other tests - this.song = new Song(0, null, null, 0, null, null, - false, null); - } - - public Song buildFromWrite(){ - //TODO: Helper for String[] data constructor. - return null; + public songDsData(int id, String name, String[] artistList, String genre, + File file, BufferedImage cover, String uploader){ + this.song = new Song(id, name, artistList, genre, file, cover, uploader); } public String buildToWrite(){ - //TODO: Helper to turn into csv formatted line. - return null; + return this.song.getID() + "," + this.song.getUploader() + "," + this.song.getFile().getPath() + "\n"; } public Song getSong() { return this.song; } + + public int getID(){ + return this.song.getID(); + } } diff --git a/src/main/java/Database/songLibrary.java b/src/main/java/Database/songLibrary.java index bc485f85..29ecad5e 100644 --- a/src/main/java/Database/songLibrary.java +++ b/src/main/java/Database/songLibrary.java @@ -1,6 +1,18 @@ package Database; -import java.util.HashMap; + +import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException; +import org.jaudiotagger.audio.exceptions.ReadOnlyFileException; +import org.jaudiotagger.audio.exceptions.CannotReadException; +import org.jaudiotagger.audio.mp3.MP3File; +import org.jaudiotagger.tag.TagException; +import org.jaudiotagger.tag.FieldKey; +import org.jaudiotagger.tag.Tag; + +import java.awt.image.BufferedImage; import java.util.Collection; +import java.util.Objects; +import java.util.HashMap; +import java.io.*; /** * Uses the Eager Instantiation version of the Singleton design pattern. @@ -9,8 +21,7 @@ */ public class songLibrary implements songAccessInterface{ - // TODO: change "" param to filepath - private static final songLibrary SONG_LIBRARY = new songLibrary(""); + private static final songLibrary SONG_LIBRARY = new songLibrary("./src/main/java/Database/songs.csv"); private final HashMap library; private final String filepath; @@ -24,7 +35,24 @@ public static songLibrary getInstance(){ private songLibrary(String filepath){ this.filepath = filepath; - library = readFile(); + this.library = readFile(); + + } + + /** + * Saves the current version of the songLibrary to songs.csv + */ + public void saveFile(){ + try { + BufferedWriter bw = new BufferedWriter(new FileWriter(filepath)); + for(songDsData song: library.values()){ + bw.write(song.buildToWrite()); + } + bw.close(); + } + catch(IOException e){ + System.out.println("IOException: " + e); + } } /** @@ -32,28 +60,118 @@ private songLibrary(String filepath){ * @return Hashmap mapping integer ID of a song to its respective songDsData. */ private HashMap readFile(){ - //TODO: Implementation of reading csv of songs. - return new HashMap<>(); + HashMap map = new HashMap<>(); + try { + BufferedReader br = new BufferedReader(new FileReader(filepath)); + String rawLine; + while ((rawLine = br.readLine()) != null) { + + String[] songInfo = rawLine.split(","); + int id = Integer.parseInt(songInfo[0]); + String uploader = songInfo[1]; + + songDsData song = readSongFromMetadata(id, uploader, new MP3File(songInfo[2])); + map.put(id, song); + + } + br.close(); + } catch (FileNotFoundException e) { + System.out.println("FileNotFoundException: " + e + ". Creating new file."); + return createFile(); + } catch (IOException e) { + System.out.println("IOException: " + e); + } catch (TagException | CannotReadException | InvalidAudioFrameException | ReadOnlyFileException e) { + throw new RuntimeException(e); + } + return map; + } + + /** + * if songs.csv does not exist, createFile will 1) create it, and + * 2) write into both the csv and SONG_LIBRARY. + */ + private HashMap createFile(){ + File csv = new File(filepath); + HashMap map = new HashMap<>(); + try{ + if(csv.createNewFile()){ + BufferedWriter bw = new BufferedWriter(new FileWriter(filepath)); + File rawLib = new File("src/songLib"); + for(File rawSong: Objects.requireNonNull(rawLib.listFiles())){ + + String idStr = rawSong.getName(); + int id = Integer.parseInt(idStr.substring(0, idStr.length() - 4)); + String uploader = "admin"; + songDsData song = readSongFromMetadata(id, uploader, new MP3File(rawSong)); + + map.put(id, song); + bw.write(song.buildToWrite()); + } + bw.close(); + } + } catch (TagException | CannotReadException | InvalidAudioFrameException | ReadOnlyFileException e){ + throw new RuntimeException(e); + } catch (IOException e){ + System.out.println("Failed to create songs.csv." + e); + } catch (NullPointerException e){ + System.out.println("Failed to read folder." + e); + } + return map; + } + + /** + * @param id The id of the song. + * @param uploader The username of the song uploader. + * @param rawSong The mp3 file of a given song. + * @return The songDsData entity representing rawSong. + */ + private songDsData readSongFromMetadata(int id, String uploader, MP3File rawSong){ + + Tag tag = rawSong.getTag(); + BufferedImage cover = (BufferedImage) tag.getFirstArtwork(); + //TODO: OR set as default cover + String name = format(tag.getFields(FieldKey.TITLE).toString()); + String[] artistList = format(tag.getFields(FieldKey.ARTIST).toString()).split(";"); + String genre = format(tag.getFields(FieldKey.GENRE).toString()); + + return new songDsData(id, name, artistList, genre, rawSong.getFile(), cover, uploader); + } + + /** + * Corrects metadata read to remove extra text. + * @param line Line to be formatted. + * @return Correctly formatted line. + */ + private String format(String line){ + return line.substring(7, line.length() - 5); } /** * @return Collection of all songs. */ + @Override public Collection getLibrary() { return library.values(); } /** - * @param song Song object to be saved to the database. + * @param song New Song object to be saved to the database. + * @return true iff save was successful. */ - public void saveSong(songDsData song) { - //TODO: 'Write' implementation for a single song. + @Override + public boolean saveSong(songDsData song) { + if(library.containsKey(song.getID())){ + library.put(song.getID(), song); + return true; + } + return false; } /** * @param id the unique int ID of a given song. * @return true iff a song with the given ID exists. */ + @Override public boolean exists(int id) { return library.containsKey(id); } @@ -62,11 +180,8 @@ public boolean exists(int id) { * @param id the unique int ID of a given song. * @return Song inside a songDsData with matching ID, or null if it does not exist. */ + @Override public songDsData getSong(int id){ - if (library.containsKey(id)) - return library.get(id); - - // TODO: change once class is complete - return new songDsData(id); + return library.get(id); } } diff --git a/src/main/java/Database/songs.csv b/src/main/java/Database/songs.csv new file mode 100644 index 00000000..318b24a5 --- /dev/null +++ b/src/main/java/Database/songs.csv @@ -0,0 +1,263 @@ +2,admin,src\songLib\000002.mp3 +5,admin,src\songLib\000005.mp3 +10,admin,src\songLib\000010.mp3 +140,admin,src\songLib\000140.mp3 +141,admin,src\songLib\000141.mp3 +148,admin,src\songLib\000148.mp3 +182,admin,src\songLib\000182.mp3 +190,admin,src\songLib\000190.mp3 +193,admin,src\songLib\000193.mp3 +194,admin,src\songLib\000194.mp3 +197,admin,src\songLib\000197.mp3 +200,admin,src\songLib\000200.mp3 +203,admin,src\songLib\000203.mp3 +204,admin,src\songLib\000204.mp3 +207,admin,src\songLib\000207.mp3 +210,admin,src\songLib\000210.mp3 +211,admin,src\songLib\000211.mp3 +212,admin,src\songLib\000212.mp3 +213,admin,src\songLib\000213.mp3 +255,admin,src\songLib\000255.mp3 +256,admin,src\songLib\000256.mp3 +368,admin,src\songLib\000368.mp3 +424,admin,src\songLib\000424.mp3 +459,admin,src\songLib\000459.mp3 +574,admin,src\songLib\000574.mp3 +602,admin,src\songLib\000602.mp3 +615,admin,src\songLib\000615.mp3 +620,admin,src\songLib\000620.mp3 +621,admin,src\songLib\000621.mp3 +625,admin,src\songLib\000625.mp3 +666,admin,src\songLib\000666.mp3 +667,admin,src\songLib\000667.mp3 +676,admin,src\songLib\000676.mp3 +690,admin,src\songLib\000690.mp3 +694,admin,src\songLib\000694.mp3 +695,admin,src\songLib\000695.mp3 +704,admin,src\songLib\000704.mp3 +705,admin,src\songLib\000705.mp3 +706,admin,src\songLib\000706.mp3 +707,admin,src\songLib\000707.mp3 +708,admin,src\songLib\000708.mp3 +709,admin,src\songLib\000709.mp3 +710,admin,src\songLib\000710.mp3 +714,admin,src\songLib\000714.mp3 +715,admin,src\songLib\000715.mp3 +716,admin,src\songLib\000716.mp3 +718,admin,src\songLib\000718.mp3 +777,admin,src\songLib\000777.mp3 +814,admin,src\songLib\000814.mp3 +821,admin,src\songLib\000821.mp3 +822,admin,src\songLib\000822.mp3 +825,admin,src\songLib\000825.mp3 +853,admin,src\songLib\000853.mp3 +890,admin,src\songLib\000890.mp3 +892,admin,src\songLib\000892.mp3 +897,admin,src\songLib\000897.mp3 +993,admin,src\songLib\000993.mp3 +995,admin,src\songLib\000995.mp3 +997,admin,src\songLib\000997.mp3 +998,admin,src\songLib\000998.mp3 +1039,admin,src\songLib\001039.mp3 +1040,admin,src\songLib\001040.mp3 +1066,admin,src\songLib\001066.mp3 +1069,admin,src\songLib\001069.mp3 +1073,admin,src\songLib\001073.mp3 +1075,admin,src\songLib\001075.mp3 +1082,admin,src\songLib\001082.mp3 +1083,admin,src\songLib\001083.mp3 +1087,admin,src\songLib\001087.mp3 +1102,admin,src\songLib\001102.mp3 +1193,admin,src\songLib\001193.mp3 +1195,admin,src\songLib\001195.mp3 +1196,admin,src\songLib\001196.mp3 +1197,admin,src\songLib\001197.mp3 +1249,admin,src\songLib\001249.mp3 +1259,admin,src\songLib\001259.mp3 +1277,admin,src\songLib\001277.mp3 +1278,admin,src\songLib\001278.mp3 +1417,admin,src\songLib\001417.mp3 +1427,admin,src\songLib\001427.mp3 +1443,admin,src\songLib\001443.mp3 +1482,admin,src\songLib\001482.mp3 +1510,admin,src\songLib\001510.mp3 +1544,admin,src\songLib\001544.mp3 +1642,admin,src\songLib\001642.mp3 +1644,admin,src\songLib\001644.mp3 +1649,admin,src\songLib\001649.mp3 +1661,admin,src\songLib\001661.mp3 +1663,admin,src\songLib\001663.mp3 +1666,admin,src\songLib\001666.mp3 +1673,admin,src\songLib\001673.mp3 +1680,admin,src\songLib\001680.mp3 +1681,admin,src\songLib\001681.mp3 +1682,admin,src\songLib\001682.mp3 +1683,admin,src\songLib\001683.mp3 +1684,admin,src\songLib\001684.mp3 +1685,admin,src\songLib\001685.mp3 +1686,admin,src\songLib\001686.mp3 +1687,admin,src\songLib\001687.mp3 +1688,admin,src\songLib\001688.mp3 +1689,admin,src\songLib\001689.mp3 +1701,admin,src\songLib\001701.mp3 +1702,admin,src\songLib\001702.mp3 +1703,admin,src\songLib\001703.mp3 +1704,admin,src\songLib\001704.mp3 +1706,admin,src\songLib\001706.mp3 +1720,admin,src\songLib\001720.mp3 +1732,admin,src\songLib\001732.mp3 +1733,admin,src\songLib\001733.mp3 +1735,admin,src\songLib\001735.mp3 +1736,admin,src\songLib\001736.mp3 +1883,admin,src\songLib\001883.mp3 +1891,admin,src\songLib\001891.mp3 +1893,admin,src\songLib\001893.mp3 +1924,admin,src\songLib\001924.mp3 +1925,admin,src\songLib\001925.mp3 +1929,admin,src\songLib\001929.mp3 +1930,admin,src\songLib\001930.mp3 +2012,admin,src\songLib\002012.mp3 +2096,admin,src\songLib\002096.mp3 +2097,admin,src\songLib\002097.mp3 +2099,admin,src\songLib\002099.mp3 +3263,admin,src\songLib\003263.mp3 +3264,admin,src\songLib\003264.mp3 +3265,admin,src\songLib\003265.mp3 +3266,admin,src\songLib\003266.mp3 +3270,admin,src\songLib\003270.mp3 +3271,admin,src\songLib\003271.mp3 +3272,admin,src\songLib\003272.mp3 +3273,admin,src\songLib\003273.mp3 +3274,admin,src\songLib\003274.mp3 +3492,admin,src\songLib\003492.mp3 +3532,admin,src\songLib\003532.mp3 +3533,admin,src\songLib\003533.mp3 +3534,admin,src\songLib\003534.mp3 +3535,admin,src\songLib\003535.mp3 +3537,admin,src\songLib\003537.mp3 +3538,admin,src\songLib\003538.mp3 +3573,admin,src\songLib\003573.mp3 +3598,admin,src\songLib\003598.mp3 +3624,admin,src\songLib\003624.mp3 +3707,admin,src\songLib\003707.mp3 +3708,admin,src\songLib\003708.mp3 +3720,admin,src\songLib\003720.mp3 +3721,admin,src\songLib\003721.mp3 +3722,admin,src\songLib\003722.mp3 +3724,admin,src\songLib\003724.mp3 +3725,admin,src\songLib\003725.mp3 +3761,admin,src\songLib\003761.mp3 +3762,admin,src\songLib\003762.mp3 +3763,admin,src\songLib\003763.mp3 +3765,admin,src\songLib\003765.mp3 +3766,admin,src\songLib\003766.mp3 +3775,admin,src\songLib\003775.mp3 +3776,admin,src\songLib\003776.mp3 +3777,admin,src\songLib\003777.mp3 +3778,admin,src\songLib\003778.mp3 +3779,admin,src\songLib\003779.mp3 +3832,admin,src\songLib\003832.mp3 +3833,admin,src\songLib\003833.mp3 +3840,admin,src\songLib\003840.mp3 +3880,admin,src\songLib\003880.mp3 +3895,admin,src\songLib\003895.mp3 +3896,admin,src\songLib\003896.mp3 +3904,admin,src\songLib\003904.mp3 +3905,admin,src\songLib\003905.mp3 +3906,admin,src\songLib\003906.mp3 +3908,admin,src\songLib\003908.mp3 +3909,admin,src\songLib\003909.mp3 +3910,admin,src\songLib\003910.mp3 +3911,admin,src\songLib\003911.mp3 +3912,admin,src\songLib\003912.mp3 +3913,admin,src\songLib\003913.mp3 +3920,admin,src\songLib\003920.mp3 +3921,admin,src\songLib\003921.mp3 +3950,admin,src\songLib\003950.mp3 +4013,admin,src\songLib\004013.mp3 +4017,admin,src\songLib\004017.mp3 +4022,admin,src\songLib\004022.mp3 +4037,admin,src\songLib\004037.mp3 +4066,admin,src\songLib\004066.mp3 +4067,admin,src\songLib\004067.mp3 +4068,admin,src\songLib\004068.mp3 +4069,admin,src\songLib\004069.mp3 +4070,admin,src\songLib\004070.mp3 +4071,admin,src\songLib\004071.mp3 +4072,admin,src\songLib\004072.mp3 +4073,admin,src\songLib\004073.mp3 +4074,admin,src\songLib\004074.mp3 +4075,admin,src\songLib\004075.mp3 +4076,admin,src\songLib\004076.mp3 +4077,admin,src\songLib\004077.mp3 +4078,admin,src\songLib\004078.mp3 +4079,admin,src\songLib\004079.mp3 +4080,admin,src\songLib\004080.mp3 +4091,admin,src\songLib\004091.mp3 +4092,admin,src\songLib\004092.mp3 +4093,admin,src\songLib\004093.mp3 +4094,admin,src\songLib\004094.mp3 +4095,admin,src\songLib\004095.mp3 +4096,admin,src\songLib\004096.mp3 +4097,admin,src\songLib\004097.mp3 +4098,admin,src\songLib\004098.mp3 +4099,admin,src\songLib\004099.mp3 +4100,admin,src\songLib\004100.mp3 +4101,admin,src\songLib\004101.mp3 +4102,admin,src\songLib\004102.mp3 +4103,admin,src\songLib\004103.mp3 +4108,admin,src\songLib\004108.mp3 +4232,admin,src\songLib\004232.mp3 +4233,admin,src\songLib\004233.mp3 +4234,admin,src\songLib\004234.mp3 +4235,admin,src\songLib\004235.mp3 +4236,admin,src\songLib\004236.mp3 +4239,admin,src\songLib\004239.mp3 +4450,admin,src\songLib\004450.mp3 +4507,admin,src\songLib\004507.mp3 +4508,admin,src\songLib\004508.mp3 +4509,admin,src\songLib\004509.mp3 +4510,admin,src\songLib\004510.mp3 +4511,admin,src\songLib\004511.mp3 +4519,admin,src\songLib\004519.mp3 +4520,admin,src\songLib\004520.mp3 +4521,admin,src\songLib\004521.mp3 +4522,admin,src\songLib\004522.mp3 +4682,admin,src\songLib\004682.mp3 +4684,admin,src\songLib\004684.mp3 +4685,admin,src\songLib\004685.mp3 +4688,admin,src\songLib\004688.mp3 +4777,admin,src\songLib\004777.mp3 +4778,admin,src\songLib\004778.mp3 +4779,admin,src\songLib\004779.mp3 +4780,admin,src\songLib\004780.mp3 +4781,admin,src\songLib\004781.mp3 +4782,admin,src\songLib\004782.mp3 +4784,admin,src\songLib\004784.mp3 +4785,admin,src\songLib\004785.mp3 +4786,admin,src\songLib\004786.mp3 +4787,admin,src\songLib\004787.mp3 +4788,admin,src\songLib\004788.mp3 +4799,admin,src\songLib\004799.mp3 +4835,admin,src\songLib\004835.mp3 +4836,admin,src\songLib\004836.mp3 +4838,admin,src\songLib\004838.mp3 +4846,admin,src\songLib\004846.mp3 +4848,admin,src\songLib\004848.mp3 +4849,admin,src\songLib\004849.mp3 +5006,admin,src\songLib\005006.mp3 +5156,admin,src\songLib\005156.mp3 +5157,admin,src\songLib\005157.mp3 +5158,admin,src\songLib\005158.mp3 +5159,admin,src\songLib\005159.mp3 +5169,admin,src\songLib\005169.mp3 +5170,admin,src\songLib\005170.mp3 +5171,admin,src\songLib\005171.mp3 +5191,admin,src\songLib\005191.mp3 +5264,admin,src\songLib\005264.mp3 +5268,admin,src\songLib\005268.mp3 +5376,admin,src\songLib\005376.mp3 +5381,admin,src\songLib\005381.mp3 +5521,admin,src\songLib\005521.mp3 +5879,admin,src\songLib\005879.mp3 +5940,admin,src\songLib\005940.mp3 diff --git a/src/main/java/Entities/Song.java b/src/main/java/Entities/Song.java index 89017337..c75d61a5 100644 --- a/src/main/java/Entities/Song.java +++ b/src/main/java/Entities/Song.java @@ -2,40 +2,37 @@ import java.awt.image.BufferedImage; import java.io.File; -import java.util.List; public class Song { private final int id; private final String name; - private final List artistList; - private final int length; + private final String[] artistList; private final String genre; private final File file; - private final boolean isExplicit; private final BufferedImage cover; + private final String uploader; /** * * @param id Unique identifier of the song. * @param name Name of the song. * @param artistList List of contributing artists. - * @param length Length of the song, in seconds. * @param genre Type of song. * @param file Audio file itself. - * @param isExplicit Whether the song is explicit or not. * @param cover Cover image of the song. + * @param uploader Username of user who uploaded the song. */ - public Song(int id, String name, List artistList, int length, String genre, - File file, boolean isExplicit, BufferedImage cover){ + public Song(int id, String name, String[] artistList, String genre, + File file, BufferedImage cover, String uploader){ + this.id = id; this.name = name; this.artistList = artistList; - this.length = length; this.genre = genre; this.file = file; - this.isExplicit = isExplicit; this.cover = cover; + this.uploader = uploader; } /** @@ -56,17 +53,10 @@ public String getName(){ * * @return list of contributing artists. */ - public List getArtistList(){ + public String[] getArtistList(){ return this.artistList; } - /** - * @return int length of song, in seconds. - */ - public int getLength(){ - return this.length; - } - /** * @return genre of song. */ @@ -81,17 +71,14 @@ public File getFile(){ return this.file; } - /** - * @return true if the song is explicit. - */ - public boolean getExplicit(){ - return this.isExplicit; - } - /** * @return BufferedImage of song cover. */ public BufferedImage getCover(){ return this.cover; } + + public String getUploader(){ + return this.uploader; + } } diff --git a/src/songLib/000002.mp3 b/src/songLib/000002.mp3 new file mode 100644 index 00000000..e6df5713 Binary files /dev/null and b/src/songLib/000002.mp3 differ diff --git a/src/songLib/000005.mp3 b/src/songLib/000005.mp3 new file mode 100644 index 00000000..afbab08b Binary files /dev/null and b/src/songLib/000005.mp3 differ diff --git a/src/songLib/000010.mp3 b/src/songLib/000010.mp3 new file mode 100644 index 00000000..61b5ba93 Binary files /dev/null and b/src/songLib/000010.mp3 differ diff --git a/src/songLib/000140.mp3 b/src/songLib/000140.mp3 new file mode 100644 index 00000000..f71c91b6 Binary files /dev/null and b/src/songLib/000140.mp3 differ diff --git a/src/songLib/000141.mp3 b/src/songLib/000141.mp3 new file mode 100644 index 00000000..f5c2e8b6 Binary files /dev/null and b/src/songLib/000141.mp3 differ diff --git a/src/songLib/000148.mp3 b/src/songLib/000148.mp3 new file mode 100644 index 00000000..b88a677d Binary files /dev/null and b/src/songLib/000148.mp3 differ diff --git a/src/songLib/000182.mp3 b/src/songLib/000182.mp3 new file mode 100644 index 00000000..4a3c6a44 Binary files /dev/null and b/src/songLib/000182.mp3 differ diff --git a/src/songLib/000190.mp3 b/src/songLib/000190.mp3 new file mode 100644 index 00000000..8c8e6b58 Binary files /dev/null and b/src/songLib/000190.mp3 differ diff --git a/src/songLib/000193.mp3 b/src/songLib/000193.mp3 new file mode 100644 index 00000000..63de33ce Binary files /dev/null and b/src/songLib/000193.mp3 differ diff --git a/src/songLib/000194.mp3 b/src/songLib/000194.mp3 new file mode 100644 index 00000000..49d37b6b Binary files /dev/null and b/src/songLib/000194.mp3 differ diff --git a/src/songLib/000197.mp3 b/src/songLib/000197.mp3 new file mode 100644 index 00000000..ff1bd757 Binary files /dev/null and b/src/songLib/000197.mp3 differ diff --git a/src/songLib/000200.mp3 b/src/songLib/000200.mp3 new file mode 100644 index 00000000..d4809ae4 Binary files /dev/null and b/src/songLib/000200.mp3 differ diff --git a/src/songLib/000203.mp3 b/src/songLib/000203.mp3 new file mode 100644 index 00000000..d54a178d Binary files /dev/null and b/src/songLib/000203.mp3 differ diff --git a/src/songLib/000204.mp3 b/src/songLib/000204.mp3 new file mode 100644 index 00000000..d9dfb3b0 Binary files /dev/null and b/src/songLib/000204.mp3 differ diff --git a/src/songLib/000207.mp3 b/src/songLib/000207.mp3 new file mode 100644 index 00000000..834fbb06 Binary files /dev/null and b/src/songLib/000207.mp3 differ diff --git a/src/songLib/000210.mp3 b/src/songLib/000210.mp3 new file mode 100644 index 00000000..e3d6ce78 Binary files /dev/null and b/src/songLib/000210.mp3 differ diff --git a/src/songLib/000211.mp3 b/src/songLib/000211.mp3 new file mode 100644 index 00000000..37e147d1 Binary files /dev/null and b/src/songLib/000211.mp3 differ diff --git a/src/songLib/000212.mp3 b/src/songLib/000212.mp3 new file mode 100644 index 00000000..c4dfb817 Binary files /dev/null and b/src/songLib/000212.mp3 differ diff --git a/src/songLib/000213.mp3 b/src/songLib/000213.mp3 new file mode 100644 index 00000000..f00cecb6 Binary files /dev/null and b/src/songLib/000213.mp3 differ diff --git a/src/songLib/000255.mp3 b/src/songLib/000255.mp3 new file mode 100644 index 00000000..a7c16107 Binary files /dev/null and b/src/songLib/000255.mp3 differ diff --git a/src/songLib/000256.mp3 b/src/songLib/000256.mp3 new file mode 100644 index 00000000..5e8f3396 Binary files /dev/null and b/src/songLib/000256.mp3 differ diff --git a/src/songLib/000368.mp3 b/src/songLib/000368.mp3 new file mode 100644 index 00000000..e7726482 Binary files /dev/null and b/src/songLib/000368.mp3 differ diff --git a/src/songLib/000424.mp3 b/src/songLib/000424.mp3 new file mode 100644 index 00000000..85e7cf79 Binary files /dev/null and b/src/songLib/000424.mp3 differ diff --git a/src/songLib/000459.mp3 b/src/songLib/000459.mp3 new file mode 100644 index 00000000..442d8745 Binary files /dev/null and b/src/songLib/000459.mp3 differ diff --git a/src/songLib/000574.mp3 b/src/songLib/000574.mp3 new file mode 100644 index 00000000..9aa2b58b Binary files /dev/null and b/src/songLib/000574.mp3 differ diff --git a/src/songLib/000602.mp3 b/src/songLib/000602.mp3 new file mode 100644 index 00000000..c006b49d Binary files /dev/null and b/src/songLib/000602.mp3 differ diff --git a/src/songLib/000615.mp3 b/src/songLib/000615.mp3 new file mode 100644 index 00000000..e1e3f5c1 Binary files /dev/null and b/src/songLib/000615.mp3 differ diff --git a/src/songLib/000620.mp3 b/src/songLib/000620.mp3 new file mode 100644 index 00000000..4d9cf7a2 Binary files /dev/null and b/src/songLib/000620.mp3 differ diff --git a/src/songLib/000621.mp3 b/src/songLib/000621.mp3 new file mode 100644 index 00000000..e8d5c07e Binary files /dev/null and b/src/songLib/000621.mp3 differ diff --git a/src/songLib/000625.mp3 b/src/songLib/000625.mp3 new file mode 100644 index 00000000..77fa1694 Binary files /dev/null and b/src/songLib/000625.mp3 differ diff --git a/src/songLib/000666.mp3 b/src/songLib/000666.mp3 new file mode 100644 index 00000000..21b25b84 Binary files /dev/null and b/src/songLib/000666.mp3 differ diff --git a/src/songLib/000667.mp3 b/src/songLib/000667.mp3 new file mode 100644 index 00000000..2b93cca3 Binary files /dev/null and b/src/songLib/000667.mp3 differ diff --git a/src/songLib/000676.mp3 b/src/songLib/000676.mp3 new file mode 100644 index 00000000..4bda492f Binary files /dev/null and b/src/songLib/000676.mp3 differ diff --git a/src/songLib/000690.mp3 b/src/songLib/000690.mp3 new file mode 100644 index 00000000..1a8621c7 Binary files /dev/null and b/src/songLib/000690.mp3 differ diff --git a/src/songLib/000694.mp3 b/src/songLib/000694.mp3 new file mode 100644 index 00000000..348a75e0 Binary files /dev/null and b/src/songLib/000694.mp3 differ diff --git a/src/songLib/000695.mp3 b/src/songLib/000695.mp3 new file mode 100644 index 00000000..d3dcba91 Binary files /dev/null and b/src/songLib/000695.mp3 differ diff --git a/src/songLib/000704.mp3 b/src/songLib/000704.mp3 new file mode 100644 index 00000000..a2786774 Binary files /dev/null and b/src/songLib/000704.mp3 differ diff --git a/src/songLib/000705.mp3 b/src/songLib/000705.mp3 new file mode 100644 index 00000000..4a8988ab Binary files /dev/null and b/src/songLib/000705.mp3 differ diff --git a/src/songLib/000706.mp3 b/src/songLib/000706.mp3 new file mode 100644 index 00000000..31e12efc Binary files /dev/null and b/src/songLib/000706.mp3 differ diff --git a/src/songLib/000707.mp3 b/src/songLib/000707.mp3 new file mode 100644 index 00000000..16bbb855 Binary files /dev/null and b/src/songLib/000707.mp3 differ diff --git a/src/songLib/000708.mp3 b/src/songLib/000708.mp3 new file mode 100644 index 00000000..1c485ea7 Binary files /dev/null and b/src/songLib/000708.mp3 differ diff --git a/src/songLib/000709.mp3 b/src/songLib/000709.mp3 new file mode 100644 index 00000000..187cd0c2 Binary files /dev/null and b/src/songLib/000709.mp3 differ diff --git a/src/songLib/000710.mp3 b/src/songLib/000710.mp3 new file mode 100644 index 00000000..a1566703 Binary files /dev/null and b/src/songLib/000710.mp3 differ diff --git a/src/songLib/000714.mp3 b/src/songLib/000714.mp3 new file mode 100644 index 00000000..e3a2a15f Binary files /dev/null and b/src/songLib/000714.mp3 differ diff --git a/src/songLib/000715.mp3 b/src/songLib/000715.mp3 new file mode 100644 index 00000000..b38e599c Binary files /dev/null and b/src/songLib/000715.mp3 differ diff --git a/src/songLib/000716.mp3 b/src/songLib/000716.mp3 new file mode 100644 index 00000000..b8bfdcdc Binary files /dev/null and b/src/songLib/000716.mp3 differ diff --git a/src/songLib/000718.mp3 b/src/songLib/000718.mp3 new file mode 100644 index 00000000..7981d6c1 Binary files /dev/null and b/src/songLib/000718.mp3 differ diff --git a/src/songLib/000777.mp3 b/src/songLib/000777.mp3 new file mode 100644 index 00000000..312b79cf Binary files /dev/null and b/src/songLib/000777.mp3 differ diff --git a/src/songLib/000814.mp3 b/src/songLib/000814.mp3 new file mode 100644 index 00000000..79b5da95 Binary files /dev/null and b/src/songLib/000814.mp3 differ diff --git a/src/songLib/000821.mp3 b/src/songLib/000821.mp3 new file mode 100644 index 00000000..6305410b Binary files /dev/null and b/src/songLib/000821.mp3 differ diff --git a/src/songLib/000822.mp3 b/src/songLib/000822.mp3 new file mode 100644 index 00000000..47e8629b Binary files /dev/null and b/src/songLib/000822.mp3 differ diff --git a/src/songLib/000825.mp3 b/src/songLib/000825.mp3 new file mode 100644 index 00000000..c72ba8e0 Binary files /dev/null and b/src/songLib/000825.mp3 differ diff --git a/src/songLib/000853.mp3 b/src/songLib/000853.mp3 new file mode 100644 index 00000000..8c6f5fc9 Binary files /dev/null and b/src/songLib/000853.mp3 differ diff --git a/src/songLib/000890.mp3 b/src/songLib/000890.mp3 new file mode 100644 index 00000000..b2486975 Binary files /dev/null and b/src/songLib/000890.mp3 differ diff --git a/src/songLib/000892.mp3 b/src/songLib/000892.mp3 new file mode 100644 index 00000000..74d97e03 Binary files /dev/null and b/src/songLib/000892.mp3 differ diff --git a/src/songLib/000897.mp3 b/src/songLib/000897.mp3 new file mode 100644 index 00000000..cc44a508 Binary files /dev/null and b/src/songLib/000897.mp3 differ diff --git a/src/songLib/000993.mp3 b/src/songLib/000993.mp3 new file mode 100644 index 00000000..0da9a961 Binary files /dev/null and b/src/songLib/000993.mp3 differ diff --git a/src/songLib/000995.mp3 b/src/songLib/000995.mp3 new file mode 100644 index 00000000..c4e8aa93 Binary files /dev/null and b/src/songLib/000995.mp3 differ diff --git a/src/songLib/000997.mp3 b/src/songLib/000997.mp3 new file mode 100644 index 00000000..152ce971 Binary files /dev/null and b/src/songLib/000997.mp3 differ diff --git a/src/songLib/000998.mp3 b/src/songLib/000998.mp3 new file mode 100644 index 00000000..997172ed Binary files /dev/null and b/src/songLib/000998.mp3 differ diff --git a/src/songLib/001039.mp3 b/src/songLib/001039.mp3 new file mode 100644 index 00000000..b54b884f Binary files /dev/null and b/src/songLib/001039.mp3 differ diff --git a/src/songLib/001040.mp3 b/src/songLib/001040.mp3 new file mode 100644 index 00000000..95cbc9c9 Binary files /dev/null and b/src/songLib/001040.mp3 differ diff --git a/src/songLib/001066.mp3 b/src/songLib/001066.mp3 new file mode 100644 index 00000000..9747d7a8 Binary files /dev/null and b/src/songLib/001066.mp3 differ diff --git a/src/songLib/001069.mp3 b/src/songLib/001069.mp3 new file mode 100644 index 00000000..c30fcc31 Binary files /dev/null and b/src/songLib/001069.mp3 differ diff --git a/src/songLib/001073.mp3 b/src/songLib/001073.mp3 new file mode 100644 index 00000000..6d3628f8 Binary files /dev/null and b/src/songLib/001073.mp3 differ diff --git a/src/songLib/001075.mp3 b/src/songLib/001075.mp3 new file mode 100644 index 00000000..5cc53cc5 Binary files /dev/null and b/src/songLib/001075.mp3 differ diff --git a/src/songLib/001082.mp3 b/src/songLib/001082.mp3 new file mode 100644 index 00000000..2f8312f4 Binary files /dev/null and b/src/songLib/001082.mp3 differ diff --git a/src/songLib/001083.mp3 b/src/songLib/001083.mp3 new file mode 100644 index 00000000..acc58c66 Binary files /dev/null and b/src/songLib/001083.mp3 differ diff --git a/src/songLib/001087.mp3 b/src/songLib/001087.mp3 new file mode 100644 index 00000000..b228166f Binary files /dev/null and b/src/songLib/001087.mp3 differ diff --git a/src/songLib/001102.mp3 b/src/songLib/001102.mp3 new file mode 100644 index 00000000..ecb51aa9 Binary files /dev/null and b/src/songLib/001102.mp3 differ diff --git a/src/songLib/001193.mp3 b/src/songLib/001193.mp3 new file mode 100644 index 00000000..1ef895c4 Binary files /dev/null and b/src/songLib/001193.mp3 differ diff --git a/src/songLib/001195.mp3 b/src/songLib/001195.mp3 new file mode 100644 index 00000000..cf7c460e Binary files /dev/null and b/src/songLib/001195.mp3 differ diff --git a/src/songLib/001196.mp3 b/src/songLib/001196.mp3 new file mode 100644 index 00000000..6c0a1dc9 Binary files /dev/null and b/src/songLib/001196.mp3 differ diff --git a/src/songLib/001197.mp3 b/src/songLib/001197.mp3 new file mode 100644 index 00000000..3c2b19a1 Binary files /dev/null and b/src/songLib/001197.mp3 differ diff --git a/src/songLib/001249.mp3 b/src/songLib/001249.mp3 new file mode 100644 index 00000000..b39e045b Binary files /dev/null and b/src/songLib/001249.mp3 differ diff --git a/src/songLib/001259.mp3 b/src/songLib/001259.mp3 new file mode 100644 index 00000000..b736afb9 Binary files /dev/null and b/src/songLib/001259.mp3 differ diff --git a/src/songLib/001277.mp3 b/src/songLib/001277.mp3 new file mode 100644 index 00000000..106891d5 Binary files /dev/null and b/src/songLib/001277.mp3 differ diff --git a/src/songLib/001278.mp3 b/src/songLib/001278.mp3 new file mode 100644 index 00000000..eb475da4 Binary files /dev/null and b/src/songLib/001278.mp3 differ diff --git a/src/songLib/001417.mp3 b/src/songLib/001417.mp3 new file mode 100644 index 00000000..4e4b1c27 Binary files /dev/null and b/src/songLib/001417.mp3 differ diff --git a/src/songLib/001427.mp3 b/src/songLib/001427.mp3 new file mode 100644 index 00000000..37e2cb9c Binary files /dev/null and b/src/songLib/001427.mp3 differ diff --git a/src/songLib/001443.mp3 b/src/songLib/001443.mp3 new file mode 100644 index 00000000..e3179652 Binary files /dev/null and b/src/songLib/001443.mp3 differ diff --git a/src/songLib/001482.mp3 b/src/songLib/001482.mp3 new file mode 100644 index 00000000..28cb977f Binary files /dev/null and b/src/songLib/001482.mp3 differ diff --git a/src/songLib/001510.mp3 b/src/songLib/001510.mp3 new file mode 100644 index 00000000..26077fe2 Binary files /dev/null and b/src/songLib/001510.mp3 differ diff --git a/src/songLib/001544.mp3 b/src/songLib/001544.mp3 new file mode 100644 index 00000000..1500dca7 Binary files /dev/null and b/src/songLib/001544.mp3 differ diff --git a/src/songLib/001642.mp3 b/src/songLib/001642.mp3 new file mode 100644 index 00000000..8a0f1038 Binary files /dev/null and b/src/songLib/001642.mp3 differ diff --git a/src/songLib/001644.mp3 b/src/songLib/001644.mp3 new file mode 100644 index 00000000..ac1e2e44 Binary files /dev/null and b/src/songLib/001644.mp3 differ diff --git a/src/songLib/001649.mp3 b/src/songLib/001649.mp3 new file mode 100644 index 00000000..e44a4817 Binary files /dev/null and b/src/songLib/001649.mp3 differ diff --git a/src/songLib/001661.mp3 b/src/songLib/001661.mp3 new file mode 100644 index 00000000..513d5fca Binary files /dev/null and b/src/songLib/001661.mp3 differ diff --git a/src/songLib/001663.mp3 b/src/songLib/001663.mp3 new file mode 100644 index 00000000..42568375 Binary files /dev/null and b/src/songLib/001663.mp3 differ diff --git a/src/songLib/001666.mp3 b/src/songLib/001666.mp3 new file mode 100644 index 00000000..31cd2f6f Binary files /dev/null and b/src/songLib/001666.mp3 differ diff --git a/src/songLib/001673.mp3 b/src/songLib/001673.mp3 new file mode 100644 index 00000000..da2966c0 Binary files /dev/null and b/src/songLib/001673.mp3 differ diff --git a/src/songLib/001680.mp3 b/src/songLib/001680.mp3 new file mode 100644 index 00000000..8d895ab4 Binary files /dev/null and b/src/songLib/001680.mp3 differ diff --git a/src/songLib/001681.mp3 b/src/songLib/001681.mp3 new file mode 100644 index 00000000..778b4e8c Binary files /dev/null and b/src/songLib/001681.mp3 differ diff --git a/src/songLib/001682.mp3 b/src/songLib/001682.mp3 new file mode 100644 index 00000000..58973427 Binary files /dev/null and b/src/songLib/001682.mp3 differ diff --git a/src/songLib/001683.mp3 b/src/songLib/001683.mp3 new file mode 100644 index 00000000..9f885101 Binary files /dev/null and b/src/songLib/001683.mp3 differ diff --git a/src/songLib/001684.mp3 b/src/songLib/001684.mp3 new file mode 100644 index 00000000..10984e27 Binary files /dev/null and b/src/songLib/001684.mp3 differ diff --git a/src/songLib/001685.mp3 b/src/songLib/001685.mp3 new file mode 100644 index 00000000..f7c3a880 Binary files /dev/null and b/src/songLib/001685.mp3 differ diff --git a/src/songLib/001686.mp3 b/src/songLib/001686.mp3 new file mode 100644 index 00000000..3d125ad5 Binary files /dev/null and b/src/songLib/001686.mp3 differ diff --git a/src/songLib/001687.mp3 b/src/songLib/001687.mp3 new file mode 100644 index 00000000..56984ead Binary files /dev/null and b/src/songLib/001687.mp3 differ diff --git a/src/songLib/001688.mp3 b/src/songLib/001688.mp3 new file mode 100644 index 00000000..747795c6 Binary files /dev/null and b/src/songLib/001688.mp3 differ diff --git a/src/songLib/001689.mp3 b/src/songLib/001689.mp3 new file mode 100644 index 00000000..be70793c Binary files /dev/null and b/src/songLib/001689.mp3 differ diff --git a/src/songLib/001701.mp3 b/src/songLib/001701.mp3 new file mode 100644 index 00000000..1fd07b2c Binary files /dev/null and b/src/songLib/001701.mp3 differ diff --git a/src/songLib/001702.mp3 b/src/songLib/001702.mp3 new file mode 100644 index 00000000..e855d992 Binary files /dev/null and b/src/songLib/001702.mp3 differ diff --git a/src/songLib/001703.mp3 b/src/songLib/001703.mp3 new file mode 100644 index 00000000..97a63ecf Binary files /dev/null and b/src/songLib/001703.mp3 differ diff --git a/src/songLib/001704.mp3 b/src/songLib/001704.mp3 new file mode 100644 index 00000000..4bea1b8d Binary files /dev/null and b/src/songLib/001704.mp3 differ diff --git a/src/songLib/001706.mp3 b/src/songLib/001706.mp3 new file mode 100644 index 00000000..41f7f646 Binary files /dev/null and b/src/songLib/001706.mp3 differ diff --git a/src/songLib/001720.mp3 b/src/songLib/001720.mp3 new file mode 100644 index 00000000..a7dfd3a6 Binary files /dev/null and b/src/songLib/001720.mp3 differ diff --git a/src/songLib/001732.mp3 b/src/songLib/001732.mp3 new file mode 100644 index 00000000..07d1b8df Binary files /dev/null and b/src/songLib/001732.mp3 differ diff --git a/src/songLib/001733.mp3 b/src/songLib/001733.mp3 new file mode 100644 index 00000000..c2693033 Binary files /dev/null and b/src/songLib/001733.mp3 differ diff --git a/src/songLib/001735.mp3 b/src/songLib/001735.mp3 new file mode 100644 index 00000000..853421de Binary files /dev/null and b/src/songLib/001735.mp3 differ diff --git a/src/songLib/001736.mp3 b/src/songLib/001736.mp3 new file mode 100644 index 00000000..b2eb5161 Binary files /dev/null and b/src/songLib/001736.mp3 differ diff --git a/src/songLib/001883.mp3 b/src/songLib/001883.mp3 new file mode 100644 index 00000000..b2a68ddb Binary files /dev/null and b/src/songLib/001883.mp3 differ diff --git a/src/songLib/001891.mp3 b/src/songLib/001891.mp3 new file mode 100644 index 00000000..609472f9 Binary files /dev/null and b/src/songLib/001891.mp3 differ diff --git a/src/songLib/001893.mp3 b/src/songLib/001893.mp3 new file mode 100644 index 00000000..bbc2ad1a Binary files /dev/null and b/src/songLib/001893.mp3 differ diff --git a/src/songLib/001924.mp3 b/src/songLib/001924.mp3 new file mode 100644 index 00000000..065b0c97 Binary files /dev/null and b/src/songLib/001924.mp3 differ diff --git a/src/songLib/001925.mp3 b/src/songLib/001925.mp3 new file mode 100644 index 00000000..2850d31d Binary files /dev/null and b/src/songLib/001925.mp3 differ diff --git a/src/songLib/001929.mp3 b/src/songLib/001929.mp3 new file mode 100644 index 00000000..5d0fb1ba Binary files /dev/null and b/src/songLib/001929.mp3 differ diff --git a/src/songLib/001930.mp3 b/src/songLib/001930.mp3 new file mode 100644 index 00000000..dc38ce56 Binary files /dev/null and b/src/songLib/001930.mp3 differ diff --git a/src/songLib/002012.mp3 b/src/songLib/002012.mp3 new file mode 100644 index 00000000..3b4de63d Binary files /dev/null and b/src/songLib/002012.mp3 differ diff --git a/src/songLib/002096.mp3 b/src/songLib/002096.mp3 new file mode 100644 index 00000000..a48c7aaa Binary files /dev/null and b/src/songLib/002096.mp3 differ diff --git a/src/songLib/002097.mp3 b/src/songLib/002097.mp3 new file mode 100644 index 00000000..6c535cc3 Binary files /dev/null and b/src/songLib/002097.mp3 differ diff --git a/src/songLib/002099.mp3 b/src/songLib/002099.mp3 new file mode 100644 index 00000000..c3f0c8b2 Binary files /dev/null and b/src/songLib/002099.mp3 differ diff --git a/src/songLib/003263.mp3 b/src/songLib/003263.mp3 new file mode 100644 index 00000000..290db7b6 Binary files /dev/null and b/src/songLib/003263.mp3 differ diff --git a/src/songLib/003264.mp3 b/src/songLib/003264.mp3 new file mode 100644 index 00000000..ba56259b Binary files /dev/null and b/src/songLib/003264.mp3 differ diff --git a/src/songLib/003265.mp3 b/src/songLib/003265.mp3 new file mode 100644 index 00000000..350749b6 Binary files /dev/null and b/src/songLib/003265.mp3 differ diff --git a/src/songLib/003266.mp3 b/src/songLib/003266.mp3 new file mode 100644 index 00000000..2c726a10 Binary files /dev/null and b/src/songLib/003266.mp3 differ diff --git a/src/songLib/003270.mp3 b/src/songLib/003270.mp3 new file mode 100644 index 00000000..a093cc83 Binary files /dev/null and b/src/songLib/003270.mp3 differ diff --git a/src/songLib/003271.mp3 b/src/songLib/003271.mp3 new file mode 100644 index 00000000..9794f6ed Binary files /dev/null and b/src/songLib/003271.mp3 differ diff --git a/src/songLib/003272.mp3 b/src/songLib/003272.mp3 new file mode 100644 index 00000000..c252df7f Binary files /dev/null and b/src/songLib/003272.mp3 differ diff --git a/src/songLib/003273.mp3 b/src/songLib/003273.mp3 new file mode 100644 index 00000000..8a36ed59 Binary files /dev/null and b/src/songLib/003273.mp3 differ diff --git a/src/songLib/003274.mp3 b/src/songLib/003274.mp3 new file mode 100644 index 00000000..7c4508d1 Binary files /dev/null and b/src/songLib/003274.mp3 differ diff --git a/src/songLib/003492.mp3 b/src/songLib/003492.mp3 new file mode 100644 index 00000000..760a0db4 Binary files /dev/null and b/src/songLib/003492.mp3 differ diff --git a/src/songLib/003532.mp3 b/src/songLib/003532.mp3 new file mode 100644 index 00000000..993de7bb Binary files /dev/null and b/src/songLib/003532.mp3 differ diff --git a/src/songLib/003533.mp3 b/src/songLib/003533.mp3 new file mode 100644 index 00000000..5e6dd72c Binary files /dev/null and b/src/songLib/003533.mp3 differ diff --git a/src/songLib/003534.mp3 b/src/songLib/003534.mp3 new file mode 100644 index 00000000..3ef0a073 Binary files /dev/null and b/src/songLib/003534.mp3 differ diff --git a/src/songLib/003535.mp3 b/src/songLib/003535.mp3 new file mode 100644 index 00000000..f92b8bcd Binary files /dev/null and b/src/songLib/003535.mp3 differ diff --git a/src/songLib/003537.mp3 b/src/songLib/003537.mp3 new file mode 100644 index 00000000..b97dfc46 Binary files /dev/null and b/src/songLib/003537.mp3 differ diff --git a/src/songLib/003538.mp3 b/src/songLib/003538.mp3 new file mode 100644 index 00000000..59d8b6d6 Binary files /dev/null and b/src/songLib/003538.mp3 differ diff --git a/src/songLib/003573.mp3 b/src/songLib/003573.mp3 new file mode 100644 index 00000000..a2109fb2 Binary files /dev/null and b/src/songLib/003573.mp3 differ diff --git a/src/songLib/003598.mp3 b/src/songLib/003598.mp3 new file mode 100644 index 00000000..535d6ea6 Binary files /dev/null and b/src/songLib/003598.mp3 differ diff --git a/src/songLib/003624.mp3 b/src/songLib/003624.mp3 new file mode 100644 index 00000000..112b741e Binary files /dev/null and b/src/songLib/003624.mp3 differ diff --git a/src/songLib/003707.mp3 b/src/songLib/003707.mp3 new file mode 100644 index 00000000..50e552a7 Binary files /dev/null and b/src/songLib/003707.mp3 differ diff --git a/src/songLib/003708.mp3 b/src/songLib/003708.mp3 new file mode 100644 index 00000000..597710a0 Binary files /dev/null and b/src/songLib/003708.mp3 differ diff --git a/src/songLib/003720.mp3 b/src/songLib/003720.mp3 new file mode 100644 index 00000000..1adcb6a4 Binary files /dev/null and b/src/songLib/003720.mp3 differ diff --git a/src/songLib/003721.mp3 b/src/songLib/003721.mp3 new file mode 100644 index 00000000..239b4edc Binary files /dev/null and b/src/songLib/003721.mp3 differ diff --git a/src/songLib/003722.mp3 b/src/songLib/003722.mp3 new file mode 100644 index 00000000..b5ae12c3 Binary files /dev/null and b/src/songLib/003722.mp3 differ diff --git a/src/songLib/003724.mp3 b/src/songLib/003724.mp3 new file mode 100644 index 00000000..d4fc1378 Binary files /dev/null and b/src/songLib/003724.mp3 differ diff --git a/src/songLib/003725.mp3 b/src/songLib/003725.mp3 new file mode 100644 index 00000000..178c9344 Binary files /dev/null and b/src/songLib/003725.mp3 differ diff --git a/src/songLib/003761.mp3 b/src/songLib/003761.mp3 new file mode 100644 index 00000000..5c4479e4 Binary files /dev/null and b/src/songLib/003761.mp3 differ diff --git a/src/songLib/003762.mp3 b/src/songLib/003762.mp3 new file mode 100644 index 00000000..a6f3c287 Binary files /dev/null and b/src/songLib/003762.mp3 differ diff --git a/src/songLib/003763.mp3 b/src/songLib/003763.mp3 new file mode 100644 index 00000000..5ca97607 Binary files /dev/null and b/src/songLib/003763.mp3 differ diff --git a/src/songLib/003765.mp3 b/src/songLib/003765.mp3 new file mode 100644 index 00000000..1055e3bb Binary files /dev/null and b/src/songLib/003765.mp3 differ diff --git a/src/songLib/003766.mp3 b/src/songLib/003766.mp3 new file mode 100644 index 00000000..eed5d5cc Binary files /dev/null and b/src/songLib/003766.mp3 differ diff --git a/src/songLib/003775.mp3 b/src/songLib/003775.mp3 new file mode 100644 index 00000000..9cf6379d Binary files /dev/null and b/src/songLib/003775.mp3 differ diff --git a/src/songLib/003776.mp3 b/src/songLib/003776.mp3 new file mode 100644 index 00000000..f38e0c47 Binary files /dev/null and b/src/songLib/003776.mp3 differ diff --git a/src/songLib/003777.mp3 b/src/songLib/003777.mp3 new file mode 100644 index 00000000..6eb3d64f Binary files /dev/null and b/src/songLib/003777.mp3 differ diff --git a/src/songLib/003778.mp3 b/src/songLib/003778.mp3 new file mode 100644 index 00000000..6262bad9 Binary files /dev/null and b/src/songLib/003778.mp3 differ diff --git a/src/songLib/003779.mp3 b/src/songLib/003779.mp3 new file mode 100644 index 00000000..0da59f50 Binary files /dev/null and b/src/songLib/003779.mp3 differ diff --git a/src/songLib/003832.mp3 b/src/songLib/003832.mp3 new file mode 100644 index 00000000..3e2fe326 Binary files /dev/null and b/src/songLib/003832.mp3 differ diff --git a/src/songLib/003833.mp3 b/src/songLib/003833.mp3 new file mode 100644 index 00000000..f1004d90 Binary files /dev/null and b/src/songLib/003833.mp3 differ diff --git a/src/songLib/003840.mp3 b/src/songLib/003840.mp3 new file mode 100644 index 00000000..9ebaa5ae Binary files /dev/null and b/src/songLib/003840.mp3 differ diff --git a/src/songLib/003880.mp3 b/src/songLib/003880.mp3 new file mode 100644 index 00000000..f27c29c5 Binary files /dev/null and b/src/songLib/003880.mp3 differ diff --git a/src/songLib/003895.mp3 b/src/songLib/003895.mp3 new file mode 100644 index 00000000..36c116eb Binary files /dev/null and b/src/songLib/003895.mp3 differ diff --git a/src/songLib/003896.mp3 b/src/songLib/003896.mp3 new file mode 100644 index 00000000..1875550e Binary files /dev/null and b/src/songLib/003896.mp3 differ diff --git a/src/songLib/003904.mp3 b/src/songLib/003904.mp3 new file mode 100644 index 00000000..71eb5035 Binary files /dev/null and b/src/songLib/003904.mp3 differ diff --git a/src/songLib/003905.mp3 b/src/songLib/003905.mp3 new file mode 100644 index 00000000..fcb0db2c Binary files /dev/null and b/src/songLib/003905.mp3 differ diff --git a/src/songLib/003906.mp3 b/src/songLib/003906.mp3 new file mode 100644 index 00000000..f590fe0d Binary files /dev/null and b/src/songLib/003906.mp3 differ diff --git a/src/songLib/003908.mp3 b/src/songLib/003908.mp3 new file mode 100644 index 00000000..df0820af Binary files /dev/null and b/src/songLib/003908.mp3 differ diff --git a/src/songLib/003909.mp3 b/src/songLib/003909.mp3 new file mode 100644 index 00000000..e75ffc12 Binary files /dev/null and b/src/songLib/003909.mp3 differ diff --git a/src/songLib/003910.mp3 b/src/songLib/003910.mp3 new file mode 100644 index 00000000..25d1e64d Binary files /dev/null and b/src/songLib/003910.mp3 differ diff --git a/src/songLib/003911.mp3 b/src/songLib/003911.mp3 new file mode 100644 index 00000000..77ceef77 Binary files /dev/null and b/src/songLib/003911.mp3 differ diff --git a/src/songLib/003912.mp3 b/src/songLib/003912.mp3 new file mode 100644 index 00000000..ea05abb9 Binary files /dev/null and b/src/songLib/003912.mp3 differ diff --git a/src/songLib/003913.mp3 b/src/songLib/003913.mp3 new file mode 100644 index 00000000..c0f974b1 Binary files /dev/null and b/src/songLib/003913.mp3 differ diff --git a/src/songLib/003920.mp3 b/src/songLib/003920.mp3 new file mode 100644 index 00000000..30544669 Binary files /dev/null and b/src/songLib/003920.mp3 differ diff --git a/src/songLib/003921.mp3 b/src/songLib/003921.mp3 new file mode 100644 index 00000000..6c8feb7c Binary files /dev/null and b/src/songLib/003921.mp3 differ diff --git a/src/songLib/003950.mp3 b/src/songLib/003950.mp3 new file mode 100644 index 00000000..1a5ec287 Binary files /dev/null and b/src/songLib/003950.mp3 differ diff --git a/src/songLib/004013.mp3 b/src/songLib/004013.mp3 new file mode 100644 index 00000000..d477d6cd Binary files /dev/null and b/src/songLib/004013.mp3 differ diff --git a/src/songLib/004017.mp3 b/src/songLib/004017.mp3 new file mode 100644 index 00000000..a8bdd0f2 Binary files /dev/null and b/src/songLib/004017.mp3 differ diff --git a/src/songLib/004022.mp3 b/src/songLib/004022.mp3 new file mode 100644 index 00000000..2711a8f5 Binary files /dev/null and b/src/songLib/004022.mp3 differ diff --git a/src/songLib/004037.mp3 b/src/songLib/004037.mp3 new file mode 100644 index 00000000..92d8f289 Binary files /dev/null and b/src/songLib/004037.mp3 differ diff --git a/src/songLib/004066.mp3 b/src/songLib/004066.mp3 new file mode 100644 index 00000000..f829ba94 Binary files /dev/null and b/src/songLib/004066.mp3 differ diff --git a/src/songLib/004067.mp3 b/src/songLib/004067.mp3 new file mode 100644 index 00000000..a5ea0956 Binary files /dev/null and b/src/songLib/004067.mp3 differ diff --git a/src/songLib/004068.mp3 b/src/songLib/004068.mp3 new file mode 100644 index 00000000..bf3cee86 Binary files /dev/null and b/src/songLib/004068.mp3 differ diff --git a/src/songLib/004069.mp3 b/src/songLib/004069.mp3 new file mode 100644 index 00000000..c55bbbaf Binary files /dev/null and b/src/songLib/004069.mp3 differ diff --git a/src/songLib/004070.mp3 b/src/songLib/004070.mp3 new file mode 100644 index 00000000..28608c5f Binary files /dev/null and b/src/songLib/004070.mp3 differ diff --git a/src/songLib/004071.mp3 b/src/songLib/004071.mp3 new file mode 100644 index 00000000..2107d21b Binary files /dev/null and b/src/songLib/004071.mp3 differ diff --git a/src/songLib/004072.mp3 b/src/songLib/004072.mp3 new file mode 100644 index 00000000..4e604e5d Binary files /dev/null and b/src/songLib/004072.mp3 differ diff --git a/src/songLib/004073.mp3 b/src/songLib/004073.mp3 new file mode 100644 index 00000000..ce9d7c94 Binary files /dev/null and b/src/songLib/004073.mp3 differ diff --git a/src/songLib/004074.mp3 b/src/songLib/004074.mp3 new file mode 100644 index 00000000..f6773b15 Binary files /dev/null and b/src/songLib/004074.mp3 differ diff --git a/src/songLib/004075.mp3 b/src/songLib/004075.mp3 new file mode 100644 index 00000000..dabd9578 Binary files /dev/null and b/src/songLib/004075.mp3 differ diff --git a/src/songLib/004076.mp3 b/src/songLib/004076.mp3 new file mode 100644 index 00000000..54f929c8 Binary files /dev/null and b/src/songLib/004076.mp3 differ diff --git a/src/songLib/004077.mp3 b/src/songLib/004077.mp3 new file mode 100644 index 00000000..6b6fbf4a Binary files /dev/null and b/src/songLib/004077.mp3 differ diff --git a/src/songLib/004078.mp3 b/src/songLib/004078.mp3 new file mode 100644 index 00000000..00d3dedf Binary files /dev/null and b/src/songLib/004078.mp3 differ diff --git a/src/songLib/004079.mp3 b/src/songLib/004079.mp3 new file mode 100644 index 00000000..685e86db Binary files /dev/null and b/src/songLib/004079.mp3 differ diff --git a/src/songLib/004080.mp3 b/src/songLib/004080.mp3 new file mode 100644 index 00000000..baa9932f Binary files /dev/null and b/src/songLib/004080.mp3 differ diff --git a/src/songLib/004091.mp3 b/src/songLib/004091.mp3 new file mode 100644 index 00000000..74530de3 Binary files /dev/null and b/src/songLib/004091.mp3 differ diff --git a/src/songLib/004092.mp3 b/src/songLib/004092.mp3 new file mode 100644 index 00000000..4b6106ae Binary files /dev/null and b/src/songLib/004092.mp3 differ diff --git a/src/songLib/004093.mp3 b/src/songLib/004093.mp3 new file mode 100644 index 00000000..d10844ea Binary files /dev/null and b/src/songLib/004093.mp3 differ diff --git a/src/songLib/004094.mp3 b/src/songLib/004094.mp3 new file mode 100644 index 00000000..7e4bfe92 Binary files /dev/null and b/src/songLib/004094.mp3 differ diff --git a/src/songLib/004095.mp3 b/src/songLib/004095.mp3 new file mode 100644 index 00000000..013036fb Binary files /dev/null and b/src/songLib/004095.mp3 differ diff --git a/src/songLib/004096.mp3 b/src/songLib/004096.mp3 new file mode 100644 index 00000000..d6a3d637 Binary files /dev/null and b/src/songLib/004096.mp3 differ diff --git a/src/songLib/004097.mp3 b/src/songLib/004097.mp3 new file mode 100644 index 00000000..209a737b Binary files /dev/null and b/src/songLib/004097.mp3 differ diff --git a/src/songLib/004098.mp3 b/src/songLib/004098.mp3 new file mode 100644 index 00000000..d53d1936 Binary files /dev/null and b/src/songLib/004098.mp3 differ diff --git a/src/songLib/004099.mp3 b/src/songLib/004099.mp3 new file mode 100644 index 00000000..0aaa5436 Binary files /dev/null and b/src/songLib/004099.mp3 differ diff --git a/src/songLib/004100.mp3 b/src/songLib/004100.mp3 new file mode 100644 index 00000000..5968c660 Binary files /dev/null and b/src/songLib/004100.mp3 differ diff --git a/src/songLib/004101.mp3 b/src/songLib/004101.mp3 new file mode 100644 index 00000000..6dc40754 Binary files /dev/null and b/src/songLib/004101.mp3 differ diff --git a/src/songLib/004102.mp3 b/src/songLib/004102.mp3 new file mode 100644 index 00000000..c0fc614b Binary files /dev/null and b/src/songLib/004102.mp3 differ diff --git a/src/songLib/004103.mp3 b/src/songLib/004103.mp3 new file mode 100644 index 00000000..35e74c3d Binary files /dev/null and b/src/songLib/004103.mp3 differ diff --git a/src/songLib/004108.mp3 b/src/songLib/004108.mp3 new file mode 100644 index 00000000..1dd41725 Binary files /dev/null and b/src/songLib/004108.mp3 differ diff --git a/src/songLib/004232.mp3 b/src/songLib/004232.mp3 new file mode 100644 index 00000000..bac8657f Binary files /dev/null and b/src/songLib/004232.mp3 differ diff --git a/src/songLib/004233.mp3 b/src/songLib/004233.mp3 new file mode 100644 index 00000000..b5ff35fc Binary files /dev/null and b/src/songLib/004233.mp3 differ diff --git a/src/songLib/004234.mp3 b/src/songLib/004234.mp3 new file mode 100644 index 00000000..385f0ba2 Binary files /dev/null and b/src/songLib/004234.mp3 differ diff --git a/src/songLib/004235.mp3 b/src/songLib/004235.mp3 new file mode 100644 index 00000000..b2eeae6e Binary files /dev/null and b/src/songLib/004235.mp3 differ diff --git a/src/songLib/004236.mp3 b/src/songLib/004236.mp3 new file mode 100644 index 00000000..e0b0c5df Binary files /dev/null and b/src/songLib/004236.mp3 differ diff --git a/src/songLib/004239.mp3 b/src/songLib/004239.mp3 new file mode 100644 index 00000000..4aca9c4d Binary files /dev/null and b/src/songLib/004239.mp3 differ diff --git a/src/songLib/004450.mp3 b/src/songLib/004450.mp3 new file mode 100644 index 00000000..25b6a75f Binary files /dev/null and b/src/songLib/004450.mp3 differ diff --git a/src/songLib/004507.mp3 b/src/songLib/004507.mp3 new file mode 100644 index 00000000..71b36575 Binary files /dev/null and b/src/songLib/004507.mp3 differ diff --git a/src/songLib/004508.mp3 b/src/songLib/004508.mp3 new file mode 100644 index 00000000..27fac8d8 Binary files /dev/null and b/src/songLib/004508.mp3 differ diff --git a/src/songLib/004509.mp3 b/src/songLib/004509.mp3 new file mode 100644 index 00000000..66f7aad8 Binary files /dev/null and b/src/songLib/004509.mp3 differ diff --git a/src/songLib/004510.mp3 b/src/songLib/004510.mp3 new file mode 100644 index 00000000..507219c9 Binary files /dev/null and b/src/songLib/004510.mp3 differ diff --git a/src/songLib/004511.mp3 b/src/songLib/004511.mp3 new file mode 100644 index 00000000..f985b66e Binary files /dev/null and b/src/songLib/004511.mp3 differ diff --git a/src/songLib/004519.mp3 b/src/songLib/004519.mp3 new file mode 100644 index 00000000..8b6bc5e5 Binary files /dev/null and b/src/songLib/004519.mp3 differ diff --git a/src/songLib/004520.mp3 b/src/songLib/004520.mp3 new file mode 100644 index 00000000..06e87d00 Binary files /dev/null and b/src/songLib/004520.mp3 differ diff --git a/src/songLib/004521.mp3 b/src/songLib/004521.mp3 new file mode 100644 index 00000000..a19530e7 Binary files /dev/null and b/src/songLib/004521.mp3 differ diff --git a/src/songLib/004522.mp3 b/src/songLib/004522.mp3 new file mode 100644 index 00000000..07d7d1bf Binary files /dev/null and b/src/songLib/004522.mp3 differ diff --git a/src/songLib/004682.mp3 b/src/songLib/004682.mp3 new file mode 100644 index 00000000..39919ae2 Binary files /dev/null and b/src/songLib/004682.mp3 differ diff --git a/src/songLib/004684.mp3 b/src/songLib/004684.mp3 new file mode 100644 index 00000000..18fa95fd Binary files /dev/null and b/src/songLib/004684.mp3 differ diff --git a/src/songLib/004685.mp3 b/src/songLib/004685.mp3 new file mode 100644 index 00000000..79a461ae Binary files /dev/null and b/src/songLib/004685.mp3 differ diff --git a/src/songLib/004688.mp3 b/src/songLib/004688.mp3 new file mode 100644 index 00000000..c201d905 Binary files /dev/null and b/src/songLib/004688.mp3 differ diff --git a/src/songLib/004777.mp3 b/src/songLib/004777.mp3 new file mode 100644 index 00000000..64fee3f3 Binary files /dev/null and b/src/songLib/004777.mp3 differ diff --git a/src/songLib/004778.mp3 b/src/songLib/004778.mp3 new file mode 100644 index 00000000..7760aa67 Binary files /dev/null and b/src/songLib/004778.mp3 differ diff --git a/src/songLib/004779.mp3 b/src/songLib/004779.mp3 new file mode 100644 index 00000000..6e6f37c4 Binary files /dev/null and b/src/songLib/004779.mp3 differ diff --git a/src/songLib/004780.mp3 b/src/songLib/004780.mp3 new file mode 100644 index 00000000..4770d6d7 Binary files /dev/null and b/src/songLib/004780.mp3 differ diff --git a/src/songLib/004781.mp3 b/src/songLib/004781.mp3 new file mode 100644 index 00000000..8b7191f3 Binary files /dev/null and b/src/songLib/004781.mp3 differ diff --git a/src/songLib/004782.mp3 b/src/songLib/004782.mp3 new file mode 100644 index 00000000..e58dd299 Binary files /dev/null and b/src/songLib/004782.mp3 differ diff --git a/src/songLib/004784.mp3 b/src/songLib/004784.mp3 new file mode 100644 index 00000000..2ca7e6ff Binary files /dev/null and b/src/songLib/004784.mp3 differ diff --git a/src/songLib/004785.mp3 b/src/songLib/004785.mp3 new file mode 100644 index 00000000..4329ad86 Binary files /dev/null and b/src/songLib/004785.mp3 differ diff --git a/src/songLib/004786.mp3 b/src/songLib/004786.mp3 new file mode 100644 index 00000000..8ab8f2fa Binary files /dev/null and b/src/songLib/004786.mp3 differ diff --git a/src/songLib/004787.mp3 b/src/songLib/004787.mp3 new file mode 100644 index 00000000..86188dd4 Binary files /dev/null and b/src/songLib/004787.mp3 differ diff --git a/src/songLib/004788.mp3 b/src/songLib/004788.mp3 new file mode 100644 index 00000000..ca55bfa4 Binary files /dev/null and b/src/songLib/004788.mp3 differ diff --git a/src/songLib/004799.mp3 b/src/songLib/004799.mp3 new file mode 100644 index 00000000..9ba5f835 Binary files /dev/null and b/src/songLib/004799.mp3 differ diff --git a/src/songLib/004835.mp3 b/src/songLib/004835.mp3 new file mode 100644 index 00000000..18670e74 Binary files /dev/null and b/src/songLib/004835.mp3 differ diff --git a/src/songLib/004836.mp3 b/src/songLib/004836.mp3 new file mode 100644 index 00000000..e8ed850e Binary files /dev/null and b/src/songLib/004836.mp3 differ diff --git a/src/songLib/004838.mp3 b/src/songLib/004838.mp3 new file mode 100644 index 00000000..22be0a3c Binary files /dev/null and b/src/songLib/004838.mp3 differ diff --git a/src/songLib/004846.mp3 b/src/songLib/004846.mp3 new file mode 100644 index 00000000..c3520c9c Binary files /dev/null and b/src/songLib/004846.mp3 differ diff --git a/src/songLib/004848.mp3 b/src/songLib/004848.mp3 new file mode 100644 index 00000000..42be21ec Binary files /dev/null and b/src/songLib/004848.mp3 differ diff --git a/src/songLib/004849.mp3 b/src/songLib/004849.mp3 new file mode 100644 index 00000000..86ce0e77 Binary files /dev/null and b/src/songLib/004849.mp3 differ diff --git a/src/songLib/005006.mp3 b/src/songLib/005006.mp3 new file mode 100644 index 00000000..3af7a7f9 Binary files /dev/null and b/src/songLib/005006.mp3 differ diff --git a/src/songLib/005156.mp3 b/src/songLib/005156.mp3 new file mode 100644 index 00000000..81b56bf6 Binary files /dev/null and b/src/songLib/005156.mp3 differ diff --git a/src/songLib/005157.mp3 b/src/songLib/005157.mp3 new file mode 100644 index 00000000..c7094943 Binary files /dev/null and b/src/songLib/005157.mp3 differ diff --git a/src/songLib/005158.mp3 b/src/songLib/005158.mp3 new file mode 100644 index 00000000..5a301de8 Binary files /dev/null and b/src/songLib/005158.mp3 differ diff --git a/src/songLib/005159.mp3 b/src/songLib/005159.mp3 new file mode 100644 index 00000000..fd5fc7ea Binary files /dev/null and b/src/songLib/005159.mp3 differ diff --git a/src/songLib/005169.mp3 b/src/songLib/005169.mp3 new file mode 100644 index 00000000..843567d8 Binary files /dev/null and b/src/songLib/005169.mp3 differ diff --git a/src/songLib/005170.mp3 b/src/songLib/005170.mp3 new file mode 100644 index 00000000..2d234520 Binary files /dev/null and b/src/songLib/005170.mp3 differ diff --git a/src/songLib/005171.mp3 b/src/songLib/005171.mp3 new file mode 100644 index 00000000..60a3ec67 Binary files /dev/null and b/src/songLib/005171.mp3 differ diff --git a/src/songLib/005191.mp3 b/src/songLib/005191.mp3 new file mode 100644 index 00000000..23668cf3 Binary files /dev/null and b/src/songLib/005191.mp3 differ diff --git a/src/songLib/005264.mp3 b/src/songLib/005264.mp3 new file mode 100644 index 00000000..909b6dde Binary files /dev/null and b/src/songLib/005264.mp3 differ diff --git a/src/songLib/005268.mp3 b/src/songLib/005268.mp3 new file mode 100644 index 00000000..b0d44316 Binary files /dev/null and b/src/songLib/005268.mp3 differ diff --git a/src/songLib/005376.mp3 b/src/songLib/005376.mp3 new file mode 100644 index 00000000..4fb4e44e Binary files /dev/null and b/src/songLib/005376.mp3 differ diff --git a/src/songLib/005381.mp3 b/src/songLib/005381.mp3 new file mode 100644 index 00000000..8b9a12da Binary files /dev/null and b/src/songLib/005381.mp3 differ diff --git a/src/songLib/005521.mp3 b/src/songLib/005521.mp3 new file mode 100644 index 00000000..52e00199 Binary files /dev/null and b/src/songLib/005521.mp3 differ diff --git a/src/songLib/005879.mp3 b/src/songLib/005879.mp3 new file mode 100644 index 00000000..8b01ad7c Binary files /dev/null and b/src/songLib/005879.mp3 differ diff --git a/src/songLib/005940.mp3 b/src/songLib/005940.mp3 new file mode 100644 index 00000000..3aaba974 Binary files /dev/null and b/src/songLib/005940.mp3 differ diff --git a/src/test/java/Database/SLibraryTest.java b/src/test/java/Database/SLibraryTest.java new file mode 100644 index 00000000..edce580d --- /dev/null +++ b/src/test/java/Database/SLibraryTest.java @@ -0,0 +1,45 @@ +package Database; +import Entities.Song; +import org.junit.Before; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class SLibraryTest { + + songAccessInterface lib; + + @Before + public void setUp(){ + lib = Database.songLibrary.getInstance(); + } + + @Test + public void testExists(){ + // A song with id 2 exists. + Assertions.assertTrue(lib.exists(2)); + // A song with id -2 does not exist. + Assertions.assertFalse(lib.exists(-2)); + } + + @Test + public void testSaveSong(){ + + songDsData song = new songDsData(-1, null, null, null, null, null, null); + + // Song is new. Song is added. + Assertions.assertTrue(lib.saveSong(song)); + + // Correct song is added. + Assertions.assertSame(lib.getSong(-1), song); + + // Song with ID already exists. Song is not added. + Assertions.assertFalse(lib.saveSong(song)); + } + + @Test + public void testGetSong(){ + Song song = lib.getSong(2).getSong(); + Assertions.assertEquals(song.getID(), 2); + } + +} diff --git a/src/test/java/UseCase/PPlaybackTest.java b/src/test/java/UseCase/PPlaybackTest.java index 509ef839..a7ee86f4 100644 --- a/src/test/java/UseCase/PPlaybackTest.java +++ b/src/test/java/UseCase/PPlaybackTest.java @@ -21,9 +21,9 @@ public void setUp(){ @Test public void testPlay(){ File file = new File("./src/test/java/UseCase/test1.mp3"); - Song song = new Song(0, null, null, 0, null, file, false, null); + Song song = new Song(0, null, null, null, file, null, null); File file2 = new File("./src/test/java/UseCase/test2.mp3"); - Song song2 = new Song(0, null, null, 0, null, file2, false, null); + Song song2 = new Song(0, null, null, null, file2, null, null); ArrayList songs = new ArrayList<>(); songs.add(song); @@ -39,9 +39,9 @@ public void testPlay(){ @Test public void testPlayNext(){ File file = new File("./src/test/java/UseCase/test1.mp3"); - Song song = new Song(0, null, null, 0, null, file, false, null); + Song song = new Song(0, null, null, null, file, null, null); File file2 = new File("./src/test/java/UseCase/test2.mp3"); - Song song2 = new Song(0, null, null, 0, null, file2, false, null); + Song song2 = new Song(0, null, null, null, file2, null, null); ArrayList songs = new ArrayList<>(); songs.add(song); @@ -60,9 +60,9 @@ public void testPlayNext(){ @Test public void testStopQueue(){ File file = new File("./src/test/java/UseCase/test1.mp3"); - Song song = new Song(0, null, null, 0, null, file, false, null); + Song song = new Song(0, null, null, null, file, null, null); File file2 = new File("./src/test/java/UseCase/test2.mp3"); - Song song2 = new Song(0, null, null, 0, null, file2, false, null); + Song song2 = new Song(0, null, null, null, file2, null, null); ArrayList songs = new ArrayList<>(); songs.add(song);