/[svn]/linuxsampler/trunk/src/network/lscpserver.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/network/lscpserver.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1161 by iliev, Mon Apr 16 15:51:18 2007 UTC revision 1345 by iliev, Thu Sep 13 21:46:25 2007 UTC
# Line 52  Line 52 
52  fd_set LSCPServer::fdSet;  fd_set LSCPServer::fdSet;
53  int LSCPServer::currentSocket = -1;  int LSCPServer::currentSocket = -1;
54  std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();  std::vector<yyparse_param_t> LSCPServer::Sessions = std::vector<yyparse_param_t>();
55    std::vector<yyparse_param_t>::iterator itCurrentSession = std::vector<yyparse_param_t>::iterator();
56  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedNotifies = std::map<int,String>();
57  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();  std::map<int,String> LSCPServer::bufferedCommands = std::map<int,String>();
58  std::map< LSCPEvent::event_t, std::list<int> > LSCPServer::eventSubscriptions = std::map< LSCPEvent::event_t, std::list<int> >();  std::map< LSCPEvent::event_t, std::list<int> > LSCPServer::eventSubscriptions = std::map< LSCPEvent::event_t, std::list<int> >();
# Line 84  LSCPServer::LSCPServer(Sampler* pSampler Line 85  LSCPServer::LSCPServer(Sampler* pSampler
85      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_dir_info, "DB_INSTRUMENT_DIRECTORY_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_dir_info, "DB_INSTRUMENT_DIRECTORY_INFO");
86      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_count, "DB_INSTRUMENT_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_count, "DB_INSTRUMENT_COUNT");
87      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_db_instr_info, "DB_INSTRUMENT_INFO");
88        LSCPEvent::RegisterEvent(LSCPEvent::event_db_instrs_job_info, "DB_INSTRUMENTS_JOB_INFO");
89      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
90      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_total_voice_count, "TOTAL_VOICE_COUNT");
91      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_global_info, "GLOBAL_INFO");
# Line 144  void LSCPServer::EventHandler::TotalVoic Line 146  void LSCPServer::EventHandler::TotalVoic
146    
147  #if HAVE_SQLITE3  #if HAVE_SQLITE3
148  void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryCountChanged(String Dir) {
149      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, Dir));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_count, InstrumentsDb::toEscapedPath(Dir)));
150  }  }
151    
152  void LSCPServer::DbInstrumentsEventHandler::DirectoryInfoChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryInfoChanged(String Dir) {
153      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, Dir));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, InstrumentsDb::toEscapedPath(Dir)));
154  }  }
155    
156  void LSCPServer::DbInstrumentsEventHandler::DirectoryNameChanged(String Dir, String NewName) {  void LSCPServer::DbInstrumentsEventHandler::DirectoryNameChanged(String Dir, String NewName) {
157      Dir = "'" + Dir + "'";      Dir = "'" + InstrumentsDb::toEscapedPath(Dir) + "'";
158      NewName = "'" + NewName + "'";      NewName = "'" + InstrumentsDb::toEscapedName(NewName) + "'";
159      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, "NAME", Dir, NewName));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_dir_info, "NAME", Dir, NewName));
160  }  }
161    
162  void LSCPServer::DbInstrumentsEventHandler::InstrumentCountChanged(String Dir) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentCountChanged(String Dir) {
163      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_count, Dir));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_count, InstrumentsDb::toEscapedPath(Dir)));
164  }  }
165    
166  void LSCPServer::DbInstrumentsEventHandler::InstrumentInfoChanged(String Instr) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentInfoChanged(String Instr) {
167      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, Instr));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, InstrumentsDb::toEscapedPath(Instr)));
168  }  }
169    
170  void LSCPServer::DbInstrumentsEventHandler::InstrumentNameChanged(String Instr, String NewName) {  void LSCPServer::DbInstrumentsEventHandler::InstrumentNameChanged(String Instr, String NewName) {
171      Instr = "'" + Instr + "'";      Instr = "'" + InstrumentsDb::toEscapedPath(Instr) + "'";
172      NewName = "'" + NewName + "'";      NewName = "'" + InstrumentsDb::toEscapedName(NewName) + "'";
173      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, "NAME", Instr, NewName));      LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instr_info, "NAME", Instr, NewName));
174  }  }
175    
176    void LSCPServer::DbInstrumentsEventHandler::JobStatusChanged(int JobId) {
177        LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_db_instrs_job_info, JobId));
178    }
179  #endif // HAVE_SQLITE3  #endif // HAVE_SQLITE3
180    
181    
# Line 212  int LSCPServer::Main() { Line 219  int LSCPServer::Main() {
219    
220      listen(hSocket, 1);      listen(hSocket, 1);
221      Initialized.Set(true);      Initialized.Set(true);
222        
223      // Registering event listeners      // Registering event listeners
224      pSampler->AddChannelCountListener(&eventHandler);      pSampler->AddChannelCountListener(&eventHandler);
225      pSampler->AddAudioDeviceCountListener(&eventHandler);      pSampler->AddAudioDeviceCountListener(&eventHandler);
# Line 321  int LSCPServer::Main() { Line 328  int LSCPServer::Main() {
328                                  int dummy; // just a temporary hack to fulfill the restart() function prototype                                  int dummy; // just a temporary hack to fulfill the restart() function prototype
329                                  restart(NULL, dummy); // restart the 'scanner'                                  restart(NULL, dummy); // restart the 'scanner'
330                                  currentSocket = (*iter).hSession;  //a hack                                  currentSocket = (*iter).hSession;  //a hack
331                                    itCurrentSession = iter; // another hack
332                                  dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));                                  dmsg(2,("LSCPServer: [%s]\n",bufferedCommands[currentSocket].c_str()));
333                                  if ((*iter).bVerbose) { // if echo mode enabled                                  if ((*iter).bVerbose) { // if echo mode enabled
334                                      AnswerClient(bufferedCommands[currentSocket]);                                      AnswerClient(bufferedCommands[currentSocket]);
335                                  }                                  }
336                                  int result = yyparse(&(*iter));                                  int result = yyparse(&(*iter));
337                                  currentSocket = -1;     //continuation of a hack                                  currentSocket = -1;     //continuation of a hack
338                                    itCurrentSession = Sessions.end(); // hack as well
339                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));                                  dmsg(3,("LSCPServer: Done parsing on socket %d.\n", currentSocket));
340                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?                                  if (result == LSCP_QUIT) { //Was it a quit command by any chance?
341                                          CloseConnection(iter);                                          CloseConnection(iter);
# Line 419  extern int GetLSCPCommand( void *buf, in Line 428  extern int GetLSCPCommand( void *buf, in
428          return command.size();          return command.size();
429  }  }
430    
431    extern yyparse_param_t* GetCurrentYaccSession() {
432        return &(*itCurrentSession);
433    }
434    
435  /**  /**
436   * Will be called to try to read the command from the socket   * Will be called to try to read the command from the socket
437   * If command is read, it will return true. Otherwise false is returned.   * If command is read, it will return true. Otherwise false is returned.
# Line 606  EngineChannel* LSCPServer::GetEngineChan Line 619  EngineChannel* LSCPServer::GetEngineChan
619      EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();      EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
620      if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");      if (!pEngineChannel) throw Exception("There is no engine deployed on this sampler channel yet");
621    
622      return pEngineChannel;              return pEngineChannel;
623  }  }
624    
625  /**  /**
# Line 1993  String LSCPServer::CreateFxSend(uint uiS Line 2006  String LSCPServer::CreateFxSend(uint uiS
2006      LSCPResultSet result;      LSCPResultSet result;
2007      try {      try {
2008          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
2009            
2010          FxSend* pFxSend = pEngineChannel->AddFxSend(MidiCtrl, Name);          FxSend* pFxSend = pEngineChannel->AddFxSend(MidiCtrl, Name);
2011          if (!pFxSend) throw Exception("Could not add FxSend, don't ask, I don't know why (probably a bug)");          if (!pFxSend) throw Exception("Could not add FxSend, don't ask, I don't know why (probably a bug)");
2012    
# Line 2077  String LSCPServer::GetFxSendInfo(uint ui Line 2090  String LSCPServer::GetFxSendInfo(uint ui
2090      try {      try {
2091          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);          EngineChannel* pEngineChannel = GetEngineChannel(uiSamplerChannel);
2092          FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);          FxSend* pFxSend = GetFxSend(uiSamplerChannel, FxSendID);
2093            
2094          // gather audio routing informations          // gather audio routing informations
2095          String AudioRouting;          String AudioRouting;
2096          for (int chan = 0; chan < pEngineChannel->Channels(); chan++) {          for (int chan = 0; chan < pEngineChannel->Channels(); chan++) {
# Line 2152  String LSCPServer::SetFxSendLevel(uint u Line 2165  String LSCPServer::SetFxSendLevel(uint u
2165      return result.Produce();      return result.Produce();
2166  }  }
2167    
2168    String LSCPServer::EditSamplerChannelInstrument(uint uiSamplerChannel) {
2169        dmsg(2,("LSCPServer: EditSamplerChannelInstrument(SamplerChannel=%d)\n", uiSamplerChannel));
2170        LSCPResultSet result;
2171        try {
2172            SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
2173            if (!pSamplerChannel) throw Exception("Invalid sampler channel number " + ToString(uiSamplerChannel));
2174            EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
2175            if (!pEngineChannel) throw Exception("No engine type assigned to sampler channel");
2176            if (pEngineChannel->InstrumentStatus() < 0) throw Exception("No instrument loaded to sampler channel");
2177            Engine* pEngine = pEngineChannel->GetEngine();
2178            InstrumentManager* pInstrumentManager = pEngine->GetInstrumentManager();
2179            if (!pInstrumentManager) throw Exception("Engine does not provide an instrument manager");
2180            InstrumentManager::instrument_id_t instrumentID;
2181            instrumentID.FileName = pEngineChannel->InstrumentFileName();
2182            instrumentID.Index    = pEngineChannel->InstrumentIndex();
2183            pInstrumentManager->LaunchInstrumentEditor(instrumentID);
2184        } catch (Exception e) {
2185            result.Error(e);
2186        }
2187        return result.Produce();
2188    }
2189    
2190  /**  /**
2191   * Will be called by the parser to reset a particular sampler channel.   * Will be called by the parser to reset a particular sampler channel.
2192   */   */
# Line 2196  String LSCPServer::GetServerInfo() { Line 2231  String LSCPServer::GetServerInfo() {
2231  #else  #else
2232      result.Add("INSTRUMENTS_DB_SUPPORT", "no");      result.Add("INSTRUMENTS_DB_SUPPORT", "no");
2233  #endif  #endif
2234        
2235      return result.Produce();      return result.Produce();
2236  }  }
2237    
# Line 2294  String LSCPServer::RemoveDbInstrumentDir Line 2329  String LSCPServer::RemoveDbInstrumentDir
2329      return result.Produce();      return result.Produce();
2330  }  }
2331    
2332  String LSCPServer::GetDbInstrumentDirectoryCount(String Dir) {  String LSCPServer::GetDbInstrumentDirectoryCount(String Dir, bool Recursive) {
2333      dmsg(2,("LSCPServer: GetDbInstrumentDirectoryCount(Dir=%s)\n", Dir.c_str()));      dmsg(2,("LSCPServer: GetDbInstrumentDirectoryCount(Dir=%s,Recursive=%d)\n", Dir.c_str(), Recursive));
2334      LSCPResultSet result;      LSCPResultSet result;
2335  #if HAVE_SQLITE3  #if HAVE_SQLITE3
2336      try {      try {
2337          result.Add(InstrumentsDb::GetInstrumentsDb()->GetDirectoryCount(Dir));          result.Add(InstrumentsDb::GetInstrumentsDb()->GetDirectoryCount(Dir, Recursive));
2338      } catch (Exception e) {      } catch (Exception e) {
2339           result.Error(e);           result.Error(e);
2340      }      }
# Line 2309  String LSCPServer::GetDbInstrumentDirect Line 2344  String LSCPServer::GetDbInstrumentDirect
2344      return result.Produce();      return result.Produce();
2345  }  }
2346    
2347  String LSCPServer::GetDbInstrumentDirectories(String Dir) {  String LSCPServer::GetDbInstrumentDirectories(String Dir, bool Recursive) {
2348      dmsg(2,("LSCPServer: GetDbInstrumentDirectories(Dir=%s)\n", Dir.c_str()));      dmsg(2,("LSCPServer: GetDbInstrumentDirectories(Dir=%s,Recursive=%d)\n", Dir.c_str(), Recursive));
2349      LSCPResultSet result;      LSCPResultSet result;
2350  #if HAVE_SQLITE3  #if HAVE_SQLITE3
2351      try {      try {
2352          String list;          String list;
2353          StringListPtr dirs = InstrumentsDb::GetInstrumentsDb()->GetDirectories(Dir);          StringListPtr dirs = InstrumentsDb::GetInstrumentsDb()->GetDirectories(Dir, Recursive);
2354    
2355          for (int i = 0; i < dirs->size(); i++) {          for (int i = 0; i < dirs->size(); i++) {
2356              if (list != "") list += ",";              if (list != "") list += ",";
2357              list += "'" + dirs->at(i) + "'";  
2358                if (Recursive) list += "'" + InstrumentsDb::toEscapedPath(dirs->at(i)) + "'";
2359                else list += "'" + InstrumentsDb::toEscapedName(dirs->at(i)) + "'";
2360          }          }
2361    
2362          result.Add(list);          result.Add(list);
# Line 2339  String LSCPServer::GetDbInstrumentDirect Line 2376  String LSCPServer::GetDbInstrumentDirect
2376      try {      try {
2377          DbDirectory info = InstrumentsDb::GetInstrumentsDb()->GetDirectoryInfo(Dir);          DbDirectory info = InstrumentsDb::GetInstrumentsDb()->GetDirectoryInfo(Dir);
2378    
2379          result.Add("DESCRIPTION", info.Description);          result.Add("DESCRIPTION", InstrumentsDb::toEscapedText(info.Description));
2380          result.Add("CREATED", info.Created);          result.Add("CREATED", info.Created);
2381          result.Add("MODIFIED", info.Modified);          result.Add("MODIFIED", info.Modified);
2382      } catch (Exception e) {      } catch (Exception e) {
# Line 2381  String LSCPServer::MoveDbInstrumentDirec Line 2418  String LSCPServer::MoveDbInstrumentDirec
2418      return result.Produce();      return result.Produce();
2419  }  }
2420    
2421  String LSCPServer::SetDbInstrumentDirectoryDescription(String Dir, String Desc) {  String LSCPServer::CopyDbInstrumentDirectory(String Dir, String Dst) {
2422      dmsg(2,("LSCPServer: SetDbInstrumentDirectoryDescription(Dir=%s,Desc=%s)\n", Dir.c_str(), Desc.c_str()));      dmsg(2,("LSCPServer: CopyDbInstrumentDirectory(Dir=%s,Dst=%s)\n", Dir.c_str(), Dst.c_str()));
2423      LSCPResultSet result;      LSCPResultSet result;
2424  #if HAVE_SQLITE3  #if HAVE_SQLITE3
2425      try {      try {
2426          InstrumentsDb::GetInstrumentsDb()->SetDirectoryDescription(Dir, Desc);          InstrumentsDb::GetInstrumentsDb()->CopyDirectory(Dir, Dst);
2427      } catch (Exception e) {      } catch (Exception e) {
2428           result.Error(e);           result.Error(e);
2429      }      }
# Line 2396  String LSCPServer::SetDbInstrumentDirect Line 2433  String LSCPServer::SetDbInstrumentDirect
2433      return result.Produce();      return result.Produce();
2434  }  }
2435    
2436  String LSCPServer::AddDbInstruments(String DbDir, String FilePath, int Index) {  String LSCPServer::SetDbInstrumentDirectoryDescription(String Dir, String Desc) {
2437      dmsg(2,("LSCPServer: AddDbInstruments(DbDir=%s,FilePath=%s,Index=%d)\n", DbDir.c_str(), FilePath.c_str(), Index));      dmsg(2,("LSCPServer: SetDbInstrumentDirectoryDescription(Dir=%s,Desc=%s)\n", Dir.c_str(), Desc.c_str()));
2438      LSCPResultSet result;      LSCPResultSet result;
2439  #if HAVE_SQLITE3  #if HAVE_SQLITE3
2440      try {      try {
2441          InstrumentsDb::GetInstrumentsDb()->AddInstruments(DbDir, FilePath, Index);          InstrumentsDb::GetInstrumentsDb()->SetDirectoryDescription(Dir, Desc);
2442      } catch (Exception e) {      } catch (Exception e) {
2443           result.Error(e);           result.Error(e);
2444      }      }
# Line 2411  String LSCPServer::AddDbInstruments(Stri Line 2448  String LSCPServer::AddDbInstruments(Stri
2448      return result.Produce();      return result.Produce();
2449  }  }
2450    
2451  String LSCPServer::AddDbInstrumentsFlat(String DbDir, String FsDir) {  String LSCPServer::AddDbInstruments(String DbDir, String FilePath, int Index, bool bBackground) {
2452      dmsg(2,("LSCPServer: AddDbInstrumentsFlat(DbDir=%s,FilePath=%s)\n", DbDir.c_str(), FsDir.c_str()));      dmsg(2,("LSCPServer: AddDbInstruments(DbDir=%s,FilePath=%s,Index=%d,bBackground=%d)\n", DbDir.c_str(), FilePath.c_str(), Index, bBackground));
2453      LSCPResultSet result;      LSCPResultSet result;
2454  #if HAVE_SQLITE3  #if HAVE_SQLITE3
2455      try {      try {
2456          InstrumentsDb::GetInstrumentsDb()->AddInstrumentsRecursive(DbDir, FsDir, true);          int id;
2457            InstrumentsDb* db = InstrumentsDb::GetInstrumentsDb();
2458            id = db->AddInstruments(DbDir, FilePath, Index, bBackground);
2459            if (bBackground) result = id;
2460      } catch (Exception e) {      } catch (Exception e) {
2461           result.Error(e);           result.Error(e);
2462      }      }
# Line 2426  String LSCPServer::AddDbInstrumentsFlat( Line 2466  String LSCPServer::AddDbInstrumentsFlat(
2466      return result.Produce();      return result.Produce();
2467  }  }
2468    
2469  String LSCPServer::AddDbInstrumentsNonrecursive(String DbDir, String FsDir) {  String LSCPServer::AddDbInstruments(String ScanMode, String DbDir, String FsDir, bool bBackground) {
2470      dmsg(2,("LSCPServer: AddDbInstrumentsNonrecursive(DbDir=%s,FilePath=%s)\n", DbDir.c_str(), FsDir.c_str()));      dmsg(2,("LSCPServer: AddDbInstruments(ScanMode=%s,DbDir=%s,FsDir=%s,bBackground=%d)\n", ScanMode.c_str(), DbDir.c_str(), FsDir.c_str(), bBackground));
2471      LSCPResultSet result;      LSCPResultSet result;
2472  #if HAVE_SQLITE3  #if HAVE_SQLITE3
2473      try {      try {
2474          InstrumentsDb::GetInstrumentsDb()->AddInstrumentsNonrecursive(DbDir, FsDir);          int id;
2475            InstrumentsDb* db = InstrumentsDb::GetInstrumentsDb();
2476            if (ScanMode.compare("RECURSIVE") == 0) {
2477               id = db->AddInstruments(RECURSIVE, DbDir, FsDir, bBackground);
2478            } else if (ScanMode.compare("NON_RECURSIVE") == 0) {
2479               id = db->AddInstruments(NON_RECURSIVE, DbDir, FsDir, bBackground);
2480            } else if (ScanMode.compare("FLAT") == 0) {
2481               id = db->AddInstruments(FLAT, DbDir, FsDir, bBackground);
2482            } else {
2483                throw Exception("Unknown scan mode: " + ScanMode);
2484            }
2485    
2486            if (bBackground) result = id;
2487      } catch (Exception e) {      } catch (Exception e) {
2488           result.Error(e);           result.Error(e);
2489      }      }
# Line 2456  String LSCPServer::RemoveDbInstrument(St Line 2508  String LSCPServer::RemoveDbInstrument(St
2508      return result.Produce();      return result.Produce();
2509  }  }
2510    
2511  String LSCPServer::GetDbInstrumentCount(String Dir) {  String LSCPServer::GetDbInstrumentCount(String Dir, bool Recursive) {
2512      dmsg(2,("LSCPServer: GetDbInstrumentCount(Dir=%s)\n", Dir.c_str()));      dmsg(2,("LSCPServer: GetDbInstrumentCount(Dir=%s,Recursive=%d)\n", Dir.c_str(), Recursive));
2513      LSCPResultSet result;      LSCPResultSet result;
2514  #if HAVE_SQLITE3  #if HAVE_SQLITE3
2515      try {      try {
2516          result.Add(InstrumentsDb::GetInstrumentsDb()->GetInstrumentCount(Dir));          result.Add(InstrumentsDb::GetInstrumentsDb()->GetInstrumentCount(Dir, Recursive));
2517      } catch (Exception e) {      } catch (Exception e) {
2518           result.Error(e);           result.Error(e);
2519      }      }
# Line 2471  String LSCPServer::GetDbInstrumentCount( Line 2523  String LSCPServer::GetDbInstrumentCount(
2523      return result.Produce();      return result.Produce();
2524  }  }
2525    
2526  String LSCPServer::GetDbInstruments(String Dir) {  String LSCPServer::GetDbInstruments(String Dir, bool Recursive) {
2527      dmsg(2,("LSCPServer: GetDbInstruments(Dir=%s)\n", Dir.c_str()));      dmsg(2,("LSCPServer: GetDbInstruments(Dir=%s,Recursive=%d)\n", Dir.c_str(), Recursive));
2528      LSCPResultSet result;      LSCPResultSet result;
2529  #if HAVE_SQLITE3  #if HAVE_SQLITE3
2530      try {      try {
2531          String list;          String list;
2532          StringListPtr instrs = InstrumentsDb::GetInstrumentsDb()->GetInstruments(Dir);          StringListPtr instrs = InstrumentsDb::GetInstrumentsDb()->GetInstruments(Dir, Recursive);
2533    
2534          for (int i = 0; i < instrs->size(); i++) {          for (int i = 0; i < instrs->size(); i++) {
2535              if (list != "") list += ",";              if (list != "") list += ",";
2536              list += "'" + instrs->at(i) + "'";  
2537                if (Recursive) list += "'" + InstrumentsDb::toEscapedPath(instrs->at(i)) + "'";
2538                else list += "'" + InstrumentsDb::toEscapedName(instrs->at(i)) + "'";
2539          }          }
2540    
2541          result.Add(list);          result.Add(list);
# Line 2508  String LSCPServer::GetDbInstrumentInfo(S Line 2562  String LSCPServer::GetDbInstrumentInfo(S
2562          result.Add("SIZE", (int)info.Size);          result.Add("SIZE", (int)info.Size);
2563          result.Add("CREATED", info.Created);          result.Add("CREATED", info.Created);
2564          result.Add("MODIFIED", info.Modified);          result.Add("MODIFIED", info.Modified);
2565          result.Add("DESCRIPTION", FilterEndlines(info.Description));          result.Add("DESCRIPTION", InstrumentsDb::toEscapedText(info.Description));
2566          result.Add("IS_DRUM", info.IsDrum);          result.Add("IS_DRUM", info.IsDrum);
2567          result.Add("PRODUCT", FilterEndlines(info.Product));          result.Add("PRODUCT", InstrumentsDb::toEscapedText(info.Product));
2568          result.Add("ARTISTS", FilterEndlines(info.Artists));          result.Add("ARTISTS", InstrumentsDb::toEscapedText(info.Artists));
2569          result.Add("KEYWORDS", FilterEndlines(info.Keywords));          result.Add("KEYWORDS", InstrumentsDb::toEscapedText(info.Keywords));
2570        } catch (Exception e) {
2571             result.Error(e);
2572        }
2573    #else
2574        result.Error(String(DOESNT_HAVE_SQLITE3), 0);
2575    #endif
2576        return result.Produce();
2577    }
2578    
2579    String LSCPServer::GetDbInstrumentsJobInfo(int JobId) {
2580        dmsg(2,("LSCPServer: GetDbInstrumentsJobInfo(JobId=%d)\n", JobId));
2581        LSCPResultSet result;
2582    #if HAVE_SQLITE3
2583        try {
2584            ScanJob job = InstrumentsDb::GetInstrumentsDb()->Jobs.GetJobById(JobId);
2585    
2586            result.Add("FILES_TOTAL", job.FilesTotal);
2587            result.Add("FILES_SCANNED", job.FilesScanned);
2588            result.Add("SCANNING", job.Scanning);
2589            result.Add("STATUS", job.Status);
2590      } catch (Exception e) {      } catch (Exception e) {
2591           result.Error(e);           result.Error(e);
2592      }      }
# Line 2552  String LSCPServer::MoveDbInstrument(Stri Line 2626  String LSCPServer::MoveDbInstrument(Stri
2626      return result.Produce();      return result.Produce();
2627  }  }
2628    
2629    String LSCPServer::CopyDbInstrument(String Instr, String Dst) {
2630        dmsg(2,("LSCPServer: CopyDbInstrument(Instr=%s,Dst=%s)\n", Instr.c_str(), Dst.c_str()));
2631        LSCPResultSet result;
2632    #if HAVE_SQLITE3
2633        try {
2634            InstrumentsDb::GetInstrumentsDb()->CopyInstrument(Instr, Dst);
2635        } catch (Exception e) {
2636             result.Error(e);
2637        }
2638    #else
2639        result.Error(String(DOESNT_HAVE_SQLITE3), 0);
2640    #endif
2641        return result.Produce();
2642    }
2643    
2644  String LSCPServer::SetDbInstrumentDescription(String Instr, String Desc) {  String LSCPServer::SetDbInstrumentDescription(String Instr, String Desc) {
2645      dmsg(2,("LSCPServer: SetDbInstrumentDescription(Instr=%s,Desc=%s)\n", Instr.c_str(), Desc.c_str()));      dmsg(2,("LSCPServer: SetDbInstrumentDescription(Instr=%s,Desc=%s)\n", Instr.c_str(), Desc.c_str()));
2646      LSCPResultSet result;      LSCPResultSet result;
# Line 2567  String LSCPServer::SetDbInstrumentDescri Line 2656  String LSCPServer::SetDbInstrumentDescri
2656      return result.Produce();      return result.Produce();
2657  }  }
2658    
2659    String LSCPServer::FindDbInstrumentDirectories(String Dir, std::map<String,String> Parameters, bool Recursive) {
2660        dmsg(2,("LSCPServer: FindDbInstrumentDirectories(Dir=%s)\n", Dir.c_str()));
2661        LSCPResultSet result;
2662    #if HAVE_SQLITE3
2663        try {
2664            SearchQuery Query;
2665            std::map<String,String>::iterator iter;
2666            for (iter = Parameters.begin(); iter != Parameters.end(); iter++) {
2667                if (iter->first.compare("NAME") == 0) {
2668                    Query.Name = iter->second;
2669                } else if (iter->first.compare("CREATED") == 0) {
2670                    Query.SetCreated(iter->second);
2671                } else if (iter->first.compare("MODIFIED") == 0) {
2672                    Query.SetModified(iter->second);
2673                } else if (iter->first.compare("DESCRIPTION") == 0) {
2674                    Query.Description = iter->second;
2675                } else {
2676                    throw Exception("Unknown search criteria: " + iter->first);
2677                }
2678            }
2679    
2680            String list;
2681            StringListPtr pDirectories =
2682                InstrumentsDb::GetInstrumentsDb()->FindDirectories(Dir, &Query, Recursive);
2683    
2684            for (int i = 0; i < pDirectories->size(); i++) {
2685                if (list != "") list += ",";
2686                list += "'" + InstrumentsDb::toEscapedPath(pDirectories->at(i)) + "'";
2687            }
2688    
2689            result.Add(list);
2690        } catch (Exception e) {
2691             result.Error(e);
2692        }
2693    #else
2694        result.Error(String(DOESNT_HAVE_SQLITE3), 0);
2695    #endif
2696        return result.Produce();
2697    }
2698    
2699    String LSCPServer::FindDbInstruments(String Dir, std::map<String,String> Parameters, bool Recursive) {
2700        dmsg(2,("LSCPServer: FindDbInstruments(Dir=%s)\n", Dir.c_str()));
2701        LSCPResultSet result;
2702    #if HAVE_SQLITE3
2703        try {
2704            SearchQuery Query;
2705            std::map<String,String>::iterator iter;
2706            for (iter = Parameters.begin(); iter != Parameters.end(); iter++) {
2707                if (iter->first.compare("NAME") == 0) {
2708                    Query.Name = iter->second;
2709                } else if (iter->first.compare("FORMAT_FAMILIES") == 0) {
2710                    Query.SetFormatFamilies(iter->second);
2711                } else if (iter->first.compare("SIZE") == 0) {
2712                    Query.SetSize(iter->second);
2713                } else if (iter->first.compare("CREATED") == 0) {
2714                    Query.SetCreated(iter->second);
2715                } else if (iter->first.compare("MODIFIED") == 0) {
2716                    Query.SetModified(iter->second);
2717                } else if (iter->first.compare("DESCRIPTION") == 0) {
2718                    Query.Description = iter->second;
2719                } else if (iter->first.compare("IS_DRUM") == 0) {
2720                    if (!strcasecmp(iter->second.c_str(), "true")) {
2721                        Query.InstrType = SearchQuery::DRUM;
2722                    } else {
2723                        Query.InstrType = SearchQuery::CHROMATIC;
2724                    }
2725                } else if (iter->first.compare("PRODUCT") == 0) {
2726                     Query.Product = iter->second;
2727                } else if (iter->first.compare("ARTISTS") == 0) {
2728                     Query.Artists = iter->second;
2729                } else if (iter->first.compare("KEYWORDS") == 0) {
2730                     Query.Keywords = iter->second;
2731                } else {
2732                    throw Exception("Unknown search criteria: " + iter->first);
2733                }
2734            }
2735    
2736            String list;
2737            StringListPtr pInstruments =
2738                InstrumentsDb::GetInstrumentsDb()->FindInstruments(Dir, &Query, Recursive);
2739    
2740            for (int i = 0; i < pInstruments->size(); i++) {
2741                if (list != "") list += ",";
2742                list += "'" + InstrumentsDb::toEscapedPath(pInstruments->at(i)) + "'";
2743            }
2744    
2745            result.Add(list);
2746        } catch (Exception e) {
2747             result.Error(e);
2748        }
2749    #else
2750        result.Error(String(DOESNT_HAVE_SQLITE3), 0);
2751    #endif
2752        return result.Produce();
2753    }
2754    
2755    
2756  /**  /**
2757   * Will be called by the parser to enable or disable echo mode; if echo   * Will be called by the parser to enable or disable echo mode; if echo
# Line 2586  String LSCPServer::SetEcho(yyparse_param Line 2771  String LSCPServer::SetEcho(yyparse_param
2771      }      }
2772      return result.Produce();      return result.Produce();
2773  }  }
   
 String LSCPServer::FilterEndlines(String s) {  
     String s2 = s;  
     for (int i = 0; i < s2.length(); i++) {  
         if (s2.at(i) == '\r') s2.at(i) = ' ';  
         else if (s2.at(i) == '\n') s2.at(i) = ' ';  
     }  
       
     return s2;  
 }  
Legend:
Removed from v.1161  
changed lines
  Added in v.1345
  ViewVC Help
Powered by ViewVC