Skip to content

Scan for boot files at run time. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ali1234 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Scan for boot files at run time. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15d1d2c
Scan for boot files at run time.
ali1234 Dec 14, 2017
0d0fb77
Remove a debugging printf().
ali1234 Dec 14, 2017
cdc1113
Use g_build_filename() instead of g_strdup_printf().
ali1234 Dec 14, 2017
4b0c6bc
These packing properties aren't needed when using a GtkScrolledWindow.
ali1234 Dec 14, 2017
359fdc6
Strip leading and trailing whitespace (and newlines) from description.
ali1234 Dec 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 32 additions & 40 deletions data/usbbootgui.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0">gpio.png</col>
<col id="1" translatable="yes">GPIO expansion board</col>
<col id="2">gpioexpand</col>
</row>
<row>
<col id="0">sdcard.png</col>
<col id="1" translatable="yes">eMMC / SD card reader</col>
<col id="2">msd</col>
</row>
<row>
<col id="0">document-open.png</col>
<col id="1" translatable="yes">Custom application</col>
Expand Down Expand Up @@ -78,7 +68,7 @@
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
Expand Down Expand Up @@ -142,43 +132,45 @@ Type: </property>
</packing>
</child>
<child>
<object class="GtkTreeView" id="treeview">
<property name="height_request">200</property>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">liststore</property>
<property name="headers_visible">False</property>
<property name="search_column">7</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1">
<property name="fixed_width">64</property>
<property name="min_width">64</property>
<property name="title" translatable="yes">icon</property>
<object class="GtkTreeView" id="treeview">
<property name="height_request">200</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">liststore</property>
<property name="headers_visible">False</property>
<property name="search_column">7</property>
<child>
<object class="GtkCellRendererPixbuf" id="cellrendererpixbuf1"/>
<attributes>
<attribute name="pixbuf">0</attribute>
</attributes>
<object class="GtkTreeViewColumn" id="treeviewcolumn1">
<property name="fixed_width">64</property>
<property name="min_width">64</property>
<property name="title" translatable="yes">icon</property>
<child>
<object class="GtkCellRendererPixbuf" id="cellrendererpixbuf1"/>
<attributes>
<attribute name="pixbuf">0</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn2">
<property name="title" translatable="yes">description</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
<object class="GtkTreeViewColumn" id="treeviewcolumn2">
<property name="title" translatable="yes">description</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
<attributes>
<attribute name="markup">1</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="alwayscheck">
Expand All @@ -189,7 +181,7 @@ Type: </property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
Expand Down
134 changes: 120 additions & 14 deletions src/usbbootgui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
#define MODEL_IDX_NAME 1 /* Friendly name */
#define MODEL_IDX_IMAGE 2 /* Image folder name */

/* Prefix to image folders */
#define IMAGE_PREFIX "/usr/share/rpiboot"

#define SETTINGS_FILE "/etc/usbbootgui.conf"

/* USB device ids of interest */
Expand Down Expand Up @@ -79,7 +76,7 @@ static gchar *promptForFolder()

gtk_widget_destroy (dialog);

bootcodepath = g_strdup_printf ("%s/bootcode.bin", folder);
bootcodepath = g_build_filename (folder, "bootcode.bin", NULL);

if (!g_file_test (bootcodepath, G_FILE_TEST_EXISTS))
{
Expand Down Expand Up @@ -303,13 +300,13 @@ static void showDialog()
}
else
{
imagepath = g_strdup_printf ("%s/%s", IMAGE_PREFIX, image);
imagepath = g_strdup(image);
}

