worked out new file class

9 files changed, 107 insertions, 12 deletions

diff --git a/cmps/tests/CodecTest.cc b/cmps/tests/CodecTest.cc
index 071ff7b..3403810 100644
--- a/cmps/tests/CodecTest.cc
+++ b/cmps/tests/CodecTest.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      CodecTest.cc
- * Created:   09.07.2012, 05:44:50
+ * Created:   09.07.2012, 05
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
@@ -35,6 +35,10 @@ static const char *TT[] = {
 , "http://localhost:12345/test/Mukke/36%20%20%20130%20-%20R.I.O.%20ft%20Jerry%20Ropero%20vs.%20Mendonca%20-%20Do%20Rio-De%20Janeiro%20Berinbau%20(Bootleg%20Edit).mp3"
 , "http://localhost:12345/import/Das_Verm%C3%A4chtnis_der_Tempelritter/2012-07-02.22.10.36-0.rec"
 , NULL
+, "file:///media/audio/Collection/Rock/XIII. Století/Vampire Songs: Tajemství gothických archivů/(1 - 05) Smutné časy.mp3"
+, "file:///media/audio/Collection/Rock/XIII. Století/Vampire Songs: Tajemství gothických archivů/(1 - 06) Starý hrabě.mp3"
+, "file:///media/audio/Collection/Rock/XIII. Století/Nosferatu/(1 - 03) Nevěsta temnot.mp3"
+, NULL
 };
 
 void test1()
@@ -54,6 +58,20 @@ void test1()
 void test2()
 {
   std::cout << "CodecTest test 2" << std::endl;
+  cURLEncoder *ue = new cURLEncoder();
+  const char **p;
+  char *newText;
+
+  for (p = TT + 8; p && *p; ++p) {
+      newText = ue->Encode(*p);
+      std::cout << "original: " << *p << std::endl;
+      std::cout << "encoded.: " << newText << std::endl << std::endl;
+      }
+}
+
+void test3()
+{
+  std::cout << "CodecTest test 3" << std::endl;
   std::cout << "%TEST_FAILED% time=0 testname=test2 (CodecTest) message=error message sample" << std::endl;
 }
 
@@ -66,9 +84,9 @@ int main(int argc, char** argv)
   test1();
   std::cout << "%TEST_FINISHED% time=0 test1 (CodecTest)" << std::endl;
 
-//  std::cout << "%TEST_STARTED% test2 (CodecTest)\n" << std::endl;
-//  test2();
-//  std::cout << "%TEST_FINISHED% time=0 test2 (CodecTest)" << std::endl;
+  std::cout << "%TEST_STARTED% test2 (CodecTest)\n" << std::endl;
+  test2();
+  std::cout << "%TEST_FINISHED% time=0 test2 (CodecTest)" << std::endl;
 
   std::cout << "%SUITE_FINISHED% time=0" << std::endl;
 
diff --git a/cmps/tests/ConnectionHandlerTest.cc b/cmps/tests/ConnectionHandlerTest.cc
index e32fbb3..6e0257b 100644
--- a/cmps/tests/ConnectionHandlerTest.cc
+++ b/cmps/tests/ConnectionHandlerTest.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      ConnectionHandlerTest.cc
- * Created:   10.07.2012, 05:48:23
+ * Created:   10.07.2012, 05
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
diff --git a/cmps/tests/DirTest.cc b/cmps/tests/DirTest.cc
index 4a1f1a7..b6270a9 100644
--- a/cmps/tests/DirTest.cc
+++ b/cmps/tests/DirTest.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      DirTest.cc
- * Created:   02.07.2012, 18:07:18
+ * Created:   02.07.2012, 18
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
diff --git a/cmps/tests/FScanTest.cc b/cmps/tests/FScanTest.cc
index 86f0895..2684557 100644
--- a/cmps/tests/FScanTest.cc
+++ b/cmps/tests/FScanTest.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      FScanTest.cc
- * Created:   02.07.2012, 16:57:48
+ * Created:   02.07.2012, 16
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
@@ -77,7 +77,7 @@ void FScanTest::test4()
   cAbstractMedia *media;
 
   std::cout << "FScanTest test 4" << std::endl;
