2.0.2: Fixed CINF command.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1466 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 9cee8d6cf6ed19a32fff44a1f39bb4208f2b5b69..aec863e885ec6ee4b4b6d7612b635b8f9fdad627 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -83,52 +83,57 @@ namespace caspar { namespace protocol {
 \r
 using namespace core;\r
 \r
+std::wstring MediaInfo(const boost::filesystem::wpath& path)\r
+{\r
+       if(boost::filesystem::is_regular_file(path))\r
+       {\r
+               std::wstring clipttype = TEXT(" N/A ");\r
+               std::wstring extension = boost::to_upper_copy(path.extension());\r
+               if(extension == TEXT(".TGA") || extension == TEXT(".COL") || extension == L".PNG" || extension == L".JPEG" || extension == L".JPG" ||\r
+                       extension == L"GIF" || extension == L"BMP")\r
+                       clipttype = TEXT(" STILL ");\r
+               else if(extension == TEXT(".SWF") || extension == TEXT(".DV") || extension == TEXT(".MOV") || extension == TEXT(".MPG") || \r
+                               extension == TEXT(".AVI") || extension == TEXT(".FLV") || extension == TEXT(".F4V") || extension == TEXT(".MP4") ||\r
+                               extension == L".M2V" || extension == L".H264" || extension == L".MKV" || extension == L".WMV" || extension == L".DIVX" || \r
+                               extension == L".XVID" || extension == L".OGG")\r
+                       clipttype = TEXT(" MOVIE ");\r
+               else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))\r
+                       clipttype = TEXT(" STILL ");\r
+\r
+               if(clipttype != TEXT(" N/A "))\r
+               {               \r
+                       auto is_not_digit = [](char c){ return std::isdigit(c) == 0; };\r
+\r
+                       auto relativePath = boost::filesystem::wpath(path.file_string().substr(env::media_folder().size()-1, path.file_string().size()));\r
+\r
+                       auto writeTimeStr = boost::posix_time::to_iso_string(boost::posix_time::from_time_t(boost::filesystem::last_write_time(path)));\r
+                       writeTimeStr.erase(std::remove_if(writeTimeStr.begin(), writeTimeStr.end(), is_not_digit), writeTimeStr.end());\r
+                       auto writeTimeWStr = std::wstring(writeTimeStr.begin(), writeTimeStr.end());\r
+\r
+                       auto sizeStr = boost::lexical_cast<std::wstring>(boost::filesystem::file_size(path));\r
+                       sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), is_not_digit), sizeStr.end());\r
+                       auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());\r
+                               \r
+                       auto str = relativePath.replace_extension(TEXT("")).external_file_string();\r
+                       if(str[0] == '\\' || str[0] == '/')\r
+                               str = std::wstring(str.begin() + 1, str.end());\r
+\r
+                       return std::wstring() + TEXT("\"") + str +\r
+                                       + TEXT("\" ") + clipttype +\r
+                                       + TEXT(" ") + sizeStr +\r
+                                       + TEXT(" ") + writeTimeWStr +\r
+                                       + TEXT("\r\n");         \r
+               }       \r
+       }\r
+       return L"";\r
+}\r
+\r
 std::wstring ListMedia()\r
 {      \r
        std::wstringstream replyString;\r
-       for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr)\r
-       {                       \r
-               if(boost::filesystem::is_regular_file(itr->path()))\r
-               {\r
-                       std::wstring clipttype = TEXT(" N/A ");\r
-                       std::wstring extension = boost::to_upper_copy(itr->path().extension());\r
-                       if(extension == TEXT(".TGA") || extension == TEXT(".COL") || extension == L".PNG" || extension == L".JPEG" || extension == L".JPG" ||\r
-                               extension == L"GIF" || extension == L"BMP")\r
-                               clipttype = TEXT(" STILL ");\r
-                       else if(extension == TEXT(".SWF") || extension == TEXT(".DV") || extension == TEXT(".MOV") || extension == TEXT(".MPG") || \r
-                                       extension == TEXT(".AVI") || extension == TEXT(".FLV") || extension == TEXT(".F4V") || extension == TEXT(".MP4") ||\r
-                                       extension == L".M2V" || extension == L".H264" || extension == L".MKV" || extension == L".WMV" || extension == L".DIVX" || \r
-                                       extension == L".XVID" || extension == L".OGG")\r
-                               clipttype = TEXT(" MOVIE ");\r
-                       else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))\r
-                               clipttype = TEXT(" STILL ");\r
-\r
-                       if(clipttype != TEXT(" N/A "))\r
-                       {               \r
-                               auto is_not_digit = [](char c){ return std::isdigit(c) == 0; };\r
-\r
-                               auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::media_folder().size()-1, itr->path().file_string().size()));\r
-\r
-                               auto writeTimeStr = boost::posix_time::to_iso_string(boost::posix_time::from_time_t(boost::filesystem::last_write_time(itr->path())));\r
-                               writeTimeStr.erase(std::remove_if(writeTimeStr.begin(), writeTimeStr.end(), is_not_digit), writeTimeStr.end());\r
-                               auto writeTimeWStr = std::wstring(writeTimeStr.begin(), writeTimeStr.end());\r
-\r
-                               auto sizeStr = boost::lexical_cast<std::wstring>(boost::filesystem::file_size(itr->path()));\r
-                               sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), is_not_digit), sizeStr.end());\r
-                               auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());\r
-                               \r
-                               auto str = relativePath.replace_extension(TEXT("")).external_file_string();\r
-                               if(str[0] == '\\' || str[0] == '/')\r
-                                       str = std::wstring(str.begin() + 1, str.end());\r
-\r
-                               replyString << TEXT("\"") << str\r
-                                                       << TEXT("\" ") << clipttype \r
-                                                       << TEXT(" ") << sizeStr\r
-                                                       << TEXT(" ") << writeTimeWStr\r
-                                                       << TEXT("\r\n");        \r
-                       }       \r
-               }\r
-       }\r
+       for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr) \r
+               replyString << MediaInfo(itr->path());\r
+       \r
        return boost::to_upper_copy(replyString.str());\r
 }\r
 \r
