Bugfixes.

1. Fix --convert option so it can be used to remove unnecessary
ID3 formats (e.g. --convert=2).
2. Fix processing of unknown frames in Guile code.
3. Fix setpic and pic modules.

* scheme/idest/batch/setpic.scm (read-picture): Use binary i/o.
* scheme/idest/format/pic.scm (save-picture): Likewise.
* scheme/idest/list-modules.scm: Minor changes.
* src/frametab.gperf (frame_field_from_rawdata): New function.
* src/getopt.m4: Update copyright years.
* src/guile.c (set_frame_from_rawdata): Use frame_field_from_rawdata.
* src/idest.h (frame_field_from_rawdata): New proto.
* src/idop.c (set_tag_options): Always call id3_tag_options.

8 files changed, 167 insertions, 38 deletions

diff --git a/scheme/idest/batch/setpic.scm b/scheme/idest/batch/setpic.scm
index c0670a3..834a571 100644
--- a/scheme/idest/batch/setpic.scm
+++ b/scheme/idest/batch/setpic.scm
@@ -1,3 +1,3 @@
 ;; This file is part of Idest
-;; Copyright (C) 2011 Sergey Poznyakoff
+;; Copyright (C) 2011, 2015 Sergey Poznyakoff
 ;;
@@ -18,3 +18,4 @@
 
-(use-modules (ice-9 getopt-long))
+(use-modules (ice-9 getopt-long)
+             (rnrs io ports))
 
@@ -28,13 +29,12 @@
     (lambda ()
-      (with-input-from-file
-          file
-        (lambda ()
-          (let loop ((chr (read-char)))
+      (let ((port (open-file-input-port file)))
+        (let ((get-byte (lambda () (get-u8 port))))
+          (let loop ((n (get-byte)))
             (cond
-             ((not (eof-object? chr))
-              (let ((n (char->integer chr)))
-                (if (< n 16)
-                    (display "0"))
-                (display (number->string n 16)))
-              (loop (read-char))))))))))
+             ((not (eof-object? n))
+              (if (< n 16)
+                  (display "0"))
+              (display (number->string n 16))
+              (loop (get-byte))))))
+        (close-port port)))))
             
diff --git a/scheme/idest/format/pic.scm b/scheme/idest/format/pic.scm
index 0e42f25..5e831fb 100644
--- a/scheme/idest/format/pic.scm
+++ b/scheme/idest/format/pic.scm
@@ -1,3 +1,3 @@
 ;; This file is part of Idest
-;; Copyright (C) 2011 Sergey Poznyakoff
+;; Copyright (C) 2011, 2015 Sergey Poznyakoff
 ;;
@@ -19,2 +19,3 @@
 (use-modules (ice-9 getopt-long)
+             (rnrs io ports)
              (srfi srfi-1))
@@ -74,2 +75,19 @@
 (define (save-picture name data)
+  (let ((port (open-file-output-port name)))
+    (for-each
+     (lambda (c) (put-u8 port c))
+     (let string->bytelist ((str data)
+                            (bytelist '()))
+       (cond
+        ((string-null? str)
+         (reverse bytelist))
+        (else
+         (string->bytelist
+          (substring str 2)
+          (cons
+           (string->number (substring str 0 2) 16)
+           bytelist))))))
+    (close-port port)))
+
+(define (save-picture-0 name data)
   (with-output-to-file
@@ -78,3 +96,3 @@
       (for-each
-       write-char
+       (lambda (c) (put-u8 (current-output-port) c))
        (let string->bytelist ((str data)
@@ -88,4 +106,3 @@
             (cons
-             (integer->char
-              (string->number (substring str 0 2) 16))
+             (string->number (substring str 0 2) 16)
              bytelist)))))))))
@@ -206,2 +223,2 @@
             
-    
\ No newline at end of file
+    
diff --git a/scheme/idest/list-modules.scm b/scheme/idest/list-modules.scm
index c69d331..880dbf8 100644
--- a/scheme/idest/list-modules.scm
+++ b/scheme/idest/list-modules.scm
@@ -1,3 +1,3 @@
 ;; This file is part of Idest
-;; Copyright (C) 2011 Sergey Poznyakoff
+;; Copyright (C) 2011, 2015 Sergey Poznyakoff
 ;;
@@ -94,3 +94,3 @@
 
-      ;; Try out each candidate and print ist name, directory and description
+      ;; Try out each candidate and print its name, directory and description
       ;; if it happens to be a valid idest format module.
