From 38ec951496280df4b5c79279e2f804424f5c7c4e Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Sun, 24 Sep 2017 21:14:13 +0200
Subject: [PATCH] It sounds!!!
---
data/zakjukebox/ctpl/template.ctpl | 2 +-
src/index.c | 115 +++++++++++++++++++++++++++--
src/index.h | 1 +
src/main.c | 3 +-
4 files changed, 113 insertions(+), 8 deletions(-)
diff --git a/data/zakjukebox/ctpl/template.ctpl b/data/zakjukebox/ctpl/template.ctpl
index d3343ac..8142994 100644
--- a/data/zakjukebox/ctpl/template.ctpl
+++ b/data/zakjukebox/ctpl/template.ctpl
@@ -12,7 +12,7 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
<!-- custom -->
- <link rel="stylesheet" href="/concorsi/css/style.css">
+ <!-- <link rel="stylesheet" href="/zakjukebox/css/style.css"> -->
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
diff --git a/src/index.c b/src/index.c
index 7411f28..fd07c73 100644
--- a/src/index.c
+++ b/src/index.c
@@ -52,7 +52,11 @@ static gchar
if (g_file_query_file_type (gfdir, G_FILE_QUERY_INFO_NONE, NULL) == G_FILE_TYPE_DIRECTORY)
{
error = NULL;
- gfenum = g_file_enumerate_children (gfdir, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NONE, NULL, &error);
+ gfenum = g_file_enumerate_children (gfdir,
+ G_FILE_ATTRIBUTE_STANDARD_NAME "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+ G_FILE_QUERY_INFO_NONE,
+ NULL,
+ &error);
if (gfenum == NULL
|| error != NULL)
{
@@ -95,11 +99,35 @@ static gchar
if (gft == G_FILE_TYPE_DIRECTORY
|| gft == G_FILE_TYPE_REGULAR)
{
- g_string_append_printf (ret,
- "<li>%s%s%s</li>\n",
- gft == G_FILE_TYPE_DIRECTORY ? g_strdup_printf ("<a href=\"/zakjukebox/index/cd/%s\">", g_file_get_basename (gf)) : "",
- g_file_get_basename (gf),
- gft == G_FILE_TYPE_DIRECTORY ? "</a>" : "");
+ if (gft == G_FILE_TYPE_DIRECTORY)
+ {
+ g_string_append_printf (ret,
+ "<li><a href=\"/zakjukebox/index/cd/%s\">%s</a></li>\n",
+ g_file_get_basename (gf),
+ g_file_get_basename (gf));
+ }
+ else
+ {
+ const gchar *content_type;
+
+ content_type = g_file_info_get_content_type (gfi);
+
+ if (g_strcmp0 (content_type, "audio/mpeg3") == 0
+ || g_strcmp0 (content_type, "audio/mpeg") == 0)
+ {
+ g_string_append_printf (ret,
+ "<li>%s <audio controls><source src=\"/zakjukebox/index/audio/%s\" type=\"%s\"></audio></li>\n",
+ g_file_get_basename (gf),
+ g_file_get_basename (gf),
+ content_type);
+ }
+ else
+ {
+ g_string_append_printf (ret,
+ "<li>%s</li>\n",
+ g_file_get_basename (gf));
+ }
+ }
}
}
}
@@ -229,3 +257,78 @@ index_cd (GMatchInfo *minfo, gpointer user_data)
zak_cgi_main_redirect (commons->zcgi_main, "/zakjukebox/index/index");
}
+
+void
+index_audio (GMatchInfo *minfo, gpointer user_data)
+{
+ g_autofree gchar *file;
+ g_autofree gchar *pwd;
+ g_autofree gchar *filename;
+
+ g_autoptr (GError) error;
+ g_autoptr (GFile) gf;
+ g_autoptr (GFileInfo) gfi;
+
+ goffset filesize;
+
+ g_autofree gchar *buf;
+
+ Commons *commons = (Commons *)user_data;
+ g_warning ("AUDIO");
+ file = g_match_info_fetch_named (minfo, "file");
+ if (file == NULL)
+ {
+ return;
+ }
+
+ pwd = zak_cgi_session_get_value (commons->zcgi_session, "pwd");
+ if (pwd == NULL)
+ {
+ pwd = g_strdup ("");
+ }
+
+ filename = g_build_filename (commons->root, pwd, file, NULL);
+ gf = g_file_new_for_path (filename);
+
+ error = NULL;
+ gfi = g_file_query_info (gf,
+ G_FILE_ATTRIBUTE_STANDARD_NAME "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," G_FILE_ATTRIBUTE_STANDARD_SIZE,
+ G_FILE_QUERY_INFO_NONE,
+ NULL,
+ &error);
+ if (gfi == NULL
+ || error != NULL)
+ {
+ return;
+ }
+
+ filesize = g_file_info_get_size (gfi);
+ g_string_printf (commons->header,
+ "Content-Description: File Transfer\n"
+ "Content-Type: %s\n"
+ "Content-Disposition: attachment; filename=\"%s\"\n"
+ "Content-Transfer-Encoding: binary\n"
+ "Content-Length: %d\n"
+ "Expires: 0\n"
+ "Cache-Control: must-revalidate, post-check=0, pre-check=0\n"
+ "Pragma: public",
+ g_file_info_get_content_type (gfi),
+ file,
+ filesize);
+
+ error = NULL;
+ buf = g_malloc0 (filesize);
+ if (!g_file_load_contents (gf,
+ NULL,
+ &buf,
+ NULL,
+ NULL,
+ &error)
+ || error != NULL)
+ {
+ return;
+ }
+
+ g_string_set_size (commons->out, filesize);
+ memcpy (commons->out->str, buf, filesize);
+}
diff --git a/src/index.h b/src/index.h
index 8e532f1..901159c 100644
--- a/src/index.h
+++ b/src/index.h
@@ -29,6 +29,7 @@
void index_index (GMatchInfo *minfo, gpointer user_data);
void index_cd (GMatchInfo *minfo, gpointer user_data);
+void index_audio (GMatchInfo *minfo, gpointer user_data);
#endif /* __INDEX_H__ */
diff --git a/src/main.c b/src/main.c
index 2cec1dd..f483a45 100644
--- a/src/main.c
+++ b/src/main.c
@@ -76,8 +76,9 @@ main (int argc, char *argv[])
zak_cgi_url_connect (zcgi_url, "/", (ZakCgiUrlConnectedFunction)index_index, commons);
zak_cgi_url_connect (zcgi_url, "/index[/]?", (ZakCgiUrlConnectedFunction)index_index, commons);
zak_cgi_url_connect (zcgi_url, "/index/index", (ZakCgiUrlConnectedFunction)index_index, commons);
- zak_cgi_url_connect (zcgi_url, "/index/cd/(?<dir>[.a-zA-Z0-9\\-_]+)", (ZakCgiUrlConnectedFunction)index_cd, commons);
+ zak_cgi_url_connect (zcgi_url, "/index/cd/(?<dir>[.a-zA-Z0-9\\-_\\(\\) ]+)", (ZakCgiUrlConnectedFunction)index_cd, commons);
zak_cgi_url_connect (zcgi_url, "/index/cd/(?<dir>{up})", (ZakCgiUrlConnectedFunction)index_cd, commons);
+ zak_cgi_url_connect (zcgi_url, "/index/audio/(?<file>[.a-zA-Z0-9\\-_\\(\\) ]+)", (ZakCgiUrlConnectedFunction)index_audio, commons);
zak_cgi_url_dispatch (zcgi_url);
--
2.49.0