Only match files when importing emulated games (#258)

Do not try to show merged games when merging is disabled (#259)
tkashkin · Jun 21, 2019 · b126539 · b126539
1 parent 4f32825
commit b126539
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/src/ui/dialogs/ImportEmulatedGamesDialog.vala b/src/ui/dialogs/ImportEmulatedGamesDialog.vala
@@ -277,6 +277,8 @@ namespace GameHub.UI.Dialogs
 						foreach(var file_path in files)
 						{
 							var file = FSUtils.file(file_path);
+							if(file.query_file_type(FileQueryInfoFlags.NONE) == FileType.DIRECTORY) continue;
+
 							var dir = file.get_parent();
 							var name = file.get_basename();
 
@@ -390,6 +392,8 @@ namespace GameHub.UI.Dialogs
 							foreach(var file_path in files)
 							{
 								var file = FSUtils.file(file_path);
+								if(file.query_file_type(FileQueryInfoFlags.NONE) == FileType.DIRECTORY) continue;
+
 								var dir = file.get_parent();
 								var name = file.get_basename();
 

diff --git a/src/ui/views/GamesView/GameCard.vala b/src/ui/views/GamesView/GameCard.vala
@@ -238,7 +238,11 @@ namespace GameHub.UI.Views.GamesView
 			}
 
 			_game = new_game;
-			merges = Tables.Merges.get(_game);
+
+			if(Settings.UI.Behavior.instance.merge_games)
+			{
+				merges = Tables.Merges.get(_game);
+			}
 
 			if(adapter != null)
 			{
@@ -255,7 +259,7 @@ namespace GameHub.UI.Views.GamesView
 
 		private void update_source(GameSource? source=null)
 		{
-			if(source == null || source == _game.source || merges == null || merges.size == 0)
+			if(!Settings.UI.Behavior.instance.merge_games || source == null || source == _game.source || merges == null || merges.size == 0)
 			{
 				update(_game);
 				return;
@@ -289,7 +293,7 @@ namespace GameHub.UI.Views.GamesView
 				{
 					add_src_icon(_game.source.icon);
 				}
-				if(merges != null && merges.size > 0)
+				if(Settings.UI.Behavior.instance.merge_games && merges != null && merges.size > 0)
 				{
 					foreach(var g in merges)
 					{
@@ -308,7 +312,7 @@ namespace GameHub.UI.Views.GamesView
 						platforms += p;
 					}
 				}
-				if(adapter.filter_source == null && merges != null && merges.size > 0)
+				if(Settings.UI.Behavior.instance.merge_games && adapter.filter_source == null && merges != null && merges.size > 0)
 				{
 					foreach(var g in merges)
 					{

diff --git a/src/ui/views/GamesView/GameContextMenu.vala b/src/ui/views/GamesView/GameContextMenu.vala
@@ -108,7 +108,7 @@ namespace GameHub.UI.Views.GamesView
 
 			if(!(game is Sources.GOG.GOGGame.DLC))
 			{
-				if(!is_merge_submenu)
+				if(Settings.UI.Behavior.instance.merge_games && !is_merge_submenu)
 				{
 					var merges = DB.Tables.Merges.get(game);
 					var primary = DB.Tables.Merges.get_primary(game);

diff --git a/src/ui/views/GamesView/GameListRow.vala b/src/ui/views/GamesView/GameListRow.vala
@@ -147,7 +147,10 @@ namespace GameHub.UI.Views.GamesView
 			}
 
 			_game = new_game;
-			merges = Tables.Merges.get(_game);
+			if(Settings.UI.Behavior.instance.merge_games)
+			{
+				merges = Tables.Merges.get(_game);
+			}
 
 			if(adapter != null)
 			{
@@ -164,7 +167,7 @@ namespace GameHub.UI.Views.GamesView
 
 		private void update_source(GameSource? source=null)
 		{
-			if(source == null || source == _game.source || merges == null || merges.size == 0)
+			if(!Settings.UI.Behavior.instance.merge_games || source == null || source == _game.source || merges == null || merges.size == 0)
 			{
 				update(_game);
 				return;