Lego yaw patch 1 (#10)

* removing some packages

* update to ReadDBC.jl

---------

Co-authored-by: Bright-yaw <[email protected]>

Author: lego-yaw

Project.toml

@@ -4,15 +4,19 @@ authors = ["Bright-yaw <[email protected]> and contributors"]
 version = "1.0.0"
 
 [deps]
+DBCtoDBF_jll = "404e8f35-d372-56c3-89ac-e648a26fddda"
 DBFTables = "75c7ada1-017a-5fb6-b8c7-2125ff2d6c93"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
+
 
 [compat]
 DBFTables = "1.2.6"
 DataFrames = "1.6.1"
 Documenter = "1.6.0"
 julia = "1.10.4"
+DBCtoDBF_jll = "v1.0.0"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/ReadDBC.jl

@@ -6,41 +6,21 @@ export dbcTable, dbctodbf
 # Importing packages 
 using DBFTables
 using DataFrames
-using Base.Libc.Libdl
-using Base.Filesystem
+using  DBCtoDBF_jll 
 
 
-# Defining function dbctodbf
-function dbctodbf(input_file::String, output_file::String)
-    # Set path for .dll files
-    lib_path = "src/libdbc2dbf.dll"
-    # Change permissions on the file before loading (optional and platform-dependent)
-    chmod(lib_path, 0o755)
 
-    # Load the shared library
-    lib = dlopen(lib_path)
-    
-    # Ensure the library is properly loaded
-    if lib === C_NULL
-        error("Failed to load the library.")
-    end
 
-    # Create a pointer to the C function in the library
-    func = dlsym(lib, :dbc2dbf)
-    
-    # Ensure the function pointer is valid
-    if func === C_NULL
-        dlclose(lib)
-        error("Failed to find the function dbc2dbf in the library.")
-    end
 
-    # Call the C function directly with string parameters
-    result = ccall(func, Cvoid, (Cstring, Cstring), input_file, output_file)
+# Defining function dbctodbf
+function dbctodbf(input_file::String, output_file::String)
+    # The DBCtoDBF_jll package provides the dbc2dbf executable directly
+    exe_path = dbc2dbf()  # This gives the path to the dbc2dbf executable
 
-    # Close the library after the function call
-    dlclose(lib)
+    # Run the executable with the input and output file arguments
+    run(`$exe_path $input_file $output_file`)
 
-    return result
+    return output_file  # Optionally return the output file name
 end
 
 # Defining function readdbc

src/ccall_dbftodbc.jl

@@ -1,36 +1,17 @@
-#using Libdl
-using Base.Filesystem
-using Base.Libc.Libdl
+using DBCtoDBF_jll  # Load the DBCtoDBF_jll wrapper
 
-function dbctodbf(input_file::String, output_file::String)
-   
-    # Set path for .dll files
-    lib_path = "src/libdbc2dbf.dll"
-    # Change permissions on the file before loading (optional and platform-dependent)
-    chmod(lib_path, 0o755)
 
-    # Load the shared library
-    lib = dlopen(lib_path)
-    
-    # Ensure the library is properly loaded
-    if lib === C_NULL
-        error("Failed to load the library.")
-    end
+function dbctodbf(input_file::String, output_file::String)
+    # The DBCtoDBF_jll package provides the dbc2dbf executable directly
+    exe_path = dbc2dbf()  # This gives the path to the dbc2dbf executable
 
-    # Create a pointer to the C function in the library
-    func = dlsym(lib, :dbc2dbf)
+    # Run the executable with the input and output file arguments
+    run(`$exe_path $input_file $output_file`)
 
-    # Ensure the function pointer is valid
-    if func === C_NULL
-        dlclose(lib)
-        error("Failed to find the function dbc2dbf in the library.")
-    end
+    return output_file  # Optionally return the output file name
+end
 
-    # Call the C function directly with string parameters
-    result = ccall(func, Cvoid, (Cstring, Cstring), input_file, output_file)
-
-    # Close the library after the function call
-    dlclose(lib)
-    
-    return result
-end
+# Example usage
+input_file = "src/ABOAC1909.dbc"
+output_file = "src/ABOAC1909.dbf"
+dbctodbf(input_file, output_file)

src/how_to_use.jl

@@ -1,3 +1,3 @@
-using ReadDBC
+using .ReadDBC
 
 df = dbcTable("src/ABOAC1909.dbc")

src/libdbc2dbf.dll

@@ -1,12 +1,13 @@
 using Test
-using ReadDBC
+using .ReadDBC
 using DataFrames
 
+
 # Test the dbctodbf function
 @testset "ReadDBC Tests" begin
     # Set up file paths 
     input_file = "src/ABOAC1909.dbc"
-    output_file = "src/ABOAC1909.dbf"
+    output_file = "src/ABOAC1909.dbf"     
 
     # Call the dbctodbf function
     result = dbctodbf(input_file, output_file)