Merge branch 'release-0.1'

Author: echernyshev

README.md

@@ -4,12 +4,12 @@ Yatour M-06 folderer.
 1. java 7.
 
 ##Usage:
-1. Put your mp3 files in one folder, for example D:\music
-2. Insert your flash and formate this in FAT32 file system.
+1. Place your mp3 files in folder, for example: D:\music
+2. Connect your yatour device (flash) to computer and format it in FAT32 file system.
 3. Run yatour-folderer from command line:
 
-**java -jar yatour-folderer.jar D:\music F:\**
+**java -jar yatour-folderer.jar -in D:\music -out F:\**
 
-where **F:\** - this is path to your flash.
+where **F:\** - this is path to your yatour device (flash).
 
 Enjoy!

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>ru.kindteam</groupId>
 	<artifactId>yatour-folderer</artifactId>
 	<packaging>jar</packaging>
-	<version>1.0-SNAPSHOT</version>
+	<version>0.1</version>
 	<name>yatour-folderer</name>
 	<url>http://maven.apache.org</url>
 
@@ -24,6 +24,13 @@
 			<artifactId>commons-io</artifactId>
 			<version>1.3.2</version>
 		</dependency>
+		
+		<dependency>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+			<version>1.2</version>
+		</dependency>
+		
 
 	</dependencies>
 	<build>

src/main/java/ru/kindteam/MusicFileCopier.java

@@ -1,6 +1,3 @@
-/**
- *
- */
 package ru.kindteam;
 
 import java.io.IOException;
@@ -23,12 +20,22 @@ public class MusicFileCopier
     private int folderCounter = 0;
     private int fileCounter = MAX_COUNT_IN_FOLDER;
 
-    public MusicFileCopier(Path source, Path target) throws IOException
+    private MusicFileCopier(MusicFileDataSource files, Path target)
     {
-        files = MusicFileDataSource.create(source);
+        this.files = files;
         this.target = target;
     }
 
+    public static MusicFileCopier create(Path source, Path target) throws IOException
+    {
+        return new MusicFileCopier(MusicFileDataSource.create(source), target);
+    }
+
+    /**
+     * Выполнение копирования файлов с заданными параметрами.
+     * 
+     * @throws IOException
+     */
     public void copyFiles() throws IOException
     {
         for (Path source : files)

src/main/java/ru/kindteam/MusicFileDataSource.java

@@ -13,6 +13,9 @@
 import java.util.TreeSet;
 
 /**
+ * Data Source для музыкальных файлов. Осуществляет поиск всех музыкальных файлов в заданной папке и предоставляет доступ к итератору списка
+ * {@link Path} отсортированному в по названиям.
+ *
  * @author echernyshev
  * @since Jan 6, 2015
  */
@@ -33,6 +36,12 @@ public static MusicFileDataSource create(Path source) throws IOException
         return result;
     }
 
+    @Override
+    public Iterator<Path> iterator()
+    {
+        return files.iterator();
+    }
+
     private void walkFiles() throws IOException
     {
         Files.walkFileTree(source, new SimpleFileVisitor<Path>()
@@ -48,7 +57,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th
             public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException
             {
                 System.out.println("Processing file " + file.toString());
-                if (file.toString().toLowerCase().endsWith(".mp3"))
+                if (isMusicFile(file))
                 {
                     files.add(file);
                 }
@@ -57,9 +66,8 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
                 });
     }
 
-    @Override
-    public Iterator<Path> iterator()
+    private boolean isMusicFile(Path file)
     {
-        return files.iterator();
+        return file.toString().toLowerCase().endsWith(".mp3");
     }
 }

src/main/java/ru/kindteam/YatourFolderer.java

@@ -2,27 +2,53 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+
 /**
- * Утилита для упаковки файлов по папкам для yatour M-06
+ * Утилита для упаковки файлов по папкам для yatour M-06. Данный класс - точка входа в приложение.
  *
  * @author echernyshev
  * @since Jan 2, 2015
  */
 public class YatourFolderer
 {
-    private static final String HELP = "Использование команды:\n"
-            + "java -jar yatour-folderer.jar /path/to/input/files /path/to/out";
+    private final static class CopyParameters
+    {
+        CopyParameters(Path source, Path target)
+        {
+            this.source = source;
+            this.target = target;
+        }
+
+        Path source;
+        Path target;
+    }
+
+    private static Options OPTIONS = new Options();
+
+    static
+    {
+        OPTIONS.addOption("in", true, "Input folder, that contains music files to copy.");
+        OPTIONS.addOption("out", true, "Output folder for copying music files.");
+    }
 
     public static void main( String[] args )
     {
-        checkArguments(args);
+        CopyParameters params = parseArguments(args);
+        System.out.println(OPTIONS.toString());
         System.out.println("Processing files");
 
         try
         {
-            MusicFileCopier copier = new MusicFileCopier(Paths.get(args[0]), Paths.get(args[1]));
+            MusicFileCopier copier = MusicFileCopier.create(params.source, params.target);
             copier.copyFiles();
         }
         catch (IOException e)
@@ -33,28 +59,50 @@ public static void main( String[] args )
     }
 
 
-    private static void checkArguments(String[] args)
+    private static CopyParameters parseArguments(String[] args)
     {
-        if (args.length != 2)
+        CommandLineParser parser = new BasicParser();
+        try
+        {
+            CommandLine line = parser.parse(OPTIONS, args);
+            if (!line.hasOption("in"))
+            {
+                printUsage("Bad syntax. Argument \"-in\" is required.");
+                System.exit(1);
+            }
+            if (!line.hasOption("out"))
+            {
+                printUsage("Bad syntax. Argument \"-out\" is required.");
+                System.exit(1);
+            }
+            String in = line.getOptionValue("in");
+            String out = line.getOptionValue("out");
+            checkFolder(in);
+            checkFolder(out);
+            return new CopyParameters(Paths.get(in), Paths.get(out));
+        }
+        catch (ParseException e)
         {
-            printHelp("Количество агргументов должно равняться 2");
+            printUsage("Parse command error: " + e.getMessage());
             System.exit(1);
+            return null;
         }
-        checkFolder(args[0]);
-        checkFolder(args[1]);
     }
 
-    private static void printHelp(String error)
+    private static void printUsage(String error)
     {
         System.out.println(error);
-        System.out.println(HELP);
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp(120,
+                "java -jar yatour-folderer.jar -in /path/to/your/music -out /path/to/yatour/device",
+                "Arguments: ", OPTIONS, "");
     }
 
     private static void checkFolder(String path)
     {
         if (!new File(path).isDirectory())
         {
-            printHelp(path + "\nНе является папкой!");
+            printUsage(path + "\nNot a folder");
             System.exit(1);
         }
     }