update

Author: ytlm

erlang/file/Makefile

@@ -2,6 +2,8 @@
 
 all: compile
 
+ERL = erl -boot start_clean -pa ../lib -pa ../lib/lib_misc
+
 ERLC = erlc +debug_info
 
 MODS = id3_v1
@@ -11,6 +13,9 @@ MODS = id3_v1
 
 compile: ${MODS:%=%.beam}
 
+id3:
+	${ERL} -s id3_v1 test
+
 .PHONY:clean
 
 clean:

erlang/file/Sorry.mp3

@@ -2,54 +2,48 @@
 -import(lists, [filter/2, map/2, reverse/1]).
 -export([test/0, dir/1, read_id3_tag/1]).
 
-test() -> dir("./").
+test() -> dir(".").
 
 dir(Dir) ->
-    Files = lib_find:files(Dir, "*.mp3", true),
+    Files = lib_files_find:files(Dir, "*.mp3", true),
     L1 = map(fun(I) ->
                      {I, (catch read_id3_tag(I))}
              end, Files),
+    io:format("L1 ~p~n", [L1]),
     L2 = filter(fun({_, error}) -> false;
                    (_) -> true
                 end, L1),
+    io:format("L2 ~p~n", [L2]),
     lib_misc:dump("mp3data", L2).
 
 read_id3_tag(File) ->
+    io:format("file : ~p~n", [File]),
     case file:open(File, [read, binary, raw]) of
         {ok, S} ->
             Size = filelib:file_size(File),
             {ok, B2} = file:pread(S, Size-128, 128),
             Result = parse_v1_tag(B2),
+            io:format("parse v1 tag result : ~p, ~p ~n", [Result, B2]),
             file:close(S),
             Result;
         Error ->
             {File, Error}
     end.
 
-parse_v1_tag(<<$T, $A, $G, 
+parse_v1_tag(<<$T, $A, $G,
                Title:30/binary, Artist:30/binary,
                Album:30/binary, _Year:4/binary,
                _Comment:28/binary, 0:8, Track:8, _Genre:8>>) ->
     {"ID3v1.1",
-     [{track, Track}, {title, trim(Title)},
-      {aritist, trim(Artist)}, {album, trim(Album)}]};
+     [{track, Track}, {title, lib_misc:trim(Title)},
+      {aritist, lib_misc:trim(Artist)}, {album, lib_misc:trim(Album)}]};
 
 parse_v1_tag(<<$T, $A, $G,
                Title:30/binary, Artist:30/binary,
                Album:30/binary, _Year:4/binary,
                _Comment:30/binary, _Genre:8>>) ->
     {"ID3v1",
-     [{title, trim(Title)},
-      {aritist, trim(Artist)}, {album, trim(Album)}]};
+     [{title, lib_misc:trim(Title)},
+      {aritist, lib_misc:trim(Artist)}, {album, lib_misc:trim(Album)}]};
 
 parse_v1_tag(_) -> error.
-
-trim(Bin) ->
-    list_to_binary(trim_blanks(binary_to_list(Bin))).
-
-trim_blanks(X) -> reverse(skip_blanks_and_zero(reverse(X))).
-
-skip_blanks_and_zero([$\s|T]) -> skip_blanks_and_zero(T);
-skip_blanks_and_zero([0|T])   -> skip_blanks_and_zero(T);
-skip_blanks_and_zero(X)       -> X.
-

erlang/file/data1.dat

@@ -1,11 +1,22 @@
 -module(lib_misc).
+
+-import(lists, [all/2, any/2, filter/2, reverse/1, reverse/2,
+                foreach/2, map/2, member/2, sort/1]).
+
 -export([string2value/1, sleep/1, random_seed/0,
-		 dump/2]).
+		 dump/2, trim/1]).
 
 string2value(L) -> string2value(L, []).
 string2value([], N) -> list_to_tuple(lists:reverse(N));
 string2value([H|T], N) -> string2value(T, [H|N]).
 
+trim(Bin) -> list_to_binary(trim_blanks(binary_to_list(Bin))).
+
+trim_blanks(X) -> reverse(skip_blanks_and_zero(reverse(X))).
+
+skip_blanks_and_zero([$\s | T]) -> skip_blanks_and_zero(T);
+skip_blanks_and_zero([0 | T])   -> skip_blanks_and_zero(T);
+skip_blanks_and_zero(X)         -> X.
 
 sleep(T) ->
     receive

erlang/file/id3_v1.erl

@@ -6,7 +6,7 @@ ERL = erl -boot start_clean -pa ../lib -pa ../lib/lib_misc
 
 ERLC = erlc +debug_info
 
-MODS = shout mp3_manager
+MODS = shout mp3_manager id3_tag_lengths mp3_sync
 
 .erl.beam:
 	${ERLC} -W $<
@@ -20,3 +20,9 @@ mp3:
 
 clean:
 	rm -rf *.beam erl_crash.dump
+
+#
+# make && make mp3
+# shout:start().
+# xmms http://127.0.0.1:3000
+#

erlang/lib/lib_misc/lib_misc.erl

@@ -103,7 +103,7 @@ parse_v1_tag(<<$T, $A, $G, B/binary>>) ->
     {Album, B3}   = split_binary(B2, 30),
     {_Year, B4}   = split_binary(B3, 30),
     {_Comment, <<K, Track, _Gendre>>} = split_binary(B4, 28),
-    L = [{title, trim(Title)}, {artist, trim(Artist)}, {album, trim(Album)}],
+    L = [{title, lib_misc:trim(Title)}, {artist, lib_misc:trim(Artist)}, {album, lib_misc:trim(Album)}],
     case K of
         0 ->
             {"ID3v1.1", [{track, Track} | L]};
@@ -112,12 +112,3 @@ parse_v1_tag(<<$T, $A, $G, B/binary>>) ->
     end;
 parse_v1_tag(_) ->
     no.
-
-trim(Bin) ->
-    list_to_binary(trim_blanks(binary_to_list(Bin))).
-
-trim_blanks(X) -> reverse(skip_blanks_and_zero(reverse(X))).
-
-skip_blanks_and_zero([$\s | T]) -> skip_blanks_and_zero(T);
-skip_blanks_and_zero([0 | T])   -> skip_blanks_and_zero(T);
-skip_blanks_and_zero(X)         -> X.