PaganOS Luna 0.6.0
PL EN DE
← pagan-welcome

Commit 27037ae

2
plików
+47
dodanych
-23
usuniętych
@@ -441,35 +441,38 @@ def clean_exec(exec_line):
441 441
442 442
443 443 def package_desktops(name):
444 - """Zwróć listę poleceń Exec aplikacji graficznych pakietu (`pag files`).
444 + """Lista (exec, terminal) aplikacji graficznych pakietu (`pag files`).
445 445
446 - Pusta lista = pakiet bez pliku .desktop (brak wersji graficznej). Sluży do
447 - przycisku „Otwórz” w sklepie i odróżnienia GUI od narzędzi konsolowych.
446 + Pusta lista = pakiet bez pliku .desktop (brak wersji graficznej). `terminal`
447 + mówi, czy .desktop wymaga uruchomienia w emulatorze terminala (Terminal=true).
448 448 """
449 449 if not valid_package_name(name):
450 450 return []
451 451 out = _run_capture([pag_cmd(), "files", name], timeout=20)
452 452 if not out:
453 453 return []
454 - execs = []
454 + entries = []
455 455 for line in out.splitlines():
456 456 path = line.strip()
457 457 if not path.startswith("/") or not path.endswith(".desktop"):
458 458 continue
459 459 if not os.path.isfile(path):
460 460 continue
461 + exec_cmd = None
462 + terminal = False
461 463 try:
462 464 with open(path, encoding="utf-8", errors="replace") as fh:
463 465 for dline in fh:
464 466 dline = dline.strip()
465 - if dline.startswith("Exec="):
466 - cmd = clean_exec(dline[5:])
467 - if cmd:
468 - execs.append(cmd)
469 - break
467 + if dline.startswith("Exec=") and exec_cmd is None:
468 + exec_cmd = clean_exec(dline[5:])
469 + elif dline.lower().startswith("terminal="):
470 + terminal = dline.split("=", 1)[1].strip().lower() == "true"
470 471 except OSError:
471 472 continue
472 - return execs
473 + if exec_cmd:
474 + entries.append((exec_cmd, terminal))
475 + return entries
473 476
474 477
475 478 def valid_package_name(name):
@@ -738,12 +741,12 @@ def _cmd_updates(_args):
738 741
739 742
740 743 def _cmd_pkgfiles(args):
741 - """Info o wersji graficznej pakietu: GUI 1/0 + linie DESKTOP z Exec."""
744 + """Info o wersji graficznej pakietu: GUI 1/0 + DESKTOP z Exec i flagą TTY."""
742 745 name = args[0] if args else ""
743 - execs = package_desktops(name)
744 - _emit("GUI", "1" if execs else "0")
745 - for cmd in execs:
746 - _emit("DESKTOP", name, cmd)
746 + entries = package_desktops(name)
747 + _emit("GUI", "1" if entries else "0")
748 + for cmd, terminal in entries:
749 + _emit("DESKTOP", name, cmd, "1" if terminal else "0")
747 750 return 0
748 751
749 752
@@ -109,6 +109,7 @@ typedef struct {
109 109 GHashTable *gui_cache;
110 110 char *store_selected;
111 111 char *store_open_exec; /* Exec aktualnie wybranego pakietu (jeśli GUI) */
112 + gboolean store_open_terminal; /* czy uruchamiać w emulatorze terminala */
112 113 PwPty *store_pty; /* bieżący proces instalacji/usuwania w terminalu */
113 114
114 115 /* Nagłówek */
@@ -885,10 +886,14 @@ store_update_buttons(App *app)
885 886
886 887 g_free(app->store_open_exec);
887 888 app->store_open_exec = NULL;
889 + app->store_open_terminal = FALSE;
888 890 if (selected && app->gui_cache) {
889 - const char *exec = g_hash_table_lookup(app->gui_cache, name);
890 - if (exec && *exec)
891 - app->store_open_exec = g_strdup(exec);
891 + const char *v = g_hash_table_lookup(app->gui_cache, name);
892 + /* Format wartości w cache: "<terminal>\t<exec>" ("" = brak GUI). */
893 + if (v && v[1] == '\t' && v[2] != '\0') {
894 + app->store_open_terminal = (v[0] == '1');
895 + app->store_open_exec = g_strdup(v + 2);
896 + }
892 897 }
893 898
894 899 gtk_widget_set_visible(app->store_install_btn, selected && !inst);
@@ -913,7 +918,9 @@ store_gui_line(const char *line, gpointer data)
913 918 char **f = split_tabs(line);
914 919 if (g_strcmp0(f[0], "DESKTOP") == 0 && f[2]) {
915 920 g_free(q->exec);
916 - q->exec = g_strdup(f[2]);
921 + /* Zachowujemy flagę terminala razem z poleceniem: "<T>\t<exec>". */
922 + q->exec = g_strdup_printf("%s\t%s", (f[3] && f[3][0] == '1') ? "1" : "0",
923 + f[2]);
917 924 }
918 925 g_strfreev(f);
919 926 }
@@ -1190,6 +1197,14 @@ detach_child_setup(gpointer data)
1190 1197 }
1191 1198 }
1192 1199
1200 +static void
1201 +store_open_fail_msg(App *app)
1202 +{
1203 + char *msg = g_strdup_printf(pw_tr("store_open_fail"), app->store_open_exec);
1204 + log_append(app->store_log, msg, "err");
1205 + g_free(msg);
1206 +}
1207 +
1193 1208 /* Uruchom graficzną aplikację pakietu (Exec z jego pliku .desktop). */
1194 1209 static void
1195 1210 on_store_open(GtkButton *btn, gpointer data)
@@ -1198,15 +1213,21 @@ on_store_open(GtkButton *btn, gpointer data)
1198 1213 App *app = data;
1199 1214 if (!app->store_open_exec || !*app->store_open_exec)
1200 1215 return;
1216 +
1217 + if (app->store_open_terminal) {
1218 + /* Aplikacja konsolowa (Terminal=true) – uruchom w emulatorze terminala. */
1219 + const char *words[] = {"/bin/sh", "-c", app->store_open_exec, NULL};
1220 + if (!open_in_terminal(words))
1221 + store_open_fail_msg(app);
1222 + return;
1223 + }
1224 +
1201 1225 const char *argv[] = {"/bin/sh", "-c", app->store_open_exec, NULL};
1202 1226 GError *err = NULL;
1203 1227 if (!g_spawn_async(NULL, (char **) argv, NULL, G_SPAWN_SEARCH_PATH,
1204 1228 detach_child_setup, NULL, NULL, &err)) {
1205 - char *msg = g_strdup_printf(pw_tr("store_open_fail"),
1206 - app->store_open_exec);
1207 - log_append(app->store_log, msg, "err");
1208 - g_free(msg);
1209 1229 g_clear_error(&err);
1230 + store_open_fail_msg(app);
1210 1231 }
1211 1232 }
1212 1233