X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=fb40a7be164232cf884a0a409272e5f34dedc3b9;hp=bcfe7e7d070198784875824c1902520c73028cc5;hb=4744d937c4160898d1fe151257606430750e580c;hpb=e7593d7c153bfca2131b18621fb24ae18c1c0cb3 diff --git a/aft.c b/aft.c index bcfe7e7d..fb40a7be 100644 --- a/aft.c +++ b/aft.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 Andre Noll + * Copyright (C) 2007-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -7,7 +7,6 @@ /** \file aft.c Audio file table functions. */ #include -#include /* readdir() */ #include #include #include @@ -19,10 +18,11 @@ #include "string.h" #include "afh.h" #include "afs.h" -#include "net.h" #include "fd.h" #include "ipc.h" #include "portable_io.h" +#include "sideband.h" +#include "command.h" static struct osl_table *audio_file_table; static char *status_items; @@ -109,6 +109,8 @@ struct ls_widths { unsigned short num_played_width; /** size of the amp field. */ unsigned short amp_width; + /** size of the audio format field. */ + unsigned short audio_format_width; }; /** Data passed from the ls command handler to its callback function. */ @@ -724,7 +726,7 @@ static int get_local_time(uint64_t *seconds, char *buf, size_t size, } \ } -static short unsigned get_duration_width(int seconds) +__a_const static short unsigned get_duration_width(int seconds) { short unsigned width; unsigned hours = seconds / 3600, mins = (seconds % 3600) / 60; @@ -904,7 +906,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, "%*d " /* image_id */ "%*d " /* lyrics_id */ "%*d " /* bitrate */ - "%s " /* audio format */ + "%*s " /* audio format */ "%*d " /* frequency */ "%d " /* channels */ "%s " /* duration */ @@ -916,6 +918,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, w->image_id_width, afsi->image_id, w->lyrics_id_width, afsi->lyrics_id, w->bitrate_width, afhi->bitrate, + w->audio_format_width, audio_format_name(afsi->audio_format_id), w->frequency_width, afhi->frequency, afhi->channels, @@ -1039,7 +1042,7 @@ static int make_status_items(struct audio_file_data *afd, .flags = LS_FLAG_FULL_PATH | LS_FLAG_ADMISSIBLE_ONLY, .mode = LS_MODE_VERBOSE, }; - struct para_buffer pb = {.max_size = SHMMAX - 1}; + struct para_buffer pb = {.max_size = shm_get_shmmax() - 1}; time_t current_time; int ret; @@ -1050,7 +1053,7 @@ static int make_status_items(struct audio_file_data *afd, free(status_items); status_items = pb.buf; memset(&pb, 0, sizeof(pb)); - pb.max_size = SHMMAX - 1; + pb.max_size = shm_get_shmmax() - 1; pb.flags = PBF_SIZE_PREFIX; ret = print_list_item(&d, &opts, &pb, current_time); if (ret < 0) { @@ -1330,6 +1333,8 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts) w->duration_width = PARA_MAX(w->duration_width, num_digits); GET_NUM_DIGITS(d->afsi.amp, &num_digits); w->amp_width = PARA_MAX(w->amp_width, num_digits); + num_digits = strlen(audio_format_name(d->afsi.audio_format_id)); + w->audio_format_width = PARA_MAX(w->audio_format_width, num_digits); if (options->flags & LS_FLAG_ADMISSIBLE_ONLY) { GET_NUM_DIGITS(score, &num_digits); num_digits++; /* add one for the sign (space or "-") */ @@ -1345,9 +1350,14 @@ static void com_ls_callback(int fd, const struct osl_object *query) { struct ls_options *opts = query->data; char *p, *pattern_start = (char *)query->data + sizeof(*opts); - struct para_buffer b = {.max_size = SHMMAX, + struct para_buffer b = { + .max_size = shm_get_shmmax(), .flags = (opts->mode == LS_MODE_PARSER)? PBF_SIZE_PREFIX : 0, - .max_size_handler = pass_buffer_as_shm, .private_data = &fd}; + .max_size_handler = afs_max_size_handler, + .private_data = &(struct afs_max_size_handler_data) { + .fd = fd, + } + }; int i = 0, ret; time_t current_time; @@ -1366,8 +1376,11 @@ static void com_ls_callback(int fd, const struct osl_object *query) prepare_ls_row)); if (ret < 0) goto out; - if (!opts->num_matching_paths) + if (opts->num_matching_paths == 0) { + if (opts->num_patterns > 0) + para_printf(&b, "no matches\n"); goto out; + } ret = sort_matching_paths(opts); if (ret < 0) goto out; @@ -1396,7 +1409,7 @@ out: /* * TODO: flags -h (sort by hash) */ -int com_ls(struct stream_cipher_context *scc, int argc, char * const * const argv) +int com_ls(struct command_context *cc) { int i, ret; unsigned flags = 0; @@ -1405,8 +1418,8 @@ int com_ls(struct stream_cipher_context *scc, int argc, char * const * const arg struct ls_options opts = {.patterns = NULL}; struct osl_object query = {.data = &opts, .size = sizeof(opts)}; - for (i = 1; i < argc; i++) { - const char *arg = argv[i]; + for (i = 1; i < cc->argc; i++) { + const char *arg = cc->argv[i]; if (arg[0] != '-') break; if (!strcmp(arg, "--")) { @@ -1506,9 +1519,9 @@ int com_ls(struct stream_cipher_context *scc, int argc, char * const * const arg opts.flags = flags; opts.sorting = sort; opts.mode = mode; - opts.num_patterns = argc - i; + opts.num_patterns = cc->argc - i; ret = send_option_arg_callback_request(&query, opts.num_patterns, - argv + i, com_ls_callback, sc_send_result, scc); + cc->argv + i, com_ls_callback, afs_cb_result_handler, cc); return ret; } @@ -1667,8 +1680,13 @@ static void com_add_callback(int fd, const struct osl_object *query) char afsi_buf[AFSI_SIZE]; uint32_t flags = read_u32(buf + CAB_FLAGS_OFFSET); struct afs_info default_afsi = {.last_played = 0}; - struct para_buffer msg = {.max_size = SHMMAX, - .max_size_handler = pass_buffer_as_shm, .private_data = &fd}; + struct para_buffer msg = { + .max_size = shm_get_shmmax(), + .max_size_handler = afs_max_size_handler, + .private_data = &(struct afs_max_size_handler_data) { + .fd = fd, + } + }; uint16_t afhi_offset, chunks_offset; hash = (unsigned char *)buf + CAB_HASH_OFFSET; @@ -1795,8 +1813,8 @@ out: /** Used by com_add(). */ struct private_add_data { - /** The socket file descriptor, including stream cipher keys. */ - struct stream_cipher_context *scc; + /** The pointer passed to the original command handler. */ + struct command_context *cc; /** The given add flags. */ uint32_t flags; }; @@ -1825,7 +1843,7 @@ static void hash_sister_callback(int fd, const struct osl_object *query) static int get_row_pointer_from_result(struct osl_object *result, void *private) { struct osl_row **row = private; - *row = result->data; + *row = *(struct osl_row **)(result->data); return 1; } @@ -1851,7 +1869,7 @@ static int add_one_audio_file(const char *path, void *private_data) ret = 1; if (pb && (pad->flags & ADD_FLAG_LAZY)) { /* lazy is really cheap */ if (pad->flags & ADD_FLAG_VERBOSE) - send_ret = sc_send_va_buffer(pad->scc, + send_ret = sc_send_va_buffer(&pad->cc->scc, "lazy-ignore: %s\n", path); goto out_free; } @@ -1872,7 +1890,7 @@ static int add_one_audio_file(const char *path, void *private_data) ret = 1; if (pb && hs && hs == pb && !(pad->flags & ADD_FLAG_FORCE)) { if (pad->flags & ADD_FLAG_VERBOSE) - send_ret = sc_send_va_buffer(pad->scc, + send_ret = sc_send_va_buffer(&pad->cc->scc, "%s exists, not forcing update\n", path); goto out_unmap; } @@ -1890,13 +1908,14 @@ static int add_one_audio_file(const char *path, void *private_data) munmap(map.data, map.size); close(fd); if (pad->flags & ADD_FLAG_VERBOSE) { - send_ret = sc_send_va_buffer(pad->scc, "adding %s\n", path); + send_ret = sc_send_va_buffer(&pad->cc->scc, "adding %s\n", path); if (send_ret < 0) goto out_free; } save_add_callback_buffer(hash, path, afhi_ptr, pad->flags, format_num, &obj); /* Ask afs to consider this entry for adding. */ - ret = send_callback_request(com_add_callback, &obj, sc_send_result, pad->scc); + ret = send_callback_request(com_add_callback, &obj, + afs_cb_result_handler, pad->cc); goto out_free; out_unmap: @@ -1904,30 +1923,22 @@ out_unmap: munmap(map.data, map.size); out_free: if (ret < 0 && send_ret >= 0) - send_ret = sc_send_va_buffer(pad->scc, + send_ret = sc_send_va_buffer(&pad->cc->scc, "failed to add %s (%s)\n", path, para_strerror(-ret)); free(obj.data); - if (afhi_ptr) { - free(afhi_ptr->chunk_table); - free(afhi_ptr->techinfo); - free(afhi_ptr->tags.artist); - free(afhi_ptr->tags.title); - free(afhi_ptr->tags.year); - free(afhi_ptr->tags.album); - free(afhi_ptr->tags.comment); - } + clear_afhi(afhi_ptr); /* Stop adding files only on send errors. */ return send_ret; } -int com_add(struct stream_cipher_context *scc, int argc, char * const * const argv) +int com_add(struct command_context *cc) { int i, ret; - struct private_add_data pad = {.scc = scc, .flags = 0}; + struct private_add_data pad = {.cc = cc, .flags = 0}; struct stat statbuf; - for (i = 1; i < argc; i++) { - const char *arg = argv[i]; + for (i = 1; i < cc->argc; i++) { + const char *arg = cc->argv[i]; if (arg[0] != '-') break; if (!strcmp(arg, "--")) { @@ -1951,21 +1962,22 @@ int com_add(struct stream_cipher_context *scc, int argc, char * const * const ar continue; } } - if (argc <= i) + if (cc->argc <= i) return -E_AFT_SYNTAX; - for (; i < argc; i++) { + for (; i < cc->argc; i++) { char *path; - ret = verify_path(argv[i], &path); + ret = verify_path(cc->argv[i], &path); if (ret < 0) { - ret = sc_send_va_buffer(scc, "%s: %s\n", argv[i], - para_strerror(-ret)); + ret = sc_send_va_buffer(&cc->scc, "%s: %s\n", + cc->argv[i], para_strerror(-ret)); if (ret < 0) return ret; continue; } ret = stat(path, &statbuf); if (ret < 0) { - ret = sc_send_va_buffer(scc, "failed to stat %s (%s)\n", path, + ret = sc_send_va_buffer(&cc->scc, + "failed to stat %s (%s)\n", path, strerror(errno)); free(path); if (ret < 0) @@ -1978,7 +1990,8 @@ int com_add(struct stream_cipher_context *scc, int argc, char * const * const ar else ret = add_one_audio_file(path, &pad); if (ret < 0) { - sc_send_va_buffer(scc, "%s: %s\n", path, para_strerror(-ret)); + sc_send_va_buffer(&cc->scc, "%s: %s\n", path, + para_strerror(-ret)); free(path); return ret; } @@ -2022,8 +2035,6 @@ struct touch_action_data { struct com_touch_options *cto; /** Message buffer. */ struct para_buffer pb; - /** How many audio files matched the given pattern. */ - unsigned num_matches; }; static int touch_audio_file(__a_unused struct osl_table *table, @@ -2070,7 +2081,6 @@ static int touch_audio_file(__a_unused struct osl_table *table, if (tad->cto->amp >= 0) new_afsi.amp = tad->cto->amp; } - tad->num_matches++; save_afsi(&new_afsi, &obj); /* in-place update */ aced.aft_row = row; aced.old_afsi = &old_afsi; @@ -2082,9 +2092,9 @@ static void com_touch_callback(int fd, const struct osl_object *query) { struct touch_action_data tad = {.cto = query->data, .pb = { - .max_size = SHMMAX, + .max_size = shm_get_shmmax(), .private_data = &fd, - .max_size_handler = pass_buffer_as_shm + .max_size_handler = afs_max_size_handler } }; int ret, ret2 = 0; @@ -2102,15 +2112,14 @@ static void com_touch_callback(int fd, const struct osl_object *query) ret = for_each_matching_row(&pmd); if (ret < 0) ret2 = para_printf(&tad.pb, "%s\n", para_strerror(-ret)); - else - if (!tad.num_matches) - ret2 = para_printf(&tad.pb, "no matches\n"); + else if (pmd.num_matches == 0) + ret2 = para_printf(&tad.pb, "no matches\n"); if (ret2 >= 0 && tad.pb.offset) pass_buffer_as_shm(tad.pb.buf, tad.pb.offset, &fd); free(tad.pb.buf); } -int com_touch(struct stream_cipher_context *scc, int argc, char * const * const argv) +int com_touch(struct command_context *cc) { struct com_touch_options cto = { .num_played = -1, @@ -2123,8 +2132,8 @@ int com_touch(struct stream_cipher_context *scc, int argc, char * const * const int i, ret; - for (i = 1; i < argc; i++) { - const char *arg = argv[i]; + for (i = 1; i < cc->argc; i++) { + const char *arg = cc->argv[i]; if (arg[0] != '-') break; if (!strcmp(arg, "--")) { @@ -2175,12 +2184,12 @@ int com_touch(struct stream_cipher_context *scc, int argc, char * const * const } break; /* non-option starting with dash */ } - if (i >= argc) + if (i >= cc->argc) return -E_AFT_SYNTAX; - ret = send_option_arg_callback_request(&query, argc - i, - argv + i, com_touch_callback, sc_send_result, scc); + ret = send_option_arg_callback_request(&query, cc->argc - i, + cc->argv + i, com_touch_callback, afs_cb_result_handler, cc); if (ret < 0) - sc_send_va_buffer(scc, "%s\n", para_strerror(-ret)); + sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret)); return ret; } @@ -2200,8 +2209,6 @@ struct com_rm_action_data { uint32_t flags; /** Message buffer. */ struct para_buffer pb; - /** Number of audio files removed. */ - unsigned num_removed; }; static int remove_audio_file(__a_unused struct osl_table *table, @@ -2219,8 +2226,6 @@ static int remove_audio_file(__a_unused struct osl_table *table, ret = osl(osl_del_row(audio_file_table, row)); if (ret < 0) para_printf(&crd->pb, "%s: %s\n", name, para_strerror(-ret)); - else - crd->num_removed++; return ret; } @@ -2228,9 +2233,9 @@ static void com_rm_callback(int fd, const struct osl_object *query) { struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data, .pb = { - .max_size = SHMMAX, + .max_size = shm_get_shmmax(), .private_data = &fd, - .max_size_handler = pass_buffer_as_shm + .max_size_handler = afs_max_size_handler } }; int ret; @@ -2250,11 +2255,11 @@ static void com_rm_callback(int fd, const struct osl_object *query) para_printf(&crd.pb, "%s\n", para_strerror(-ret)); return; } - if (!crd.num_removed && !(crd.flags & RM_FLAG_FORCE)) + if ((pmd.num_matches == 0) && !(crd.flags & RM_FLAG_FORCE)) ret = para_printf(&crd.pb, "no matches -- nothing removed\n"); - else { - if (crd.flags & RM_FLAG_VERBOSE) - ret = para_printf(&crd.pb, "removed %u files\n", crd.num_removed); + else if (crd.flags & RM_FLAG_VERBOSE) { + ret = para_printf(&crd.pb, "removed %u files\n", + pmd.num_matches); } if (ret >= 0 && crd.pb.offset) pass_buffer_as_shm(crd.pb.buf, crd.pb.offset, &fd); @@ -2262,14 +2267,14 @@ static void com_rm_callback(int fd, const struct osl_object *query) } /* TODO options: -r (recursive) */ -int com_rm(struct stream_cipher_context *scc, int argc, char * const * const argv) +int com_rm(struct command_context *cc) { uint32_t flags = 0; struct osl_object query = {.data = &flags, .size = sizeof(flags)}; int i, ret; - for (i = 1; i < argc; i++) { - const char *arg = argv[i]; + for (i = 1; i < cc->argc; i++) { + const char *arg = cc->argv[i]; if (arg[0] != '-') break; if (!strcmp(arg, "--")) { @@ -2290,12 +2295,12 @@ int com_rm(struct stream_cipher_context *scc, int argc, char * const * const ar } break; } - if (i >= argc) + if (i >= cc->argc) return -E_AFT_SYNTAX; - ret = send_option_arg_callback_request(&query, argc - i, argv + i, - com_rm_callback, sc_send_result, scc); + ret = send_option_arg_callback_request(&query, cc->argc - i, + cc->argv + i, com_rm_callback, afs_cb_result_handler, cc); if (ret < 0) - sc_send_va_buffer(scc, "%s\n", para_strerror(-ret)); + sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret)); return ret; } @@ -2323,8 +2328,6 @@ enum cpsi_flags { struct cpsi_action_data { /** command line flags (see \ref cpsi_flags). */ unsigned flags; - /** Number of audio files changed. */ - unsigned num_copied; /** Message buffer. */ struct para_buffer pb; /** Values are copied from here. */ @@ -2356,7 +2359,6 @@ static int copy_selector_info(__a_unused struct osl_table *table, if (cad->flags & CPSI_FLAG_COPY_ATTRIBUTES) target_afsi.attributes = cad->source_afsi.attributes; save_afsi(&target_afsi, &target_afsi_obj); /* in-place update */ - cad->num_copied++; if (cad->flags & CPSI_FLAG_VERBOSE) { ret = para_printf(&cad->pb, "copied afsi to %s\n", name); if (ret < 0) @@ -2373,9 +2375,9 @@ static void com_cpsi_callback(int fd, const struct osl_object *query) struct cpsi_action_data cad = { .flags = *(unsigned *)query->data, .pb = { - .max_size = SHMMAX, + .max_size = shm_get_shmmax(), .private_data = &fd, - .max_size_handler = pass_buffer_as_shm + .max_size_handler = afs_max_size_handler } }; int ret; @@ -2399,9 +2401,9 @@ out: if (ret < 0) para_printf(&cad.pb, "%s\n", para_strerror(-ret)); else if (cad.flags & CPSI_FLAG_VERBOSE) { - if (cad.num_copied) + if (pmd.num_matches > 0) para_printf(&cad.pb, "copied requested afsi from %s " - "to %u files\n", source_path, cad.num_copied); + "to %u files\n", source_path, pmd.num_matches); else para_printf(&cad.pb, "nothing copied\n"); } @@ -2410,14 +2412,14 @@ out: free(cad.pb.buf); } -int com_cpsi(struct stream_cipher_context *scc, int argc, char * const * const argv) +int com_cpsi(struct command_context *cc) { unsigned flags = 0; int i, ret; struct osl_object options = {.data = &flags, .size = sizeof(flags)}; - for (i = 1; i < argc; i++) { - const char *arg = argv[i]; + for (i = 1; i < cc->argc; i++) { + const char *arg = cc->argv[i]; if (arg[0] != '-') break; if (!strcmp(arg, "--")) { @@ -2450,14 +2452,14 @@ int com_cpsi(struct stream_cipher_context *scc, int argc, char * const * const } break; } - if (i + 1 >= argc) /* need at least source file and pattern */ + if (i + 1 >= cc->argc) /* need at least source file and pattern */ return -E_AFT_SYNTAX; if (!(flags & ~CPSI_FLAG_VERBOSE)) /* no copy flags given */ flags = ~(unsigned)CPSI_FLAG_VERBOSE | flags; - ret = send_option_arg_callback_request(&options, argc - i, argv + i, - com_cpsi_callback, sc_send_result, scc); + ret = send_option_arg_callback_request(&options, cc->argc - i, + cc->argv + i, com_cpsi_callback, afs_cb_result_handler, cc); if (ret < 0) - sc_send_va_buffer(scc, "%s\n", para_strerror(-ret)); + sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret)); return ret; } @@ -2475,7 +2477,7 @@ static void afs_stat_callback(int fd, const struct osl_object *query) /** * Get the current afs status items from the afs process and send it. * - * \param scc The stream cipher context for data encryption. + * \param cc The command context, used e.g. for data encryption. * \param parser_friendly Whether parser-friendly output format should be used. * * As the contents of the afs status items change in time and the command @@ -2483,13 +2485,16 @@ static void afs_stat_callback(int fd, const struct osl_object *query) * up-to-date afs status items directly. Therefore the usual callback mechanism * is used to pass the status items from the afs process to the command handler * via a shared memory area and a pipe. + * + * \return The return value of the underyling call to \ref send_callback_request(). */ -int send_afs_status(struct stream_cipher_context *scc, int parser_friendly) +int send_afs_status(struct command_context *cc, int parser_friendly) { struct osl_object query = {.data = &parser_friendly, .size = sizeof(parser_friendly)}; - return send_callback_request(afs_stat_callback, &query, sc_send_result, scc); + return send_callback_request(afs_stat_callback, &query, + afs_cb_result_handler, cc); } /* TODO: optionally fix problems by removing offending rows */ @@ -2545,9 +2550,11 @@ static int check_audio_file(struct osl_row *row, void *data) void aft_check_callback(int fd, __a_unused const struct osl_object *query) { struct para_buffer pb = { - .max_size = SHMMAX, - .private_data = &fd, - .max_size_handler = pass_buffer_as_shm + .max_size = shm_get_shmmax(), + .private_data = &(struct afs_max_size_handler_data) { + .fd = fd, + }, + .max_size_handler = afs_max_size_handler }; int ret = para_printf(&pb, "checking audio file table...\n"); @@ -2570,10 +2577,6 @@ static void aft_close(void) { osl_close_table(audio_file_table, OSL_MARK_CLEAN); audio_file_table = NULL; - free(status_items); - status_items = NULL; - free(parser_friendly_status_items); - parser_friendly_status_items = NULL; } /**