Merge pull request #1413 from domoticz/Python-Plugins

Resolved crash on Raspberry Pi when added icon zip files via a plugin
domoticz · Mar 28, 2017 · 3a2f81b · 3a2f81b
2 parents 28ec1dd + 74b193b
commit 3a2f81b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 27 deletions.
diff --git a/hardware/plugins/PythonObjects.cpp b/hardware/plugins/PythonObjects.cpp
@@ -111,29 +111,7 @@ namespace Plugins {
 				if (sFileName.length())
 				{
 					self->pPlugin = pModState->pPlugin;
-					//
-					//	Check file exists in plugin home folder and load it
-					//
 					sFileName = self->pPlugin->m_HomeFolder + sFileName;
-					if (self->pPlugin->m_bDebug)
-					{
-						_log.Log(LOG_NORM, "(%s) Opening image file '%s'.", self->pPlugin->Name.c_str(), sFileName.c_str());
-					}
-					std::ifstream	infile(sFileName.c_str(), std::ios::in | std::ios::binary);
-					if (infile.is_open())
-					{
-						std::stringstream	ssImages;
-						ssImages << infile.rdbuf();
-						infile.close();
-						self->ZipFile = ssImages.str();
-						if (self->pPlugin->m_bDebug)
-						{
-							_log.Log(LOG_NORM, "(%s) Loaded %d bytes from image file.", self->pPlugin->Name.c_str(), self->ZipFile.length());
-						}
-					}
-					else
-						_log.Log(LOG_ERROR, "CImage:%s, File read failed on '%s'.", __func__, sFileName.c_str());
-
 					Py_DECREF(self->Filename);
 					self->Filename = PyUnicode_FromString(sFileName.c_str());
 				}
@@ -166,7 +144,7 @@ namespace Plugins {
 			std::string	sFilename = PyUnicode_AsUTF8(self->Filename);
 			if (self->ImageID == -1)
 			{
-				if (self->ZipFile.length())
+				if (sFilename.length())
 				{
 					if (self->pPlugin->m_bDebug)
 					{
@@ -177,7 +155,7 @@ namespace Plugins {
 					//	Call code to do insert here
 					//
 					std::string ErrorMessage;
-					if (!m_sql.InsertCustomIconFromZip(self->ZipFile, ErrorMessage))
+					if (!m_sql.InsertCustomIconFromZipFile(sFilename, ErrorMessage))
 					{
 						_log.Log(LOG_ERROR, "(%s) Insert Custom Icon From Zip failed on file '%s' with error '%s'.", self->pPlugin->Name.c_str(), sFilename.c_str(), ErrorMessage.c_str());
 					}

diff --git a/hardware/plugins/PythonObjects.h b/hardware/plugins/PythonObjects.h
@@ -12,7 +12,6 @@ namespace Plugins {
 		PyObject*	Name;
 		PyObject*	Description;
 		PyObject*	Filename;
-		std::string	ZipFile;
 		CPlugin*	pPlugin;
 	} CImage;
 

diff --git a/main/SQLHelper.cpp b/main/SQLHelper.cpp
@@ -7218,7 +7218,12 @@ bool CSQLHelper::InsertCustomIconFromZip(const std::string &szZip, std::string &
 	outfile.flush();
 	outfile.close();
 
-	clx::basic_unzip<char> in(outputfile);
+	return InsertCustomIconFromZipFile(outputfile, ErrorMessage);
+}
+
+bool CSQLHelper::InsertCustomIconFromZipFile(const std::string &szZipFile, std::string &ErrorMessage)
+{
+	clx::basic_unzip<char> in(szZipFile);
 	if (!in.is_open())
 	{
 		ErrorMessage = "Error opening zip file";
@@ -7236,7 +7241,7 @@ bool CSQLHelper::InsertCustomIconFromZip(const std::string &szZip, std::string &
 			continue;
 
 		int ipos = fpath.find("icons.txt");
-		if ( ipos != std::string::npos)
+		if (ipos != std::string::npos)
 		{
 			std::string rpath;
 			if (ipos > 0)

diff --git a/main/SQLHelper.h b/main/SQLHelper.h
@@ -315,6 +315,7 @@ class CSQLHelper
 	void AllowNewHardwareTimer(const int iTotMinutes);
 
 	bool InsertCustomIconFromZip(const std::string &szZip, std::string &ErrorMessage);
+	bool InsertCustomIconFromZipFile(const std::string & szZipFile, std::string & ErrorMessage);
 
 	std::map<std::string, std::string> BuildDeviceOptions(const std::string & options, const bool decode = true);
 	std::map<std::string, std::string> GetDeviceOptions(const std::string & idx);