Skip to content

Commit

Permalink
Remove debug messages.
Browse files Browse the repository at this point in the history
  • Loading branch information
@NewCreature
NewCreature committed Oct 5, 2018
1 parent 1a90df8 commit 631a904
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 86 deletions.
39 changes: 0 additions & 39 deletions src/cloud.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,35 +120,26 @@ bool omo_submit_track_tags(OMO_LIBRARY * lp, const char * id, const char * url,
OMO_TRACK * track;
int i;

printf("submitting track tags\n");
arguments = t3net_create_arguments();
if(arguments)
{
printf("getting tagger key\n");
tagger_key = al_get_config_value(t3f_config, "Settings", "tagger_id");
if(tagger_key)
{
printf("tagger key: %s\n", tagger_key);
printf("retrieving track database entry\n");
entry = omo_get_library_entry(lp, id);
if(entry < 0)
{
entry = omo_get_library_base_entry(lp, id);
}
if(entry >= 0)
{
printf("track entry: %d\n", entry);
al_stop_timer(t3f_timer);
printf("loading track: %s/%s:%s\n", lp->entry[entry]->filename, lp->entry[entry]->sub_filename, lp->entry[entry]->track);
track = omo_load_track(archive_handler_registry, codec_handler_registry, lp->entry[entry]->filename, lp->entry[entry]->sub_filename, lp->entry[entry]->track, temp_path, NULL);
al_start_timer(t3f_timer);
if(!track)
{
printf("failed to load track!\n");
return false;
}

printf("creating T3Net arguments list\n");
t3net_add_argument(arguments, "tagger", tagger_key);
t3net_add_argument(arguments, "track_id", id);
for(i = 0; i < OMO_MAX_TAG_TYPES; i++)
Expand Down Expand Up @@ -176,42 +167,28 @@ bool omo_submit_track_tags(OMO_LIBRARY * lp, const char * id, const char * url,
{
t3net_add_argument(arguments, convert_tag_name("Detected Length"), val);
}
printf("finished creating T3Net arguments list\n");
printf("unloading track\n");
omo_unload_track(track);
printf("finished unloading track\n");
printf("submitting data\n");
submit_data = t3net_get_data(url, arguments);
if(submit_data)
{
printf("finished submitting data\n");
submit_error = t3net_get_error(submit_data);
if(submit_error)
{
printf("submit error: %s\n", submit_error);
if(!strcmp(submit_error, "Can't delete non-existent entry.\r\n"))
{
printf("deleting Submitted key\n");
omo_remove_database_key(lp->entry_database, id, "Submitted");
printf("finished deleting Submitted key\n");
}
}
else
{
ret = true;
}
printf("destroying data set\n");
t3net_destroy_data(submit_data);
printf("finished destroying data set\n");
}
}
}
printf("destroying arguments list\n");
t3net_destroy_arguments(arguments);
printf("finished destroying arguments list\n");
}
printf("ret: %d\n", ret);

return ret;
}

Expand All @@ -225,20 +202,14 @@ bool omo_retrieve_track_tags(OMO_LIBRARY * lp, const char * id, const char * url
bool ret = false;
int i;

printf("retrieving track tags\n");
arguments = t3net_create_arguments();
if(arguments)
{
printf("creating arguments list\n");
t3net_add_argument(arguments, "track_id", id);
printf("getting remote data\n");
track_data = t3net_get_data(url, arguments);
printf("finished getting remote data\n");
t3net_destroy_arguments(arguments);
printf("destroying arguments list\n");
if(track_data)
{
printf("copying track data to local database\n");
for(i = 0; i < OMO_MAX_TAG_TYPES; i++)
{
if(omo_tag_type[i])
Expand All @@ -265,11 +236,9 @@ bool omo_retrieve_track_tags(OMO_LIBRARY * lp, const char * id, const char * url
{
omo_set_database_value(lp->entry_database, id, convert_tag_name("Detected Length"), track_val);
}
printf("finished copying track data to local database\n");
ret = true;
}
}
printf("ret: %d\n", ret);
return ret;
}

Expand All @@ -282,40 +251,32 @@ static void * cloud_submit_thread_proc(ALLEGRO_THREAD * thread, void * data)
const char * id;
int i;

printf("submitting all unsubmitted tags\n");
for(i = 0; i < app->library->entry_count; i++)
{
id = app->library->entry[i]->id;
val = omo_get_database_value(app->library->entry_database, app->library->entry[i]->id, "Submitted");
if(!val)
{
printf("break 1\n");
base_id = omo_get_library_file_base_id(app->library, app->library->entry[i]->filename, buffer);
if(base_id)
{
id = base_id;
val = omo_get_database_value(app->library->entry_database, id, "Submitted");
}
printf("break 2\n");
}
if(val && !strcmp(val, "false"))
{
printf("submitting tags for entry %d\n", i);
sprintf(app->status_bar_text, "Submitting tags: %s", id);
if(omo_submit_track_tags(app->library, id, app->cloud_url, app->archive_handler_registry, app->codec_handler_registry, app->cloud_temp_path))
{
printf("submission successful, removing Submitted key\n");
omo_remove_database_key(app->library->entry_database, id, "Submitted");
printf("finished removing Submitted key\n");
}
}
if(al_get_thread_should_stop(thread))
{
printf("thread stop requested\n");
break;
}
}
printf("marking thread as done\n");
app->cloud_thread_done = true;
return NULL;
}
Expand Down
16 changes: 0 additions & 16 deletions src/library_helpers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,6 @@ static void * library_setup_thread_proc(ALLEGRO_THREAD * thread, void * data)
{
APP_INSTANCE * app = (APP_INSTANCE *)data;

printf("setting up library\n");
if(omo_setup_library_helper(app))
{
if(app->prune_library)
Expand All @@ -1116,26 +1115,19 @@ static void * library_setup_thread_proc(ALLEGRO_THREAD * thread, void * data)
}
app->library = app->loading_library;
}
printf("finished setting up library\n");
return NULL;
}

void omo_cancel_library_setup(APP_INSTANCE * app)
{
printf("cancelling library setup\n");
if(app->library_thread)
{
printf("l 1\n");
omo_cancel_library_sort();
printf("l 2\n");
app->loading_library_file_helper_data.cancel_scan = true;
al_join_thread(app->library_thread, NULL);
printf("l 3\n");
al_destroy_thread(app->library_thread);
printf("l 4\n");
app->library_thread = NULL;
}
printf("finished cancelling library setup\n");
}

void omo_setup_library(APP_INSTANCE * app, const char * file_database_fn, const char * entry_database_fn, ALLEGRO_CONFIG * config)
Expand Down Expand Up @@ -1163,19 +1155,16 @@ static bool omo_setup_library_lists_helper(APP_INSTANCE * app)
omo_setup_file_helper_data(&app->loading_library_file_helper_data, app->archive_handler_registry, app->codec_handler_registry, NULL, NULL, app->player->queue, NULL, app->status_bar_text);

/* tally up artists */
printf("getting artist list\n");
if(app->library->modified || !omo_load_library_artists_cache(app->library, t3f_get_filename(t3f_data_path, "omo.artists", buffer, 1024)))
{
sprintf(app->status_bar_text, "Creating artist list...");
if(!omo_build_library_artists_list(app, app->library))
{
printf("failed to get artist list\n");
return false;
}
}

/* tally up albums */
printf("getting album list\n");
if(app->loading_library_file_helper_data.cancel_scan)
{
app->loading_library_file_helper_data.scan_done = true;
Expand All @@ -1186,20 +1175,17 @@ static bool omo_setup_library_lists_helper(APP_INSTANCE * app)
if(app->loading_library_file_helper_data.cancel_scan)
{
app->loading_library_file_helper_data.scan_done = true;
printf("failed to get album list\n");
return false;
}

/* make song list */
printf("getting song list\n");
if(app->loading_library_file_helper_data.cancel_scan)
{
app->loading_library_file_helper_data.scan_done = true;
return false;
}
sprintf(app->status_bar_text, "Creating song list...");
omo_get_library_song_list(app->library, "All Artists", "All Albums");
printf("finished getting song list\n");

app->loading_library_file_helper_data.scan_done = true;
if(app->loading_library_file_helper_data.cancel_scan)
Expand All @@ -1214,12 +1200,10 @@ static void * library_lists_setup_thread_proc(ALLEGRO_THREAD * thread, void * da
{
APP_INSTANCE * app = (APP_INSTANCE *)data;

printf("setting up library lists\n");
if(omo_setup_library_lists_helper(app))
{
app->library->loaded = true;
}
printf("finished setting up library lists\n");
return NULL;
}

Expand Down
14 changes: 0 additions & 14 deletions src/queue_helpers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ bool omo_get_queue_entry_tags(OMO_QUEUE * qp, int i, OMO_LIBRARY * lp)
qp->entry[i]->tags_retrieved = false;
if(lp)
{
printf("getting tags from database\n");
strcpy(section, qp->entry[i]->file);
if(qp->entry[i]->sub_file)
{
Expand Down Expand Up @@ -255,7 +254,6 @@ bool omo_get_queue_entry_tags(OMO_QUEUE * qp, int i, OMO_LIBRARY * lp)
ret = true;
}
}
printf("finished getting tags from database\n");
}
if(qp->entry[i]->skip_scan)
{
Expand Down Expand Up @@ -283,24 +281,19 @@ static void * get_queue_tags_thread_proc(ALLEGRO_THREAD * thread, void * data)

for(i = 0; i < app->player->queue->entry_count && !al_get_thread_should_stop(thread); i++)
{
printf("getting tags for queue entry %d\n", i);
if(!app->player->queue->entry[i]->tags_retrieved)
{
extracted_fn = NULL;
target_fn = NULL;
archive_handler = omo_get_archive_handler(app->archive_handler_registry, app->player->queue->entry[i]->file);
if(archive_handler && app->player->queue->entry[i]->sub_file)
{
printf("opening archive %s\n", app->player->queue->entry[i]->file);
archive_handler_data = archive_handler->open_archive(app->player->queue->entry[i]->file, app->queue_tags_temp_path);
if(archive_handler_data)
{
printf("archive opened, extracting file\n");
extracted_fn = archive_handler->extract_file(archive_handler_data, atoi(app->player->queue->entry[i]->sub_file), fn_buffer);
target_fn = extracted_fn;
printf("closing archive\n");
archive_handler->close_archive(archive_handler_data);
printf("finished closing archive\n");
}
}
else
Expand All @@ -310,9 +303,7 @@ static void * get_queue_tags_thread_proc(ALLEGRO_THREAD * thread, void * data)
codec_handler = omo_get_codec_handler(app->codec_handler_registry, target_fn, NULL);
if(codec_handler && codec_handler->get_tag)
{
printf("loading track\n");
codec_handler_data = codec_handler->load_file(target_fn, app->player->queue->entry[i]->track);
printf("getting tags\n");
if(codec_handler_data)
{
if(!strlen(app->player->queue->entry[i]->tags.artist))
Expand Down Expand Up @@ -352,17 +343,13 @@ static void * get_queue_tags_thread_proc(ALLEGRO_THREAD * thread, void * data)
app->player->queue->entry[i]->tags.length = codec_handler->get_length(codec_handler_data);
app->player->queue->length += app->player->queue->entry[i]->tags.length;
}
printf("unloading track\n");
codec_handler->unload_file(codec_handler_data);
printf("finished unloading track\n");
app->player->queue->entry[i]->tags_retrieved = true;
}
}
if(extracted_fn)
{
printf("deleting extracted file\n");
al_remove_filename(extracted_fn);
printf("finished deleting extracted file\n");
}
}
}
Expand All @@ -383,7 +370,6 @@ void omo_get_queue_tags(OMO_QUEUE * qp, OMO_LIBRARY * lp, void * data)
int i;
bool rescan = false;

printf("getting queue tags\n");
if(qp)
{
if(qp->thread)
Expand Down
12 changes: 0 additions & 12 deletions src/threads.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,12 @@ void omo_threads_logic(APP_INSTANCE * app)
/* destroy thread when library scan finished */
if(app->library_thread && app->loading_library_file_helper_data.scan_done)
{
printf("destroying library thread\n");
al_destroy_thread(app->library_thread);
app->library_thread = NULL;
if(app->library && app->player->queue)
{
app->spawn_queue_thread = true;
}
printf("fixing library selections\n");
if(app->library)
{
if(app->library->loaded)
Expand Down Expand Up @@ -79,47 +77,37 @@ void omo_threads_logic(APP_INSTANCE * app)
}
if(app->cloud_thread_done)
{
printf("destroying cloud thread\n");
al_destroy_thread(app->cloud_thread);
app->cloud_thread = NULL;
app->cloud_thread_done = false;
printf("finished destroying cloud thread\n");
}

if(app->spawn_library_thread)
{
printf("spawning library thread\n");
kill_all_threads(app);
strcpy(file_database_fn, t3f_get_filename(t3f_data_path, "files.ini", buffer, 1024));
strcpy(entry_database_fn, t3f_get_filename(t3f_data_path, "database.ini", buffer, 1024));
if(app->library)
{
printf("destroying library\n");
omo_destroy_library(app->library);
app->library = NULL;
printf("finished destroying library\n");
}
printf("setting up library\n");
omo_setup_library(app, file_database_fn, entry_database_fn, NULL);
app->spawn_library_thread = false;
}
if(app->spawn_library_lists_thread && app->library)
{
printf("spawning library lists thread\n");
omo_setup_library_lists(app);
app->spawn_library_lists_thread = false;
}
if(app->spawn_cloud_thread && app->library)
{
printf("spawning cloud thread\n");
app->cloud_thread_done = false;
printf("submitting tags\n");
omo_submit_library_tags(app, "http://www.t3-i.com/omo/tag_track.php");
app->spawn_cloud_thread = false;
}
if(app->spawn_queue_thread)
{
printf("spawning queue thread\n");
omo_get_queue_tags(app->player->queue, app->library, app);
app->spawn_queue_thread = false;
}
Expand Down
Loading

0 comments on commit 631a904

Please sign in to comment.