@@ -196,11 +201,16 @@ bool ParamCommand::DoExecute()
        //Perform loading of the clip\r
        try\r
        {\r
-               auto what = _parameters.at(2);\r
+               auto what = _parameters.at(0);\r
+\r
+               std::wstring param = _parameters2.at(1);\r
+               for(auto it = std::begin(_parameters2)+2; it != std::end(_parameters2); ++it)\r
+                       param += L" " + *it;\r
+\r
                if(what == L"B")\r
-                       GetChannel()->stage()->background(GetLayerIndex()).get()->param(_parameters.at(3));\r
+                       GetChannel()->stage()->background(GetLayerIndex()).get()->param(param);\r
                else if(what == L"F")\r
-                       GetChannel()->stage()->foreground(GetLayerIndex()).get()->param(_parameters.at(3));\r
+                       GetChannel()->stage()->foreground(GetLayerIndex()).get()->param(param);\r
        \r
                CASPAR_LOG(info) << "Executed param: " <<  _parameters[0] << TEXT(" successfully");\r
 \r
@@ -765,7 +775,7 @@ bool StatusCommand::DoExecute()
                auto status = GetChannel()->stage()->get_status(GetLayerIndex());\r
                std::wstringstream status_text;\r
                status_text\r
-                       << L"202 STATUS OK\r\n"\r
+                       << L"200 STATUS OK\r\n"\r
                        << L"FOREGROUND:"               << status.foreground << L"\r\n"\r
                        << L"BACKGROUND:"               << status.background << L"\r\n"\r
                        << L"STATUS:"                   << (status.is_paused ? L"PAUSED" : L"PLAYING") << L"\r\n"\r
@@ -1208,30 +1218,34 @@ bool DataCommand::DoExecuteList()
 bool CinfCommand::DoExecute()\r
 {\r
        std::wstringstream replyString;\r
+       \r
+       try\r
+       {\r
+               std::wstring info;\r
+               for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr)\r
+               {\r
+                       auto path = itr->path();\r
+                       auto file = path.replace_extension(L"").filename();\r
+                       if(boost::iequals(file, _parameters.at(0)))\r
+                               info += MediaInfo(itr->path()) + L"\r\n";\r
+               }\r
 \r
-       std::wstring filename = _parameters[0];\r
-\r
-       // TODO:\r
-\r
-       //FileInfo fileInfo;\r
-\r
-       //MediaManagerPtr pMediaManager = GetApplication()->FindMediaFile(filename, &fileInfo);\r
-       //if(pMediaManager != 0 && fileInfo.filetype.length() >0)       //File was found\r
-       //{\r
-       //      if(pMediaManager->getFileInfo(&fileInfo))\r
-       //      {\r
-       //              TCHAR numBuffer[32];\r
-       //              _ui64tot_s(fileInfo.size, numBuffer, 32, 10);\r
-\r
-       //              replyString << TEXT("201 CINF OK\r\n\"") << fileInfo.filename << TEXT("\" ") << fileInfo.type << TEXT("/") << fileInfo.filetype << TEXT("/") << fileInfo.encoding << TEXT(" ") << numBuffer << TEXT("\r\n");\r
-\r
-       //              SetReplyString(replyString.str());\r
-       //              return true;\r
-       //      }\r
-       //}\r
-\r
-       SetReplyString(TEXT("404 CINF ERROR\r\n"));\r
-       return false;\r
+               if(info.empty())\r
+               {\r
+                       SetReplyString(TEXT("404 CINF ERROR\r\n"));\r
+                       return false;\r
+               }\r
+               replyString << TEXT("200 INFO OK\r\n");\r
+               replyString << info << "\r\n";\r
+       }\r
+       catch(...)\r
+       {\r
+               SetReplyString(TEXT("404 CINF ERROR\r\n"));\r
+               return false;\r
+       }\r
+       \r
+       SetReplyString(replyString.str());\r
+       return true;\r
 }\r
 \r
 void GenerateChannelInfo(int index, const safe_ptr<core::video_channel>& pChannel, std::wstringstream& replyString)\r
