From ba11539f586fd4e14e63a1f5e4020ebdee13609c Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Thu, 11 May 2023 17:55:34 +0600
Subject: [PATCH] Drivers test fix for certain cases

---
 source/CMakeLists.txt       | 22 +++++++++++++++--
 source/ubl-settings-video.c | 49 +++++++++++++++++++++++--------------
 source/ubl-settings-video.h |  3 +++
 3 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index b0fba42..6559f48 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -8,6 +8,20 @@ include_directories(${GTK_INCLUDE_DIRS})
 link_directories(${GTK_LIBRARY_DIRS})
 add_definitions(${GTK_CFLAGS_OTHER})
 
+option(WEBKIT_FOUND "No" OFF)
+
+find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
+
+if(WEBKIT_LIBRARIES_FOUND)
+        option(WEBKIT_FOUND "Yes" ON)
+        PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
+        include_directories(${WEBKIT_INCLUDE_DIRS})
+        link_directories(${WEBKIT_LIBRARY_DIRS})
+        add_definitions(${WEBKIT_CFLAGS_OTHER})
+endif()
+
+configure_file(ubl-settings-video.h.in ubl-settings-video-cm.h)
+
 
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a")
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm")
@@ -19,7 +33,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin
 set(SOURCE_FILES
         ubl-settings-video.c
         ubl-utils.c
-)
+        ubl-settings-video-cm.h)
 
 set(LIBRARIES
         ${GTK_LIBRARIES}
@@ -28,5 +42,9 @@ set(LIBRARIES
 
 
 add_executable(ubl-settings-video ${SOURCE_FILES})
-target_link_libraries(ubl-settings-video ${LIBRARIES})
+target_link_libraries(ubl-settings-video PUBLIC ${WEBKIT_LIBRARIES} ${LIBRARIES})
+target_include_directories(ubl-settings-video PUBLIC
+                           "${PROJECT_BINARY_DIR}"
+                           ${WEBKIT_INCLUDE_DIRS}
+                           )
 install(TARGETS ubl-settings-video DESTINATION bin)
\ No newline at end of file
diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c
index 73b6e75..a07ab8a 100644
--- a/source/ubl-settings-video.c
+++ b/source/ubl-settings-video.c
@@ -1025,7 +1025,7 @@ dictionary *yon_proprieary_get(){
                 else videoconfig.proprietary=yon_dictionary_create_with_data_connected(videoconfig.proprietary,drivers[drivers_found],rtn[i]);
         }
     }
-    if (videoconfig.proprietary){
+    if (!videoconfig.proprietary){
         yon_gtk_list_store_fill_with_proprietaries(videoconfig.list);
         videoconfig.status_render.strings_size=0;
         videoconfig.status_render.text_strings_to_render=NULL;
@@ -1034,26 +1034,37 @@ dictionary *yon_proprieary_get(){
         yon_ubl_status_box_render(&videoconfig.status_render);
     } else {
         drivers=yon_config_load(get_proprietary_drivers_local_command,&drivers_size);
-        for (int drivers_found=0;drivers_found<drivers_size;drivers_found++){
-            drivers[drivers_found]=yon_char_divide_search(drivers[drivers_found],"\n",-1);
-            for (int i=0;i<size;i++){
-                rtn[i] = yon_char_divide_search(rtn[i],"\n",-1);
-                char *key=yon_char_new(rtn[i]);
-                if (key[0]==';')
-                    yon_char_divide_search(key,";",-1);
-                key = yon_char_divide_search(key,";",-1);
-                char *driver_name=yon_char_divide_search(yon_char_new(drivers[drivers_found])," ",-1);
-                if (strcmp(key,driver_name)==0)
-                    if (i==0) videoconfig.proprietary=yon_dictionary_create_with_data(drivers[drivers_found],rtn[i]);
-                    else videoconfig.proprietary=yon_dictionary_create_with_data_connected(videoconfig.proprietary,drivers[drivers_found],rtn[i]);
+        if (drivers){
+            printf("%s\n",drivers[0]);
+            for (int drivers_found=0;drivers_found<drivers_size;drivers_found++){
+                drivers[drivers_found]=yon_char_divide_search(drivers[drivers_found],"\n",-1);
+                for (int i=0;i<size;i++){
+                    rtn[i] = yon_char_divide_search(rtn[i],"\n",-1);
+                    char *key=yon_char_new(rtn[i]);
+                    if (key[0]==';')
+                        yon_char_divide_search(key,";",-1);
+                    key = yon_char_divide_search(key,";",-1);
+                    char *driver_name=yon_char_divide_search(yon_char_new(drivers[drivers_found])," ",-1);
+                    if (strcmp(key,driver_name)==0)
+                        if (i==0) videoconfig.proprietary=yon_dictionary_create_with_data(drivers[drivers_found],rtn[i]);
+                        else videoconfig.proprietary=yon_dictionary_create_with_data_connected(videoconfig.proprietary,drivers[drivers_found],rtn[i]);
+                }
             }
+
+            yon_gtk_list_store_fill_with_proprietaries(videoconfig.list);
+            videoconfig.status_render.strings_size=0;
+            videoconfig.status_render.text_strings_to_render=NULL;
+            videoconfig.status_render.text_to_render=PROPRIETARY_USE_LOCAL_LABEL;
+            videoconfig.status_render.type=BACKGROUND_IMAGE_SUCCESS_TYPE;
+            yon_ubl_status_box_render(&videoconfig.status_render);
+        } else
+        {
+            videoconfig.status_render.strings_size=0;
+            videoconfig.status_render.text_strings_to_render=NULL;
+            videoconfig.status_render.text_to_render=PROPRIETARY_LOADING_FAILED_LABEL;
+            videoconfig.status_render.type=BACKGROUND_IMAGE_FAIL_TYPE;
+            yon_ubl_status_box_render(&videoconfig.status_render);
         }
-        
-        videoconfig.status_render.strings_size=0;
-        videoconfig.status_render.text_strings_to_render=NULL;
-        videoconfig.status_render.text_to_render=PROPRIETARY_LOADING_FAILED_LABEL;
-        videoconfig.status_render.type=BACKGROUND_IMAGE_FAIL_TYPE;
-        yon_ubl_status_box_render(&videoconfig.status_render);
     }
 }
 
diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h
index bc19f51..b05462c 100644
--- a/source/ubl-settings-video.h
+++ b/source/ubl-settings-video.h
@@ -11,6 +11,9 @@
 #include <fcntl.h>
 #include <getopt.h>
 #include <libintl.h>
+#ifdef WEBKIT_FOUND
+    #include <webkit2/webkit2.h>
+#endif
 #include "ubl-utils.h"
 #include "ubl-settings-video-strings.h"
 #ifndef UBL_SETINGS_VIDEO_H