Merge pull request #19 from vcmi/features/mods-launcher

Features/mods launcher

Author: nullkiller

ext/vcmi

@@ -1,15 +1,18 @@
 package eu.vcmi.vcmi;
 
+import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Environment;
+
 import androidx.annotation.Nullable;
 import com.google.android.material.snackbar.Snackbar;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.appcompat.widget.Toolbar;
+
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -24,24 +27,25 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Stream;
-import java.util.stream.Collectors;
+import java.util.Locale;
 
 import eu.vcmi.vcmi.content.ModBaseViewHolder;
 import eu.vcmi.vcmi.content.ModsAdapter;
-import eu.vcmi.vcmi.content.ModsViewHolder;
+import eu.vcmi.vcmi.mods.VCMIMod;
 import eu.vcmi.vcmi.mods.VCMIModContainer;
 import eu.vcmi.vcmi.mods.VCMIModsRepo;
+import eu.vcmi.vcmi.util.InstallModAsync;
 import eu.vcmi.vcmi.util.FileUtil;
 import eu.vcmi.vcmi.util.Log;
+import eu.vcmi.vcmi.util.ServerResponse;
 
 /**
  * @author F
  */
 public class ActivityMods extends ActivityWithToolbar
 {
-    private static final boolean ENABLE_REPO_DOWNLOADING = false;
-    private static final String REPO_URL = "http://download.vcmi.eu/mods/repository/repository.json";
+    private static final boolean ENABLE_REPO_DOWNLOADING = true;
+    private static final String REPO_URL = "https://raw.githubusercontent.com/vcmi/vcmi-mods-repository/develop/github.json";
     private VCMIModsRepo mRepo;
     private RecyclerView mRecycler;
 
@@ -70,15 +74,18 @@ protected void onCreate(@Nullable final Bundle savedInstanceState)
         mRecycler.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
         mRecycler.setVisibility(View.GONE);
 
+        mModsAdapter = new ModsAdapter(new OnAdapterItemAction());
+        mRecycler.setAdapter(mModsAdapter);
+
         new AsyncLoadLocalMods().execute((Void) null);
     }
 
     private void loadLocalModData() throws IOException, JSONException
     {
-        final String dataRoot = getDataDir() + "/" + Const.VCMI_DATA_ROOT_FOLDER_NAME;
+        final File dataRoot = Storage.getVcmiDataDir(this);
         final String internalDataRoot = getFilesDir() + "/" + Const.VCMI_DATA_ROOT_FOLDER_NAME;
 
-        final File modsRoot = new File(dataRoot + "/Mods");
+        final File modsRoot = new File(dataRoot,"/Mods");
         final File internalModsRoot = new File(internalDataRoot + "/Mods");
         if (!modsRoot.exists() && !internalModsRoot.exists())
         {
@@ -98,8 +105,7 @@ private void loadLocalModData() throws IOException, JSONException
         }
         mModContainer = VCMIModContainer.createContainer(topLevelModsFolders);
 
-        final String configPath = dataRoot + "/config/modSettings.json";
-        final File modConfigFile = new File(configPath);
+        final File modConfigFile = new File(dataRoot, "config/modSettings.json");
         if (!modConfigFile.exists())
         {
             Log.w(this, "We don't have mods config");
@@ -129,6 +135,7 @@ public boolean onOptionsItemSelected(final MenuItem item)
             Log.i(this, "Should download repo now...");
             if (ENABLE_REPO_DOWNLOADING)
             {
+                mProgress.setVisibility(View.VISIBLE);
                 mRepo.init(REPO_URL, new OnModsRepoInitialized()); // disabled because the json is broken anyway
             }
             else
@@ -150,16 +157,21 @@ private void handleNoData()
 
     private void saveModSettingsToFile()
     {
-        mModContainer.saveToFile(new File(getDataDir(), Const.VCMI_DATA_ROOT_FOLDER_NAME + "/config/modSettings.json"));
+        mModContainer.saveToFile(
+                new File(
+                        Storage.getVcmiDataDir(this),
+                        "config/modSettings.json"));
     }
 
     private class OnModsRepoInitialized implements VCMIModsRepo.IOnModsRepoDownloaded
     {
         @Override
-        public void onSuccess()
+        public void onSuccess(ServerResponse<List<VCMIMod>> response)
         {
             Log.i(this, "Initialized mods repo");
-            // TODO update dataset
+            mModContainer.updateFromRepo(response.mContent);
+            mModsAdapter.updateModsList(mModContainer.submods());
+            mProgress.setVisibility(View.GONE);
         }
 
         @Override
@@ -206,13 +218,7 @@ protected void onPostExecute(final Void aVoid)
             {
                 mProgress.setVisibility(View.GONE);
                 mRecycler.setVisibility(View.VISIBLE);
-                mModsAdapter = new ModsAdapter(
-                    mModContainer.submods()
-                        .stream()
-                        .map(ModsAdapter.ModItem::new)
-                        .collect(Collectors.toList()),
-                    new OnAdapterItemAction());
-                mRecycler.setAdapter(mModsAdapter);
+                mModsAdapter.updateModsList(mModContainer.submods());
             }
         }
     }
@@ -242,14 +248,84 @@ public void onItemPressed(final ModsAdapter.ModItem mod, final RecyclerView.View
         public void onDownloadPressed(final ModsAdapter.ModItem mod, final RecyclerView.ViewHolder vh)
         {
             Log.i(this, "Mod download pressed: " + mod);
+            mModsAdapter.downloadProgress(mod, "0%");
+            installModAsync(mod);
         }
 
         @Override
         public void onTogglePressed(final ModsAdapter.ModItem item, final ModBaseViewHolder holder)
         {
-            item.mMod.mActive = !item.mMod.mActive;
-            mModsAdapter.notifyItemChanged(holder.getAdapterPosition());
-            saveModSettingsToFile();
+            if(!item.mMod.mSystem && item.mMod.mInstalled)
+            {
+                item.mMod.mActive = !item.mMod.mActive;
+                mModsAdapter.notifyItemChanged(holder.getAdapterPosition());
+                saveModSettingsToFile();
+            }
+        }
+
+        @Override
+        public void onUninstall(ModsAdapter.ModItem item, ModBaseViewHolder holder)
+        {
+            File installationFolder = item.mMod.installationFolder;
+            ActivityMods activity = ActivityMods.this;
+
+            if(installationFolder != null){
+                new AlertDialog.Builder(activity)
+                    .setTitle(activity.getString(R.string.mods_removal_title, item.mMod.mName))
+                    .setMessage(activity.getString(R.string.mods_removal_confirmation, item.mMod.mName))
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setNegativeButton(android.R.string.no, null)
+                    .setPositiveButton(android.R.string.yes, (dialog, whichButton) ->
+                    {
+                        FileUtil.clearDirectory(installationFolder);
+                        installationFolder.delete();
+
+                        mModsAdapter.modRemoved(item);
+                    })
+                    .show();
+            }
+        }
+    }
+
+    private void installModAsync(ModsAdapter.ModItem mod){
+        File dataDir = Storage.getVcmiDataDir(this);
+        File modFolder = new File(
+                new File(dataDir, "Mods"),
+                mod.mMod.mId.toLowerCase(Locale.US));
+
+        InstallModAsync modInstaller = new InstallModAsync(
+            modFolder,
+            this,
+            new InstallModCallback(mod)
+        );
+
+        modInstaller.execute(mod.mMod.mArchiveUrl);
+    }
+
+    public class InstallModCallback implements InstallModAsync.PostDownload
+    {
+        private ModsAdapter.ModItem mod;
+
+        public InstallModCallback(ModsAdapter.ModItem mod)
+        {
+            this.mod = mod;
+        }
+
+        @Override
+        public void downloadDone(Boolean succeed, File modFolder)
+        {
+            if(succeed){
+                mModsAdapter.modInstalled(mod, modFolder);
+            }
+        }
+
+        @Override
+        public void downloadProgress(String... progress)
+        {
+            if(progress.length > 0)
+            {
+                mModsAdapter.downloadProgress(mod, progress[0]);
+            }
         }
     }
 }

