Beautified output.

[usetaglib.git] / usetaglib.cpp

diff --git a/usetaglib.cpp b/usetaglib.cpp
index a616a2ee98fb09da30cfe402cc810a0ed11ee94b..25c0d8df913e6fde2e4cf404fa11292ef4eb06fb 100644 (file)
--- a/usetaglib.cpp
+++ b/usetaglib.cpp
@@ -1,17 +1,18 @@
-/*
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-  
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-  
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/
+/* Copyright (C) 2015 Alexander Schmidt <alex@treefish.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+ */

 
 #include <iostream>
 #include <iomanip>
 
 #include <iostream>
 #include <iomanip>


@@ -53,39 +54,32 @@ tagpair splitToTagPair (const string &rawarg)
   return make_pair(rawarg.substr(0, delpos), rawarg.substr(delpos+1, string::npos));
 }
 
   return make_pair(rawarg.substr(0, delpos), rawarg.substr(delpos+1, string::npos));
 }
 

-void action_eraseTag (const TagLib::FileRef f, const string &key)
+void action_eraseTag (TagLib::PropertyMap &propmap, const string &key)

 {
 {

-  TagLib::PropertyMap propmap = f.file()->properties();

   propmap.erase(key);
   propmap.erase(key);

-  f.file()->setProperties(propmap);

 }
 
 }
 

-void action_replaceTag (const TagLib::FileRef f, const tagpair &tagPair)
+void action_replaceTag (TagLib::PropertyMap &propmap, const tagpair &tagPair)

 {
 {

-  TagLib::PropertyMap propmap = f.file()->properties();

   propmap.replace(tagPair.first, argToStringList(tagPair.second));
   propmap.replace(tagPair.first, argToStringList(tagPair.second));

-  f.file()->setProperties(propmap);

 }
 
 }
 

-void action_insertTag (const TagLib::FileRef f, const tagpair &tagPair)
+void action_insertTag (TagLib::PropertyMap &propmap, const tagpair &tagPair)

 {
 {

-  TagLib::PropertyMap propmap = f.file()->properties();

   propmap.insert(tagPair.first, argToStringList(tagPair.second));
   propmap.insert(tagPair.first, argToStringList(tagPair.second));

-  f.file()->setProperties(propmap);

 }
 
 }
 

