deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-19 04:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes for importing themes.

Browse Source
This commit is contained in:
deepend
2026-01-16 22:42:18 -07:00
parent 2c349deee2
commit f473f3d4b9
1 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/common/zoitechat.c
View File

@@ -259,7 +259,6 @@ zoitechat_import_theme (const char *path, GError **error)
#ifdef WIN32 #ifdef WIN32
char *command = NULL; char *command = NULL;
char *powershell = NULL; char *powershell = NULL;
char *extractor = NULL;
#endif #endif
if (!path) if (!path)
@@ -295,65 +294,74 @@ zoitechat_import_theme (const char *path, GError **error)
return FALSE; return FALSE;
} }
argv[4] = theme_dir;
#ifdef WIN32 #ifdef WIN32
extractor = g_find_program_in_path ("unzip"); powershell = g_find_program_in_path ("powershell.exe");
if (extractor) if (!powershell)
powershell = g_find_program_in_path ("powershell");
if (!powershell)
{ {
argv[0] = extractor; g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT,
ok = g_spawn_sync (NULL, argv, NULL, 0, NULL, NULL, _("No archive extractor was found."));
NULL, NULL, &status, error); ok = FALSE;
} }
else else
{ {
powershell = g_find_program_in_path ("powershell.exe"); GString *escaped_path = g_string_new ("'");
if (!powershell) GString *escaped_dir = g_string_new ("'");
powershell = g_find_program_in_path ("powershell"); const char *cursor;
if (!powershell) for (cursor = path; *cursor != '\0'; cursor++)
{ {
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT, if (*cursor == '\'')
_("No archive extractor was found.")); g_string_append (escaped_path, "''");
ok = FALSE; else
g_string_append_c (escaped_path, *cursor);
} }
else g_string_append_c (escaped_path, '\'');
for (cursor = theme_dir; *cursor != '\0'; cursor++)
{ {
GString *escaped_path = g_string_new ("'"); if (*cursor == '\'')
GString *escaped_dir = g_string_new ("'"); g_string_append (escaped_dir, "''");
const char *cursor; else
g_string_append_c (escaped_dir, *cursor);
}
g_string_append_c (escaped_dir, '\'');
for (cursor = path; *cursor != '\0'; cursor++) command = g_strdup_printf (
{ "Add-Type -AssemblyName WindowsBase; "
if (*cursor == '\'') "$ErrorActionPreference='Stop'; "
g_string_append (escaped_path, "''"); "$package=[System.IO.Packaging.Package]::Open(%s); "
else "try { "
g_string_append_c (escaped_path, *cursor); "foreach ($part in $package.GetParts()) { "
} "$relative=$part.Uri.OriginalString.TrimStart('/'); "
g_string_append_c (escaped_path, '\''); "if ([string]::IsNullOrEmpty($relative)) { continue }; "
"$destPath=[System.IO.Path]::Combine(%s, $relative); "
"$destDir=[System.IO.Path]::GetDirectoryName($destPath); "
"if ($destDir -and -not (Test-Path -LiteralPath $destDir)) { "
"[System.IO.Directory]::CreateDirectory($destDir) | Out-Null "
"}; "
"$partStream=$part.GetStream(); "
"$fileStream=[System.IO.File]::Open($destPath,[System.IO.FileMode]::Create,[System.IO.FileAccess]::Write); "
"$partStream.CopyTo($fileStream); "
"$fileStream.Dispose(); "
"$partStream.Dispose(); "
"} "
"} finally { $package.Close(); }",
escaped_path->str,
escaped_dir->str);
g_string_free (escaped_path, TRUE);
g_string_free (escaped_dir, TRUE);
for (cursor = theme_dir; *cursor != '\0'; cursor++) {
{ char *ps_argv[] = {powershell, "-NoProfile", "-NonInteractive", "-Command", command, NULL};
if (*cursor == '\'') ok = g_spawn_sync (NULL, ps_argv, NULL, 0, NULL, NULL,
g_string_append (escaped_dir, "''"); NULL, NULL, &status, error);
else
g_string_append_c (escaped_dir, *cursor);
}
g_string_append_c (escaped_dir, '\'');
command = g_strdup_printf ("Expand-Archive -LiteralPath %s -DestinationPath %s -Force",
escaped_path->str,
escaped_dir->str);
g_string_free (escaped_path, TRUE);
g_string_free (escaped_dir, TRUE);
{
char *ps_argv[] = {powershell, "-NoProfile", "-NonInteractive", "-Command", command, NULL};
ok = g_spawn_sync (NULL, ps_argv, NULL, 0, NULL, NULL,
NULL, NULL, &status, error);
}
} }
} }
#else #else
argv[4] = theme_dir;
ok = g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, ok = g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL,
NULL, NULL, &status, error); NULL, NULL, &status, error);
#endif #endif
@@ -362,7 +370,6 @@ zoitechat_import_theme (const char *path, GError **error)
#ifdef WIN32 #ifdef WIN32
g_free (command); g_free (command);
g_free (powershell); g_free (powershell);
g_free (extractor);
#endif #endif
g_free (theme_dir); g_free (theme_dir);
g_free (basename); g_free (basename);
@@ -375,7 +382,6 @@ zoitechat_import_theme (const char *path, GError **error)
#ifdef WIN32 #ifdef WIN32
g_free (command); g_free (command);
g_free (powershell); g_free (powershell);
g_free (extractor);
#endif #endif
g_free (theme_dir); g_free (theme_dir);
g_free (basename); g_free (basename);
@@ -386,7 +392,6 @@ zoitechat_import_theme (const char *path, GError **error)
#ifdef WIN32 #ifdef WIN32
g_free (command); g_free (command);
g_free (powershell); g_free (powershell);
g_free (extractor);
#endif #endif
g_free (theme_dir); g_free (theme_dir);