@@ -1241,32 +1255,30 @@ void GenerateChannelInfo(int index, const safe_ptr<core::video_channel>& pChanne
 \r
 bool InfoCommand::DoExecute()\r
 {\r
-       std::wstringstream replyString;\r
-\r
-       if(_parameters.size() >= 1)\r
+       try\r
        {\r
-               int channelIndex = _ttoi(_parameters[0].c_str())-1;\r
-\r
-               if(channelIndex < channels_.size())\r
+               std::wstringstream replyString;\r
+               if(_parameters.size() >= 1)\r
                {\r
+                       int channelIndex = _ttoi(_parameters.at(0).c_str())-1;\r
                        replyString << TEXT("201 INFO OK\r\n");\r
-                       GenerateChannelInfo(channelIndex, channels_[channelIndex], replyString);\r
+                       GenerateChannelInfo(channelIndex, channels_.at(channelIndex), replyString);\r
                }\r
                else\r
                {\r
-                       SetReplyString(TEXT("401 INFO ERROR\r\n"));\r
-                       return false;\r
+                       replyString << TEXT("200 INFO OK\r\n");\r
+                       for(size_t n = 0; n < channels_.size(); ++n)\r
+                               GenerateChannelInfo(n, channels_[n], replyString);\r
+                       replyString << TEXT("\r\n");\r
                }\r
+               SetReplyString(replyString.str());\r
        }\r
-       else\r
+       catch(...)\r
        {\r
-               replyString << TEXT("200 INFO OK\r\n");\r
-               for(size_t n = 0; n < channels_.size(); ++n)\r
-                       GenerateChannelInfo(n, channels_[n], replyString);\r
-               replyString << TEXT("\r\n");\r
+               SetReplyString(TEXT("401 INFO ERROR\r\n"));\r
+               return false;\r
        }\r
 \r
-       SetReplyString(replyString.str());\r
        return true;\r
 }\r
 \r