Add .gitattributes rules for text and binary handling

compressed_archive/unarr/compressed_archive.cpp

@@ -1,133 +1,133 @@
-#include "compressed_archive.h"
-
-#include <QFileInfo>
-#include <QDebug>
-
-#include "extract_delegate.h"
-#include <unarr.h>
-
-CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent) :
-    QObject(parent),tools(true),valid(false),numFiles(0),ar(NULL),stream(NULL)
-{
-	//open file
-  #ifdef Q_OS_WIN
-  stream = ar_open_file_w((wchar_t *)filePath.utf16());
-  #else
-	stream = ar_open_file(filePath.toLocal8Bit().constData());
-  #endif
-	if (!stream)
-	{
-		return;
-	}
-
-	//open archive
-	ar = ar_open_rar_archive(stream);
-	//TODO: build unarr with 7z support and test this!
-	//if (!ar) ar = ar_open_7z_archive(stream);
-	if (!ar) ar = ar_open_tar_archive(stream);
-	//zip detection is costly, so it comes last...
-	if (!ar) ar = ar_open_zip_archive(stream, false);
-	if (!ar)
-	{
-		return;
-	}
-
-	//initial parse
-	while (ar_parse_entry(ar))
-	{
-		//make sure we really got a file header
-		if (ar_entry_get_size(ar) > 0)
-		{
-			fileNames.append(ar_entry_get_name(ar));
-			offsets.append(ar_entry_get_offset(ar));
-			numFiles++;
-		}
-	}
-	if (!ar_at_eof(ar))
-	{
-		//fail if the initial parse didn't reach EOF
-		//this might be a bit too drastic
-		qDebug() << "Error while parsing archive";
-		return;
-	}
-	if (numFiles > 0)
-	{
-		valid = true;
-	}
-}
-
-CompressedArchive::~CompressedArchive()
-{
-	ar_close_archive(ar);
-	ar_close(stream);
-}
-
-QList<QString> CompressedArchive::getFileNames()
-{
-	return fileNames;
-}
-
-bool CompressedArchive::isValid()
-{
-	return valid;
-}
-
-bool CompressedArchive::toolsLoaded()
-{
-	//for backwards compatibilty
-	return tools;
-}
-
-int CompressedArchive::getNumFiles()
-{
-	return numFiles;
-}
-
-void CompressedArchive::getAllData(const QVector<quint32> & indexes, ExtractDelegate * delegate)
-{
-	if (indexes.isEmpty())
-		return;
-
-	QByteArray buffer;
-
-	int i=0;
-	while (i < indexes.count())
-	{
-        if(delegate == nullptr || delegate->isCancelled())
-        {
-            return;
-        }
-
-		//use the offset list so we generated so we're not getting any non-page files
-		ar_parse_entry_at(ar, offsets.at(indexes.at(i))); //set ar_entry to start of indexes
-		buffer.resize(ar_entry_get_size(ar));
-		if (ar_entry_uncompress(ar, buffer.data(), buffer.size())) //did we extract it?
-		{
-			delegate->fileExtracted(indexes.at(i), buffer); //return extracted file
-		}
-		else
-		{
-			delegate->crcError(indexes.at(i)); 	//we could not extract it...
-		}
-		i++;
-	}
-}
-
-QByteArray CompressedArchive::getRawDataAtIndex(int index)
-{
-	QByteArray buffer;
-	if(index >= 0 && index < getNumFiles())
-	{
-		ar_parse_entry_at(ar, offsets.at(index));
-		buffer.resize(ar_entry_get_size(ar));
-		if(ar_entry_uncompress(ar, buffer.data(), buffer.size()))
-		{
-			return buffer;
-		}
-		else
-		{
-			return QByteArray();
-		}
-	}
-    return buffer;
-}
+#include "compressed_archive.h"
+
+#include <QFileInfo>
+#include <QDebug>
+
+#include "extract_delegate.h"
+#include <unarr.h>
+
+CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent) :
+    QObject(parent),tools(true),valid(false),numFiles(0),ar(NULL),stream(NULL)
+{
+	//open file
+  #ifdef Q_OS_WIN
+  stream = ar_open_file_w((wchar_t *)filePath.utf16());
+  #else
+	stream = ar_open_file(filePath.toLocal8Bit().constData());
+  #endif
+	if (!stream)
+	{
+		return;
+	}
+
+	//open archive
+	ar = ar_open_rar_archive(stream);
+	//TODO: build unarr with 7z support and test this!
+	//if (!ar) ar = ar_open_7z_archive(stream);
+	if (!ar) ar = ar_open_tar_archive(stream);
+	//zip detection is costly, so it comes last...
+	if (!ar) ar = ar_open_zip_archive(stream, false);
+	if (!ar)
+	{
+		return;
+	}
+
+	//initial parse
+	while (ar_parse_entry(ar))
+	{
+		//make sure we really got a file header
+		if (ar_entry_get_size(ar) > 0)
+		{
+			fileNames.append(ar_entry_get_name(ar));
+			offsets.append(ar_entry_get_offset(ar));
+			numFiles++;
+		}
+	}
+	if (!ar_at_eof(ar))
+	{
+		//fail if the initial parse didn't reach EOF
+		//this might be a bit too drastic
+		qDebug() << "Error while parsing archive";
+		return;
+	}
+	if (numFiles > 0)
+	{
+		valid = true;
+	}
+}
+
+CompressedArchive::~CompressedArchive()
+{
+	ar_close_archive(ar);
+	ar_close(stream);
+}
+
+QList<QString> CompressedArchive::getFileNames()
+{
+	return fileNames;
+}
+
+bool CompressedArchive::isValid()
+{
+	return valid;
+}
+
+bool CompressedArchive::toolsLoaded()
+{
+	//for backwards compatibilty
+	return tools;
+}
+
+int CompressedArchive::getNumFiles()
+{
+	return numFiles;
+}
+
+void CompressedArchive::getAllData(const QVector<quint32> & indexes, ExtractDelegate * delegate)
+{
+	if (indexes.isEmpty())
+		return;
+
+	QByteArray buffer;
+
+	int i=0;
+	while (i < indexes.count())
+	{
+        if(delegate == nullptr || delegate->isCancelled())
+        {
+            return;
+        }
+
+		//use the offset list so we generated so we're not getting any non-page files
+		ar_parse_entry_at(ar, offsets.at(indexes.at(i))); //set ar_entry to start of indexes
+		buffer.resize(ar_entry_get_size(ar));
+		if (ar_entry_uncompress(ar, buffer.data(), buffer.size())) //did we extract it?
+		{
+			delegate->fileExtracted(indexes.at(i), buffer); //return extracted file
+		}
+		else
+		{
+			delegate->crcError(indexes.at(i)); 	//we could not extract it...
+		}
+		i++;
+	}
+}
+
+QByteArray CompressedArchive::getRawDataAtIndex(int index)
+{
+	QByteArray buffer;
+	if(index >= 0 && index < getNumFiles())
+	{
+		ar_parse_entry_at(ar, offsets.at(index));
+		buffer.resize(ar_entry_get_size(ar));
+		if(ar_entry_uncompress(ar, buffer.data(), buffer.size()))
+		{
+			return buffer;
+		}
+		else
+		{
+			return QByteArray();
+		}
+	}
+    return buffer;
+}