project/vcmi-app/src/main/java/eu/vcmi/vcmi/ActivityMods.java

@@ -21,8 +21,4 @@ public class Const
     public static final int SUPPRESS_TRY_WITH_RESOURCES_WARNING = Build.VERSION_CODES.KITKAT;
 
     public static final String VCMI_DATA_ROOT_FOLDER_NAME = "vcmi-data";
-
-    public static final String VCMI_DATA_ZIP_FILE_NAME = "vcmi-data.zip";
-    public static final String STORAGE_CONFIG_FILE_NAME = "storage.config";
-    public static final boolean INTERNAL_STORAGE_AVAILABLE = Build.VERSION.SDK_INT >= 24;
 }

project/vcmi-app/src/main/java/eu/vcmi/vcmi/Const.java

@@ -28,9 +28,4 @@ public static boolean testH3DataFolder(final File baseDir)
     public static String getH3DataFolder(Context context){
         return getVcmiDataDir(context).getAbsolutePath();
     }
-
-    private static File getStorageSettingsFile(Context context)
-    {
-        return new File(context.getFilesDir(),"storage.config");
-    }
 }

project/vcmi-app/src/main/java/eu/vcmi/vcmi/Storage.java

@@ -66,6 +66,7 @@ private InitResult handleDataFoldersInitialization()
         Log.i(this, "Using " + vcmiDir.getAbsolutePath() + " as root vcmi dir");
 
         if(!vcmiInternalDir.exists()) vcmiInternalDir.mkdir();
