From 406203e76b239f86b72df268137874bb322ed20e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Tue, 13 Aug 2019 19:54:50 +0200
Subject: [PATCH] WIP clean Library a bit

---
 api/logic/minecraft/Library.cpp | 33 +++++++++++----------------------
 api/logic/minecraft/Library.h   |  8 --------
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/api/logic/minecraft/Library.cpp b/api/logic/minecraft/Library.cpp
index acff662e..66ee13e5 100644
--- a/api/logic/minecraft/Library.cpp
+++ b/api/logic/minecraft/Library.cpp
@@ -8,13 +8,19 @@
 #include <FileSystem.h>
 
 
-void Library::getApplicableFiles(OpSys system, QStringList& jar, QStringList& native, QStringList& native32,
-                                 QStringList& native64, const QString &overridePath) const
+void Library::getApplicableFiles(
+    OpSys system,
+    QStringList& jar,
+    QStringList& native,
+    QStringList& native32,
+    QStringList& native64,
+    const QString &overridePath
+) const
 {
     bool local = isInstanceLocal();
     auto actualPath = [&](QString relPath)
     {
-        QFileInfo out(FS::PathCombine(storagePrefix(), relPath));
+        QFileInfo out(FS::PathCombine("libraries", relPath));
         if(local && !overridePath.isEmpty())
         {
             QString fileName = out.fileName();
@@ -98,7 +104,9 @@ QList< std::shared_ptr< NetAction > > Library::getDownloads(
             entry->setStale(true);
         }
         if (!entry->isStale())
+        {
             return true;
+        }
         Net::Download::Options options;
         if(stale)
         {
@@ -269,25 +277,6 @@ bool Library::isForge() const
     return m_hint == "forge-pack-xz";
 }
 
-void Library::setStoragePrefix(QString prefix)
-{
-    m_storagePrefix = prefix;
-}
-
-QString Library::defaultStoragePrefix()
-{
-    return "libraries/";
-}
-
-QString Library::storagePrefix() const
-{
-    if(m_storagePrefix.isEmpty())
-    {
-        return defaultStoragePrefix();
-    }
-    return m_storagePrefix;
-}
-
 QString Library::filename(OpSys system) const
 {
     if(!m_filename.isEmpty())
diff --git a/api/logic/minecraft/Library.h b/api/logic/minecraft/Library.h
index 2f202291..d79cfb4a 100644
--- a/api/logic/minecraft/Library.h
+++ b/api/logic/minecraft/Library.h
@@ -46,7 +46,6 @@ public:
         newlib->m_extractExcludes = base->m_extractExcludes;
         newlib->m_nativeClassifiers = base->m_nativeClassifiers;
         newlib->m_rules = base->m_rules;
-        newlib->m_storagePrefix = base->m_storagePrefix;
         newlib->m_mojangDownloads = base->m_mojangDownloads;
         newlib->m_filename = base->m_filename;
         newlib->presenceOnly = base->presenceOnly;
@@ -95,8 +94,6 @@ public: /* methods */
         return m_nativeClassifiers.size() != 0;
     }
 
-    void setStoragePrefix(QString prefix = QString());
-
     /// Set the url base for downloads
     void setRepositoryURL(const QString &base_url)
     {
@@ -169,11 +166,6 @@ public: /* methods */
                                      QStringList & failedLocalFiles, const QString & overridePath) const;
 
 private: /* methods */
-    /// the default storage prefix used by MultiMC
-    static QString defaultStoragePrefix();
-
-    /// Get the prefix - root of the storage to be used
-    QString storagePrefix() const;
 
     /// Get the relative file path where the library should be saved
     QString storageSuffix(OpSys system) const;