aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorClyhtsuriva <61652557+clyhtsuriva@users.noreply.github.com>2021-06-28 18:36:50 +0000
committerGitHub <noreply@github.com>2021-06-28 18:36:50 +0000
commite45539bd4b071e41d681dd5946e131de24c07d82 (patch)
tree4e74dd2fd311bebdc92ccf9fea57eef7b5e7db9c /src/main
parentd9e5505c6a283c7e576e7c77172221d7cb153351 (diff)
parent0572c31567b386f0845fdaa7d595ceeef01b24b7 (diff)
Merge pull request #22 from Said-Belhadj/STZ-0015
STZ-0015 : Added logs a little bit everywhere and fixed the r feature.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/musichub/business/AudioElement.java18
-rw-r--r--src/main/java/musichub/main/Main.java14
-rw-r--r--src/main/java/musichub/util/Policy.java6
3 files changed, 33 insertions, 5 deletions
diff --git a/src/main/java/musichub/business/AudioElement.java b/src/main/java/musichub/business/AudioElement.java
index fa410d8..80a649a 100644
--- a/src/main/java/musichub/business/AudioElement.java
+++ b/src/main/java/musichub/business/AudioElement.java
@@ -1,5 +1,6 @@
package musichub.business;
+import musichub.util.LogHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -107,12 +108,21 @@ public abstract class AudioElement {
action = action.toUpperCase();
switch (action) {
- case "S", "Q" -> clip.stop();
- case "P" -> clip.start();
- case "R" -> clip.setMicrosecondPosition(0);
+ case "S", "Q" -> {
+ clip.stop();
+ LogHandler.write("Music stopped", "INFO");
+ }
+ case "P" -> {
+ clip.start();
+ LogHandler.write("Music started", "INFO");
+ }
+ case "R" -> {
+ clip.setMicrosecondPosition(0);
+ LogHandler.write("Music reseted", "INFO");
+ }
default -> System.out.println("try again");
}
- System.out.println("You stoped the Audio element");
+ System.out.println("You stopped the Audio element");
}
clip.close();
diff --git a/src/main/java/musichub/main/Main.java b/src/main/java/musichub/main/Main.java
index 4ac7052..07786d9 100644
--- a/src/main/java/musichub/main/Main.java
+++ b/src/main/java/musichub/main/Main.java
@@ -54,6 +54,7 @@ public class Main {
List<Song> songs = theHub.getAlbumSongsSortedByGenre(albumTitle);
System.out.println(songs);
} catch (NoAlbumFoundException ex) {
+ LogHandler.write("No album found with the requested title", "WARNING");
System.out.println("No album found with the requested title " + ex.getMessage());
}
printAvailableCommands();
@@ -71,6 +72,7 @@ public class Main {
String song = scan.nextLine();
theHub.getAudioElement(songs, song);
} catch (NoAlbumFoundException ex) {
+ LogHandler.write("No album found with the requested title", "WARNING");
System.out.println("No album found with the requested title " + ex.getMessage());
}
printAvailableCommands();
@@ -121,6 +123,7 @@ public class Main {
System.out.println("New element list: ");
Iterator<AudioElement> it = theHub.elements();
while (it.hasNext()) System.out.println(it.next().getTitle());
+ LogHandler.write("Song successfully created", "INFO");
System.out.println("Song created!");
printAvailableCommands();
choice = scan.nextLine();
@@ -141,6 +144,7 @@ public class Main {
System.out.println("New list of albums: ");
Iterator<Album> ita = theHub.albums();
while (ita.hasNext()) System.out.println(ita.next().getTitle());
+ LogHandler.write("Album successfully created", "INFO");
System.out.println("Album created!");
printAvailableCommands();
choice = scan.nextLine();
@@ -168,6 +172,7 @@ public class Main {
} catch (NoAlbumFoundException | NoElementFoundException ex) {
System.out.println(ex.getMessage());
}
+ LogHandler.write("Song successfully added to the album", "INFO");
System.out.println("Song added to the album!");
printAvailableCommands();
choice = scan.nextLine();
@@ -189,6 +194,7 @@ public class Main {
String bLanguage = scan.nextLine();
AudioBook b = new AudioBook(bTitle, bArtist, bLength, bContent, bLanguage, bCategory);
theHub.addElement(b);
+ LogHandler.write("Audiobook successfully created", "INFO");
System.out.println("Audiobook created! New element list: ");
Iterator<AudioElement> itl = theHub.elements();
while (itl.hasNext()) System.out.println(itl.next().getTitle());
@@ -227,6 +233,7 @@ public class Main {
System.out.println("Type y to add a new one, n to end");
choice = scan.nextLine();
}
+ LogHandler.write("Playlist successfully created", "INFO");
System.out.println("Playlist created!");
printAvailableCommands();
choice = scan.nextLine();
@@ -245,6 +252,7 @@ public class Main {
} catch (NoPlayListFoundException ex) {
System.out.println(ex.getMessage());
}
+ LogHandler.write("Playlist successfully deleted", "INFO");
System.out.println("Playlist deleted!");
printAvailableCommands();
choice = scan.nextLine();
@@ -254,6 +262,7 @@ public class Main {
theHub.saveElements();
theHub.saveAlbums();
theHub.savePlayLists();
+ LogHandler.write("Elements, albums and playlists successfully saved", "INFO");
System.out.println("Elements, albums and playlists saved!");
printAvailableCommands();
choice = scan.nextLine();
@@ -267,9 +276,11 @@ public class Main {
System.err.println(e.getMessage());
}
catch (java.io.FileNotFoundException e){
- System.err.println(e.getMessage()+" Please create a file with the extension .wav inside the song folder at root of the app");
+ LogHandler.write("Please create a file with the extension .wav inside the song folder at root of the app", "ERROR");
+ System.err.println(e.getMessage() + " Please create a file with the extension .wav inside the song folder at root of the app");
}
printAvailableCommands();
+ choice = scan.nextLine();
break;
case 'o':
//consult the app logs
@@ -289,6 +300,7 @@ public class Main {
String song = scan.nextLine();
theHub.getAudioElement(songs, song);
} catch (NoPlayListFoundException ex) {
+ LogHandler.write("No playlist found with the requested title", "WARNING");
System.out.println("No playlist found with the requested title " + ex.getMessage());
}
printAvailableCommands();
diff --git a/src/main/java/musichub/util/Policy.java b/src/main/java/musichub/util/Policy.java
index 67a1c40..ac067b4 100644
--- a/src/main/java/musichub/util/Policy.java
+++ b/src/main/java/musichub/util/Policy.java
@@ -1,5 +1,6 @@
package musichub.util;
+import java.io.IOException;
import java.util.Scanner;
/**
@@ -104,6 +105,11 @@ public final class Policy {
}
}
}
+ try {
+ LogHandler.write("Terms accepted by the user.", "INFO");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
/**