From ee6d211929d8da2f0612fdefd06894a9d6f224a3 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Fri, 22 Mar 2019 08:11:28 -0600 Subject: [PATCH] Removed import variables that are no longer needed --- GBM/Forms/frmAdvancedImport.vb | 12 +----------- GBM/Forms/frmGameManager.vb | 12 +++++------- GBM/Forms/frmStartUpWizard.vb | 2 +- GBM/Managers/mgrMonitorList.vb | 11 +++++------ GBM/Managers/mgrXML.vb | 9 +++------ 5 files changed, 15 insertions(+), 31 deletions(-) diff --git a/GBM/Forms/frmAdvancedImport.vb b/GBM/Forms/frmAdvancedImport.vb index 7e9631f..b614321 100644 --- a/GBM/Forms/frmAdvancedImport.vb +++ b/GBM/Forms/frmAdvancedImport.vb @@ -6,7 +6,6 @@ Public Class frmAdvancedImport Private oImportData As ExportData Private hshImportData As Hashtable Private hshFinalData As New Hashtable - Private bModWinConfigsForLinux As Boolean Private bSelectAll As Boolean = True Private bIsLoading As Boolean = False Private iCurrentSort As Integer = 0 @@ -31,15 +30,6 @@ Public Class frmAdvancedImport End Get End Property - Public Property ModWinConfigsForLinux As Boolean - Set(value As Boolean) - bModWinConfigsForLinux = value - End Set - Get - Return bModWinConfigsForLinux - End Get - End Property - Public ReadOnly Property FinalData As Hashtable Get Return hshFinalData @@ -147,7 +137,7 @@ Public Class frmAdvancedImport End If 'Check for hardcoded ignore tags - If bAddItem And ModWinConfigsForLinux Then + If bAddItem And (mgrCommon.IsUnix And oApp.OS = clsGame.eOS.Windows) Then bAddItem = CheckIgnoreTags(oApp.ImportTags) End If diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index 697ed2f..5e823b3 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -1763,7 +1763,7 @@ Public Class frmGameManager sLocation = mgrCommon.OpenFileBrowser("XML_Import", frmGameManager_ChooseImportXML, "xml", frmGameManager_XML, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False) If sLocation <> String.Empty Then - If mgrMonitorList.DoImport(sLocation, False, Settings) Then + If mgrMonitorList.DoImport(sLocation, False) Then mgrMonitorList.SyncMonitorLists(Settings) LoadData() LoadBackupData() @@ -1783,9 +1783,9 @@ Public Class frmGameManager End Sub - Private Sub ImportOfficialGameList(ByVal sImportUrl As String, ByVal bWinConfigsInLinux As Boolean) + Private Sub ImportOfficialGameList(ByVal sImportUrl As String) If mgrCommon.ShowMessage(frmGameManager_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - If mgrMonitorList.DoImport(sImportUrl, True, Settings,, bWinConfigsInLinux) Then + If mgrMonitorList.DoImport(sImportUrl, True) Then mgrMonitorList.SyncMonitorLists(Settings) LoadData() LoadBackupData() @@ -2080,7 +2080,6 @@ Public Class frmGameManager End Sub Private Sub cmsOfficialWindows_Click(sender As Object, e As EventArgs) Handles cmsOfficialWindows.Click, cmsOfficial.Click - Dim bWinConfigsinLinux As Boolean = False 'Show one time warning about Windows configs in Linux If mgrCommon.IsUnix Then If Not (oSettings.SuppressMessages And mgrSettings.eSuppressMessages.WinConfigsInLinux) = mgrSettings.eSuppressMessages.WinConfigsInLinux Then @@ -2088,14 +2087,13 @@ Public Class frmGameManager oSettings.SuppressMessages = oSettings.SetMessageField(oSettings.SuppressMessages, mgrSettings.eSuppressMessages.WinConfigsInLinux) oSettings.SaveSettings() End If - bWinConfigsinLinux = True End If - ImportOfficialGameList(App_URLImport, bWinConfigsinLinux) + ImportOfficialGameList(App_URLImport) End Sub Private Sub cmsOfficialLinux_Click(sender As Object, e As EventArgs) Handles cmsOfficialLinux.Click - ImportOfficialGameList(App_URLImportLinux, False) + ImportOfficialGameList(App_URLImportLinux) End Sub Private Sub cmsFile_Click(sender As Object, e As EventArgs) Handles cmsFile.Click diff --git a/GBM/Forms/frmStartUpWizard.vb b/GBM/Forms/frmStartUpWizard.vb index 6d56e04..633b305 100644 --- a/GBM/Forms/frmStartUpWizard.vb +++ b/GBM/Forms/frmStartUpWizard.vb @@ -106,7 +106,7 @@ Public Class frmStartUpWizard End If If mgrCommon.ShowMessage(frmStartUpWizard_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - If mgrMonitorList.DoImport(sImportURL, True, Settings, True) Then + If mgrMonitorList.DoImport(sImportURL, True) Then oGameData = mgrMonitorList.ReadList(mgrMonitorList.eListTypes.FullList) mgrMonitorList.SyncMonitorLists(oSettings) End If diff --git a/GBM/Managers/mgrMonitorList.vb b/GBM/Managers/mgrMonitorList.vb index 70f090b..f4e3736 100644 --- a/GBM/Managers/mgrMonitorList.vb +++ b/GBM/Managers/mgrMonitorList.vb @@ -824,10 +824,10 @@ Public Class mgrMonitorList Return True End Function - Public Shared Function DoImport(ByVal sPath As String, ByVal bOfficial As Boolean, ByRef oSettings As mgrSettings, Optional ByVal bStartUpWizard As Boolean = False, Optional ByVal bWinConfigsInLinux As Boolean = False) As Boolean + Public Shared Function DoImport(ByVal sPath As String, ByVal bOfficial As Boolean) As Boolean If mgrCommon.IsAddress(sPath) Then If mgrCommon.CheckAddress(sPath) Then - ImportMonitorList(sPath, True, bWinConfigsInLinux) + ImportMonitorList(sPath, True) Return True Else mgrCommon.ShowMessage(mgrMonitorList_WebNoReponse, sPath, MsgBoxStyle.Exclamation) @@ -835,7 +835,7 @@ Public Class mgrMonitorList End If Else If File.Exists(sPath) Then - ImportMonitorList(sPath,, bWinConfigsInLinux) + ImportMonitorList(sPath) Return True Else mgrCommon.ShowMessage(mgrMonitorList_FileNotFound, sPath, MsgBoxStyle.Exclamation) @@ -845,7 +845,7 @@ Public Class mgrMonitorList Return True End Function - Private Shared Sub ImportMonitorList(ByVal sLocation As String, Optional ByVal bWebRead As Boolean = False, Optional ByVal bWinConfigsInLinux As Boolean = False) + Private Shared Sub ImportMonitorList(ByVal sLocation As String, Optional ByVal bWebRead As Boolean = False) Dim hshCompareFrom As New Hashtable Dim hshCompareTo As Hashtable Dim hshSyncItems As Hashtable @@ -855,7 +855,7 @@ Public Class mgrMonitorList Cursor.Current = Cursors.WaitCursor - If Not mgrXML.ReadMonitorList(sLocation, oExportInfo, hshCompareFrom, bWebRead, bWinConfigsInLinux) Then + If Not mgrXML.ReadMonitorList(sLocation, oExportInfo, hshCompareFrom, bWebRead) Then Exit Sub End If @@ -892,7 +892,6 @@ Public Class mgrMonitorList Dim frm As New frmAdvancedImport frm.ImportInfo = oExportInfo frm.ImportData = hshSyncItems - frm.ModWinConfigsForLinux = bWinConfigsInLinux If frm.ShowDialog() = DialogResult.OK Then Cursor.Current = Cursors.WaitCursor diff --git a/GBM/Managers/mgrXML.vb b/GBM/Managers/mgrXML.vb index 6920e8d..fdd21a1 100644 --- a/GBM/Managers/mgrXML.vb +++ b/GBM/Managers/mgrXML.vb @@ -6,7 +6,7 @@ Imports System.Net Public Class mgrXML - Public Shared Function ReadMonitorList(ByVal sLocation As String, ByRef oExportInfo As ExportData, ByRef hshList As Hashtable, Optional ByVal bWebRead As Boolean = False, Optional ByVal bWinConfigsInLinux As Boolean = False) As Boolean + Public Shared Function ReadMonitorList(ByVal sLocation As String, ByRef oExportInfo As ExportData, ByRef hshList As Hashtable, Optional ByVal bWebRead As Boolean = False) As Boolean Dim oList As List(Of Game) Dim hshDupeList As New Hashtable Dim oExportData As New ExportData @@ -45,12 +45,9 @@ Public Class mgrXML oGame.OS = g.OS 'Retain compatability when the OS value is not set If oGame.OS = 0 Then - If bWinConfigsInLinux Then - oGame.OS = clsGame.eOS.Windows - Else - oGame.OS = mgrCommon.GetCurrentOS - End If + oGame.OS = mgrCommon.GetCurrentOS End If + For Each t As Tag In g.Tags oGame.ImportTags.Add(t) Next