Skip to content

Commit

Permalink
Fix Firefox profile
Browse files Browse the repository at this point in the history
  • Loading branch information
@hassandraga
hassandraga committed Sep 22, 2023
1 parent edc8617 commit 58f294e
Showing 1 changed file with 45 additions and 41 deletions.
86 changes: 45 additions & 41 deletions src/webui.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ static int _webui_cmd_async(_webui_window_t* win, char* cmd, bool show);
static int _webui_run_browser(_webui_window_t* win, char* cmd);
static void _webui_clean(void);
static bool _webui_browser_exist(_webui_window_t* win, size_t browser);
static const char* _webui_browser_get_temp_path(size_t browser);
static const char* _webui_get_temp_path();
static bool _webui_folder_exist(char* folder);
static bool _webui_browser_create_profile_folder(_webui_window_t* win, size_t browser);
static bool _webui_browser_start_chrome(_webui_window_t* win, const char* address);
Expand Down Expand Up @@ -432,7 +432,6 @@ size_t webui_new_window(void) {
// Initialisation
win->window_number = window_number;
win->browser_path = (char*) _webui_malloc(WEBUI_MAX_PATH);
win->profile_path = (char*) _webui_malloc(WEBUI_MAX_PATH);
win->server_root_path = (char*) _webui_malloc(WEBUI_MAX_PATH);
if(_webui_is_empty(_webui_core.default_server_root_path))
sprintf(win->server_root_path, "%s", WEBUI_DEFAULT_PATH);
Expand All @@ -446,27 +445,6 @@ size_t webui_new_window(void) {
return (size_t)window_number;
}

size_t webui_get_new_window_id(void) {

#ifdef WEBUI_LOG
printf("[User] webui_get_new_window_id()...\n");
#endif

_webui_init();

for(size_t i = 1; i < WEBUI_MAX_IDS; i++) {
if(_webui_core.wins[i] == NULL) {
if(i > _webui_core.last_win_number)
_webui_core.last_win_number = i;
return i;
}
}

// We should never reach here
_webui_panic();
return 0;
}

size_t webui_new_window_id(size_t window_number) {

#ifdef WEBUI_LOG
Expand Down Expand Up @@ -506,6 +484,27 @@ size_t webui_new_window_id(size_t window_number) {
return window_number;
}

size_t webui_get_new_window_id(void) {

#ifdef WEBUI_LOG
printf("[User] webui_get_new_window_id()...\n");
#endif

_webui_init();

for(size_t i = 1; i < WEBUI_MAX_IDS; i++) {
if(_webui_core.wins[i] == NULL) {
if(i > _webui_core.last_win_number)
_webui_core.last_win_number = i;
return i;
}
}

// We should never reach here
_webui_panic();
return 0;
}

void webui_set_kiosk(size_t window, bool status) {

#ifdef WEBUI_LOG
Expand Down Expand Up @@ -2659,8 +2658,16 @@ static bool _webui_browser_create_profile_folder(_webui_window_t* win, size_t br
printf("[Core]\t\t_webui_browser_create_profile_folder(%zu) -> Generating WebUI profile...\n", browser);
#endif

// Buffers
if(win->profile_name != NULL)
_webui_free_mem((void*)win->profile_name);
if(win->profile_path != NULL)
_webui_free_mem((void*)win->profile_path);
win->profile_path = (char*) _webui_malloc(WEBUI_MAX_PATH);
const char* temp = _webui_browser_get_temp_path(browser);
win->profile_name = (char*) _webui_malloc(WEBUI_MAX_PATH);

// Temp folder
const char* temp = _webui_get_temp_path();

if(browser == Chrome) {

Expand Down Expand Up @@ -2708,21 +2715,19 @@ static bool _webui_browser_create_profile_folder(_webui_window_t* win, size_t br

// Firefox (We need to create a folder)

char* profile_name = "WebUIFirefoxProfile";

char firefox_profile_path[1024] = {0};
sprintf(firefox_profile_path, "%s%s.WebUI%s%s", temp, webui_sep, webui_sep, profile_name);
sprintf(firefox_profile_path, "%s%s.WebUI%sWebUIFirefoxProfile", temp, webui_sep, webui_sep);

if(!_webui_folder_exist(firefox_profile_path)) {

char buf[2048] = {0};

sprintf(buf, "%s -CreateProfile \"WebUI %s\"", win->browser_path, firefox_profile_path);
sprintf(buf, "\"%s\" -CreateProfile \"WebUI %s\"", win->browser_path, firefox_profile_path);
_webui_cmd_sync(win, buf, false);

// Creating the browser profile
for(size_t n = 0; n <= 12; n++) {
// 3000ms
for(size_t n = 0; n <= 24; n++) {
// 6000ms
if(_webui_folder_exist(firefox_profile_path))
break;
_webui_sleep(250);
Expand Down Expand Up @@ -2761,10 +2766,14 @@ static bool _webui_browser_create_profile_folder(_webui_window_t* win, size_t br
fputs(":root{--uc-toolbar-height:32px}:root:not([uidensity=\"compact\"]) {--uc-toolbar-height:38px}#TabsToolbar{visibility:collapse!important}:root:not([inFullscreen]) #nav-bar{margin-top:calc(0px - var(--uc-toolbar-height))}#toolbar-menubar{min-height:unset!important;height:var(--uc-toolbar-height)!important;position:relative}#main-menubar{-moz-box-flex:1;background-color:var(--toolbar-bgcolor,--toolbar-non-lwt-bgcolor);background-clip:padding-box;border-right:30px solid transparent;border-image:linear-gradient(to left,transparent,var(--toolbar-bgcolor,--toolbar-non-lwt-bgcolor) 30px) 20 / 30px}#toolbar-menubar:not([inactive]) {z-index:2}#toolbar-menubar[inactive] > #menubar-items{opacity:0;pointer-events:none;margin-left:var(--uc-window-drag-space-width,0px)}#nav-bar{visibility:collapse}@-moz-document url(chrome://browser/content/browser.xhtml) {:root:not([sizemode=\"fullscreen\"]) > head{display: block;position: fixed;width: calc(200vw - 440px);text-align: left;z-index: 9;pointer-events: none;}head > *{ display: none }head > title{display: -moz-inline-box;padding: 4px;max-width: 50vw;overflow-x: hidden;text-overflow: ellipsis;}}", file);
#endif
fclose(file);

sprintf(win->profile_path, "%s%s%s", temp, webui_sep, profile_name);
}

// Save Firefox profile name (CLI: -P {profile_name})
strcpy(win->profile_name, "WebUI");

// Save Firefox profile full path
strcpy(win->profile_path, firefox_profile_path);

return true;
}

Expand Down Expand Up @@ -2806,10 +2815,10 @@ static char* _webui_generate_internal_id(_webui_window_t* win, const char* eleme
return webui_internal_id;
}

static const char* _webui_browser_get_temp_path(size_t browser) {
static const char* _webui_get_temp_path() {

#ifdef WEBUI_LOG
printf("[Core]\t\t_webui_browser_get_temp_path([%zu])...\n", browser);
printf("[Core]\t\t_webui_get_temp_path()...\n");
#endif

#ifdef _WIN32
Expand All @@ -2824,23 +2833,18 @@ static const char* _webui_browser_get_temp_path(size_t browser) {
if(WinUserProfile == NULL)
return "";
#endif
return WinUserProfile;
#elif __APPLE__
// Resolve $HOME
char* MacUserProfile = getenv("HOME");
if(MacUserProfile == NULL)
return "";
return MacUserProfile;
#else
// Resolve $HOME
char* LinuxUserProfile = getenv("HOME");
if(LinuxUserProfile == NULL)
return "";
#endif

#ifdef _WIN32
return WinUserProfile;
#elif __APPLE__
return MacUserProfile;
#else
return LinuxUserProfile;
#endif
}
Expand Down

0 comments on commit 58f294e

Please sign in to comment.