diff options
Diffstat (limited to 'src/plugins/fs/extensions/musicinsert.c')
-rw-r--r-- | src/plugins/fs/extensions/musicinsert.c | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/src/plugins/fs/extensions/musicinsert.c b/src/plugins/fs/extensions/musicinsert.c index cb20bc7d..bd60154e 100644 --- a/src/plugins/fs/extensions/musicinsert.c +++ b/src/plugins/fs/extensions/musicinsert.c | |||
@@ -518,13 +518,12 @@ insertfiles () | |||
518 | while (dirkeywords[n]) | 518 | while (dirkeywords[n]) |
519 | { | 519 | { |
520 | GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS, | 520 | GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS, |
521 | dirkeywords[n]); | 521 | dirkeywords[n]); |
522 | n++; | 522 | n++; |
523 | } | 523 | } |
524 | /* Add a standard keyword to allow finding all available music albums | 524 | /* Add a standard keyword to allow finding all available music albums |
525 | * on AFS in one search */ | 525 | * on AFS in one search */ |
526 | GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS, | 526 | GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS, "music album"); |
527 | "music album"); | ||
528 | 527 | ||
529 | 528 | ||
530 | /* Manage files metadatas */ | 529 | /* Manage files metadatas */ |
@@ -548,8 +547,7 @@ insertfiles () | |||
548 | useforallflags = gtk_toggle_button_get_active (commentstogglebutton) << 3; | 547 | useforallflags = gtk_toggle_button_get_active (commentstogglebutton) << 3; |
549 | 548 | ||
550 | filesmetadatas = | 549 | filesmetadatas = |
551 | g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_MetaData *), | 550 | g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_MetaData *), 20); |
552 | 20); | ||
553 | files = g_array_sized_new (FALSE, FALSE, sizeof (gchar *), 20); | 551 | files = g_array_sized_new (FALSE, FALSE, sizeof (gchar *), 20); |
554 | i = 0; | 552 | i = 0; |
555 | do | 553 | do |
@@ -572,28 +570,25 @@ insertfiles () | |||
572 | 570 | ||
573 | if (tempmetas[1]) | 571 | if (tempmetas[1]) |
574 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME, | 572 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME, |
575 | tempmetas[1]); | 573 | tempmetas[1]); |
576 | if ((useforallflags & 0x1) && dirmetas[0]) | 574 | if ((useforallflags & 0x1) && dirmetas[0]) |
577 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME, | 575 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME, |
578 | dirmetas[0]); | 576 | dirmetas[0]); |
579 | else if (!(useforallflags & 0x1) && tempmetas[2]) | 577 | else if (!(useforallflags & 0x1) && tempmetas[2]) |
580 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_TITLE, | 578 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_TITLE, tempmetas[2]); |
581 | tempmetas[2]); | ||
582 | if ((useforallflags & 0x2) && dirmetas[1]) | 579 | if ((useforallflags & 0x2) && dirmetas[1]) |
583 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ARTIST, | 580 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ARTIST, dirmetas[1]); |
584 | dirmetas[1]); | ||
585 | else if (!(useforallflags & 0x2) && tempmetas[3]) | 581 | else if (!(useforallflags & 0x2) && tempmetas[3]) |
586 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME, | 582 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME, |
587 | tempmetas[3]); | 583 | tempmetas[3]); |
588 | if (tempmetas[4]) | 584 | if (tempmetas[4]) |
589 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ALBUM, | 585 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ALBUM, tempmetas[4]); |
590 | tempmetas[4]); | ||
591 | if (tempmetas[5]) | 586 | if (tempmetas[5]) |
592 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_MIMETYPE, | 587 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_MIMETYPE, |
593 | tempmetas[5]); | 588 | tempmetas[5]); |
594 | if (tempmetas[6]) | 589 | if (tempmetas[6]) |
595 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FORMAT, | 590 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FORMAT, |
596 | tempmetas[6]); | 591 | tempmetas[6]); |
597 | 592 | ||
598 | if (!(useforallflags & 0x1)) | 593 | if (!(useforallflags & 0x1)) |
599 | { | 594 | { |
@@ -601,7 +596,7 @@ insertfiles () | |||
601 | while (dirkeywords[n]) | 596 | while (dirkeywords[n]) |
602 | { | 597 | { |
603 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS, | 598 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS, |
604 | dirkeywords[n]); | 599 | dirkeywords[n]); |
605 | n++; | 600 | n++; |
606 | } | 601 | } |
607 | } | 602 | } |
@@ -612,15 +607,13 @@ insertfiles () | |||
612 | while (tempkeywords[n]) | 607 | while (tempkeywords[n]) |
613 | { | 608 | { |
614 | GNUNET_meta_data_insert (tempmetadata, | 609 | GNUNET_meta_data_insert (tempmetadata, |
615 | EXTRACTOR_KEYWORDS, | 610 | EXTRACTOR_KEYWORDS, tempkeywords[n]); |
616 | tempkeywords[n]); | ||
617 | n++; | 611 | n++; |
618 | } | 612 | } |
619 | g_strfreev (tempkeywords); | 613 | g_strfreev (tempkeywords); |
620 | /* Add a standard keyword to allow finding all available music files | 614 | /* Add a standard keyword to allow finding all available music files |
621 | * on AFS in one search */ | 615 | * on AFS in one search */ |
622 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS, | 616 | GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS, "music"); |
623 | "music"); | ||
624 | } | 617 | } |
625 | 618 | ||
626 | GNUNET_free (tempmetas); | 619 | GNUNET_free (tempmetas); |