-  scanner.SetMediaFactory(new cMediaFactory("/media"));
+  scanner.SetMediaFactory(new cMediaFactory("/media/video"));
 
   uint64_t start = cTimeMs::Now();
   scanner.Refresh();
diff --git a/cmps/tests/FileSystemTest.cc b/cmps/tests/FileSystemTest.cc
new file mode 100644
index 0000000..99a76d0
--- /dev/null
+++ b/cmps/tests/FileSystemTest.cc
@@ -0,0 +1,77 @@
+/**
+ * ======================== legal notice ======================
+ * 
+ * File:      FileSystemTest.cc
+ * Created:   21.07.2012, 12:40:48
+ * 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 <stdlib.h>
+#include <iostream>
+#include <FileSystem.h>
+#include <File.h>
+
+/*
+ * Simple C++ Test Suite
+ */
+
+void test1()
+{
+  std::cout << "FileSystemTest test 1" << std::endl;
+  cFile *f = new cFile("/media/xchange/");
+
+  std::cout << "got file: " << f->AbsolutePath() << std::endl;
+
+  cFile *other = f->Parent();
+
+  std::cout << "parent is file: " << other->AbsolutePath() << std::endl;
+
+  cFile *newOne = new cFile(*other, "/video/test/blah");
+
+  std::cout << "assembled file: " << newOne->AbsolutePath() << std::endl;
+
+  delete newOne;
+  delete other;
+  delete f;
+}
+
+void test2()
+{
+  std::cout << "FileSystemTest test 2" << std::endl;
+  std::cout << "%TEST_FAILED% time=0 testname=test2 (FileSystemTest) message=error message sample" << std::endl;
+}
+
+int main(int argc, char** argv)
+{
+  std::cout << "%SUITE_STARTING% FileSystemTest" << std::endl;
+  std::cout << "%SUITE_STARTED%" << std::endl;
+
+  std::cout << "%TEST_STARTED% test1 (FileSystemTest)" << std::endl;
+  test1();
+  std::cout << "%TEST_FINISHED% time=0 test1 (FileSystemTest)" << std::endl;
+
+  std::cout << "%TEST_STARTED% test2 (FileSystemTest)\n" << std::endl;
+  test2();
+  std::cout << "%TEST_FINISHED% time=0 test2 (FileSystemTest)" << std::endl;
+
+  std::cout << "%SUITE_FINISHED% time=0" << std::endl;
+
+  return (EXIT_SUCCESS);
+}
+
diff --git a/cmps/tests/JSonTest.cc b/cmps/tests/JSonTest.cc
index 21fc394..422a845 100644
--- a/cmps/tests/JSonTest.cc
+++ b/cmps/tests/JSonTest.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      JSonTest.cc
- * Created:   12.07.2012, 07:31:46
+ * Created:   12.07.2012, 07
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
diff --git a/cmps/tests/StringBuilderTest.cc b/cmps/tests/StringBuilderTest.cc
index 4a0443b..bb07d2e 100644
--- a/cmps/tests/StringBuilderTest.cc
+++ b/cmps/tests/StringBuilderTest.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      StringBuilderTest.cc
- * Created:   06.07.2012, 18:28:08
+ * Created:   06.07.2012, 18
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
diff --git a/cmps/tests/URLTest.cc b/cmps/tests/URLTest.cc
index 9dc69c3..5f13ca0 100644
--- a/cmps/tests/URLTest.cc
+++ b/cmps/tests/URLTest.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      URLTest.cc
- * Created:   04.07.2012, 09:25:57
+ * Created:   04.07.2012, 09
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
diff --git a/cmps/tests/UTF8Test.cc b/cmps/tests/UTF8Test.cc
index 70c7cc1..fa417b8 100644
--- a/cmps/tests/UTF8Test.cc
+++ b/cmps/tests/UTF8Test.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      UTF8Test.cc
- * Created:   05.07.2012, 15:19:07
+ * Created:   05.07.2012, 15
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  *