X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Ftextsplitter%2FMain.java;h=5d8082eea66e3236ba9dfbd3db5e511fd6dcba05;hb=1d9057cc722b349a0bc370c0860344f59c42fd0f;hp=9a52d55e54f943d11d20d2c3a1924da11f929fd4;hpb=50cb7085d553fdd82cd06806cd27b1675299f719;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/textsplitter/Main.java b/src/main/java/eu/svjatoslav/meviz/textsplitter/Main.java
index 9a52d55..5d8082e 100755
--- a/src/main/java/eu/svjatoslav/meviz/textsplitter/Main.java
+++ b/src/main/java/eu/svjatoslav/meviz/textsplitter/Main.java
@@ -1,7 +1,7 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
  * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public License
  * as published by the Free Software Foundation.
@@ -17,18 +17,12 @@ import java.io.FileWriter;
 import java.io.IOException;
 
 import eu.svjatoslav.commons.file.FilePathParser;
-import eu.svjatoslav.commons.string.CuttableString;
+import eu.svjatoslav.commons.string.String2;
 import eu.svjatoslav.commons.string.WildCardMatcher;
 import eu.svjatoslav.meviz.Module;
 
 public class Main implements Module {
 
-	public static final int targetLineLength = 200;
-
-	public static final int maxSplittedLines = 3;
-
-	public static final String splitLinePrefix = "    ";
-
 	CommandlineHandler commandlineHandler = new CommandlineHandler();
 
 	TextSplittingOptions options;
@@ -36,7 +30,7 @@ public class Main implements Module {
 	public boolean fileMatchesInputPattern(final File file) {
 		final String fileName = file.getName().toLowerCase();
 
-		for (final String inputPattern : options.inputPatterns)
+		for (final String inputPattern : options.fileInputPatterns)
 			if (WildCardMatcher.match(fileName, inputPattern.toLowerCase()))
 				return true;
 
@@ -60,7 +54,7 @@ public class Main implements Module {
 		targetFilePath.append(FilePathParser
 				.getFileNameWithoutExtension(sourceFile));
 
-		targetFilePath.append(".fixedLengh");
+		targetFilePath.append(".splitted");
 
 		// add file extension
 		{
@@ -105,29 +99,19 @@ public class Main implements Module {
 			if (readLine == null)
 				break;
 
-			if (readLine.length() <= targetLineLength)
-				bufferedWriter.write(readLine + "\n");
-			else {
-
-				final CuttableString cuttableString = new CuttableString(
-						readLine);
+			final String2 cuttableString = new String2(readLine);
 
-				bufferedWriter.write(cuttableString.cutLeft(targetLineLength)
-						+ "\n");
+			while (!cuttableString.isEmpty()) {
+				for (final String pattern : options.textSplitPatterns)
+					if (WildCardMatcher.match(cuttableString.toString(),
+							pattern))
+						bufferedWriter.write("\n");
 
-				int splittedLinesCount = 0;
-
-				while (!cuttableString.isEmpty()) {
-					splittedLinesCount++;
-					if (splittedLinesCount >= maxSplittedLines)
-						break;
-
-					bufferedWriter.write(splitLinePrefix
-							+ cuttableString.cutLeft(targetLineLength
-									- splitLinePrefix.length()) + "\n");
-				}
+				final String character = cuttableString.cutLeft(1);
+				bufferedWriter.append(character);
 			}
 
+			bufferedWriter.write("\n");
 		}
 
 		bufferedReader.close();
@@ -150,7 +134,7 @@ public class Main implements Module {
 
 	@Override
 	public void showCommandlineHelp() {
-		commandlineHandler.initParser().showHelp();
+		commandlineHandler.parser.showHelp();
 	}
 
 }