Added version callback to arg parsing.

dabamos · Nov 18, 2024 · ad37901 · ad37901
1 parent 8c09462
commit ad37901
Show file tree

Hide file tree

Showing 26 changed files with 168 additions and 90 deletions.
diff --git a/app/dmbackup.f90 b/app/dmbackup.f90
@@ -91,7 +91,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read all command-line arguments.
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, dm_db_version(.true.))
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args(1), app%database)
@@ -125,4 +125,9 @@ subroutine backup_handler(remaining, page_count)
         write (*, '(a1, "[0GProgress: ", f5.1, " %")', advance='no') &
             ASCII_ESC, 100.0 * (page_count - remaining) / page_count
     end subroutine backup_handler
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a)', dm_db_version(.true.)
+    end subroutine version_callback
 end program dmbackup
diff --git a/app/dmbeat.f90 b/app/dmbeat.f90
@@ -79,8 +79,7 @@ integer function read_args(app) result(rc)
         !! Reads command-line arguments and settings from configuration file.
         type(app_type), intent(out) :: app !! App type.
 
-        character(len=:), allocatable :: version
-        type(arg_type)                :: args(14)
+        type(arg_type) :: args(14)
 
         args = [ &
             arg_type('name',        short='n', type=ARG_TYPE_ID),      & ! -n, --name <id>
@@ -100,8 +99,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read all command-line arguments.
-        version = dm_rpc_version() // ' ' // dm_lua_version(.true.) // ' ' // dm_zstd_version(.true.)
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, version)
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args(1), app%name)
@@ -344,4 +342,9 @@ subroutine signal_callback(signum) bind(c)
                 call dm_stop(STOP_SUCCESS)
         end select
     end subroutine signal_callback
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a, 2(1x, a))', dm_rpc_version(), dm_lua_version(.true.), dm_zstd_version(.true.)
+    end subroutine version_callback
 end program dmbeat
diff --git a/app/dmbot.f90 b/app/dmbot.f90
@@ -171,8 +171,7 @@ integer function read_args(app, bot) result(rc)
         type(app_type), intent(out) :: app !! App type.
         type(bot_type), intent(out) :: bot !! Bot type.
 
-        character(len=:), allocatable :: version
-        type(arg_type)                :: args(12)
+        type(arg_type) :: args(12)
 
         args = [ &
             arg_type('name',      short='n', type=ARG_TYPE_ID),       & ! -n, --name <id>
@@ -190,8 +189,7 @@ integer function read_args(app, bot) result(rc)
         ]
 
         ! Read all command-line arguments.
-        version = dm_lua_version(.true.) // ' ' // dm_db_version(.true.)
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, version)
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args(1), app%name)
@@ -909,4 +907,9 @@ subroutine signal_callback(signum) bind(c)
                 call halt(E_NONE)
         end select
     end subroutine signal_callback
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a, 1x, a)', dm_lua_version(.true.), dm_db_version(.true.)
+    end subroutine version_callback
 end program dmbot
diff --git a/app/dmdb.f90 b/app/dmdb.f90
@@ -96,8 +96,7 @@ integer function read_args(app) result(rc)
         !! Reads command-line arguments and settings from configuration file.
         type(app_type), intent(out) :: app
 
-        character(len=:), allocatable :: version
-        type(arg_type)                :: args(8)
+        type(arg_type) :: args(8)
 
         ! Required and optional command-line arguments.
         args = [ &
@@ -112,8 +111,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read all command-line arguments.
-        version = dm_lua_version(.true.) // ' ' // dm_db_version(.true.)
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, version)
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args(1), app%name)
@@ -295,4 +293,9 @@ subroutine signal_callback(signum) bind(c)
                 call halt(E_NONE)
         end select
     end subroutine signal_callback
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a, 1x, a)', dm_lua_version(.true.), dm_db_version(.true.)
+    end subroutine version_callback
 end program dmdb
diff --git a/app/dmdbctl.f90 b/app/dmdbctl.f90
@@ -419,7 +419,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read command-line arguments.
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, dm_db_version(.true.))
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         ! CRUD operation.
@@ -553,4 +553,9 @@ integer function read_args(app) result(rc)
         ! Validation passed.
         rc = E_NONE
     end function read_args
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a)', dm_db_version(.true.)
+    end subroutine version_callback
 end program dmdbctl
diff --git a/app/dmexport.f90 b/app/dmexport.f90
@@ -182,7 +182,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read all command-line arguments.
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, dm_db_version(.true.))
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args( 1), app%database)
@@ -267,4 +267,9 @@ integer function read_args(app) result(rc)
 
         rc = E_NONE
     end function read_args
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a)', dm_db_version(.true.)
+    end subroutine version_callback
 end program dmexport
diff --git a/app/dmfeed.f90 b/app/dmfeed.f90
@@ -77,8 +77,7 @@ integer function read_args(app) result(rc)
         !! `--config` is passed).
         type(app_type), intent(out) :: app !! App type.
 
-        character(len=:), allocatable :: version
-        type(arg_type)                :: args(16)
+        type(arg_type) :: args(16)
 
         args = [ &
             arg_type('name',     short='n', type=ARG_TYPE_ID),       & ! -n, --name <id>
@@ -100,8 +99,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read all command-line arguments.
-        version = dm_lua_version(.true.) // ' ' // dm_db_version(.true.)
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, version)
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args(1), app%name)
@@ -274,4 +272,9 @@ subroutine create_feed(app, error)
         if (present(error)) error = rc
         rc = dm_db_close(db)
     end subroutine create_feed
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a, 1x, a)', dm_lua_version(.true.), dm_db_version(.true.)
+    end subroutine version_callback
 end program dmfeed
