Differential D4847 Diff 12054 src/buffer/katetextbuffer.cpp

Changeset View

Standalone View

src/buffer/katetextbuffer.cpp

Context not available.
21	#include "config.h"	21		#include "config.h"
22		22
23	#include "katetextbuffer.h"	23		#include "katetextbuffer.h"
		24		#include "katesecuretextbuffer.h"
24	#include "katetextloader.h"	25		#include "katetextloader.h"
25		26
26	// this is unfortunate, but needed for performance	27		// this is unfortunate, but needed for performance
			dfaureUnsubmitted Done Isn't it weird to ignore the constructor argument in some cases? dfaure: Isn't it weird to ignore the constructor argument in some cases?
Context not available.
763	// codec must be set!	764		// codec must be set!
764	Q_ASSERT(m_textCodec);	765		Q_ASSERT(m_textCodec);
765		766
766	#ifndef Q_OS_WIN	767		// prepare parameters for calling helper method
767	const bool newFile = !QFile::exists(filename);	768		const QString textCodec = QString::fromLatin1(m_textCodec->name());
768	#endif	769		const int eolMode = static_cast<int>(endOfLineMode());
			dhaumannUnsubmitted Done const QString textCodec = ... const int eolMode = ... Please use const whenever possible for locally defined variables. dhaumann: const QString textCodec = ... const int eolMode = ... Please use const whenever possible for…
769		770		QList<QVariant> dataToSave;
770	/**
771	* use QSaveFile for save write + rename
772	*/
773	QSaveFile saveFile(filename);
774	saveFile.setDirectWriteFallback(true);
775
776	if (!saveFile.open(QIODevice::WriteOnly \| QIODevice::Truncate)) {
777	return false;
778	}
779
780	/**
781	* construct correct filter device and try to open
782	*/
783	KCompressionDevice::CompressionType type = KFilterDev::compressionTypeForMimeType(m_mimeTypeForFilterDev);
784	KCompressionDevice file(&saveFile, false, type);
785
786	if (!file.open(QIODevice::WriteOnly)) {
787	return false;
788	}
789
790	/**
791	* construct stream + disable Unicode headers
792	*/
793	QTextStream stream(&file);
794	stream.setCodec(QTextCodec::codecForName("UTF-16"));
795
796	// set the correct codec
797	stream.setCodec(m_textCodec);
798
799	// generate byte order mark?
800	stream.setGenerateByteOrderMark(generateByteOrderMark());
801
802	// our loved eol string ;)
803	QString eol = QStringLiteral("\n"); //m_doc->config()->eolString ();
804	if (endOfLineMode() == eolDos) {
805	eol = QStringLiteral("\r\n");
806	} else if (endOfLineMode() == eolMac) {
807	eol = QStringLiteral("\r");
808	}
809
810	// just dump the lines out ;)
811	for (int i = 0; i < m_lines; ++i) {	771		for (int i = 0; i < m_lines; ++i) {
812	// get line to save	772		const Kate::TextLine textline = line(i);
813	Kate::TextLine textline = line(i);	773		const QString line = textline->string();
814		774		dataToSave.push_back(QVariant(line));
815	stream << textline->text();
816
817	// append correct end of line string
818	if ((i + 1) < m_lines) {
819	stream << eol;
820	}
821	}	775		}
822		776
823	if (m_newLineAtEof) {	777		// trying regular save
824	Q_ASSERT(m_lines > 0); // see .h file	778		bool ok = SecureTextBuffer().saveInternal(filename, m_mimeTypeForFilterDev, textCodec, generateByteOrderMark(), eolMode, m_newLineAtEof, dataToSave);
825	const Kate::TextLine lastLine = line(m_lines - 1);
826	const int firstChar = lastLine->firstChar();
827	if (firstChar > -1 \|\| lastLine->length() > 0) {
828	stream << eol;
829	}
830	}
831
832	// flush stream
833	stream.flush();
834		779
835	// close and delete file	780		// save was not successful, trying with elevated privileges
836	file.close();	781		if (!ok) {
837		782
838	// flush file	783		// prepare parameter map for helper
839	if (!saveFile.flush()) {	784		QVariantMap args;
840	return false;	785		args[QLatin1String("filename")] = filename;
841	}	786		args[QLatin1String("mimeTypeForFilterDev")] = m_mimeTypeForFilterDev;
		787		args[QLatin1String("textCodec")] = textCodec;
		788		args[QLatin1String("generateByteOrderMark")] = generateByteOrderMark();
		789		args[QLatin1String("endOfLineMode")] = eolMode;
		790		args[QLatin1String("newLineAtEof")] = m_newLineAtEof;
		791		args[QLatin1String("dataToSave")] = dataToSave;
			anthonyfieroniUnsubmitted Done use QScopedPointer, remove manual delete anthonyfieroni: use QScopedPointer, remove manual delete
842		792
843	#ifndef Q_OS_WIN	793		// call save with elevated privileges
844	// ensure that the file is written to disk	794		KAuth::Action saveAction(QLatin1String("org.kde.ktexteditor.katetextbuffer.save"));
845	#ifdef HAVE_FDATASYNC	795		saveAction.setHelperId(QLatin1String("org.kde.ktexteditor.katetextbuffer"));
846	fdatasync(saveFile.handle());	796		saveAction.setArguments(args);
847	#else	797		KAuth::ExecuteJob *job = saveAction.execute();
848	fsync(saveFile.handle());	798		ok = job->exec();
849	#endif
850	#endif
851		799
852	// did save work?	800		}
853	// only finalize if stream status == OK
854	bool ok = (stream.status() == QTextStream::Ok) && saveFile.commit();
855		801
856	// remember this revision as last saved if we had success!
857	if (ok) {	802		if (ok) {
858	m_history.setLastSavedRevision();	803		m_history.setLastSavedRevision();
859	}	804		}
860		805
861	#ifndef Q_OS_WIN
862	if (ok && newFile) { // QTemporaryFile sets permissions to 0600, so fixing this
863	const mode_t mask = umask(0);
864	umask(mask);
865
866	const mode_t fileMode = 0666 & ~mask;
867	chmod(QFile::encodeName(filename).constData(), fileMode);
868	}
869	#endif
870
871	// report CODEC + ERRORS	806		// report CODEC + ERRORS
872	BUFFER_DEBUG << "Saved file " << filename << "with codec" << m_textCodec->name() << (ok ? "without" : "with") << "errors";	807		BUFFER_DEBUG << "Saved file " << filename << "with codec" << m_textCodec->name() << (ok ? "without" : "with") << "errors";
			dfaureUnsubmitted Done The thing about using Qt's setPermissions() is that it should work on Windows too. dfaure: The thing about using Qt's setPermissions() is that it should work on Windows too.
873		808
Context not available.
			anthonyfieroniUnsubmitted Done Should be -> instead of . anthonyfieroni: Should be -> instead of .
			dfaureUnsubmitted Not Done Nested event loops are evil. Any chance to make this asynchronous (connecting to a slot instead, for anything that needs to be done after completion of the job) ? dfaure: Nested event loops are evil. Any chance to make this asynchronous (connecting to a slot instead…
			dfaureUnsubmitted Done Doesn't QSaveFile do this? dfaure: Doesn't QSaveFile do this?
			dfaureUnsubmitted Done (pre-existing) done by QSaveFile already dfaure: (pre-existing) done by QSaveFile already
			dfaureUnsubmitted Done use .insert() to avoid the creation of a temporary. dfaure: use .insert() to avoid the creation of a temporary.
			apolUnsubmitted Not Done Or better use an initializer list? apol: Or better use an initializer list?