-int action_printTags (const TagLib::FileRef f)
+int action_printTags (const TagLib::FileRef f, TagLib::PropertyMap &propmap)

 {
   if(f.tag()) {
 {
   if(f.tag()) {

-    TagLib::PropertyMap tags = f.file()->properties();

     unsigned int longest = 0;
     unsigned int longest = 0;

-    for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
+    for(TagLib::PropertyMap::ConstIterator i = propmap.begin(); i != propmap.end(); ++i) {

       if (i->first.size() > longest) {
        longest = i->first.size();
       }
     }
       if (i->first.size() > longest) {
        longest = i->first.size();
       }
     }

-    cout << "-- TAG (properties) --" << endl;
-    for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
+    cout << "----[ TAGS ]----" << endl;
+    for(TagLib::PropertyMap::ConstIterator i = propmap.begin(); i != propmap.end(); ++i) {

       for(TagLib::StringList::ConstIterator j = i->second.begin(); j != i->second.end(); ++j) {
        cout << i->first << "=" << *j << endl;
       }
       for(TagLib::StringList::ConstIterator j = i->second.begin(); j != i->second.end(); ++j) {
        cout << i->first << "=" << *j << endl;
       }


@@ -102,7 +96,7 @@ int action_printAudio (const TagLib::FileRef f)
     TagLib::AudioProperties *properties = f.audioProperties();
     int seconds = properties->length() % 60;
     int minutes = (properties->length() - seconds) / 60;
     TagLib::AudioProperties *properties = f.audioProperties();
     int seconds = properties->length() % 60;
     int minutes = (properties->length() - seconds) / 60;

-    cout << "-- AUDIO --" << endl;
+    cout << "----[ AUDIO PROPERTIES ]----" << endl;

     cout << "BITRATE=" << properties->bitrate() << endl;
     cout << "SAMPLERATE=" << properties->sampleRate() << endl;
     cout << "CHANNELS=" << properties->channels() << endl;
     cout << "BITRATE=" << properties->bitrate() << endl;
     cout << "SAMPLERATE=" << properties->sampleRate() << endl;
     cout << "CHANNELS=" << properties->channels() << endl;


@@ -114,21 +108,52 @@ int action_printAudio (const TagLib::FileRef f)
 }
 
 void printHelp ()
 }
 
 void printHelp ()

+{  
+  cout <<
+    "Usage: usetaglib [ACTION]... [FILE]...\n"    
+    "Read and edit meta-data of audio formats supported by taglib.\n"
+    "Multiple ACTIONS and FILES may be given in arbitrary order.\n"
+    "\n"
+    "-h, --help      show help\n"
+    "-H, --longhelp  show long help\n"
+    "\n"
+    "ACTIONS\n"
+    "  If multiple actions are specified they are executed in given order.\n"
+    "\n"
+    "  -l, --list                    list all tags (implicit if no action given)\n"
+    "  -a, --audio                   show audio properties\n"
+    "  -e, --erase=TAGNAME           erase tag TAGNAME\n"
+    "  -r, --replace=TAGNAME=TAGVAL  replace tag TAGNAME with value TAGVAL\n"
+    "  -i, --insert=TAGNAME=TAGVAL   insert tag TAGNAME with value TAGVAL\n";
+}
+
+void printExtraHelp ()

 {
 {

-  cout << "Usage: usetaglib [ACTION]... [FILE]..." << endl;
-  cout << "List and edit tags on mediafiles in formats supported by libtag." << endl;
-  cout << endl;
-  cout << "-h, --help   Show this help" << endl;
-  cout << endl;
-  cout << "ACTIONS" << endl;
-  cout << setfill(' ') << setw(45) << left << "  -l, --list"
-       << "list all tags (implicit if no action specified)"<< endl;
-  cout << setfill(' ') << setw(45) << left << "  -e, --erase=TAGNAME"
-       << "erase tag with name TAGNAME"<< endl;
-  cout << setfill(' ') << setw(45) << left << "  -r, --replace=TAGNAME=TAGVAL[=TAGVAL...]"
-       << "replace tag TAGNAME with list of values TAGVAL"<< endl;
-  cout << setfill(' ') << setw(45) << left << "  -i, --insert=TAGNAME=TAGVAL[=TAGVAL...]"
-       << "insert list of values TAGVAL for tag TAGNAME"<< endl;
+  cout <<
+    "\n"
+    "TAGNAME\n"
+    "  TAGNAME is a media format independent id encoding the type of a tag.\n"
+    "  Note that also in --list output, format specific tag ids are translated\n"
+    "  to unified TAGNAMES.\n"
+    "\n"
+    "  Some \"well-known\" tags you might want to use are:\n"
+    "  TITLE ALBUM ARTIST ALBUMARTIST SUBTITLE TRACKNUMBER DISCNUMBER DATE\n"
+    "  ORIGINALDATE GENRE COMMENT TITLESORT ALBUMSORT ARTISTSORT\n"
+    "  ALBUMARTISTSORT COMPOSER LYRICIST CONDUCTOR REMIXER PERFORMER ISRC ASIN\n"
+    "  BPM COPYRIGHT ENCODEDBY MOOD COMMENT MEDIA LABEL CATALOGNUMBER BARCODE\n"
+    "\n"
+    "TAGVAL\n"
+    "  TAGVAL has to be either a single string or a list of strings separated\n"
+    "  by equal signs (=). If a list is given, multiple tags of type TAGNAME\n"
+    "  will be created and set to the respective values given in the list.\n"
+    "\n"
+    "EXAMPLES\n"
+    "  usetaglib file.ogg\n"
+    "  usetaglib -e ALBUM file.flac\n"
+    "  usetaglib -r \"ALBUM=New Album\" -i ARTIST=Horst=Hubert file.mp3\n"
+    "  usetaglib -r ARTIST=Horst -l file1.ogg file2.mp3\n"
+    "  usetaglib -i \"ALBUMARTIST=Horst und Hubert\" file.ogg\n"
+    "  usetaglib --insert=\"ALBUMARTIST=Horst und Hubert\" file.ogg\n";

 }
   
 int main(int argc, char *argv[])
 }
   
 int main(int argc, char *argv[])


@@ -141,8 +166,9 @@ int main(int argc, char *argv[])
       static struct option long_options[] =
         {
          {"help",      no_argument,       0, 'h'},
       static struct option long_options[] =
         {
          {"help",      no_argument,       0, 'h'},

+         {"longhelp",  no_argument,       0, 'H'},

           {"list",      no_argument,       0, 'l'},
           {"list",      no_argument,       0, 'l'},

-         {"listaudio", no_argument,       0, 'a'},
+         {"audio",     no_argument,       0, 'a'},

           {"insert",    required_argument, 0, 'i'},
           {"erase",     required_argument, 0, 'e'},
           {"replace",   required_argument, 0, 'r'},
           {"insert",    required_argument, 0, 'i'},
           {"erase",     required_argument, 0, 'e'},
           {"replace",   required_argument, 0, 'r'},


@@ -150,7 +176,7 @@ int main(int argc, char *argv[])
         };
 
       int option_index = 0;      
         };
 
       int option_index = 0;      

-      c = getopt_long (argc, argv, "hlai:e:r:",
+      c = getopt_long (argc, argv, "hHlai:e:r:",

                        long_options, &option_index);
 
       if (c == -1)
                        long_options, &option_index);
 
       if (c == -1)


@@ -161,75 +187,86 @@ int main(int argc, char *argv[])
         case 0:
           if (long_options[option_index].flag != 0)
             break;
         case 0:
           if (long_options[option_index].flag != 0)
             break;

-

        case 'h':
          printHelp();
          return 0;
           break;
        case 'h':
          printHelp();
          return 0;
           break;

-         
+       case 'H':
+         printHelp();
+         printExtraHelp();
+         return 0;
+          break;

         case 'l':
          requestedActions.push_back( make_pair(LIST, "") );
           break;
         case 'l':
          requestedActions.push_back( make_pair(LIST, "") );
           break;

-

        case 'a':
          requestedActions.push_back( make_pair(AUDIO, "") );
           break;
        case 'a':
          requestedActions.push_back( make_pair(AUDIO, "") );
           break;

-

         case 'i':
          requestedActions.push_back( make_pair(INSERT, optarg) );
           break;
         case 'i':
          requestedActions.push_back( make_pair(INSERT, optarg) );
           break;

-

         case 'e':
          requestedActions.push_back( make_pair(ERASE, optarg) );
           break;
         case 'e':
          requestedActions.push_back( make_pair(ERASE, optarg) );
           break;

-

         case 'r':
          requestedActions.push_back( make_pair(REPLACE, optarg) );
           break;
         case 'r':
          requestedActions.push_back( make_pair(REPLACE, optarg) );
           break;

-

         case '?':
           break;
         case '?':
           break;

-

         default:
           abort ();
         }
     }
 
         default:
           abort ();
         }
     }
 