diff --git a/app/dmfs.f90 b/app/dmfs.f90
@@ -124,7 +124,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read all command-line arguments.
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, dm_lua_version(.true.))
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args(1), app%name)
@@ -467,4 +467,9 @@ subroutine signal_callback(signum) bind(c)
                 call dm_stop(STOP_SUCCESS)
         end select
     end subroutine signal_callback
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a)', dm_lua_version(.true.)
+    end subroutine version_callback
 end program dmfs
diff --git a/app/dmgrc.f90 b/app/dmgrc.f90
@@ -94,7 +94,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read all command-line arguments.
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, dm_lua_version(.true.))
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args(1), app%name)
@@ -306,4 +306,9 @@ subroutine signal_callback(signum) bind(c)
                 call halt(E_NONE)
         end select
     end subroutine signal_callback
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a)', dm_lua_version(.true.)
+    end subroutine version_callback
 end program dmgrc
diff --git a/app/dmimport.f90 b/app/dmimport.f90
@@ -270,7 +270,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read all command-line arguments.
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, dm_db_version(.true.))
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args(1), type_name)
@@ -308,4 +308,9 @@ integer function read_args(app) result(rc)
 
         rc = E_NONE
     end function read_args
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a)', dm_db_version(.true.)
+    end subroutine version_callback
 end program dmimport
diff --git a/app/dminfo.f90 b/app/dminfo.f90
@@ -40,7 +40,7 @@ integer function read_args(app) result(rc)
             arg_type(name='database', short='d', type=ARG_TYPE_DATABASE) & ! -d, --database <path>
         ]
 
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, dm_db_version(.true.))
+        rc = dm_arg_read(args, version_callback)
         call dm_arg_get(args(1), app%database)
         rc = E_NONE
     end function read_args
@@ -145,4 +145,9 @@ integer function output_info(app) result(rc)
         print '("system.time.zone: ", a)',  dm_time_zone()
         print '("system.version: ", a)',    trim(uname%version)
     end function output_info
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a)', dm_db_version(.true.)
+    end subroutine version_callback
 end program dminfo
diff --git a/app/dminit.f90 b/app/dminit.f90
@@ -100,7 +100,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read all command-line arguments.
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, dm_db_version(.true.))
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         ! Database type (observ, log, beat).
@@ -130,4 +130,9 @@ integer function read_args(app) result(rc)
 
         rc = E_NONE
     end function read_args
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a)', dm_db_version(.true.)
+    end subroutine version_callback
 end program dminit
diff --git a/app/dmlog.f90 b/app/dmlog.f90
@@ -62,7 +62,7 @@ integer function read_args(app, log) result(rc)
         ]
 
         ! Read all command-line arguments.
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args( 1), app%logger)
@@ -85,4 +85,8 @@ integer function read_args(app, log) result(rc)
 
         rc = E_NONE
     end function read_args
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+    end subroutine version_callback
 end program dmlog
diff --git a/app/dmlogger.f90 b/app/dmlogger.f90
@@ -92,8 +92,7 @@ integer function read_args(app) result(rc)
         !! Reads command-line arguments and settings from configuration file.
         type(app_type), intent(out) :: app
 
-        character(len=:), allocatable :: version
-        type(arg_type)                :: args(7)
+        type(arg_type) :: args(7)
 
         ! Required and optional command-line arguments.
         args = [ &
@@ -107,8 +106,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read all command-line arguments.
-        version = dm_lua_version(.true.) // ' ' // dm_db_version(.true.)
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, version)
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args(1), app%name)
@@ -289,4 +287,9 @@ subroutine signal_callback(signum) bind(c)
                 call halt(0)
         end select
     end subroutine signal_callback
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a, 1x, a)', dm_lua_version(.true.), dm_db_version(.true.)
+    end subroutine version_callback
 end program dmlogger
diff --git a/app/dmlua.f90 b/app/dmlua.f90
@@ -125,7 +125,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read all command-line arguments.
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, dm_lua_version(.true.))
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args(1), app%name)
@@ -319,4 +319,9 @@ subroutine signal_callback(signum) bind(c)
                 call halt(E_NONE)
         end select
     end subroutine signal_callback
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a)', dm_lua_version(.true.)
+    end subroutine version_callback
 end program dmlua
diff --git a/app/dmmbctl.f90 b/app/dmmbctl.f90
@@ -89,7 +89,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read all command-line arguments.
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, dm_modbus_version(.true.))
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args( 1), app%rtu%path,      passed=has_path)
@@ -286,4 +286,9 @@ integer function read_args(app) result(rc)
 
         rc = E_NONE
     end function read_args
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a)', dm_modbus_version(.true.)
+    end subroutine version_callback
 end program dmmbctl
diff --git a/app/dmpipe.f90 b/app/dmpipe.f90
@@ -124,7 +124,7 @@ integer function read_args(app) result(rc)
         ]
 
         ! Read all command-line arguments.
-        rc = dm_arg_read(args, APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH, dm_lua_version(.true.))
+        rc = dm_arg_read(args, version_callback)
         if (dm_is_error(rc)) return
 
         call dm_arg_get(args(1), app%name)
@@ -452,4 +452,9 @@ subroutine signal_callback(signum) bind(c)
                 call dm_stop(STOP_SUCCESS)
         end select
     end subroutine signal_callback
+
+    subroutine version_callback()
+        call dm_version_out(APP_NAME, APP_MAJOR, APP_MINOR, APP_PATCH)
+        print '(a)', dm_lua_version(.true.)
+    end subroutine version_callback
 end program dmpipe