+        if(!vcmiDir.exists()) vcmiDir.mkdir();
 
         if (!Storage.testH3DataFolder(ctx))
         {

project/vcmi-app/src/main/java/eu/vcmi/vcmi/content/AsyncLauncherInitialization.java

@@ -5,6 +5,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import java.io.File;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -27,10 +28,9 @@ public class ModsAdapter extends RecyclerView.Adapter<ModBaseViewHolder>
     private final List<ModItem> mDataset = new ArrayList<>();
     private final IOnItemAction mItemListener;
 
-    public ModsAdapter(final List<ModItem> mods, final IOnItemAction itemListener)
+    public ModsAdapter(final IOnItemAction itemListener)
     {
         mItemListener = itemListener;
-        mDataset.addAll(mods);
     }
 
     @Override
@@ -75,12 +75,32 @@ public void onBindViewHolder(final ModBaseViewHolder holder, final int position)
                 modHolder.mModAuthor.setText(ctx.getString(R.string.mods_item_author_template, item.mMod.mAuthor));
                 modHolder.mStatusIcon.setImageResource(selectModStatusIcon(item.mMod.mActive));
 
+                modHolder.mDownloadBtn.setVisibility(View.GONE);
+                modHolder.mDownloadProgress.setVisibility(View.GONE);
+                modHolder.mUninstall.setVisibility(View.GONE);
 
-                modHolder.mDownloadBtn.setVisibility(View.GONE); // TODO visible for mods that aren't downloaded
+                if(!item.mMod.mSystem)
+                {
+                    if (item.mDownloadProgress != null)
+                    {
+                        modHolder.mDownloadProgress.setText(item.mDownloadProgress);
+                        modHolder.mDownloadProgress.setVisibility(View.VISIBLE);
+                    }
+                    else if (!item.mMod.mInstalled)
+                    {
+                        modHolder.mDownloadBtn.setVisibility(View.VISIBLE);
+                    }
+                    else if (item.mMod.installationFolder != null)
+                    {
+                        modHolder.mUninstall.setVisibility(View.VISIBLE);
+                    }
+
+                    modHolder.itemView.setOnClickListener(v -> mItemListener.onItemPressed(item, holder));
+                    modHolder.mStatusIcon.setOnClickListener(v -> mItemListener.onTogglePressed(item, holder));
+                    modHolder.mDownloadBtn.setOnClickListener(v -> mItemListener.onDownloadPressed(item, holder));
+                    modHolder.mUninstall.setOnClickListener(v -> mItemListener.onUninstall(item, holder));
+                }
 
-                modHolder.itemView.setOnClickListener(v -> mItemListener.onItemPressed(item, holder));
-                modHolder.mStatusIcon.setOnClickListener(v -> mItemListener.onTogglePressed(item, holder));
-                modHolder.mDownloadBtn.setOnClickListener(v -> mItemListener.onDownloadPressed(item, holder));
                 break;
             case VIEWTYPE_FAILED_MOD:
                 holder.mModName.setText(ctx.getString(R.string.mods_failed_mod_loading, item.mMod.mName));
@@ -138,20 +158,74 @@ public void detachSubmods(final ModItem mod, final RecyclerView.ViewHolder vh)
         notifyItemRangeRemoved(checkedPosition, detachedElements);
     }
 
