From c66589b38dc18d5f168d472a612df37980010314 Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Mon, 7 Apr 2025 15:58:14 +0200 Subject: [PATCH] Correzione verifica estensione files in tutto il codice --- Assembly/Assembly.vb | 4 ++-- AssemblyManager/AssemblyManagerVM.vb | 15 +++++++-------- DoorParameters/Part.vb | 2 +- Utility.vb | 10 +++++----- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Assembly/Assembly.vb b/Assembly/Assembly.vb index 14d8db5..f0e3837 100644 --- a/Assembly/Assembly.vb +++ b/Assembly/Assembly.vb @@ -2045,7 +2045,7 @@ Public Class Assembly ' cerco il nome della componente da associare FrameFile Dim CurrDoorHArdwareFile As String = CurrCompo.CompoType.Path & "\" & CurrCompo.TemplateSelItem - If Path.GetExtension(CurrDoorHArdwareFile) <> NGE_EXTENSION Then + If Path.GetExtension(CurrDoorHArdwareFile).ToLower <> NGE_EXTENSION Then CurrDoorHArdwareFile &= LUA_EXTENSION End If ' cerco il campo [Match file] nel file lua della componente @@ -2197,7 +2197,7 @@ Public Class Assembly ' cerco il nome della componente da associare FrameFile Dim CurrDoorHArdwareFile As String = CurrCompo.CompoType.Path & "\" & CurrCompo.TemplateSelItem - If Path.GetExtension(CurrDoorHArdwareFile) <> NGE_EXTENSION Then + If Path.GetExtension(CurrDoorHArdwareFile).ToLower <> NGE_EXTENSION Then CurrDoorHArdwareFile &= LUA_EXTENSION End If ' cerco il campo [Match file] nel file lua della componente diff --git a/AssemblyManager/AssemblyManagerVM.vb b/AssemblyManager/AssemblyManagerVM.vb index dfff29e..6530842 100644 --- a/AssemblyManager/AssemblyManagerVM.vb +++ b/AssemblyManager/AssemblyManagerVM.vb @@ -367,13 +367,12 @@ Public Class AssemblyManagerVM Map.refAssemblyManagerVM.CurrProject.AssemblyList = New ObservableCollection(Of AssemblyName) Dim DDFArray() As String = Directory.GetFiles(Map.refAssemblyManagerVM.CurrProject.Name) For IndexFile As Integer = 0 To DDFArray.Count - 1 - If Path.GetExtension(DDFArray(IndexFile)) <> DDF_EXTENSION Then - Continue For + If Path.GetExtension(DDFArray(IndexFile)).ToLower = DDF_EXTENSION Then + Dim NewAssembly As New AssemblyName + NewAssembly.Name = DDFArray(IndexFile) + NewAssembly.IsModified = False + Map.refAssemblyManagerVM.CurrProject.AssemblyList.Add(NewAssembly) End If - Dim NewAssembly As New AssemblyName - NewAssembly.Name = DDFArray(IndexFile) - NewAssembly.IsModified = False - Map.refAssemblyManagerVM.CurrProject.AssemblyList.Add(NewAssembly) Next If Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then Try @@ -1655,8 +1654,8 @@ Public Class AssemblyManagerVM SaveFileDialog.FileName = SaveFileDialog.FileName.Replace(FilePath, Trim(FilePath)) ' Controllo se il nome della porta ha estensione If Path.HasExtension(SaveFileDialog.FileName) Then - Dim sExtension As String = Path.GetExtension(SaveFileDialog.FileName) - If Not sExtension.ToLower = DDF_EXTENSION Then + Dim sExtension As String = Path.GetExtension(SaveFileDialog.FileName).ToLower + If Not sExtension = DDF_EXTENSION Then SaveFileDialog.FileName = SaveFileDialog.FileName.Replace(sExtension, DDF_EXTENSION) End If Else diff --git a/DoorParameters/Part.vb b/DoorParameters/Part.vb index faa106d..167121f 100644 --- a/DoorParameters/Part.vb +++ b/DoorParameters/Part.vb @@ -1421,7 +1421,7 @@ Public Class Part NewCompo.SetSelBrand(NewCompo.BrandListPart(0)) ' Carico il primo modello della lista Dim SelItemIndex As Integer = 0 - While SelItemIndex < NewCompo.FileList.Count - 1 AndAlso Path.HasExtension(NewCompo.FileList(SelItemIndex)) AndAlso Path.GetExtension(NewCompo.FileList(SelItemIndex)) = NGE_EXTENSION + While SelItemIndex < NewCompo.FileList.Count - 1 AndAlso Path.HasExtension(NewCompo.FileList(SelItemIndex)) AndAlso Path.GetExtension(NewCompo.FileList(SelItemIndex)).ToLower = NGE_EXTENSION SelItemIndex += 1 End While If SelItemIndex < NewCompo.FileList.Count Then diff --git a/Utility.vb b/Utility.vb index b1627e5..0bbad29 100644 --- a/Utility.vb +++ b/Utility.vb @@ -668,8 +668,8 @@ Public Module Utility Dim CurrHardwareFolder As CompoBrandDir = Nothing For Each File In FileArray File = File.Replace("/", "\") - If Not Path.GetExtension(File) = INI_EXTENSION And Not Path.GetExtension(File) = TEMPL_EXTENSION And - (Path.GetExtension(File) = LUA_EXTENSION Or Path.GetExtension(File) = NGE_EXTENSION) And + If Not Path.GetExtension(File).ToLower = INI_EXTENSION And Not Path.GetExtension(File).ToLower = TEMPL_EXTENSION And + (Path.GetExtension(File).ToLower = LUA_EXTENSION Or Path.GetExtension(File).ToLower = NGE_EXTENSION) And Not File.Contains(MATCHING_FILE_NAME) And Not File.ToLower().Contains("currhardware") Then If File.Contains(FRAME_FOLDER) Then If IsNothing(CurrFrameFolder) Then @@ -677,21 +677,21 @@ Public Module Utility CurrFrameFolder = New CompoBrandDir(HardwareDirPath, BaseDirName & FRAME_FOLDER) FrameFolderList.Add(CurrFrameFolder) End If - CurrFrameFolder.ModelFileList.Add(If(Path.GetExtension(File) = NGE_EXTENSION, Path.GetFileName(File), Path.GetFileNameWithoutExtension(File))) + CurrFrameFolder.ModelFileList.Add(If(Path.GetExtension(File).ToLower = NGE_EXTENSION, Path.GetFileName(File), Path.GetFileNameWithoutExtension(File))) Else If IsNothing(CurrFolder) Then ' CurrFolder = New CompoBrandDir(Path.GetFileName(HardwareDirPath), BaseDirName) CurrFolder = New CompoBrandDir(HardwareDirPath, BaseDirName) FolderList.Add(CurrFolder) End If - CurrFolder.ModelFileList.Add(If(Path.GetExtension(File) = NGE_EXTENSION, Path.GetFileName(File), Path.GetFileNameWithoutExtension(File))) + CurrFolder.ModelFileList.Add(If(Path.GetExtension(File).ToLower = NGE_EXTENSION, Path.GetFileName(File), Path.GetFileNameWithoutExtension(File))) If Not File.Contains(NGE_EXTENSION) Then If IsNothing(CurrHardwareFolder) Then ' CurrHardwareFolder = New CompoBrandDir(Path.GetFileName(HardwareDirPath), BaseDirName) CurrHardwareFolder = New CompoBrandDir(HardwareDirPath, BaseDirName) HardwareFolderList.Add(CurrHardwareFolder) End If - CurrHardwareFolder.ModelFileList.Add(If(Path.GetExtension(File) = NGE_EXTENSION, Path.GetFileName(File), Path.GetFileNameWithoutExtension(File))) + CurrHardwareFolder.ModelFileList.Add(If(Path.GetExtension(File).ToLower = NGE_EXTENSION, Path.GetFileName(File), Path.GetFileNameWithoutExtension(File))) End If End If End If