Functional in Mono

This commit is contained in:
Michael J. Seiferling
2016-03-01 23:27:42 -06:00
parent 4c7d36baef
commit 7a7fa65ce6
17 changed files with 132 additions and 2970 deletions
+4 -3
View File
@@ -117,7 +117,7 @@ Public Class mgrBackup
End If
If oSettings.CreateSubFolder Then
sBackupFile = sBackupFile & "\" & oGame.Name
sBackupFile = sBackupFile & Path.DirectorySeparatorChar & oGame.Name
Try
If Not Directory.Exists(sBackupFile) Then
Directory.CreateDirectory(sBackupFile)
@@ -168,8 +168,9 @@ Public Class mgrBackup
End If
If Directory.Exists(sSavePath) Then
prs7z.StartInfo.Arguments = "a -bb1 -bt -t7z -mx" & oSettings.CompressionLevel & " -i@""" & mgrPath.IncludeFileLocation & """ -x@""" & mgrPath.ExcludeFileLocation & """ """ & sBackupFile & """ -r"
prs7z.StartInfo.FileName = mgrPath.Utility7zLocation
'prs7z.StartInfo.Arguments = "a -bb1 -bt -t7z -mx" & oSettings.CompressionLevel & " -i@""" & mgrPath.IncludeFileLocation & """ -x@""" & mgrPath.ExcludeFileLocation & """ """ & sBackupFile & """ -r"
prs7z.StartInfo.Arguments = "a -t7z -mx" & oSettings.CompressionLevel & " -i@""" & mgrPath.IncludeFileLocation & """ -x@""" & mgrPath.ExcludeFileLocation & """ """ & sBackupFile & """ -r"
prs7z.StartInfo.FileName = mgrPath.Utility7zLocation
prs7z.StartInfo.UseShellExecute = False
prs7z.StartInfo.RedirectStandardOutput = True
prs7z.StartInfo.CreateNoWindow = True
+11
View File
@@ -108,7 +108,18 @@ Public Class mgrCommon
End If
End Function
Public Shared Function IsUnix() As Boolean
If Path.DirectorySeparatorChar = "/" Then
Return True
End If
Return False
End Function
Public Shared Function IsElevated() As Boolean
If IsUnix() Then
Return True
End If
If My.User.IsInRole(ApplicationServices.BuiltInRole.Administrator) Then
Return True
Else
+24 -13
View File
@@ -39,6 +39,10 @@ Public Class mgrPath
Shared ReadOnly Property Utility7zLocation As String
Get
If mgrCommon.IsUnix Then
Return "/usr/bin/7za"
End If
Select Case oReleaseType
Case ProcessorArchitecture.Amd64
Return Application.StartupPath & "/Utilities/x64/7za.exe"
@@ -91,7 +95,7 @@ Public Class mgrPath
Return sRemoteDatabaseLocation
End Get
Set(value As String)
sRemoteDatabaseLocation = value & "\gbm.s3db"
sRemoteDatabaseLocation = value & "/gbm.s3db"
End Set
End Property
@@ -191,14 +195,11 @@ Public Class mgrPath
Dim sCurrentUser As String = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)
Dim oCustomVariable As clsPathVariable
If sValue.Contains("*mydocs*") Then
Return sValue.Replace("*mydocs*", sMyDocs)
End If
If sValue.Contains("*publicdocs*") Then
Return sValue.Replace("*publicdocs*", sPublicDocs)
End If
If sValue.Contains("*appdatalocal*") Then
Return sValue.Replace("*appdatalocal*", sAppDataLocal)
End If
@@ -207,8 +208,15 @@ Public Class mgrPath
Return sValue.Replace("*appdataroaming*", sAppDataRoaming)
End If
If sValue.Contains("*currentuser*") Then
Return sValue.Replace("*currentuser*", sCurrentUser)
'These don't work on Unix OS
If Not mgrCommon.IsUnix Then
If sValue.Contains("*publicdocs*") Then
Return sValue.Replace("*publicdocs*", sPublicDocs)
End If
If sValue.Contains("*currentuser*") Then
Return sValue.Replace("*currentuser*", sCurrentUser)
End If
End If
For Each oCustomVariable In hshCustomVariables.Values
@@ -232,10 +240,6 @@ Public Class mgrPath
Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), sMyDocs)
End If
If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments)) Then
Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments), sPublicDocs)
End If
If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)) Then
Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), sAppDataLocal)
End If
@@ -244,8 +248,15 @@ Public Class mgrPath
Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), sAppDataRoaming)
End If
If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)) Then
Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), sCurrentUser)
'These don't work on Unix OS
If Not mgrCommon.IsUnix Then
If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments)) Then
Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments), sPublicDocs)
End If
If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)) Then
Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), sCurrentUser)
End If
End If
For Each oCustomVariable In hshCustomVariables.Values
+7 -1
View File
@@ -90,7 +90,11 @@ Public Class mgrProcesses
Dim sProcessCheck As String = String.Empty
For Each prsCurrent As Process In prsList
sProcessCheck = prsCurrent.ProcessName
Try
sProcessCheck = prsCurrent.ProcessName
Catch ex As Exception
'Do Nothing
End Try
If hshScanList.ContainsKey(sProcessCheck) Then
prsFoundProcess = prsCurrent
@@ -117,10 +121,12 @@ Public Class mgrProcesses
bNeedsPath = True
iErrorCode = 299
Else
MsgBox(exWin32.Message & vbCrLf & exWin32.StackTrace)
'A different failure occured, drop out and continue to scan.
Return False
End If
Catch exAll As Exception
MsgBox(exAll.Message & vbCrLf & exAll.StackTrace)
'A different failure occured, drop out and continue to scan.
Return False
End Try
+1 -1
View File
@@ -232,7 +232,7 @@ Public Class mgrRestore
If bDoRestore Then
Try
If File.Exists(sBackupFile) Then
prs7z.StartInfo.Arguments = "x """ & sBackupFile & """ -o""" & sExtractPath & "\"" -aoa -r"
prs7z.StartInfo.Arguments = "x """ & sBackupFile & """ -o""" & sExtractPath & Path.DirectorySeparatorChar & """ -aoa -r"
prs7z.StartInfo.FileName = mgrPath.Utility7zLocation
prs7z.StartInfo.UseShellExecute = False
prs7z.StartInfo.RedirectStandardOutput = True
+3 -2
View File
@@ -1,6 +1,6 @@
Imports GBM.My.Resources
Imports System.IO
Imports System.Data.SQLite
Imports Mono.Data.Sqlite
Public Class mgrSQLite
@@ -232,7 +232,8 @@ Public Class mgrSQLite
BuildParams(command, hshParams)
Try
adapter = New SQLiteDataAdapter(command)
adapter = New SqliteDataAdapter()
adapter.SelectCommand = command
adapter.Fill(oData)
Catch ex As Exception
mgrCommon.ShowMessage(mgrSQLite_ErrorQueryFailure, New String() {sSQL, ex.Message}, MsgBoxStyle.Exclamation)