+  if ( optind == argc ) {
+    printHelp();
+    return 0;
+  }
+  

   if (requestedActions.size() == 0)
     requestedActions.push_back( make_pair(LIST, "") );
   if (requestedActions.size() == 0)
     requestedActions.push_back( make_pair(LIST, "") );

-  
+        

   for(int i = optind; i < argc; i++) {
   for(int i = optind; i < argc; i++) {

-    cout << "******************** \"" << argv[i] << "\" ********************" << endl;
+    cout << " _________________________________________ _ _ _" << endl;
+    cout << "/" << endl;
+    cout << "  " << argv[i] << endl;
+    cout << "\\_________________________________________ _ _ _" << endl;
+    

     TagLib::FileRef f(argv[i]);
 
     if(f.isNull())
       continue;
     TagLib::FileRef f(argv[i]);
 
     if(f.isNull())
       continue;

+
+    TagLib::PropertyMap propmap = f.file()->properties();    
+    bool FCHANGED = false;

     
     for (actionqueue::iterator actit = requestedActions.begin(); actit != requestedActions.end(); ++actit) {
       switch (actit->first) {
       case LIST:
     
     for (actionqueue::iterator actit = requestedActions.begin(); actit != requestedActions.end(); ++actit) {
       switch (actit->first) {
       case LIST:

-       action_printTags(f);
+       action_printTags(f, propmap);

        break;
        break;

-       

       case AUDIO:
        action_printAudio(f);
        break;
       case AUDIO:
        action_printAudio(f);
        break;

-       

       case ERASE:
       case ERASE:

-       action_eraseTag(f, actit->second);
+       action_eraseTag(propmap, actit->second);
+       FCHANGED = true;

        break;
        break;

-       

       case REPLACE:
       case REPLACE:

-       action_replaceTag(f, splitToTagPair(actit->second));
+       action_replaceTag(propmap, splitToTagPair(actit->second));
+       FCHANGED = true;

        break;
        break;

-

       case INSERT:
       case INSERT:

-       action_insertTag(f, splitToTagPair(actit->second));
+       action_insertTag(propmap, splitToTagPair(actit->second));
+       FCHANGED = true;

        break;
       }
     }
        break;
       }
     }

-    
-    f.file()->save();
+
+    if (FCHANGED) {
+      f.file()->setProperties(propmap);
+      f.file()->save();
+    }

   }
   
   return 0;
   }
   
   return 0;