Merge branch 'develop'

1 files changed, 36 insertions, 158 deletions

diff --git a/logic/OneSixVersion.h b/logic/OneSixVersion.h
index 89b7c911..3529138c 100644
--- a/logic/OneSixVersion.h
+++ b/logic/OneSixVersion.h
@@ -1,155 +1,38 @@
 #pragma once
 #include <QtCore>
+#include <memory>
 
-class Library;
+class OneSixLibrary;
 
-enum OpSys
+class OneSixVersion : public QAbstractListModel
 {
-	Os_Windows,
-	Os_Linux,
-	Os_OSX,
-	Os_Other
-};
-
-OpSys OpSys_fromString(QString);
-
-#ifdef Q_OS_WIN32
-	#define currentSystem Os_Windows
-#else
-	#ifdef Q_OS_MAC
-		#define currentSystem Os_OSX
-	#else
-		#define currentSystem Os_Linux
-	#endif
-#endif
-enum RuleAction
-{
-	Allow,
-	Disallow,
-	Defer
-};
-
-RuleAction RuleAction_fromString(QString);
-
-class Rule
-{
-protected:
-	RuleAction m_result;
-	virtual bool applies(Library * parent) = 0;
+	// Things required to implement the Qt list model
 public:
-	Rule(RuleAction result)
-		:m_result(result) {}
-	virtual ~Rule(){};
-	RuleAction apply(Library * parent)
-	{
-		if(applies(parent))
-			return m_result;
-		else
-			return Defer;
-	};
-};
+	virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+	virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
+	virtual QVariant headerData(int section, Qt::Orientation orientation,
+								int role = Qt::DisplayRole) const;
+	virtual int columnCount(const QModelIndex &parent) const;
+	virtual Qt::ItemFlags flags(const QModelIndex &index) const;
 
-class OsRule : public Rule
-{
-private:
-	// the OS
-	OpSys m_system;
-	// the OS version regexp
-	QString m_version_regexp;
-protected:
-	virtual bool applies ( Library* )
-	{
-		return (m_system == currentSystem);
-	}
-	OsRule(RuleAction result, OpSys system, QString version_regexp)
-		: Rule(result), m_system(system), m_version_regexp(version_regexp) {}
+	// serialization/deserialization
 public:
-	static QSharedPointer<OsRule> create(RuleAction result, OpSys system, QString version_regexp)
-	{
-		return QSharedPointer<OsRule> (new OsRule(result, system, version_regexp));
-	}
-};
+	bool toOriginalFile();
+	static std::shared_ptr<OneSixVersion> fromJson(QJsonObject root);
+	static std::shared_ptr<OneSixVersion> fromFile(QString filepath);
 
-class ImplicitRule : public Rule
-{
-protected:
-	virtual bool applies ( Library* )
-	{
-		return true;
-	}
-	ImplicitRule(RuleAction result)
-		: Rule(result) {}
 public:
-	static QSharedPointer<ImplicitRule> create(RuleAction result)
-	{
-		return QSharedPointer<ImplicitRule> (new ImplicitRule(result));
-	}
-};
+	QList<std::shared_ptr<OneSixLibrary>> getActiveNormalLibs();
+	QList<std::shared_ptr<OneSixLibrary>> getActiveNativeLibs();
+	// called when something starts/stops messing with the object
+	// FIXME: these are ugly in every possible way.
+	void externalUpdateStart();
+	void externalUpdateFinish();
 
-class Library
-{
-private:
-	// basic values used internally (so far)
-	QString m_name;
-	QString m_base_url;
-	QList<QSharedPointer<Rule> > m_rules;
-	
-	// derived values used for real things
-	/// where to store the lib locally
-	QString m_storage_path;
-	/// where to download the lib from
-	QString m_download_path;
-	/// is this lib actually active on the current OS?
-	bool m_is_active;
-	/// is the library a native?
-	bool m_is_native;
-	/// native suffixes per OS
-	QMap<OpSys, QString> m_native_suffixes;
-public:
-	QStringList extract_excludes;
-	
-public:
-	/// Constructor
-	Library(QString name)
-	{
-		m_is_native = false;
-		m_is_native = false;
-		m_name = name;
-		m_base_url = "https://s3.amazonaws.com/Minecraft.Download/libraries/";
-	}
-	
-	/**
-	 * finalize the library, processing the input values into derived values and state
-	 * 
-	 * This SHALL be called after all the values are parsed or after any further change.
-	 */
-	void finalize();
-	
-	/// Set the library composite name
-	void setName(QString name);
-	/// Set the url base for downloads
-	void setBaseUrl(QString base_url);
-	/// Call this to mark the library as 'native' (it's a zip archive with DLLs)
-	void setIsNative();
-	/// Attach a name suffix to the specified OS native
-	void addNative(OpSys os, QString suffix);
-	/// Set the load rules
-	void setRules(QList<QSharedPointer<Rule> > rules);
-
-	/// Returns true if the library should be loaded (or extracted, in case of natives)
-	bool isActive();
-	/// Returns true if the library is native
-	bool isNative();
-	/// Get the URL to download the library from
-	QString downloadPath();
-	/// Get the relative path where the library should be saved
-	QString storagePath();
-};
-
-
-class OneSixVersion
-{
+	// data members
 public:
+	/// file this was read from. blank, if none
+	QString original_file;
 	/// the ID - determines which jar to use! ACTUALLY IMPORTANT!
 	QString id;
 	/// Last updated time - as a string
@@ -162,26 +45,27 @@ public:
 	 * DEPRECATED: Old versions of the new vanilla launcher used this
 	 * ex: "username_session_version"
 	 */
-	QString processArguments; 
+	QString processArguments;
 	/**
 	 * arguments that should be used for launching minecraft
-	 * 
+	 *
 	 * ex: "--username ${auth_player_name} --session ${auth_session}
 	 *      --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets}"
 	 */
 	QString minecraftArguments;
 	/**
-	 * the minimum launcher version required by this version ... current is 4 (at point of writing)
+	 * the minimum launcher version required by this version ... current is 4 (at point of
+	 * writing)
 	 */
-	int minimumLauncherVersion;
+	int minimumLauncherVersion = 0xDEADBEEF;
 	/**
 	 * The main class to load first
 	 */
 	QString mainClass;
-	
+
 	/// the list of libs - both active and inactive, native and java
-	QList<QSharedPointer<Library> > libraries;
-	
+	QList<std::shared_ptr<OneSixLibrary>> libraries;
+
 	/*
 	FIXME: add support for those rules here? Looks like a pile of quick hacks to me though.
 
@@ -197,17 +81,11 @@ public:
 		}
 		}
 	],
-	"incompatibilityReason": "There is a bug in LWJGL which makes it incompatible with OSX 10.5.8. Please go to New Profile and use 1.5.2 for now. Sorry!"
+	"incompatibilityReason": "There is a bug in LWJGL which makes it incompatible with OSX
+	10.5.8. Please go to New Profile and use 1.5.2 for now. Sorry!"
 	}
 	*/
 	// QList<Rule> rules;
-	
-public:
-	OneSixVersion()
-	{
-		minimumLauncherVersion = 0xDEADBEEF;
-	}
-	
-	QList<QSharedPointer<Library> > getActiveNormalLibs();
-	QList<QSharedPointer<Library> > getActiveNativeLibs();
-};
\ No newline at end of file
+
+
+};