compressed_archive/unarr/compressed_archive.h

@@ -1,37 +1,37 @@
-#ifndef COMPRESSED_ARCHIVE_H
-#define COMPRESSED_ARCHIVE_H
-
-#include <QObject>
-#include "extract_delegate.h"
-extern"C" {
-#include <unarr.h>
-}
-
-class CompressedArchive : public QObject
-{
-	Q_OBJECT
-public:
-	explicit CompressedArchive(const QString & filePath, QObject *parent = 0);
-	~CompressedArchive();
-
-signals:
-	
-public slots:
-	int getNumFiles();
-	void getAllData(const QVector<quint32> & indexes, ExtractDelegate * delegate=0);
-	QByteArray getRawDataAtIndex(int index);
-	QList<QString> getFileNames();
-	bool isValid();
-	bool toolsLoaded();
-private:
-
-	bool tools;
-	bool valid;
-	QList<QString> fileNames;
-	int numFiles;
-	ar_archive *ar;
-	ar_stream *stream;
-	QList<qint64> offsets;
-};
-
-#endif // COMPRESSED_ARCHIVE_H
+#ifndef COMPRESSED_ARCHIVE_H
+#define COMPRESSED_ARCHIVE_H
+
+#include <QObject>
+#include "extract_delegate.h"
+extern"C" {
+#include <unarr.h>
+}
+
+class CompressedArchive : public QObject
+{
+	Q_OBJECT
+public:
+	explicit CompressedArchive(const QString & filePath, QObject *parent = 0);
+	~CompressedArchive();
+
+signals:
+	
+public slots:
+	int getNumFiles();
+	void getAllData(const QVector<quint32> & indexes, ExtractDelegate * delegate=0);
+	QByteArray getRawDataAtIndex(int index);
+	QList<QString> getFileNames();
+	bool isValid();
+	bool toolsLoaded();
+private:
+
+	bool tools;
+	bool valid;
+	QList<QString> fileNames;
+	int numFiles;
+	ar_archive *ar;
+	ar_stream *stream;
+	QList<qint64> offsets;
+};
+
+#endif // COMPRESSED_ARCHIVE_H

compressed_archive/unarr/extract_delegate.h

@@ -1,15 +1,15 @@
-#ifndef EXTRACT_DELEGATE_H
-#define EXTRACT_DELEGATE_H
-
-#include <QByteArray>
-
-class ExtractDelegate
-{
-	public:
-		virtual void fileExtracted(int index, const QByteArray & rawData) = 0;
-		virtual void crcError(int index) = 0;
-		virtual void unknownError(int index) = 0;
-        virtual bool isCancelled() = 0;
-};
-
+#ifndef EXTRACT_DELEGATE_H
+#define EXTRACT_DELEGATE_H
+
+#include <QByteArray>
+
+class ExtractDelegate
+{
+	public:
+		virtual void fileExtracted(int index, const QByteArray & rawData) = 0;
+		virtual void crcError(int index) = 0;
+		virtual void unknownError(int index) = 0;
+        virtual bool isCancelled() = 0;
+};
+
 #endif //EXTRACT_DELEGATE_H