Maybe fix Humble Trove downloads (#429)

tkashkin · Nov 27, 2020 · 51dd7c8 · 51dd7c8
1 parent 1cce940
commit 51dd7c8
Show file tree

Hide file tree

Showing 6 changed files with 244 additions and 168 deletions.
diff --git a/src/data/runnables/tasks/install/InstallTask.vala b/src/data/runnables/tasks/install/InstallTask.vala
@@ -45,7 +45,7 @@ namespace GameHub.Data.Runnables.Tasks.Install
 
 		public bool cancelled { get; private set; default = false; }
 
-		public InstallTask(Runnable? runnable, ArrayList<Installer>? installers, ArrayList<File>? install_dirs, InstallTask.Mode install_mode=InstallTask.Mode.INTERACTIVE, bool allow_install_dir_import=true)
+		public InstallTask(Runnable? runnable, ArrayList<Installer>? installers, ArrayList<File>? install_dirs, InstallTask.Mode install_mode = InstallTask.Mode.INTERACTIVE, bool allow_install_dir_import = true)
 		{
 			Object(runnable: runnable, installers: installers, install_dirs: install_dirs, install_mode: install_mode, can_import_install_dir: allow_install_dir_import);
 		}

diff --git a/src/data/runnables/tasks/install/Installer.vala b/src/data/runnables/tasks/install/Installer.vala
@@ -92,7 +92,6 @@ namespace GameHub.Data.Runnables.Tasks.Install
 					if(compat_runnable == null || task.selected_compat_tool == null || !task.selected_compat_tool.can_install(compat_runnable, task)) return false;
 					yield task.selected_compat_tool.install(compat_runnable, task, file);
 					return true;
-					break;
 
 				case InstallerType.ARCHIVE:
 				case InstallerType.WINDOWS_NSIS_INSTALLER:
@@ -253,6 +252,8 @@ namespace GameHub.Data.Runnables.Tasks.Install
 				uint current_part = 1;
 				foreach(var part in parts)
 				{
+					debug("[DownloadableInstaller.download] Part %u: `%s`", current_part, part.remote.get_uri());
+
 					FS.mkdir(part.local.get_parent().get_path());
 
 					var ds_id = Downloader.download_manager().file_download_started.connect(dl => {
@@ -330,7 +331,7 @@ namespace GameHub.Data.Runnables.Tasks.Install
 			catch(IOError.CANCELLED e){}
 			catch(Error e)
 			{
-				warning("[DownloadableInstaller.download] %s", e.message);
+				warning("[DownloadableInstaller.download] Error: %s", e.message);
 			}
 			task.status = new InstallTask.Status();
 			return files;

diff --git a/src/data/sources/gog/GOGGame.vala b/src/data/sources/gog/GOGGame.vala
@@ -435,16 +435,6 @@ namespace GameHub.Data.Sources.GOG
 					}
 				}
 			}
-
-			string g = name;
-			string? d = null;
-			if(this is DLC)
-			{
-				g = ((DLC) this).game.name;
-				d = name;
-			}
-			/*installers_dir = FS.file(FS.Paths.Collection.GOG.expand_installers(g, d));
-			bonus_content_dir = FS.file(FS.Paths.Collection.GOG.expand_bonus(g, d));*/
 		}
 
 		private bool loading_achievements = false;

diff --git a/src/data/sources/humble/Humble.vala b/src/data/sources/humble/Humble.vala
@@ -238,5 +238,54 @@ namespace GameHub.Data.Sources.Humble
 
 			return _games;
 		}
+
+		public override ArrayList<File>? game_dirs
+		{
+			owned get
+			{
+				ArrayList<File>? dirs = null;
+
+				var paths = GameHub.Settings.Paths.Humble.instance.game_directories;
+				if(paths != null && paths.length > 0)
+				{
+					foreach(var path in paths)
+					{
+						if(path != null && path.length > 0)
+						{
+							var dir = FS.file(path);
+							if(dir != null)
+							{
+								if(dirs == null) dirs = new ArrayList<File>();
+								dirs.add(dir);
+							}
+						}
+					}
+				}
+
+				return dirs;
+			}
+		}
+
+		public override File? default_game_dir
+		{
+			owned get
+			{
+				var path = GameHub.Settings.Paths.Humble.instance.default_game_directory;
+				if(path != null && path.length > 0)
+				{
+					var dir = FS.file(path);
+					if(dir != null && dir.query_exists())
+					{
+						return dir;
+					}
+				}
+				var dirs = game_dirs;
+				if(dirs != null && dirs.size > 0)
+				{
+					return dirs.first();
+				}
+				return null;
+			}
+		}
 	}
 }