Replace strptime with portable code (#1185)

* Prepare CMake code for tests to module code

* Add tests for DatetimeXMLstring_to_mseconds

* Get rid of strptime

strptime is not portable as it is not supported by MinGW and MSVC. We only use it for the GPS filters which use Qt anyways hence we can use QDateTime instead.

Author: jlskuz

.github/workflows/static-code-analysis.yml

@@ -14,7 +14,6 @@ jobs:
         -i src/modules/glaxnimate/glaxnimate/
         -i src/modules/plus/ebur128/
         -i src/modules/xml/common.c
-        -i src/win32/strptime.c
         --include=src/framework/mlt_log.h
         --include=src/framework/mlt_types.h
         --library=cppcheck.cfg

makefile

@@ -25,7 +25,6 @@ cppcheck:
 		-i src/modules/glaxnimate/glaxnimate/ \
 		-i src/modules/plus/ebur128/ \
 		-i src/modules/xml/common.c \
-		-i src/win32/strptime.c \
 		--include=src/framework/mlt_log.h \
 		--include=src/framework/mlt_types.h \
 		--library=cppcheck.cfg \

src/framework/CMakeLists.txt

@@ -111,7 +111,7 @@ if(WIN32)
     target_link_options(mlt PRIVATE -Wl,--output-def,${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libmlt-${MLT_VERSION_MAJOR}.def)
     install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libmlt-${MLT_VERSION_MAJOR}.def" DESTINATION ${CMAKE_INSTALL_LIBDIR})
   endif()
-  target_sources(mlt PRIVATE ../win32/win32.c ../win32/strptime.c)
+  target_sources(mlt PRIVATE ../win32/win32.c)
   target_link_libraries(mlt PRIVATE Iconv::Iconv)
   if(NOT WINDOWS_DEPLOY)
     target_compile_definitions(mlt PRIVATE NODEPLOY)

src/framework/mlt_types.h

@@ -346,7 +346,6 @@ MLT_EXPORT FILE *win32_fopen(const char *filename_utf8, const char *mode_utf8);
 #include <sys/types.h>
 MLT_EXPORT int win32_stat(const char *filename_utf8, struct stat *buffer);
 #include <time.h>
-MLT_EXPORT char *strptime(const char *buf, const char *fmt, struct tm *tm);
 #define mlt_fopen win32_fopen
 #define mlt_stat win32_stat
 #define MLT_DIRLIST_DELIMITER ";"

src/modules/qt/filter_gpstext.cpp

@@ -425,7 +425,7 @@ static void process_filter_properties(mlt_filter filter, mlt_frame frame)
         if (strlen(read_gps_processing_start_time) != 0
             && strcmp(read_gps_processing_start_time, "yyyy-MM-dd hh:mm:ss"))
             gps_proc_t = datetimeXMLstring_to_mseconds(read_gps_processing_start_time,
-                                                       (char *) "%Y-%m-%d %H:%M:%S");
+                                                       (char *) "yyyy-MM-dd hh:mm:ss");
         if (gps_proc_t != pdata->gps_proc_start_t) {
             pdata->gps_proc_start_t = gps_proc_t;
             do_processing = 1;

src/modules/qt/gps_parser.cpp

@@ -22,6 +22,8 @@
 #define _GNU_SOURCE
 #endif
 #include "gps_parser.h"
+#include <QDateTime>
+#include <QTimeZone>
 
 #define _x (const xmlChar *)
 #define _s (const char *)
@@ -70,36 +72,29 @@ double get_avg_gps_time_ms(gps_private_data gdata)
  */
 int64_t datetimeXMLstring_to_mseconds(const char *text, char *format /* = NULL*/)
 {
-    char def_format[] = "%Y-%m-%dT%H:%M:%S";
     int64_t ret = 0;
-    int ms = 0;
-    struct tm tm_time;
-    //samples: 2020-07-11T09:03:23.000Z or 2021-02-27T12:10:00+00:00
-    tm_time.tm_isdst = -1; //force dst detection
 
-    if (format == NULL)
-        format = def_format;
+    QDateTime datetime;
+    if (format != NULL)
+        datetime = QDateTime::fromString(QString(text), QString(format));
+    else
+        datetime = QDateTime::fromString(QString(text), Qt::ISODateWithMs);
 
-    if (strptime(text, format, &tm_time) == NULL) {
+    if (!datetime.isValid()) {
         mlt_log_warning(
             NULL,
-            "filter_gpsText.c datetimeXMLstring_to_seconds strptime failed on string: %.25s",
+            "filter_gpsText.c datetimeXMLstring_to_seconds conversion failed on string: %.25s",
             text);
         return 0;
     }
 
-    ret = internal_timegm(&tm_time);
-
-    //check if we have miliseconds, 3 digits only
-    const char *ms_part = strchr(text, '.');
-    if (ms_part != NULL) {
-        ms = strtol(ms_part + 1, NULL, 10);
-        while (abs(ms) > 999)
-            ms /= 10;
-    }
-    ret = ret * 1000 + ms;
+#if QT_VERSION > QT_VERSION_CHECK(6, 5, 0)
+    datetime.setTimeZone(QTimeZone::UTC);
+#else
+    datetime.setTimeZone(QTimeZone(0));
+#endif
 
-    // mlt_log_info(NULL, "datetimeXMLstring_to_mseconds: text:%s, ms:%d (/1000)", text, ret/1000);
+    ret = datetime.toMSecsSinceEpoch();
     return ret;
 }
 

src/tests/CMakeLists.txt

@@ -1,14 +1,56 @@
 set(CMAKE_AUTOMOC ON)
 
-foreach(QT_TEST_NAME animation audio events filter frame image multitrack playlist producer properties repository service tractor xml)
-  add_executable(test_${QT_TEST_NAME} test_${QT_TEST_NAME}/test_${QT_TEST_NAME}.cpp)
-  target_compile_options(test_${QT_TEST_NAME} PRIVATE ${MLT_COMPILE_OPTIONS})
-  target_link_libraries(test_${QT_TEST_NAME} PRIVATE Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Test mlt++)
-  add_test(NAME "QtTest:${QT_TEST_NAME}" COMMAND test_${QT_TEST_NAME})
+function(add_qt_test)
+  set(options "")
+  set(oneValueArgs TEST_NAME)
+  set(multiValueArgs LINK_LIBRARIES INCLUDE_DIRS SOURCE_FILES)
+  cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  set(_testname test_${arg_TEST_NAME})
+
+  add_executable(${_testname} ${_testname}/${_testname}.cpp ${arg_SOURCE_FILES})
+
+  target_compile_options(${_testname} PRIVATE ${MLT_COMPILE_OPTIONS})
+
+  target_link_libraries(${_testname} PRIVATE
+    Qt${QT_MAJOR_VERSION}::Core
+    Qt${QT_MAJOR_VERSION}::Test
+    mlt++
+    ${ARG_LINK_LIBRARIES}
+  )
+  target_include_directories(${_testname} PRIVATE ${arg_INCLUDE_DIRS})
+  add_test(NAME "QtTest:${arg_TEST_NAME}" COMMAND ${_testname})
+
   if(NOT WIN32)
-    set_tests_properties("QtTest:${QT_TEST_NAME}" PROPERTIES ENVIRONMENT "LANG=en_US")
+    set_tests_properties("QtTest:${arg_TEST_NAME}" PROPERTIES ENVIRONMENT "LANG=en_US")
   endif()
-endforeach()
+
+endfunction()
+
+add_qt_test(TEST_NAME animation)
+add_qt_test(TEST_NAME audio)
+add_qt_test(TEST_NAME events)
+add_qt_test(TEST_NAME filter)
+add_qt_test(TEST_NAME frame)
+add_qt_test(TEST_NAME image)
+add_qt_test(TEST_NAME multitrack)
+add_qt_test(TEST_NAME playlist)
+add_qt_test(TEST_NAME producer)
+add_qt_test(TEST_NAME properties)
+add_qt_test(TEST_NAME repository)
+add_qt_test(TEST_NAME service)
+add_qt_test(TEST_NAME tractor)
+add_qt_test(TEST_NAME xml)
+
+if(MOD_QT6)
+  add_qt_test(
+    TEST_NAME mod_qt_gps
+    SOURCE_FILES
+      "${CMAKE_SOURCE_DIR}/src/modules/qt/gps_parser.h"
+      "${CMAKE_SOURCE_DIR}/src/modules/qt/gps_parser.cpp"
+  )
+endif()
+
 
 file(GLOB YML_FILES "${CMAKE_SOURCE_DIR}/src/modules/*/*.yml")
 foreach(YML_FILE ${YML_FILES})

src/tests/test_mod_qt_gps/test_mod_qt_gps.cpp

@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2025 Julius Künzel <julius.kuenzel@kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with consumer library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <QtTest>
+
+#include <modules/qt/gps_parser.h>
+
+extern int64_t datetimeXMLstring_to_mseconds(const char *text, char *format);
+
+class TestModQt : public QObject
+{
+    Q_OBJECT
+
+public:
+    TestModQt() { }
+
+    ~TestModQt() { }
+
+private Q_SLOTS:
+    void DatetimeXMLstring_to_mseconds_ValidConversion()
+    {
+        int64_t gps_proc_t = 0;
+
+        // ISO 8601 extended date with timezone info Z
+        const char *text = "2020-07-11T09:03:23.000Z";
+        gps_proc_t = datetimeXMLstring_to_mseconds(text);
+        QCOMPARE(gps_proc_t, 1594458203000);
+
+        // ISO 8601 extended date with timezone offset
+        text = "2021-02-27T12:10:00+00:00";
+        gps_proc_t = datetimeXMLstring_to_mseconds(text);
+        QCOMPARE(gps_proc_t, 1614427800000);
+
+        // ISO 8601 extended date with ms and timezone offset
+        text = "2020-07-11T09:03:23.000+00:00";
+        gps_proc_t = datetimeXMLstring_to_mseconds(text);
+        QCOMPARE(gps_proc_t, 1594458203000);
+
+        // ISO 8601 extended date without timezone info
+        text = "2020-07-11T09:03:23.000";
+        gps_proc_t = datetimeXMLstring_to_mseconds(text);
+        QCOMPARE(gps_proc_t, 1594458203000);
+    }
+
+    void DatetimeXMLstring_to_mseconds_FormatString()
+    {
+        int64_t gps_proc_t = 0;
+
+        // Unknown input, with format string as hint
+        const char *text = "12:10:00 27-02-2021";
+        gps_proc_t = datetimeXMLstring_to_mseconds(text, (char *) "HH:mm:ss dd-MM-yyyy");
+        QCOMPARE(gps_proc_t, 1614427800000);
+
+        // Unknown input, without format string
+        text = "12:10:00 27-02-2021";
+        gps_proc_t = datetimeXMLstring_to_mseconds(text);
+        QCOMPARE(gps_proc_t, 0);
+
+        // Valid input, but mismatching format string
+        text = "2021-02-27T12:10:00+00:00";
+        gps_proc_t = datetimeXMLstring_to_mseconds(text, (char *) "HH:mm:ss dd-MM-yyyy");
+        QCOMPARE(gps_proc_t, 0);
+    }
+
+    void DatetimeXMLstring_to_mseconds_InvalidInput()
+    {
+        int64_t gps_proc_t = 0;
+
+        // Invalid input, without format string
+        const char *text = "invalid-date-format";
+        gps_proc_t = datetimeXMLstring_to_mseconds(text);
+        QCOMPARE(gps_proc_t, 0);
+
+        // Invalid input, with format string
+        gps_proc_t = datetimeXMLstring_to_mseconds(text, (char *) "%Y-%m-%dT%H:%M:%S");
+        QCOMPARE(gps_proc_t, 0);
+    }
+};
+
+QTEST_APPLESS_MAIN(TestModQt)
+
+#include "test_mod_qt_gps.moc"