created more readers

11 files changed, 101 insertions, 54 deletions

diff --git a/tests/ConnectionHandlerTest/ConnectionHandlerTest.cbp b/tests/ConnectionHandlerTest/ConnectionHandlerTest.cbp
index 31d9050..346b0a3 100644
--- a/tests/ConnectionHandlerTest/ConnectionHandlerTest.cbp
+++ b/tests/ConnectionHandlerTest/ConnectionHandlerTest.cbp
@@ -14,14 +14,6 @@
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
-				<Linker>
-					<Add library="../../libs/fsScan/libfsScan.a" />
-					<Add library="../../libs/networking/libnetworking.a" />
-					<Add library="../../libs/util/libutil.a" />
-					<Add library="../../libs/vdr/libvdr.a" />
-					<Add library="ssl" />
-					<Add library="crypt" />
-				</Linker>
 			</Target>
 			<Target title="Release">
 				<Option output="bin/Release/Tests" prefix_auto="1" extension_auto="1" />
@@ -42,7 +34,7 @@
 			<Add option="-D_REENTRANT" />
 			<Add option="-D_GNU_SOURCE=1" />
 			<Add directory="../../cmps/serverlib/include" />
-			<Add directory="../../libs/fsScan/include" />
+			<Add directory="../../libs/mediaScan/include" />
 			<Add directory="../../libs/networking/include" />
 			<Add directory="../../libs/IO/include" />
 			<Add directory="../../libs/util/include" />
@@ -50,13 +42,12 @@
 		</Compiler>
 		<Linker>
 			<Add library="../../cmps/serverlib/libserverlib.a" />
-			<Add library="../../libs/fsScan/libfsScan.a" />
+			<Add library="../../libs/mediaScan/libmediaScan.a" />
 			<Add library="../../libs/networking/libnetworking.a" />
 			<Add library="../../libs/IO/libIO.a" />
 			<Add library="../../libs/util/libutil.a" />
 			<Add library="../../libs/vdr/libvdr.a" />
 			<Add library="ssl" />
-			<Add library="crypt" />
 			<Add library="pthread" />
 			<Add library="rt" />
 			<Add library="pcrecpp" />
diff --git a/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout b/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout
index 130e1dc..b559e7b 100644
--- a/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout
+++ b/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout
@@ -3,7 +3,7 @@
 	<ActiveTarget name="Debug" />
 	<File name="ConnectionHandlerTest.cc" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="916" topLine="0" />
+			<Cursor1 position="156" topLine="15" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>
diff --git a/tests/CredentialPersistence/CredentialPersistence.cbp b/tests/CredentialPersistence/CredentialPersistence.cbp
index 6bb20e4..0d81a73 100644
--- a/tests/CredentialPersistence/CredentialPersistence.cbp
+++ b/tests/CredentialPersistence/CredentialPersistence.cbp
@@ -41,20 +41,14 @@
 		</Compiler>
 		<Linker>
 			<Add library="../../cmps/serverlib/libserverlib.a" />
-			<Add library="../../libs/fsScan/libfsScan.a" />
+			<Add library="../../libs/mediaScan/libmediaScan.a" />
 			<Add library="../../libs/networking/libnetworking.a" />
 			<Add library="../../libs/util/libutil.a" />
 			<Add library="../../libs/vdr/libvdr.a" />
-			<Add library="jpeg" />
 			<Add library="pthread" />
 			<Add library="dl" />
-			<Add library="cap" />
 			<Add library="rt" />
-			<Add library="fribidi" />
-			<Add library="freetype" />
-			<Add library="yajl" />
 			<Add library="ssl" />
-			<Add library="crypt" />
 		</Linker>
 		<Unit filename="CredentialPersistence.cc" />
 		<Extensions>
diff --git a/tests/FilesystemTest/FilesystemTest.cbp b/tests/FilesystemTest/FilesystemTest.cbp
index 43f5b5c..a9b8f84 100644
--- a/tests/FilesystemTest/FilesystemTest.cbp
+++ b/tests/FilesystemTest/FilesystemTest.cbp
@@ -40,15 +40,14 @@
 			<Add directory="../../libs/util/include" />
 			<Add directory="../../libs/networking/include" />
 			<Add directory="../../libs/IO/include" />
