optimized (42b01687) · Commits · jan.koester / blogi

plugins/media/media.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -509,6 +509,8 @@ namespace blogi {
		int plen=strlen(Args->config->buildurl("media/getimage/",url,512));
		int mlen=strlen(ccurl);

		std::cout << "test" << std::endl;

		if(mlen-plen<0)
		return false;

		@@ -528,10 +530,12 @@ namespace blogi {

		suuid.push_back('\0');

		std::cout << suuid.data() << std::endl;

		blogi::SQL sql;
		blogi::DBResult res;

		sql << "SELECT media_type.ctype FROM media_items_files LEFT JOIN media_type ON media_items_files.id=media_type.id WHERE media_items_files.redis_uuid='";
		sql << "SELECT media_type.ctype FROM media_items_files LEFT JOIN media_type ON media_items_files.media_Type_id=media_type.id WHERE media_items_files.redis_uuid='";
		sql.escaped(suuid.data()) <<"'";

		int n = Args->database->exec(&sql,res);
		@@ -544,7 +548,7 @@ namespace blogi {
		libhttppp::HttpResponse curres;
		curres.setVersion(HTTPVERSION(1.1));
		curres.setState(HTTP404);
		curres.send(req,nullptr,-1);
		curres.send(req,nullptr,0);
		}

		return true;

plugins/media/redis.cpp

+1 −10

Original line number	Diff line number	Diff line
		@@ -62,12 +62,6 @@ void blogi::RedisStore::save(const char key, const char data,size_t datalen){
		}

		void blogi::RedisStore::load(libhttppp::HttpRequest req,const char key,const char *ctype) {
		if(strlen(ctype)>255){
		libhttppp::HTTPException e;
		e[libhttppp::HTTPException::Error] << "media plugin err: " << "ctype to long nor more the 255 signs are allowed !";
		throw e;
		}

		try{
		redisReply rep=(redisReply)redisCommand(_RedisCTX,"GET %s",key);

		@@ -83,9 +77,6 @@ void blogi::RedisStore::load(libhttppp::HttpRequest req,const char key,const c
		curres.send(req,rep->str,rep->len);
		freeReplyObject(rep);
		}catch(libhttppp::HTTPException &e){
		libhttppp::HttpResponse curres;
		curres.setContentType(ctype);
		curres.setState(HTTP501);
		curres.send(req,e.what(),strlen(e.what()));
		throw e;
		}
		}

plugins/navbar/navbar.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ namespace blogi {
		blogi::DBResult res,res2;
		sql << "select id,name,container_id from navbar";

		std::string turl=req->getRequestURL();
		std::string turl=req->getRequest();
		if(turl.rfind('?')>0){
		turl=turl.substr(0,turl.rfind('?'));
		}

plugins/nginxfiler/filer.cpp

+11 −10

Original line number	Diff line number	Diff line
		@@ -160,14 +160,15 @@ namespace blogi {
		path+="/";

		std::shared_ptr<netplus::tcp> srvsock;
		std::shared_ptr<netplus::socket> cltsock;
		std::shared_ptr<netplus::tcp> cltsock;
		try{
		try{
		srvsock=std::make_shared<netplus::tcp>(_NHost.c_str(),_NPort,1,0);
		cltsock=std::make_shared<netplus::tcp>();
		srvsock->setnonblocking();
		srvsock->connect(cltsock);
		cltsock->setnonblocking();
		srvsock=std::make_shared<netplus::tcp>();
		// srvsock->setnonblocking();
		cltsock=std::make_shared<netplus::tcp>(_NHost.c_str(),_NPort,1,0);
		// cltsock->setnonblocking();
		srvsock->connect(cltsock.get());

		}catch(netplus::NetException &e){
		libhttppp::HTTPException he;
		he[libhttppp::HTTPException::Error] << e.what();
		@@ -184,7 +185,7 @@ namespace blogi {
		*nreq.setData("host") << _NHost.c_str() << ":" << _NPort;
		*nreq.setData("accept") << "text/json";
		*nreq.setData("user-agent") << "blogi/1.0 (Alpha Version 0.1)";
		nreq.send(cltsock,srvsock);
		nreq.send(cltsock.get(),srvsock.get());

		char data[16384];
		int recv,tries=0,chunklen=0;
		@@ -192,7 +193,7 @@ namespace blogi {
		try{
		for(;;){
		try{
		recv=srvsock->recvData(cltsock,data,16384);
		recv=srvsock->recvData(cltsock.get(),data,16384);
		break;
		}catch(netplus::NetException &e){
		if(e.getErrorType()==netplus::NetException::Note){
		@@ -250,7 +251,7 @@ namespace blogi {
		for(;;){
		cpos=0;
		try{
		recv=srvsock->recvData(cltsock,data,16384);
		recv=srvsock->recvData(cltsock.get(),data,16384);
		break;
		}catch(netplus::NetException &e){
		if(e.getErrorType()==netplus::NetException::Note){
		@@ -292,7 +293,7 @@ namespace blogi {
		for(;;){
		cpos=0;
		try{
		recv=srvsock->recvData(cltsock,data,16384);
		recv=srvsock->recvData(cltsock.get(),data,16384);
		break;
		}catch(netplus::NetException &e){
		if(e.getErrorType()==netplus::NetException::Note){

plugins/youtube/youtube.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -142,11 +142,11 @@ namespace blogi {
		}

		try{
		std::shared_ptr<netplus::ssl> ysock=std::make_shared<netplus::ssl>("www.googleapis.com",443,1,0,GOOGLECA,1966);
		std::shared_ptr<netplus::ssl> ycsock=std::make_shared<netplus::ssl>();
		netplus::ssl ysock("www.googleapis.com",443,1,0,GOOGLECA,1966);
		netplus::ssl ycsock;

		ysock->connect(ycsock);
		ycsock->setnonblocking();
		ysock.connect(&ycsock);
		ycsock.setnonblocking();

		libhttppp::HttpRequest nreq;
		nreq.setRequestType(GETREQUEST);
		@@ -158,7 +158,7 @@ namespace blogi {
		*nreq.setData("host") << "www.googleapis.com" << ":" << 443;
		*nreq.setData("accept") << "text/json";
		*nreq.setData("user-agent") << "blogi/1.0 (Alpha Version 0.1)";
		nreq.send(ycsock,ysock);
		nreq.send(&ycsock,&ysock);

		char data[16384];
		int recv,tries=0,chunklen=0;
		@@ -166,7 +166,7 @@ namespace blogi {
		try{
		for(;;){
		try{
		recv=ysock->recvData(ycsock,data,16384);
		recv=ysock.recvData(&ycsock,data,16384);
		break;
		}catch(netplus::NetException &re){
		if(re.getErrorType()!=netplus::NetException::Note)
		@@ -213,7 +213,7 @@ namespace blogi {
		cpos=0;
		for(;;){
		try{
		recv=ysock->recvData(ycsock,data,16384);
		recv=ysock.recvData(&ycsock,data,16384);
		break;
		}catch(netplus::NetException &re){
		if(re.getErrorType()!=netplus::NetException::Note)
		@@ -253,7 +253,7 @@ namespace blogi {
		cpos=0;
		for(;;){
		try{
		recv=ysock->recvData(ycsock,data,16384);
		recv=ysock.recvData(&ycsock,data,16384);
		break;
		}catch(netplus::NetException &e){
		if(e.getErrorType()!=netplus::NetException::Note){