if (imagepath)
{
/* Sanity check: check that image folder is present, and contains at least bootcode.bin */
bootcodepath = g_strdup_printf ("%s/bootcode.bin", imagepath);
bootcodepath = g_build_filename (imagepath, "bootcode.bin", NULL);

if (!g_file_test (imagepath, G_FILE_TEST_EXISTS))
{
Expand Down Expand Up @@ -441,14 +438,7 @@ static gboolean pollForPi()
showDialog();
else
{
if (image[0] == '/')
success = usbboot (image);
else
{
imagepath = g_strdup_printf ("%s/%s", IMAGE_PREFIX, image);
success = usbboot (imagepath);
g_free (imagepath);
}
success = usbboot (image);

if (!success)
{
Expand Down Expand Up @@ -477,8 +467,117 @@ static void showTrayIcon()
}
}

static void addImage(const gchar *name, const gchar *folder)
{
GtkListStore *store = GTK_LIST_STORE (gtk_builder_get_object (builder, "liststore"));
GtkTreeIter iter;
gchar *description, *descpath, *iconpath;
GdkPixbuf *icon;

gchar format[] = "%s<span size=\"smaller\">\n\n%s</span>";

descpath = g_build_filename (folder, "description.txt", NULL);
if (g_file_test (descpath, G_FILE_TEST_EXISTS))
{
gchar *desc;
g_file_get_contents (descpath, &desc, NULL, NULL);
description = g_strdup_printf (format, g_strstrip (desc), folder);
g_free (desc);
} else {
if (g_strcmp0 (name, "gpioexpand") == 0)
description = g_strdup_printf (format, _("GPIO expansion board"), folder);
else if (g_strcmp0 (name, "msd") == 0)
description = g_strdup_printf (format, _("eMMC / SD card reader"), folder);
else
description = g_strdup_printf (format, name, folder);
}
g_free (descpath);

iconpath = g_build_filename (folder, "icon.png", NULL);
if (g_file_test (iconpath, G_FILE_TEST_EXISTS)) {
icon = gdk_pixbuf_new_from_file(iconpath, NULL);
} else {
if (g_strcmp0 (name, "gpioexpand") == 0)
icon = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR "/gpio.png", NULL);
else if (g_strcmp0 (name, "msd") == 0)
icon = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR "/sdcard.png", NULL);
else
icon = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR "/document-open.png", NULL); // TODO: make an "unknown" icon
}
g_free (iconpath);

gtk_list_store_append(store, &iter);

gtk_list_store_set(store, &iter,
MODEL_IDX_ICON, icon,
MODEL_IDX_NAME, description,
MODEL_IDX_IMAGE, g_strdup (folder),
-1);
}

static void scanDirectory(const gchar *path)
{
gchar *rpibootpath, *imagepath, *bootcodepath;
const gchar *name;
GDir *rpibootdir;

rpibootpath = g_build_filename (path, "rpiboot", NULL);
rpibootdir = g_dir_open(rpibootpath, 0, NULL);
if (!rpibootdir)
return;

while(name = g_dir_read_name(rpibootdir)) {
imagepath = g_build_filename (rpibootpath, name, NULL);
if (g_file_test (imagepath, G_FILE_TEST_IS_DIR)) {
bootcodepath = g_build_filename (imagepath, "bootcode.bin", NULL);
if (g_file_test (bootcodepath, G_FILE_TEST_EXISTS)) {
addImage(name, imagepath);
}
g_free (bootcodepath);
}
g_free(imagepath);
}
g_dir_close (rpibootdir);
g_free (rpibootpath);
}

gboolean stringInList(GList *list, const gchar *string)
{
GList *l;
for (l=list; l!=NULL; l = l->next)
if (g_strcmp0 (string, l->data) == 0)
return TRUE;
return FALSE;
}

static void populateImageList()
{
const gchar *path;
const gchar *var;
const gchar * const *xdg_data_dirs;
gint i;

GList *scanned_dirs = NULL;
GList *l;

xdg_data_dirs = g_get_system_data_dirs ();
for (i = 0; xdg_data_dirs[i]; i++) {
if (stringInList(scanned_dirs, xdg_data_dirs[i]))
continue;
scanned_dirs = g_list_prepend(scanned_dirs, (gpointer)xdg_data_dirs[i]);
scanDirectory(xdg_data_dirs[i]);
}
path = g_get_user_data_dir ();
if (stringInList(scanned_dirs, path))
return;
scanDirectory(path);
}

int main(int argc, char *argv[])
{
GtkListStore *store;
GtkTreeIter iter;

#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
Expand All @@ -498,6 +597,13 @@ int main(int argc, char *argv[])
builder = gtk_builder_new();
gtk_builder_add_from_file (builder, PACKAGE_DATA_DIR "/usbbootgui.ui", NULL);

populateImageList();

/* Move "Custom application" to the end of the list. */
store = GTK_LIST_STORE (gtk_builder_get_object (builder, "liststore"));
gtk_tree_model_get_iter_first(GTK_TREE_MODEL (store), &iter);
gtk_list_store_move_before(store, &iter, NULL);

if ( !hasAlwaysUseImage() )
showDialog();
if ( hasAlwaysUseImage() )
Expand Down