@@ -113,3 +113,3 @@
                         (format #t " (~A)" (cdr candidate)))
-                    ; A colon, and description (if any
+                    ; A colon, and description (if any)
                     (format #t ": ~A~%"
diff --git a/src/frametab.gperf b/src/frametab.gperf
index e716954..80d60f9 100644
--- a/src/frametab.gperf
+++ b/src/frametab.gperf
@@ -2,3 +2,3 @@
 /* This file is part of Idest. 
-   Copyright (C) 2009-2011 Sergey Poznyakoff
+   Copyright (C) 2009-2011, 2015 Sergey Poznyakoff
  
@@ -88,3 +88,3 @@ frame_field_from_string(struct id3_frame *frame, int n, const char *value)
                 return IDEST_ERR_NOFIELD;
-        if (frametype->fields[n] == ID3_FIELD_TYPE_TEXTENCODING) {
+        if (type == ID3_FIELD_TYPE_TEXTENCODING) {
                 /* Special case */
@@ -188,2 +188,109 @@ frame_field_from_string(struct id3_frame *frame, int n, const char *value)
 
+int
+frame_field_from_rawdata(struct id3_frame *frame, int n,
+                         enum id3_field_type type,
+                         const char *value)
+{
+        int rc = 0, res = 0;
+        union id3_field *field;
+        id3_ucs4_t *ucs4;
+
+        field = id3_frame_field(frame, n);
+        if (!field)
+                return IDEST_ERR_NOFIELD;
+        if (type == ID3_FIELD_TYPE_TEXTENCODING) {
+                /* Special case */
+                if (id3_field_settextencoding(field,
+                                              latin1_option ?
+                                              ID3_FIELD_TEXTENCODING_ISO_8859_1 
+                                              : ID3_FIELD_TEXTENCODING_UTF_8))
+                        rc = IDEST_ERR_SET;
+                return rc;
+        }
+
+        switch (type) {
+        case ID3_FIELD_TYPE_INT8:
+        case ID3_FIELD_TYPE_INT16:
+        case ID3_FIELD_TYPE_INT24:
+        case ID3_FIELD_TYPE_INT32: {
+                char *p;
+                signed long number = strtoul(value, &p, 10);
+                if (*p)
+                        rc = IDEST_ERR_BADCONV;
+                else
+                        res = id3_field_setint(field, number);
+                break;
+        }
+
+        case ID3_FIELD_TYPE_LATIN1:
+        case ID3_FIELD_TYPE_LATIN1FULL:
+                /* FIXME: Recode */
+                res = id3_field_setlatin1(field, (id3_latin1_t const *)value);
+                break;
+
+        case ID3_FIELD_TYPE_LATIN1LIST:
+                /* FIXME */
+                rc = IDEST_ERR_NOTSUPP;
+                break;
+
+        case ID3_FIELD_TYPE_STRING:
+                if (latin1_option)
+                        ucs4 = id3_latin1_ucs4duplicate(
+                                     (const id3_latin1_t *)value);
+                else
+                        ucs4 = id3_utf8_ucs4duplicate(
+                                     (const id3_utf8_t *)value);
+                res = id3_field_setstring(field, ucs4);
+                free(ucs4);
+                break;
+
+        case ID3_FIELD_TYPE_STRINGFULL:
+                if (latin1_option)
+                        ucs4 = id3_latin1_ucs4duplicate(
+                                     (const id3_latin1_t *)value);
+                else
+                        ucs4 = id3_utf8_ucs4duplicate(
+                                     (const id3_utf8_t *)value);
+                res = id3_field_setfullstring(field, ucs4);
+                free(ucs4);
+                break;
+
+        case ID3_FIELD_TYPE_STRINGLIST:
+                if (latin1_option)
+                        ucs4 = id3_latin1_ucs4duplicate(
+                                     (const id3_latin1_t *)value);
+                else
+                        ucs4 = id3_utf8_ucs4duplicate(
+                                     (const id3_utf8_t *)value);
+                res = id3_field_setstrings(field, 1, &ucs4);
+                free(ucs4);
+                break;
+
+        case ID3_FIELD_TYPE_LANGUAGE:
+                res = id3_field_setlanguage(field, value);
+                break;
+                
+        case ID3_FIELD_TYPE_FRAMEID:
+                res = id3_field_setframeid(field, value);
+                break;
+                
+        case ID3_FIELD_TYPE_DATE:
+                /* FIXME: Convert and copy 8 bytes into
+                   field->immediate.value */
+                rc = IDEST_ERR_NOTSUPP;
+                break;
+                
+        case ID3_FIELD_TYPE_INT32PLUS:
+        case ID3_FIELD_TYPE_BINARYDATA:
+                rc = field_binary_from_string(field, value);
+                break;
+
+        default:
+                rc = IDEST_ERR_BADTYPE;
+        }
+        if (rc == 0 && res)
+                rc = IDEST_ERR_SET;