+    public void updateModsList(List<VCMIMod> mods)
+    {
+        mDataset.clear();
+        mDataset.addAll(
+                mods.stream()
+                    .map(ModItem::new)
+                    .collect(Collectors.toList()));
+
+        notifyDataSetChanged();
+    }
+
+    public void modInstalled(ModItem mod, File modFolder)
+    {
+        try
+        {
+            mod.mMod.updateFromModInfo(modFolder);
+            mod.mMod.mLoadedCorrectly = true;
+            mod.mMod.mActive = true; // active by default
+            mod.mMod.mInstalled = true;
+            mod.mMod.installationFolder = modFolder;
+            mod.mDownloadProgress = null;
+            notifyItemChanged(mDataset.indexOf(mod));
+        } catch (Exception ex)
+        {
+            Log.e("Failed to install mod", ex);
+        }
+    }
+
+    public void downloadProgress(ModItem mod, String progress)
+    {
+        mod.mDownloadProgress = progress;
+        notifyItemChanged(mDataset.indexOf(mod));
+    }
+
+    public void modRemoved(ModItem item)
+    {
+        int itemIndex = mDataset.indexOf(item);
+
+        if(item.mMod.mArchiveUrl != null && item.mMod.mArchiveUrl != "")
+        {
+            item.mMod.mInstalled = false;
+            item.mMod.installationFolder = null;
+
+            notifyItemChanged(itemIndex);
+        }
+        else{
+            mDataset.remove(item);
+            notifyItemRemoved(itemIndex);
+        }
+    }
+
     public interface IOnItemAction
     {
         void onItemPressed(final ModItem mod, final RecyclerView.ViewHolder vh);
 
         void onDownloadPressed(final ModItem mod, final RecyclerView.ViewHolder vh);
 
         void onTogglePressed(ModItem item, ModBaseViewHolder holder);
+
+        void onUninstall(ModItem item, ModBaseViewHolder holder);
     }
 
     public static class ModItem
     {
         public final VCMIMod mMod;
         public int mNestingLevel;
         public boolean mExpanded;
+        public String mDownloadProgress;
 
         public ModItem(final VCMIMod mod)
         {

project/vcmi-app/src/main/java/eu/vcmi/vcmi/content/ModsAdapter.java

@@ -18,6 +18,8 @@ public class ModsViewHolder extends ModBaseViewHolder
     final TextView mModSize;
     final ImageView mStatusIcon;
     final View mDownloadBtn;
+    final TextView mDownloadProgress;
+    final View mUninstall;
 
     ModsViewHolder(final View parentView)
     {
@@ -27,5 +29,7 @@ public class ModsViewHolder extends ModBaseViewHolder
         mModSize = (TextView) itemView.findViewById(R.id.mods_adapter_item_size);
         mDownloadBtn = itemView.findViewById(R.id.mods_adapter_item_btn_download);
         mStatusIcon = (ImageView) itemView.findViewById(R.id.mods_adapter_item_status);
+        mDownloadProgress = (TextView) itemView.findViewById(R.id.mods_adapter_item_install_progress);
+        mUninstall = itemView.findViewById(R.id.mods_adapter_item_btn_uninstall);
     }
 }