Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/misc.xml # .idea/workspace.xml # src/ffmpegconverter/Main.java
This commit is contained in:
@ -76,21 +76,21 @@ public class Main {
|
||||
}
|
||||
WRITER.close();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Prints a string
|
||||
* @param input <p>The string to print.</p>
|
||||
* @throws IOException <p>If the writer can't be written to.</p>
|
||||
* @throws IOException <p>If the writer fails to write.</p>
|
||||
*/
|
||||
private static void print(String input) throws IOException {
|
||||
WRITER.write(input);
|
||||
WRITER.flush();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Prints a string and a line break
|
||||
* @param input <p>The string to print.</p>
|
||||
* @throws IOException <p>If the writer can't be written to.</p>
|
||||
* @throws IOException <p>If the writer fails to write.</p>
|
||||
*/
|
||||
private static void printl(String input) throws IOException {
|
||||
WRITER.write(input);
|
||||
@ -213,11 +213,10 @@ public class Main {
|
||||
|
||||
/**
|
||||
* Initializes the anime converter
|
||||
* @throws IOException <p>If something goes wrong.</p>
|
||||
* @throws IOException <p>If reading or writing fails.</p>
|
||||
*/
|
||||
private static void animeConverter() throws IOException {
|
||||
printl("[Audio languages jpn,eng,ger,fre] [Subtitle languages eng,ger,fre] " +
|
||||
"[Convert to stereo if necessary true/false] [Prevent signs&songs subtitles true/false]\nYour input: ");
|
||||
printl("[Audio languages jpn,eng,ger,fre] [Subtitle languages eng,ger,fre] [Convert to stereo if necessary true/false] [Prevent signs&songs subtitles true/false]\nYour input: ");
|
||||
List<String> input = readInput(4);
|
||||
String[] audioLang = new String[]{"jpn", "*"};
|
||||
String[] subtitleLang = new String[]{"eng", "*"};
|
||||
@ -274,7 +273,7 @@ public class Main {
|
||||
* Gets the user's choice
|
||||
* @param prompt <p>The prompt shown to the user.</p>
|
||||
* @return <p>The non-empty choice given by the user.</p>
|
||||
* @throws IOException <p>If the reader can't be read.</p>
|
||||
* @throws IOException <p>If reading or writing fails.</p>
|
||||
*/
|
||||
private static String getChoice(String prompt) throws IOException {
|
||||
printl(prompt);
|
||||
|
Reference in New Issue
Block a user