X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=0f15cd28e96cf726275508faa63b07d4a75e190b;hp=3c33aae0c747513a39ddd4426a413a30e5644b58;hb=2d8f0c21ac8735fc06d1aa88e7873614392e3042;hpb=191d16070b9511f5b32b1ede7a9d0db1ffb3da54 diff --git a/aft.c b/aft.c index 3c33aae0..0f15cd28 100644 --- a/aft.c +++ b/aft.c @@ -69,7 +69,7 @@ int load_afsi(struct afs_info *afsi, struct osl_object *obj) { char *buf = obj->data; if (obj->size < AFSI_SIZE) - return -E_BAD_AFS; + return -E_BAD_AFSI; afsi->last_played = read_u64(buf + AFSI_LAST_PLAYED_OFFSET); afsi->attributes = read_u64(buf + AFSI_ATTRIBUTES_OFFSET); afsi->num_played = read_u32(buf + AFSI_NUM_PLAYED_OFFSET); @@ -205,40 +205,38 @@ static int verify_dotfile(const char *rest) return 1; } -static int verify_path(const char *path, char **resolved_path) +static int verify_path(const char *orig_path, char **resolved_path) { - const char *orig_path = path; char c; const char prefix[] = AFS_AUDIO_FILE_DIR "/"; + const char *path = orig_path; const size_t prefix_len = strlen(prefix); - PARA_DEBUG_LOG("path: %s\n", path); c = *path++; if (!c) - return -E_BAD_PATH; + goto bad_path; while (c) { if (c == '/') { c = *path++; switch (c) { default: continue; - case '/': case '\0': - break; + case '/': /* double slash */ + goto bad_path; case '.': - if (verify_dotfile(path) > 0) - continue; + if (verify_dotfile(path) < 0) + goto bad_path; } - *resolved_path = NULL; - return -E_BAD_PATH; } c = *path++; } - if (*orig_path == '/') - *resolved_path = prefix_path("", 0, orig_path); - else + if (*orig_path != '/') *resolved_path = prefix_path(prefix, prefix_len, orig_path); - PARA_DEBUG_LOG("resolved: %s\n", *resolved_path); - return *resolved_path? 1: -E_BAD_PATH; + else + *resolved_path = para_strdup(orig_path); + return 1; +bad_path: + return -E_BAD_PATH; } enum afhi_offsets { @@ -288,7 +286,7 @@ static unsigned sizeof_chunk_info_buf(struct audio_format_info *afhi) } /** The offsets of the data contained in the AFTCOL_CHUNKS column. */ -enum chunk_info_offsets { +enum chunk_info_offsets{ /** The total number of chunks (4 bytes). */ CHUNKS_TOTAL_OFFSET = 0, /** The length of the audio file header (4 bytes). */ @@ -353,7 +351,6 @@ int aft_get_row_of_path(char *path, struct osl_row **row) { struct osl_object obj = {.data = path, .size = strlen(path) + 1}; - PARA_NOTICE_LOG("audio_file_table: %p\n", audio_file_table); return osl_get_row(audio_file_table, AFTCOL_PATH, &obj, row); } @@ -379,7 +376,7 @@ int aft_get_row_of_hash(HASH_TYPE *hash, struct osl_row **row) * * \return The return value of the underlying call to osl_get_object(). */ -int get_afsi_object_of_row(const void *row, struct osl_object *obj) +int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj) { return osl_get_object(audio_file_table, row, AFTCOL_AFSI, obj); } @@ -448,7 +445,7 @@ int get_audio_file_path_of_row(const struct osl_row *row, char **path) * * \sa get_hash_of_row(). */ -int get_hash_object_of_aft_row(const void *row, struct osl_object *obj) +static int get_hash_object_of_aft_row(const struct osl_row *row, struct osl_object *obj) { return osl_get_object(audio_file_table, row, AFTCOL_HASH, obj); } @@ -464,7 +461,7 @@ int get_hash_object_of_aft_row(const void *row, struct osl_object *obj) * \return The return value of the underlying call to * get_hash_object_of_aft_row(). */ -static int get_hash_of_row(const void *row, HASH_TYPE **hash) +static int get_hash_of_row(const struct osl_row *row, HASH_TYPE **hash) { struct osl_object obj; int ret = get_hash_object_of_aft_row(row, &obj); @@ -485,7 +482,7 @@ static int get_hash_of_row(const void *row, HASH_TYPE **hash) * * \sa get_chunk_table_of_row(). */ -int get_afhi_of_row(const void *row, struct audio_format_info *afhi) +static int get_afhi_of_row(const struct osl_row *row, struct audio_format_info *afhi) { struct osl_object obj; int ret = osl_get_object(audio_file_table, row, AFTCOL_AFHI, @@ -506,7 +503,7 @@ int get_afhi_of_row(const void *row, struct audio_format_info *afhi) * * \sa get_afhi_of_row(). */ -int get_chunk_table_of_row(const void *row, struct audio_format_info *afhi) +static int get_chunk_table_of_row(const struct osl_row *row, struct audio_format_info *afhi) { struct osl_object obj; int ret = osl_open_disk_object(audio_file_table, row, AFTCOL_CHUNKS, @@ -575,15 +572,14 @@ err: return ret; } -time_t now; - -static int get_local_time(uint64_t *seconds, char *buf, size_t size) +static int get_local_time(uint64_t *seconds, char *buf, size_t size, + time_t current_time) { struct tm t; if (!localtime_r((time_t *)seconds, &t)) return -E_LOCALTIME; - if (*seconds + 6 * 30 * 24 * 3600 > now) { + if (*seconds + 6 * 30 * 24 * 3600 > current_time) { if (!strftime(buf, size, "%b %e %k:%M", &t)) return -E_STRFTIME; return 1; @@ -603,25 +599,27 @@ static int get_local_time(uint64_t *seconds, char *buf, size_t size) } \ } -static short unsigned get_duration(int seconds_total, char *buf, short unsigned max_width) +static short unsigned get_duration_width(int seconds) { short unsigned width; - int s = seconds_total; - unsigned hours = s / 3600, mins = (s % 3600) / 60, secs = s % 60; - - if (s < 3600) { /* less than one hour => m:ss or mm:ss */ - GET_NUM_DIGITS(mins, &width); /* 1 or 2 */ - width += 3; /* 4 or 5 */ - if (buf) - sprintf(buf, "%*u:%02u", max_width - width + 1, mins, secs); - return width; - } + unsigned hours = seconds / 3600, mins = (seconds % 3600) / 60; + + if (!hours) /* less than one hour => m:ss or mm:ss => 4 or 5 digits */ + return 4 + (mins > 9); /* more than one hour => h:mm:ss, hh:mm:ss, hhh:mm:ss, ... */ GET_NUM_DIGITS(hours, &width); - width += 6; - if (buf) - sprintf(buf, "%*u:%02u:%02u", max_width - width + 1, hours, mins, secs); - return width; + return width + 6; +} + +static void get_duration_buf(int seconds, char *buf, short unsigned max_width) +{ + unsigned hours = seconds / 3600, mins = (seconds % 3600) / 60; + + if (!hours) /* m:ss or mm:ss */ + sprintf(buf, "%*u:%02u", max_width - 3, mins, seconds % 60); + else /* more than one hour => h:mm:ss, hh:mm:ss, hhh:mm:ss, ... */ + sprintf(buf, "%*u:%02u:%02u", max_width - 6, hours, mins, + seconds % 60); } static char *make_attribute_line(const char *att_bitmap, struct afs_info *afsi) @@ -655,7 +653,7 @@ static char *make_image_line(struct afs_info *afsi) } static int print_list_item(struct ls_data *d, struct ls_options *opts, - struct para_buffer *b) + struct para_buffer *b, time_t current_time) { int ret; char att_buf[65]; @@ -673,10 +671,10 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, } get_attribute_bitmap(&afsi->attributes, att_buf); ret = get_local_time(&afsi->last_played, last_played_time, - sizeof(last_played_time)); + sizeof(last_played_time), current_time); if (ret < 0) return ret; - get_duration(afhi->seconds_total, duration_buf, w->duration_width); + get_duration_buf(afhi->seconds_total, duration_buf, w->duration_width); if (have_score) { if (opts->mode == LS_MODE_LONG) sprintf(score_buf, "%*li ", w->score_width, d->score); @@ -684,6 +682,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, sprintf(score_buf, "%li ", d->score); } + PARA_NOTICE_LOG("id: %s, %d\n", d->path, afsi->audio_format_id); if (opts->mode == LS_MODE_LONG) { para_printf(b, "%s" /* score */ @@ -828,7 +827,7 @@ static int ls_path_compare(const void *a, const void *b) static int sort_matching_paths(struct ls_options *options) { size_t nmemb = options->num_matching_paths; - size_t size = sizeof(uint32_t); + size_t size = sizeof(*options->data_ptr); int (*compar)(const void *, const void *); int i; @@ -944,8 +943,8 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts) w->frequency_width = PARA_MAX(w->frequency_width, num_digits); GET_NUM_DIGITS(d->afsi.num_played, &num_digits); w->num_played_width = PARA_MAX(w->num_played_width, num_digits); - /* just get the number of chars to print this amount of time */ - tmp = get_duration(d->afhi.seconds_total, NULL, 0); + /* get the number of chars to print this amount of time */ + tmp = get_duration_width(d->afhi.seconds_total); w->duration_width = PARA_MAX(w->duration_width, tmp); if (options->flags & LS_FLAG_ADMISSIBLE_ONLY) { GET_NUM_DIGITS(score, &num_digits); @@ -963,6 +962,8 @@ static int com_ls_callback(const struct osl_object *query, char *p, *pattern_start = (char *)query->data + sizeof(*opts); struct para_buffer b = {.buf = NULL, .size = 0}; int i = 0, ret; + time_t current_time; + PARA_NOTICE_LOG("%d patterns\n", opts->num_patterns); if (opts->num_patterns) { @@ -981,7 +982,7 @@ static int com_ls_callback(const struct osl_object *query, prepare_ls_row); if (ret < 0) goto out; - ret = opts->num_patterns? -E_NO_MATCH : 1; + ret = opts->num_patterns? -E_NO_MATCH : 0; if (!opts->num_matching_paths) { PARA_NOTICE_LOG("no match, ret: %d\n", ret); goto out; @@ -989,21 +990,23 @@ static int com_ls_callback(const struct osl_object *query, ret = sort_matching_paths(opts); if (ret < 0) goto out; + time(¤t_time); if (opts->flags & LS_FLAG_REVERSE) for (i = opts->num_matching_paths - 1; i >= 0; i--) { - ret = print_list_item(opts->data_ptr[i], opts, &b); + ret = print_list_item(opts->data_ptr[i], opts, &b, current_time); if (ret < 0) break; } else for (i = 0; i < opts->num_matching_paths; i++) { - ret = print_list_item(opts->data_ptr[i], opts, &b); + ret = print_list_item(opts->data_ptr[i], opts, &b, current_time); if (ret < 0) break; } ret = 1; out: ls_output->data = b.buf; + PARA_NOTICE_LOG("ls_outoute.data: %p\n", ls_output->data); ls_output->size = b.size; free(opts->data); free(opts->data_ptr); @@ -1012,7 +1015,7 @@ out: } /* - * TODO: flags -h (sort by hash) + * TODO: flags -h (sort by hash) -lm (list in mbox format) * * long list: list hash, attributes as (xx--x-x-), file size, lastplayed * full list: list everything, including afsi, afhi, atts as clear text @@ -1116,15 +1119,14 @@ int com_afs_ls(int fd, int argc, char * const * const argv) } return -E_AFT_SYNTAX; } - time(&now); opts.flags = flags; opts.sorting = sort; opts.mode = mode; opts.num_patterns = argc - i; ret = send_option_arg_callback_request(&query, opts.num_patterns, argv + i, com_ls_callback, &ls_output); - if (ret >= 0 && ls_output.data) { - send_buffer(fd, (char *)ls_output.data); + if (ret > 0) { + ret = send_buffer(fd, (char *)ls_output.data); free(ls_output.data); } return ret; @@ -1268,7 +1270,7 @@ static int com_add_callback(const struct osl_object *query, objs[AFTCOL_PATH].data = path; objs[AFTCOL_PATH].size = strlen(path) + 1; - PARA_DEBUG_LOG("request to add %s with hash %s\n", path, asc); + PARA_INFO_LOG("request to add %s\n", path); hs = find_hash_sister(hash); ret = aft_get_row_of_path(path, &pb); if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND) @@ -1325,31 +1327,27 @@ static int com_add_callback(const struct osl_object *query, return ret; } if (hs || pb) { /* (hs != NULL and pb != NULL) implies hs == pb */ - const void *row = pb? pb : hs; + const struct osl_row *row = pb? pb : hs; /* update afhi and chunk_table */ if (flags & ADD_FLAG_VERBOSE) - PARA_NOTICE_LOG("updating audio format handler info (%zd bytes)\n", + PARA_DEBUG_LOG("updating audio format handler info (%zd bytes)\n", objs[AFTCOL_AFHI].size); ret = osl_update_object(audio_file_table, row, AFTCOL_AFHI, &objs[AFTCOL_AFHI]); if (ret < 0) return ret; if (flags & ADD_FLAG_VERBOSE) - PARA_NOTICE_LOG("updating chunk table\n"); + PARA_DEBUG_LOG("updating chunk table\n"); ret = osl_update_object(audio_file_table, row, AFTCOL_CHUNKS, &objs[AFTCOL_CHUNKS]); if (ret < 0) return ret; - ret = mood_update_audio_file(row, NULL); - if (ret < 0) - return ret; + return mood_update_audio_file(row, NULL); } /* new entry, use default afsi */ default_afsi.last_played = time(NULL) - 365 * 24 * 60 * 60; default_afsi.audio_format_id = read_u8(buf + AFTROW_AUDIO_FORMAT_OFFSET); - if (flags & ADD_FLAG_VERBOSE) - PARA_NOTICE_LOG("adding %s\n", path); objs[AFTCOL_AFSI].data = &afsi_buf; objs[AFTCOL_AFSI].size = AFSI_SIZE; save_afsi(&default_afsi, &objs[AFTCOL_AFSI]); @@ -1393,7 +1391,6 @@ static int hash_sister_callback(const struct osl_object *query, return 1; } - static int add_one_audio_file(const char *arg, const void *private_data) { int ret; @@ -1401,15 +1398,15 @@ static int add_one_audio_file(const char *arg, const void *private_data) const struct private_add_data *pad = private_data; struct audio_format_info afhi, *afhi_ptr = NULL; struct osl_row *pb = NULL, *hs = NULL; /* path brother/hash sister */ - struct osl_object map, obj, query, result; - char *path; + struct osl_object map, obj = {.data = NULL}, query, result; + char *path = NULL; HASH_TYPE hash[HASH_SIZE]; afhi.header_offset = 0; afhi.header_len = 0; ret = verify_path(arg, &path); if (ret < 0) - return ret; + goto out_free; query.data = path; query.size = strlen(path) + 1; ret = send_callback_request(path_brother_callback, &query, &result); @@ -1455,14 +1452,13 @@ static int add_one_audio_file(const char *arg, const void *private_data) */ if (!hs || (pad->flags & ADD_FLAG_FORCE)) { ret = compute_afhi(path, map.data, map.size, &afhi); - if (ret < 0) { - ret = send_va_buffer(pad->fd, - "audio format of %s not recognized\n", path); + if (ret < 0) goto out_unmap; - } format_num = ret; afhi_ptr = &afhi; } + if (pad->flags & ADD_FLAG_VERBOSE) + send_va_buffer(pad->fd, "adding %s\n", path); munmap(map.data, map.size); save_audio_file_info(hash, path, afhi_ptr, pad->flags, format_num, &obj); /* Ask afs to consider this entry for adding. */ @@ -1472,11 +1468,14 @@ static int add_one_audio_file(const char *arg, const void *private_data) out_unmap: munmap(map.data, map.size); out_free: + if (ret < 0) + send_va_buffer(pad->fd, "failed to add %s (%s)\n", path? + path : arg, PARA_STRERROR(-ret)); free(obj.data); free(path); if (afhi_ptr) free(afhi_ptr->chunk_table); - return ret; + return 1; /* it's not an error if not all files could be added */ } int com_add(int fd, int argc, char * const * const argv) @@ -1485,7 +1484,6 @@ int com_add(int fd, int argc, char * const * const argv) struct private_add_data pad = {.fd = fd, .flags = 0}; struct stat statbuf; - PARA_NOTICE_LOG("argv[1]: %s\n", argv[1]); for (i = 1; i < argc; i++) { const char *arg = argv[i]; if (arg[0] != '-') @@ -1510,22 +1508,23 @@ int com_add(int fd, int argc, char * const * const argv) if (argc <= i) return -E_AFT_SYNTAX; for (; i < argc; i++) { - ret = stat(argv[i], &statbuf); + char *path = para_strdup(argv[i]); + size_t len = strlen(path); + while (len > 1 && path[--len] == '/') + path[len] = '\0'; + ret = stat(path, &statbuf); if (ret < 0) - return -E_AFS_STAT; - if (S_ISDIR(statbuf.st_mode)) { - ret = for_each_file_in_dir(argv[i], - add_one_audio_file, &pad); - if (ret < 0) - return ret; - continue; - } - ret = add_one_audio_file(argv[i], &pad); - if (ret < 0) - goto out; + PARA_NOTICE_LOG("failed to stat %s (%s)", path, + strerror(errno)); + else + if (S_ISDIR(statbuf.st_mode)) + for_each_file_in_dir(path, add_one_audio_file, + &pad); + else + add_one_audio_file(path, &pad); + free(path); } ret = 1; -out: return ret; } @@ -1696,6 +1695,54 @@ err: return ret; } +/* TODO: optionally fix problems by removing offending rows */ +static int check_audio_file(struct osl_row *row, void *data) +{ + char *path; + struct para_buffer *pb = data; + struct stat statbuf; + int ret = get_audio_file_path_of_row(row, &path); + struct afs_info afsi; + char *blob_name; + + if (ret < 0) { + para_printf(pb, "%s\n", PARA_STRERROR(-ret)); + return 1; + } + if (stat(path, &statbuf) < 0) + para_printf(pb, "%s: stat error (%s)\n", path, strerror(errno)); + else { + if (!S_ISREG(statbuf.st_mode)) + para_printf(pb, "%s: not a regular file\n", path); + } + ret = get_afsi_of_row(row, &afsi); + if (ret < 0) { + para_printf(pb, "%s: %s\n", path, PARA_STRERROR(-ret)); + return 1; + } + ret = lyr_get_name_by_id(afsi.lyrics_id, &blob_name); + if (ret < 0) + para_printf(pb, "%s lyrics id %u: %s\n", path, afsi.lyrics_id, + PARA_STRERROR(-ret)); + ret = img_get_name_by_id(afsi.image_id, &blob_name); + if (ret < 0) + para_printf(pb, "%s image id %u: %s\n", path, afsi.image_id, + PARA_STRERROR(-ret)); + return 1; +} + +int aft_check_callback(__a_unused const struct osl_object *query, struct osl_object *result) +{ + struct para_buffer pb = {.buf = NULL}; + + para_printf(&pb, "checking audio file table...\n"); + audio_file_loop(&pb, check_audio_file); + result->data = pb.buf; + result->size = pb.size; + return 1; + +} + /** * Close the audio file table. * @@ -1706,6 +1753,7 @@ err: void aft_shutdown(enum osl_close_flags flags) { osl_close_table(audio_file_table, flags); + audio_file_table = NULL; } /**