-			<Add directory="../../libs/fsScan/include" />
+			<Add directory="../../libs/mediaScan/include" />
 			<Add directory="include" />
 		</Compiler>
 		<Linker>
 			<Add library="pthread" />
 			<Add library="rt" />
 			<Add library="ssl" />
-			<Add library="crypt" />
-			<Add library="../../libs/fsScan/libfsScan.a" />
+			<Add library="../../libs/mediaScan/libmediaScan.a" />
 			<Add library="../../libs/networking/libnetworking.a" />
 			<Add library="../../libs/IO/libIO.a" />
 			<Add library="../../libs/util/libutil.a" />
diff --git a/tests/FilesystemTest/FilesystemTest.layout b/tests/FilesystemTest/FilesystemTest.layout
index d39418a..369877a 100644
--- a/tests/FilesystemTest/FilesystemTest.layout
+++ b/tests/FilesystemTest/FilesystemTest.layout
@@ -3,7 +3,7 @@
 	<ActiveTarget name="Debug" />
 	<File name="main.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="438" topLine="0" />
+			<Cursor1 position="202" topLine="0" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>
diff --git a/tests/JSonTest/JSonTest.cbp b/tests/JSonTest/JSonTest.cbp
index 3ce250a..cfbb238 100644
--- a/tests/JSonTest/JSonTest.cbp
+++ b/tests/JSonTest/JSonTest.cbp
@@ -33,27 +33,20 @@
 			<Add option="-std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration" />
 			<Add option="-D_REENTRANT" />
 			<Add option="-D_GNU_SOURCE=1" />
-			<Add directory="../../libs/fsScan/include" />
+			<Add directory="../../libs/mediaScan/include" />
 			<Add directory="../../libs/networking/include" />
 			<Add directory="../../libs/util/include" />
 			<Add directory="../../libs/vdr/include" />
 		</Compiler>
 		<Linker>
-			<Add library="../../libs/fsScan/libfsScan.a" />
+			<Add library="../../libs/mediaScan/libmediaScan.a" />
 			<Add library="../../libs/networking/libnetworking.a" />
 			<Add library="../../libs/util/libutil.a" />
 			<Add library="../../libs/vdr/libvdr.a" />
-			<Add library="jpeg" />
 			<Add library="pthread" />
 			<Add library="dl" />
-			<Add library="cap" />
 			<Add library="rt" />
-			<Add library="fribidi" />
-			<Add library="freetype" />
-			<Add library="fontconfig" />
-			<Add library="yajl" />
 			<Add library="ssl" />
-			<Add library="crypt" />
 		</Linker>
 		<Unit filename="JSonTest.cc" />
 		<Extensions>
diff --git a/tests/MetaScanTest/MetaScanTest.cbp b/tests/MetaScanTest/MetaScanTest.cbp
index 832ce4a..31b7674 100644
--- a/tests/MetaScanTest/MetaScanTest.cbp
+++ b/tests/MetaScanTest/MetaScanTest.cbp
@@ -39,14 +39,14 @@
 			<Add option="-D__STDC_CONSTANT_MACROS" />
 			<Add option="-D__STDC_FORMAT_MACROS" />
 			<Add option="-D__STDC_LIMIT_MACROS" />
-			<Add directory="../../libs/fsScan/include" />
+			<Add directory="../../libs/mediaScan/include" />
 			<Add directory="../../libs/networking/include" />
 			<Add directory="../../libs/IO/include" />
 			<Add directory="../../libs/util/include" />
 			<Add directory="../../libs/vdr/include" />
 		</Compiler>
 		<Linker>
-			<Add library="../../libs/fsScan/libfsScan.a" />
+			<Add library="../../libs/mediaScan/libmediaScan.a" />
 			<Add library="../../libs/networking/libnetworking.a" />
 			<Add library="../../libs/IO/libIO.a" />
 			<Add library="../../libs/util/libutil.a" />
