Unix path fixes and search lock out
This commit is contained in:
@@ -98,6 +98,11 @@ Public Class mgrCommon
|
||||
Dim sExemptList As String() = {"dosbox", "scummvm"}
|
||||
Dim bFound As Boolean = False
|
||||
|
||||
'frmFileFolderSearch is currently very buggy in Mono, this will disable all searches on Unix
|
||||
If IsUnix() Then
|
||||
Return True
|
||||
End If
|
||||
|
||||
For Each s As String In sExemptList
|
||||
If oGame.ProcessName.ToLower.Contains(s) Then bFound = True
|
||||
Next
|
||||
|
||||
+26
-15
@@ -125,10 +125,14 @@ Public Class mgrPath
|
||||
Dim bDeep As Boolean
|
||||
Dim cDS As Char = Path.DirectorySeparatorChar 'Set the directory seperator based on the OS
|
||||
|
||||
'If we are working with a case insenstive file system, use a uniform case. **Look into removing this completely**
|
||||
If cDS <> "/" Then 'Checking the seperator to determine OS is better than messing with enumerations that weren't always supported
|
||||
If Not mgrCommon.IsUnix Then
|
||||
'If we are working with a case insenstive file system, use a uniform case to reduce possible issues
|
||||
sProcessPath = sProcessPath.ToLower
|
||||
sSavePath = sSavePath.ToLower
|
||||
Else
|
||||
'If we are on Unix trim the root off
|
||||
sProcessPath = sProcessPath.TrimStart(cDS)
|
||||
sSavePath = sSavePath.TrimStart(cDS)
|
||||
End If
|
||||
|
||||
'We need to ensure we have a single trailing slash on the parameters
|
||||
@@ -137,6 +141,7 @@ Public Class mgrPath
|
||||
sProcessPath &= cDS
|
||||
sSavePath &= cDS
|
||||
|
||||
|
||||
'Determines the direction we need to go, we always want to be relative to the process location
|
||||
If sSavePath.Split(cDS).Length > sProcessPath.Split(cDS).Length Then
|
||||
sPath1 = sProcessPath
|
||||
@@ -196,10 +201,6 @@ Public Class mgrPath
|
||||
Dim oCustomVariable As clsPathVariable
|
||||
|
||||
|
||||
If sValue.Contains("*mydocs*") Then
|
||||
Return sValue.Replace("*mydocs*", sMyDocs)
|
||||
End If
|
||||
|
||||
If sValue.Contains("*appdatalocal*") Then
|
||||
Return sValue.Replace("*appdatalocal*", sAppDataLocal)
|
||||
End If
|
||||
@@ -208,8 +209,12 @@ Public Class mgrPath
|
||||
Return sValue.Replace("*appdataroaming*", sAppDataRoaming)
|
||||
End If
|
||||
|
||||
'These don't work on Unix OS
|
||||
'Don't use these in Unix
|
||||
If Not mgrCommon.IsUnix Then
|
||||
If sValue.Contains("*mydocs*") Then
|
||||
Return sValue.Replace("*mydocs*", sMyDocs)
|
||||
End If
|
||||
|
||||
If sValue.Contains("*publicdocs*") Then
|
||||
Return sValue.Replace("*publicdocs*", sPublicDocs)
|
||||
End If
|
||||
@@ -236,10 +241,7 @@ Public Class mgrPath
|
||||
Dim sCurrentUser As String = "*currentuser*"
|
||||
Dim oCustomVariable As clsPathVariable
|
||||
|
||||
If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)) Then
|
||||
Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), sMyDocs)
|
||||
End If
|
||||
|
||||
|
||||
If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)) Then
|
||||
Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), sAppDataLocal)
|
||||
End If
|
||||
@@ -248,8 +250,12 @@ Public Class mgrPath
|
||||
Return sValue.Replace(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), sAppDataRoaming)
|
||||
End If
|
||||
|
||||
'These don't work on Unix OS
|
||||
'Don't use these in Unix
|
||||
If Not mgrCommon.IsUnix Then
|
||||
If sValue.Contains(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)) Then
|
||||
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
|
||||
@@ -273,11 +279,16 @@ Public Class mgrPath
|
||||
Dim hshCustomVariables As Hashtable = mgrVariables.ReadVariables
|
||||
Dim oCustomVariable As clsPathVariable
|
||||
|
||||
hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
|
||||
hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments))
|
||||
|
||||
hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData))
|
||||
hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData))
|
||||
hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.UserProfile))
|
||||
|
||||
'Don't use these in Unix
|
||||
If Not mgrCommon.IsUnix Then
|
||||
hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
|
||||
hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments))
|
||||
hshFolders.Add(Guid.NewGuid.ToString, Environment.GetFolderPath(Environment.SpecialFolder.UserProfile))
|
||||
End If
|
||||
|
||||
'Load Custom Variables
|
||||
For Each oCustomVariable In hshCustomVariables.Values
|
||||
|
||||
@@ -85,7 +85,7 @@ Public Class mgrProcesses
|
||||
Next
|
||||
End Sub
|
||||
|
||||
'This function will only works correctly on Unix
|
||||
'This function will only work correctly on Unix
|
||||
Private Function GetUnixProcessArguments(ByVal prs As Process) As String()
|
||||
Dim sArguments As String
|
||||
Try
|
||||
@@ -96,8 +96,8 @@ Public Class mgrProcesses
|
||||
End Try
|
||||
End Function
|
||||
|
||||
'This function will only works correctly on Unix
|
||||
Private Function GetUnixProcessWorkingDirectory(ByVal prs As Process) As String
|
||||
'This function will only work correctly on Unix
|
||||
Private Function GetUnixSymLinkDirectory(ByVal prs As Process) As String
|
||||
Dim prsls As Process
|
||||
Dim slsinfo As String()
|
||||
|
||||
@@ -110,7 +110,7 @@ Public Class mgrProcesses
|
||||
prsls.StartInfo.RedirectStandardOutput = True
|
||||
prsls.StartInfo.CreateNoWindow = True
|
||||
prsls.Start()
|
||||
slsinfo = prsls.StandardOutput.ReadToEnd().Split(" ")
|
||||
slsinfo = prsls.StandardOutput.ReadToEnd().Split(New Char() {" "}, 12)
|
||||
Return slsinfo(slsinfo.Length - 1).TrimEnd
|
||||
Catch ex As Exception
|
||||
Return String.Empty
|
||||
@@ -165,7 +165,7 @@ Public Class mgrProcesses
|
||||
If Not bWineProcess Then
|
||||
oGame.ProcessPath = Path.GetDirectoryName(prsCurrent.MainModule.FileName)
|
||||
Else
|
||||
oGame.ProcessPath = GetUnixProcessWorkingDirectory(prsCurrent)
|
||||
oGame.ProcessPath = GetUnixSymLinkDirectory(prsCurrent)
|
||||
End If
|
||||
Catch exWin32 As System.ComponentModel.Win32Exception
|
||||
'If an exception occurs the process is:
|
||||
|
||||
Reference in New Issue
Block a user