From ab7186c6c116629983dc506c4b53794026518455 Mon Sep 17 00:00:00 2001 From: geronimo Date: Sun, 22 Jul 2012 11:38:43 +0200 Subject: worked out new file class --- cmps/serverlib/include/AbstractMediaRequestHandler.h | 2 +- cmps/serverlib/include/CommandHandler.h | 2 +- cmps/serverlib/include/HTMLListAssembler.h | 2 +- cmps/serverlib/include/HTTPMediaResponse.h | 2 +- cmps/serverlib/include/JSonListAssembler.h | 14 +++++++------- cmps/serverlib/include/MediaFileHandler.h | 2 +- cmps/serverlib/include/MediaListHandler.h | 2 +- cmps/serverlib/serverlib.layout | 12 ++++++------ cmps/serverlib/serverlib.layout.save | 10 +++++----- cmps/serverlib/src/AbstractMediaRequestHandler.cc | 2 +- cmps/serverlib/src/CommandHandler.cc | 2 +- cmps/serverlib/src/HTMLListAssembler.cc | 8 ++++++-- cmps/serverlib/src/HTTPMediaResponse.cc | 2 +- cmps/serverlib/src/JSonListAssembler.cc | 20 ++++++++++++-------- cmps/serverlib/src/MediaFileHandler.cc | 2 +- cmps/serverlib/src/MediaListHandler.cc | 2 +- 16 files changed, 47 insertions(+), 39 deletions(-) (limited to 'cmps/serverlib') diff --git a/cmps/serverlib/include/AbstractMediaRequestHandler.h b/cmps/serverlib/include/AbstractMediaRequestHandler.h index ff57e33..f92e87c 100644 --- a/cmps/serverlib/include/AbstractMediaRequestHandler.h +++ b/cmps/serverlib/include/AbstractMediaRequestHandler.h @@ -2,7 +2,7 @@ * ======================== legal notice ====================== * * File: AbstractMediaRequestHandler.h - * Created: 5. Juli 2012, 07:58 + * Created: 5. Juli 2012, 07 * Author: Geronimo * Project: cmps - the backend (server) part of compound media player * diff --git a/cmps/serverlib/include/CommandHandler.h b/cmps/serverlib/include/CommandHandler.h index 42436da..ee4ddbb 100644 --- a/cmps/serverlib/include/CommandHandler.h +++ b/cmps/serverlib/include/CommandHandler.h @@ -2,7 +2,7 @@ * ======================== legal notice ====================== * * File: CommandHandler.h - * Created: 5. Juli 2012, 16:06 + * Created: 5. Juli 2012, 16 * Author: Geronimo * Project: cmps - the backend (server) part of compound media player * diff --git a/cmps/serverlib/include/HTMLListAssembler.h b/cmps/serverlib/include/HTMLListAssembler.h index d53d861..8450130 100644 --- a/cmps/serverlib/include/HTMLListAssembler.h +++ b/cmps/serverlib/include/HTMLListAssembler.h @@ -2,7 +2,7 @@ * ======================== legal notice ====================== * * File: HTMLListAssembler.h - * Created: 6. Juli 2012, 09:55 + * Created: 6. Juli 2012, 09 * Author: Geronimo * Project: cmps - the backend (server) part of compound media player * diff --git a/cmps/serverlib/include/HTTPMediaResponse.h b/cmps/serverlib/include/HTTPMediaResponse.h index 1c7827e..b1ac4ca 100644 --- a/cmps/serverlib/include/HTTPMediaResponse.h +++ b/cmps/serverlib/include/HTTPMediaResponse.h @@ -2,7 +2,7 @@ * ======================== legal notice ====================== * * File: HTTPMediaResponse.h - * Created: 6. Juli 2012, 07:44 + * Created: 6. Juli 2012, 07 * Author: Geronimo * Project: cmps - the backend (server) part of compound media player * diff --git a/cmps/serverlib/include/JSonListAssembler.h b/cmps/serverlib/include/JSonListAssembler.h index 6185508..463c391 100644 --- a/cmps/serverlib/include/JSonListAssembler.h +++ b/cmps/serverlib/include/JSonListAssembler.h @@ -1,25 +1,25 @@ /** * ======================== legal notice ====================== - * + * * File: JSonListAssembler.h - * Created: 6. Juli 2012, 09:53 + * Created: 6. Juli 2012, 09 * Author: Geronimo * 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 - * + * * -------------------------------------------------------------- */ #ifndef JSONLISTASSEMBLER_H diff --git a/cmps/serverlib/include/MediaFileHandler.h b/cmps/serverlib/include/MediaFileHandler.h index 01c7b83..81836d0 100644 --- a/cmps/serverlib/include/MediaFileHandler.h +++ b/cmps/serverlib/include/MediaFileHandler.h @@ -2,7 +2,7 @@ * ======================== legal notice ====================== * * File: MediaFileHandler.h - * Created: 5. Juli 2012, 08:06 + * Created: 5. Juli 2012, 08 * Author: Geronimo * Project: cmps - the backend (server) part of compound media player * diff --git a/cmps/serverlib/include/MediaListHandler.h b/cmps/serverlib/include/MediaListHandler.h index cc3127c..1662cc8 100644 --- a/cmps/serverlib/include/MediaListHandler.h +++ b/cmps/serverlib/include/MediaListHandler.h @@ -2,7 +2,7 @@ * ======================== legal notice ====================== * * File: MediaListHandler.h - * Created: 5. Juli 2012, 08:06 + * Created: 5. Juli 2012, 08 * Author: Geronimo * Project: cmps - the backend (server) part of compound media player * diff --git a/cmps/serverlib/serverlib.layout b/cmps/serverlib/serverlib.layout index d8fea17..cff8ff9 100644 --- a/cmps/serverlib/serverlib.layout +++ b/cmps/serverlib/serverlib.layout @@ -1,24 +1,24 @@ - + - + - + - + - + - + diff --git a/cmps/serverlib/serverlib.layout.save b/cmps/serverlib/serverlib.layout.save index 6d13f5b..cff8ff9 100644 --- a/cmps/serverlib/serverlib.layout.save +++ b/cmps/serverlib/serverlib.layout.save @@ -1,22 +1,22 @@ - + - + - + - + - + diff --git a/cmps/serverlib/src/AbstractMediaRequestHandler.cc b/cmps/serverlib/src/AbstractMediaRequestHandler.cc index b65ad13..ad845b6 100644 --- a/cmps/serverlib/src/AbstractMediaRequestHandler.cc +++ b/cmps/serverlib/src/AbstractMediaRequestHandler.cc @@ -2,7 +2,7 @@ * ======================== legal notice ====================== * * File: AbstractMediaRequestHandler.cc - * Created: 5. Juli 2012, 07:58 + * Created: 5. Juli 2012, 07 * Author: Geronimo * Project: cmps - the backend (server) part of compound media player * diff --git a/cmps/serverlib/src/CommandHandler.cc b/cmps/serverlib/src/CommandHandler.cc index b1a17b8..5449d25 100644 --- a/cmps/serverlib/src/CommandHandler.cc +++ b/cmps/serverlib/src/CommandHandler.cc @@ -2,7 +2,7 @@ * ======================== legal notice ====================== * * File: CommandHandler.cc - * Created: 5. Juli 2012, 16:06 + * Created: 5. Juli 2012, 16 * Author: Geronimo * Project: cmps - the backend (server) part of compound media player * diff --git a/cmps/serverlib/src/HTMLListAssembler.cc b/cmps/serverlib/src/HTMLListAssembler.cc index 8ef3261..c455fc1 100644 --- a/cmps/serverlib/src/HTMLListAssembler.cc +++ b/cmps/serverlib/src/HTMLListAssembler.cc @@ -2,7 +2,7 @@ * ======================== legal notice ====================== * * File: HTMLListAssembler.cc - * Created: 6. Juli 2012, 09:55 + * Created: 6. Juli 2012, 09 * Author: Geronimo * Project: cmps - the backend (server) part of compound media player * @@ -25,6 +25,7 @@ #include #include #include +#include #include cHTMLListAssembler::cHTMLListAssembler() @@ -97,11 +98,14 @@ cStringBuilder &cHTMLListAssembler::genDelim(cStringBuilder &sb) cStringBuilder &cHTMLListAssembler::genMediaLink(cStringBuilder &sb, void *Element, bool odd) { cAbstractMedia *m = (cAbstractMedia *)Element; + cUrl *uri = new cUrl(m->LogicalPath()); + char *lp = uri->ToString(); sb.Append("LogicalPath()); + sb.Append(lp); + free(lp); sb.Append("\">"); switch (m->MediaType()) { case cAbstractMedia::Audio: sb.Append("[A] "); break; diff --git a/cmps/serverlib/src/HTTPMediaResponse.cc b/cmps/serverlib/src/HTTPMediaResponse.cc index 667d114..ca08576 100644 --- a/cmps/serverlib/src/HTTPMediaResponse.cc +++ b/cmps/serverlib/src/HTTPMediaResponse.cc @@ -2,7 +2,7 @@ * ======================== legal notice ====================== * * File: HTTPMediaResponse.cc - * Created: 6. Juli 2012, 07:44 + * Created: 6. Juli 2012, 07 * Author: Geronimo * Project: cmps - the backend (server) part of compound media player * diff --git a/cmps/serverlib/src/JSonListAssembler.cc b/cmps/serverlib/src/JSonListAssembler.cc index 8660953..f49b8ec 100644 --- a/cmps/serverlib/src/JSonListAssembler.cc +++ b/cmps/serverlib/src/JSonListAssembler.cc @@ -1,30 +1,31 @@ /** * ======================== legal notice ====================== - * + * * File: JSonListAssembler.cc - * Created: 6. Juli 2012, 09:53 + * Created: 6. Juli 2012, 09 * Author: Geronimo * 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 #include #include +#include cJSonListAssembler::cJSonListAssembler() { @@ -57,11 +58,14 @@ bool cJSonListAssembler::OpenList(cStringBuilder &sb, std::map &Cat bool cJSonListAssembler::AddElement(cStringBuilder &sb, void *ListElement, bool odd) { cAbstractMedia *m = (cAbstractMedia *)ListElement; + cUrl *uri = new cUrl(m->LogicalPath()); + char *lp = uri->ToString(); writer->Object(); writer->Key("name").Value(m->Name()); writer->Key("type").Value(m->MediaType()); - writer->Key("path").Value(m->LogicalPath()); + writer->Key("path").Value(lp); + free(lp); writer->EndObject(); return true; diff --git a/cmps/serverlib/src/MediaFileHandler.cc b/cmps/serverlib/src/MediaFileHandler.cc index d16a033..b2e97a3 100644 --- a/cmps/serverlib/src/MediaFileHandler.cc +++ b/cmps/serverlib/src/MediaFileHandler.cc @@ -2,7 +2,7 @@ * ======================== legal notice ====================== * * File: MediaFileHandler.cc - * Created: 5. Juli 2012, 08:06 + * Created: 5. Juli 2012, 08 * Author: Geronimo * Project: cmps - the backend (server) part of compound media player * diff --git a/cmps/serverlib/src/MediaListHandler.cc b/cmps/serverlib/src/MediaListHandler.cc index 029c137..cdb2b21 100644 --- a/cmps/serverlib/src/MediaListHandler.cc +++ b/cmps/serverlib/src/MediaListHandler.cc @@ -2,7 +2,7 @@ * ======================== legal notice ====================== * * File: MediaListHandler.cc - * Created: 5. Juli 2012, 08:06 + * Created: 5. Juli 2012, 08 * Author: Geronimo * Project: cmps - the backend (server) part of compound media player * -- cgit v1.2.3