diff --git a/tests/MetaScanTest/MetaScanTest.depend b/tests/MetaScanTest/MetaScanTest.depend
index aa86b49..4a9fb68 100644
--- a/tests/MetaScanTest/MetaScanTest.depend
+++ b/tests/MetaScanTest/MetaScanTest.depend
@@ -1,9 +1,11 @@
 # depslib dependency file v1.0
-1343547065 source:/d/linux/CMP/tests/MetaScanTest/main.cpp
+1343662973 source:/d/linux/CMP/tests/MetaScanTest/main.cpp
 	<File.h>
 	<FileReader.h>
 	<LineReader.h>
 	<ConfigReader.h>
+	<CommandReader.h>
+	<MediainfoReader.h>
 	<iostream>
 	<stdlib.h>
 	<string.h>
@@ -13,16 +15,33 @@
 	<unistd.h>
 	<wait.h>
 	<tr1/tuple>
+	<util.h>
 
 1343485153 /d/linux/CMP/libs/IO/include/File.h
 	<stddef.h>
 	<sys/types.h>
 
-1343485153 /d/linux/CMP/libs/IO/include/FileReader.h
+1343628880 /d/linux/CMP/libs/IO/include/FileReader.h
+	<Reader.h>
 
-1343485153 /d/linux/CMP/libs/IO/include/LineReader.h
+1343629066 /d/linux/CMP/libs/IO/include/LineReader.h
 
-1343538490 /d/linux/CMP/libs/IO/include/ConfigReader.h
+1343653800 /d/linux/CMP/libs/IO/include/ConfigReader.h
 	<tuple>
 	<string>
 
+1343628826 /d/linux/CMP/libs/IO/include/Reader.h
+
+1343629103 /d/linux/CMP/libs/IO/include/CommandReader.h
+	<Reader.h>
+	<vector>
+	<string>
+
+1343655505 /d/linux/CMP/libs/mediaScan/include/MediainfoReader.h
+	<tuple>
+	<string>
+	<vector>
+
+1343622277 /d/linux/CMP/libs/util/include/util.h
+	<stdlib.h>
+
diff --git a/tests/MetaScanTest/MetaScanTest.layout b/tests/MetaScanTest/MetaScanTest.layout
index d189d61..0daa8b2 100644
--- a/tests/MetaScanTest/MetaScanTest.layout
+++ b/tests/MetaScanTest/MetaScanTest.layout
@@ -3,7 +3,7 @@
 	<ActiveTarget name="Debug" />
 	<File name="main.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="1575" topLine="9" />
+			<Cursor1 position="2038" topLine="0" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>
diff --git a/tests/MetaScanTest/main.cpp b/tests/MetaScanTest/main.cpp
index 751186e..dcca444 100644
--- a/tests/MetaScanTest/main.cpp
+++ b/tests/MetaScanTest/main.cpp
@@ -1,14 +1,33 @@
-/*
- * File:   MetaScanTest.cc
- * Author: django
+/**
+ * ======================== legal notice ======================
  *
- * Created on 27.07.2012, 10:03
+ * File:      MetaScanTest.cc
+ * Created:   27.07.2012, 10:03
+ * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
+ * Project:   cmps - the backend (server) part of compound media player
+ *
+ * CMP - compound media player
+ *
+ * is a client/server mediaplayer intended to play any media from any workstation
+ * without the need to export or mount shares. cmps is an easy to use backend
+ * with a (ready to use) HTML-interface. Additionally the backend supports
+ * authentication via HTTP-digest authorization.
+ * cmpc is a client with vdr-like osd-menues.
+ *
+ * Copyright (c) 2012 Reinhard Mantey, some rights reserved!
+ * published under Creative Commons by-sa
+ * For details see http://creativecommons.org/licenses/by-sa/3.0/
+ *
+ * The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
+ *
+ * --------------------------------------------------------------
  */
 #include <File.h>
 #include <FileReader.h>
 #include <LineReader.h>
 #include <ConfigReader.h>
 #include <CommandReader.h>
+#include <MediainfoReader.h>
 #include <iostream>
 #include <stdlib.h>
 #include <string.h>
@@ -20,14 +39,14 @@
 #include <tr1/tuple>
 #include <util.h>
 
