notepad.loadSession() and notepad.getSessionFiles()

These notepad object functions had not been exported (or tested!)
Many thanks to user kankri, who pointed this out.

Author: bruderstein

PythonScript/src/NotepadPlusWrapper.cpp

@@ -281,8 +281,13 @@ boost::python::list NotepadPlusWrapper::getFiles()
 boost::python::list NotepadPlusWrapper::getSessionFiles(const char *sessionFilename)
 {
 	boost::python::list result;
-
-	idx_t count = (idx_t)callNotepad(NPPM_GETNBSESSIONFILES, 0, reinterpret_cast<LPARAM>(sessionFilename));
+#ifdef UNICODE
+	std::shared_ptr<TCHAR> converted = WcharMbcsConverter::char2tchar(sessionFilename);
+	const TCHAR *convertedSessionFilename = converted.get();
+#else
+	const TCHAR *convertedSessionFilename = sessionFilename;
+#endif
+	idx_t count = (idx_t)callNotepad(NPPM_GETNBSESSIONFILES, 0, reinterpret_cast<LPARAM>(convertedSessionFilename));
 	if (count > 0)
 	{
 		TCHAR **fileNames = (TCHAR **)new TCHAR*[count];
@@ -291,7 +296,7 @@ boost::python::list NotepadPlusWrapper::getSessionFiles(const char *sessionFilen
 			fileNames[pos] = new TCHAR[MAX_PATH];
 		}
 
-		if (callNotepad(NPPM_GETSESSIONFILES, 0, reinterpret_cast<LPARAM>(fileNames)))
+		if (callNotepad(NPPM_GETSESSIONFILES, reinterpret_cast<WPARAM>(fileNames), reinterpret_cast<LPARAM>(convertedSessionFilename)))
 		{
 
 			for(idx_t pos = 0; pos < count; pos++)
@@ -334,7 +339,7 @@ void NotepadPlusWrapper::saveSession(const char *sessionFilename, boost::python:
 
 	for(idx_t pos = 0; pos < filesCount; pos++)
 	{
-		filesList[pos] = WcharMbcsConverter::char2tchar(static_cast<const char*>(boost::python::extract<const char *>(files[0])));
+		filesList[pos] = WcharMbcsConverter::char2tchar(static_cast<const char*>(boost::python::extract<const char *>(files[pos])));
 		si.files[pos] = filesList[pos].get();
 	}
 

PythonScript/src/NotepadPython.cpp

@@ -28,7 +28,9 @@ void export_notepad()
 		.def("getCurrentLang", &NotepadPlusWrapper::getCurrentLangType, "Get the current language type (returns the LANGTYPE.xxx constants)")
 		.def("setCurrentLang", &NotepadPlusWrapper::setCurrentLangType, "Set the current language type (use LANGTYPE.xxx constants)")
 		.def("getFiles", &NotepadPlusWrapper::getFiles, "Gets a list of the open filenames, as a list of tuples (filename, bufferID, index, view)")
+		.def("loadSession", &NotepadPlusWrapper::loadSession, "Loads a session from a session file")
 		.def("saveSession", &NotepadPlusWrapper::saveSession, "Saves a session file with the list of files (sessionFilename, filesList)")
+		.def("getSessionFiles", &NotepadPlusWrapper::getSessionFiles, "Gets a list of files within a session file")
 		.def("saveCurrentSession", &NotepadPlusWrapper::saveCurrentSession, "Save the current session (filename)")
 		.def("createScintilla", &NotepadPlusWrapper::createScintilla, "Create a new Scintilla handle. Returns a Buffer object")
 		.def("destroyScintilla", &NotepadPlusWrapper::destroyScintilla, "Destroy a Scintilla handle created with createScintilla")
@@ -51,6 +53,8 @@ void export_notepad()
 		.def("setLangType", &NotepadPlusWrapper::setBufferLangType, "Sets the language type of the current buffer. Pass a buffer ID as the second parameter to set the language for a specific buffer.")
 		.def("getEncoding", &NotepadPlusWrapper::getEncoding, "Gets the encoding of the current buffer.  Pass a buffer ID to get the encoding of a specific buffer.")
 		.def("getEncoding", &NotepadPlusWrapper::getBufferEncoding, "Gets the encoding of the current buffer.  Pass a buffer ID to get the encoding of a specific buffer.")
+		.def("setEncoding", &NotepadPlusWrapper::setEncoding, "Sets the encoding of the current buffer.  Pass a buffer ID to set the encoding of a specific buffer.")
+		.def("setEncoding", &NotepadPlusWrapper::setBufferEncoding, "Sets the encoding of the current buffer.  Pass a buffer ID to set the encoding of a specific buffer.")		
 		.def("getFormatType", &NotepadPlusWrapper::getFormatType, "Gets the format type (i.e. Windows, Unix or Mac) of the current buffer.  Pass a buffer ID to get the format type of a specific buffer.")
 		.def("getFormatType", &NotepadPlusWrapper::getBufferFormatType, "Gets the format type (i.e. Windows, Unix or Mac) of the current buffer.  Pass a buffer ID to get the format type of a specific buffer.")
 		.def("setFormatType", &NotepadPlusWrapper::setFormatType, "Sets the format type (i.e. Windows, Unix or Mac) of the current buffer - use the FORMATTYPE enum.  Pass a buffer ID as the second parameter to set the format type of a specific buffer.")