-static void testPipe(const char *chk = NULL);
+void testPipe(const char *chk = NULL);
 
 static void parseConfig(const char *FileName)
 {
   cConfigReader *cr = new cConfigReader(new cLineReader(new cFileReader(new cFile(FileName))));
   cConfigReader::ConfigEntry *ce;
 
-  while ((ce = cr->ReadValue())) {
+  while ((ce = cr->ReadEntry())) {
         std::cout << "config entry [" << std::get<0>(*ce) << "] => " << std::get<1>(*ce) << std::endl;
         delete ce;
         }
@@ -35,14 +54,47 @@ static void parseConfig(const char *FileName)
   delete cr;
 }
 
-static void testMediaFiles(const char *FileName)
+static void setupMediainfoReader(cMediainfoReader *mir)
+{
+  mir->AddValuableKey("Format");
+  //Audio
+  mir->AddValuableKey("Duration");
+  mir->AddValuableKey("Album");
+  mir->AddValuableKey("Track name");
+  mir->AddValuableKey("Performer");
+  mir->AddValuableKey("Bit rate");
+  //Image
+  mir->AddValuableKey("Width");
+  mir->AddValuableKey("Height");
+  //Video
+  mir->AddValuableKey("Display aspect ratio");
+  mir->AddValuableKey("Scan type");
+}
+
+static void testMediaInfo(const char *FileName)
+{
+  cCommandReader *cr = new cCommandReader("/usr/bin/mediainfo");
+  cMediainfoReader *mir = new cMediainfoReader(new cLineReader(cr));
+  cMediainfoReader::InfoEntry *ie;
+
+  cr->AddCommandParameter(FileName);
+  setupMediainfoReader(mir);
+  while ((ie = mir->ReadEntry())) {
+        std::cout << "media info - [" << std::get<0>(*ie) << "] ==> " << std::get<1>(*ie) << std::endl;
+//        delete ie;
+        }
+  mir->Close();
+  delete mir;
+}
+
+void testMediaFiles(const char *FileName)
 {
   cLineReader *lr = new cLineReader(new cFileReader(new cFile(FileName)));
   const char *line;
 
   while ((line = lr->ReadLine())) {
-        std::cout << "media-test-file: " << line << std::endl;
-        testPipe(line);
+        std::cout << std::endl << "media-test-file: " << line << std::endl;
+        testMediaInfo(line);
         }
   lr->Close();
   delete lr;
@@ -69,7 +121,7 @@ static void testCommandReader()
   delete lr;
 };
 
-static void testPipe(const char *chk)
+void testPipe(const char *chk)
 {
   int parent2Child[2];
   int child2Parent[2];
@@ -153,8 +205,8 @@ int main()
   std::cout << std::endl << "===========================================" << std::endl << std::endl;
   testCommandReader();
 
-//  std::cout << std::endl << "===========================================" << std::endl << std::endl;
-//  testMediaFiles("testMedia.files");
+  std::cout << std::endl << "===========================================" << std::endl << std::endl;
+  testMediaFiles("testMedia.files");
 
   cFile::Cleanup();
   return 0;
diff --git a/tests/StringBuilderTest/StringBuilderTest.cbp b/tests/StringBuilderTest/StringBuilderTest.cbp
index bc86f1b..b58f2b3 100644
--- a/tests/StringBuilderTest/StringBuilderTest.cbp
+++ b/tests/StringBuilderTest/StringBuilderTest.cbp
@@ -43,14 +43,13 @@
 			<Add directory="../../libs/util/include" />
 			<Add directory="../../libs/IO/include" />
 			<Add directory="../../libs/networking/include" />
-			<Add directory="../../libs/fsScan/include" />
+			<Add directory="../../libs/mediaScan/include" />
 		</Compiler>
 		<Linker>
 			<Add library="pthread" />
 			<Add library="rt" />
 			<Add library="ssl" />
-			<Add library="crypt" />
-			<Add library="../../libs/fsScan/libfsScan.a" />
+			<Add library="../../libs/mediaScan/libmediaScan.a" />
 			<Add library="../../libs/networking/libnetworking.a" />
 			<Add library="../../libs/IO/libIO.a" />
 			<Add library="../../libs/util/libutil.a" />