Skip to content

Commit 7770ff8

Browse files
wezwez
committed
fix file encoding issue
1 parent f927648 commit 7770ff8

File tree

1 file changed

+48
-42
lines changed

1 file changed

+48
-42
lines changed

‎src/main.cpp

Lines changed: 48 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
cannot, write to the Free Software Foundation, 59 Temple Place
1616
Suite 330, Boston, MA 02111-1307, USA. Or www.fsf.org
1717
18-
Copyright ©2005-2007 puck_lock
18+
Copyright (c) 2005-2007 puck_lock
1919
with contributions from others; see the CREDITS file
2020
2121
----------------------
@@ -269,12 +269,12 @@ static const char *longHelp_text =
269269
" Tag setting options:\n"
270270
"\n"
271271
" --artist , -a (str) Set the artist tag: "
272-
"\"moov.udta.meta.ilst.\302©ART.data\"\n"
272+
"\"moov.udta.meta.ilst.\302\251ART.data\"\n"
273273
" --title , -s (str) Set the title tag: "
274-
"\"moov.udta.meta.ilst.\302©nam.data\"\n"
274+
"\"moov.udta.meta.ilst.\302\251nam.data\"\n"
275275
" --album , -b (str) Set the album tag: "
276-
"\"moov.udta.meta.ilst.\302©alb.data\"\n"
277-
" --genre , -g (str) Set the genre tag: \"\302©gen\" "
276+
"\"moov.udta.meta.ilst.\302\251alb.data\"\n"
277+
" --genre , -g (str) Set the genre tag: \"\302\251gen\" "
278278
"(custom) or \"gnre\" (standard).\n"
279279
" see the standard list with "
280280
"\"AtomicParsley --genre-list\"\n"
@@ -283,21 +283,21 @@ static const char *longHelp_text =
283283
" --disk , -d (num)[/tot] Set the disk number (or disk "
284284
"number & total disks).\n"
285285
" --comment , -c (str) Set the comment tag: "
286-
"\"moov.udta.meta.ilst.\302©cmt.data\"\n"
286+
"\"moov.udta.meta.ilst.\302\251cmt.data\"\n"
287287
" --year , -y (num|UTC) Set the year tag: "
288-
"\"moov.udta.meta.ilst.\302©day.data\"\n"
288+
"\"moov.udta.meta.ilst.\302\251day.data\"\n"
289289
" set with UTC "
290290
"\"2006-09-11T09:00:00Z\" for Release Date\n"
291291
" --lyrics , -l (str) Set the lyrics tag: "
292-
"\"moov.udta.meta.ilst.\302©lyr.data\"\n"
292+
"\"moov.udta.meta.ilst.\302\251lyr.data\"\n"
293293
" --lyricsFile , (/path) Set the lyrics tag to the content "
294294
"of a file\n"
295295
" --composer , -w (str) Set the composer tag: "
296-
"\"moov.udta.meta.ilst.\302©wrt.data\"\n"
296+
"\"moov.udta.meta.ilst.\302\251wrt.data\"\n"
297297
" --copyright , -x (str) Set the copyright tag: "
298298
"\"moov.udta.meta.ilst.cprt.data\"\n"
299299
" --grouping , -G (str) Set the grouping tag: "
300-
"\"moov.udta.meta.ilst.\302©grp.data\"\n"
300+
"\"moov.udta.meta.ilst.\302\251grp.data\"\n"
301301
" --artwork , -A (/path) Set a piece of artwork (jpeg or "
302302
"png) on \"covr.data\"\n"
303303
" Note: multiple pieces are "
@@ -356,9 +356,9 @@ static const char *longHelp_text =
356356
" (use \"timestamp\" to set UTC to "
357357
"now; can be akin to id3v2 TDTG tag)\n"
358358
" --encodingTool , (str) Set the name of the encoder on the "
359-
"\"\302©too\" atom\n"
359+
"\"\302\251too\" atom\n"
360360
" --encodedBy , (str) Set the name of the Person/company "
361-
"who encoded the file on the \"\302©enc\" atom\n"
361+
"who encoded the file on the \"\302\251enc\" atom\n"
362362
" --apID , -Y (str) Set the name of the Account Name on "
363363
"the \"apID\" atom\n"
364364
" --cnID , (num) Set iTunes Catalog ID, used for "
@@ -881,9 +881,9 @@ static const char *uuidHelp_text =
881881
"show up with AP -t.\n"
882882
"\n"
883883
" --information , -i (str) Set an information tag on uuid atom "
884-
"name\"©inf\"\n"
884+
"name\"\251inf\"\n"
885885
" --url , -u (URL) Set a URL tag on uuid atom name "
886-
"\"\302©url\"\n"
886+
"\"\302\251url\"\n"
887887
" --tagtime , timestamp Set the Coordinated Univeral Time "
888888
"of tagging on \"tdtg\"\n"
889889
"\n"
@@ -1346,7 +1346,7 @@ int real_main(int argc, char *argv[]) {
13461346
(strcmp(argv[1], "-Lh") == 0)) {
13471347
#if defined(_WIN32) && !defined(__CYGWIN__)
13481348
if (UnicodeOutputStatus == WIN32_UTF16) { // convert the helptext to utf16
1349-
// to preserve © characters
1349+
// to preserve \251 characters
13501350
int help_len = strlen(longHelp_text) + 1;
13511351
wchar_t *Lhelp_text = (wchar_t *)malloc(sizeof(wchar_t) * help_len);
13521352
wmemset(Lhelp_text, 0, help_len);
@@ -1721,7 +1721,7 @@ int real_main(int argc, char *argv[]) {
17211721
break;
17221722
}
17231723
AtomicInfo *artistData_atom = APar_MetaData_atom_Init(
1724-
"moov.udta.meta.ilst.©ART.data", optarg, AtomFlags_Data_Text);
1724+
"moov.udta.meta.ilst.\251ART.data", optarg, AtomFlags_Data_Text);
17251725
APar_Unified_atom_Put(
17261726
artistData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
17271727
break;
@@ -1736,7 +1736,7 @@ int real_main(int argc, char *argv[]) {
17361736
break;
17371737
}
17381738
AtomicInfo *artistData_atom = APar_MetaData_atom_Init(
1739-
"moov.udta.meta.ilst.©ard.data", optarg, AtomFlags_Data_Text);
1739+
"moov.udta.meta.ilst.\251ard.data", optarg, AtomFlags_Data_Text);
17401740
APar_Unified_atom_Put(
17411741
artistData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
17421742
break;
@@ -1751,7 +1751,7 @@ int real_main(int argc, char *argv[]) {
17511751
break;
17521752
}
17531753
AtomicInfo *artistData_atom = APar_MetaData_atom_Init(
1754-
"moov.udta.meta.ilst.©arg.data", optarg, AtomFlags_Data_Text);
1754+
"moov.udta.meta.ilst.\251arg.data", optarg, AtomFlags_Data_Text);
17551755
APar_Unified_atom_Put(
17561756
artistData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
17571757
break;
@@ -1766,7 +1766,7 @@ int real_main(int argc, char *argv[]) {
17661766
break;
17671767
}
17681768
AtomicInfo *artistData_atom = APar_MetaData_atom_Init(
1769-
"moov.udta.meta.ilst.©aut.data", optarg, AtomFlags_Data_Text);
1769+
"moov.udta.meta.ilst.\251aut.data", optarg, AtomFlags_Data_Text);
17701770
APar_Unified_atom_Put(
17711771
artistData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
17721772
break;
@@ -1781,7 +1781,7 @@ int real_main(int argc, char *argv[]) {
17811781
break;
17821782
}
17831783
AtomicInfo *artistData_atom = APar_MetaData_atom_Init(
1784-
"moov.udta.meta.ilst.©con.data", optarg, AtomFlags_Data_Text);
1784+
"moov.udta.meta.ilst.\251con.data", optarg, AtomFlags_Data_Text);
17851785
APar_Unified_atom_Put(
17861786
artistData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
17871787
break;
@@ -1796,7 +1796,7 @@ int real_main(int argc, char *argv[]) {
17961796
break;
17971797
}
17981798
AtomicInfo *artistData_atom = APar_MetaData_atom_Init(
1799-
"moov.udta.meta.ilst.©dir.data", optarg, AtomFlags_Data_Text);
1799+
"moov.udta.meta.ilst.\251dir.data", optarg, AtomFlags_Data_Text);
18001800
APar_Unified_atom_Put(
18011801
artistData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
18021802
break;
@@ -1811,7 +1811,7 @@ int real_main(int argc, char *argv[]) {
18111811
break;
18121812
}
18131813
AtomicInfo *artistData_atom = APar_MetaData_atom_Init(
1814-
"moov.udta.meta.ilst.©ope.data", optarg, AtomFlags_Data_Text);
1814+
"moov.udta.meta.ilst.\251ope.data", optarg, AtomFlags_Data_Text);
18151815
APar_Unified_atom_Put(
18161816
artistData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
18171817
break;
@@ -1826,7 +1826,7 @@ int real_main(int argc, char *argv[]) {
18261826
break;
18271827
}
18281828
AtomicInfo *artistData_atom = APar_MetaData_atom_Init(
1829-
"moov.udta.meta.ilst.©prd.data", optarg, AtomFlags_Data_Text);
1829+
"moov.udta.meta.ilst.\251prd.data", optarg, AtomFlags_Data_Text);
18301830
APar_Unified_atom_Put(
18311831
artistData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
18321832
break;
@@ -1840,7 +1840,7 @@ int real_main(int argc, char *argv[]) {
18401840
&*major_brand); APar_assert(false, 4, &*major_brand); break;
18411841
}
18421842
AtomicInfo* artistData_atom =
1843-
APar_MetaData_atom_Init("moov.udta.meta.ilst.©prf.data", optarg,
1843+
APar_MetaData_atom_Init("moov.udta.meta.ilst.\251prf.data", optarg,
18441844
AtomFlags_Data_Text); APar_Unified_atom_Put(artistData_atom, optarg,
18451845
UTF8_iTunesStyle_256glyphLimited, 0, 0); break;
18461846
}
@@ -1855,7 +1855,7 @@ int real_main(int argc, char *argv[]) {
18551855
break;
18561856
}
18571857
AtomicInfo *artistData_atom = APar_MetaData_atom_Init(
1858-
"moov.udta.meta.ilst.©sne.data", optarg, AtomFlags_Data_Text);
1858+
"moov.udta.meta.ilst.\251sne.data", optarg, AtomFlags_Data_Text);
18591859
APar_Unified_atom_Put(
18601860
artistData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
18611861
break;
@@ -1870,7 +1870,7 @@ int real_main(int argc, char *argv[]) {
18701870
break;
18711871
}
18721872
AtomicInfo *artistData_atom = APar_MetaData_atom_Init(
1873-
"moov.udta.meta.ilst.©sol.data", optarg, AtomFlags_Data_Text);
1873+
"moov.udta.meta.ilst.\251sol.data", optarg, AtomFlags_Data_Text);
18741874
APar_Unified_atom_Put(
18751875
artistData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
18761876
break;
@@ -1886,7 +1886,7 @@ int real_main(int argc, char *argv[]) {
18861886
break;
18871887
}
18881888
AtomicInfo *artistData_atom = APar_MetaData_atom_Init(
1889-
"moov.udta.meta.ilst.©xpd.data", optarg, AtomFlags_Data_Text);
1889+
"moov.udta.meta.ilst.\251xpd.data", optarg, AtomFlags_Data_Text);
18901890
APar_Unified_atom_Put(
18911891
artistData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
18921892
break;
@@ -1899,7 +1899,7 @@ int real_main(int argc, char *argv[]) {
18991899
}
19001900

19011901
AtomicInfo *titleData_atom = APar_MetaData_atom_Init(
1902-
"moov.udta.meta.ilst.©nam.data", optarg, AtomFlags_Data_Text);
1902+
"moov.udta.meta.ilst.\251nam.data", optarg, AtomFlags_Data_Text);
19031903
APar_Unified_atom_Put(
19041904
titleData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
19051905
break;
@@ -1912,7 +1912,7 @@ int real_main(int argc, char *argv[]) {
19121912
}
19131913

19141914
AtomicInfo *titleData_atom = APar_MetaData_atom_Init(
1915-
"moov.udta.meta.ilst.©st3.data", optarg, AtomFlags_Data_Text);
1915+
"moov.udta.meta.ilst.\251st3.data", optarg, AtomFlags_Data_Text);
19161916
APar_Unified_atom_Put(
19171917
titleData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
19181918
break;
@@ -1925,7 +1925,7 @@ int real_main(int argc, char *argv[]) {
19251925
}
19261926

19271927
AtomicInfo *albumData_atom = APar_MetaData_atom_Init(
1928-
"moov.udta.meta.ilst.©alb.data", optarg, AtomFlags_Data_Text);
1928+
"moov.udta.meta.ilst.\251alb.data", optarg, AtomFlags_Data_Text);
19291929
APar_Unified_atom_Put(
19301930
albumData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
19311931
break;
@@ -2028,7 +2028,7 @@ int real_main(int argc, char *argv[]) {
20282028
}
20292029

20302030
AtomicInfo *commentData_atom = APar_MetaData_atom_Init(
2031-
"moov.udta.meta.ilst.©cmt.data", optarg, AtomFlags_Data_Text);
2031+
"moov.udta.meta.ilst.\251cmt.data", optarg, AtomFlags_Data_Text);
20322032
APar_Unified_atom_Put(
20332033
commentData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
20342034
break;
@@ -2041,7 +2041,7 @@ int real_main(int argc, char *argv[]) {
20412041
}
20422042

20432043
AtomicInfo *yearData_atom = APar_MetaData_atom_Init(
2044-
"moov.udta.meta.ilst.©day.data", optarg, AtomFlags_Data_Text);
2044+
"moov.udta.meta.ilst.\251day.data", optarg, AtomFlags_Data_Text);
20452045
APar_Unified_atom_Put(
20462046
yearData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
20472047
break;
@@ -2054,7 +2054,7 @@ int real_main(int argc, char *argv[]) {
20542054
}
20552055

20562056
AtomicInfo *lyricsData_atom = APar_MetaData_atom_Init(
2057-
"moov.udta.meta.ilst.©lyr.data", optarg, AtomFlags_Data_Text);
2057+
"moov.udta.meta.ilst.\251lyr.data", optarg, AtomFlags_Data_Text);
20582058
APar_Unified_atom_Put(
20592059
lyricsData_atom, optarg, UTF8_iTunesStyle_Unlimited, 0, 0);
20602060
break;
@@ -2077,7 +2077,7 @@ int real_main(int argc, char *argv[]) {
20772077
}
20782078

20792079
AtomicInfo *composerData_atom = APar_MetaData_atom_Init(
2080-
"moov.udta.meta.ilst.©wrt.data", optarg, AtomFlags_Data_Text);
2080+
"moov.udta.meta.ilst.\251wrt.data", optarg, AtomFlags_Data_Text);
20812081
APar_Unified_atom_Put(
20822082
composerData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
20832083
break;
@@ -2103,7 +2103,7 @@ int real_main(int argc, char *argv[]) {
21032103
}
21042104

21052105
AtomicInfo *groupingData_atom = APar_MetaData_atom_Init(
2106-
"moov.udta.meta.ilst.©grp.data", optarg, AtomFlags_Data_Text);
2106+
"moov.udta.meta.ilst.\251grp.data", optarg, AtomFlags_Data_Text);
21072107
APar_Unified_atom_Put(
21082108
groupingData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
21092109
break;
@@ -2261,7 +2261,7 @@ int real_main(int argc, char *argv[]) {
22612261
}
22622262

22632263
AtomicInfo *encodingtoolData_atom = APar_MetaData_atom_Init(
2264-
"moov.udta.meta.ilst.©too.data", optarg, AtomFlags_Data_Text);
2264+
"moov.udta.meta.ilst.\251too.data", optarg, AtomFlags_Data_Text);
22652265
APar_Unified_atom_Put(encodingtoolData_atom,
22662266
optarg,
22672267
UTF8_iTunesStyle_256glyphLimited,
@@ -2277,7 +2277,7 @@ int real_main(int argc, char *argv[]) {
22772277
}
22782278

22792279
AtomicInfo *encodedbyData_atom = APar_MetaData_atom_Init(
2280-
"moov.udta.meta.ilst.©enc.data", optarg, AtomFlags_Data_Text);
2280+
"moov.udta.meta.ilst.\251enc.data", optarg, AtomFlags_Data_Text);
22812281
APar_Unified_atom_Put(
22822282
encodedbyData_atom, optarg, UTF8_iTunesStyle_256glyphLimited, 0, 0);
22832283
break;
@@ -2697,16 +2697,22 @@ int real_main(int argc, char *argv[]) {
26972697

26982698
case Meta_URL: {
26992699
APar_ScanAtoms(ISObasemediafile);
2700-
AtomicInfo *urlUUID = APar_uuid_atom_Init(
2701-
"moov.udta.meta.uuid=%s", "©url", AtomFlags_Data_Text, optarg, false);
2700+
AtomicInfo *urlUUID = APar_uuid_atom_Init("moov.udta.meta.uuid=%s",
2701+
"\251url",
2702+
AtomFlags_Data_Text,
2703+
optarg,
2704+
false);
27022705
APar_Unified_atom_Put(urlUUID, optarg, UTF8_iTunesStyle_Unlimited, 0, 0);
27032706
break;
27042707
}
27052708

27062709
case Meta_Information: {
27072710
APar_ScanAtoms(ISObasemediafile);
2708-
AtomicInfo *infoUUID = APar_uuid_atom_Init(
2709-
"moov.udta.meta.uuid=%s", "©inf", AtomFlags_Data_Text, optarg, false);
2711+
AtomicInfo *infoUUID = APar_uuid_atom_Init("moov.udta.meta.uuid=%s",
2712+
"\251inf",
2713+
AtomFlags_Data_Text,
2714+
optarg,
2715+
false);
27102716
APar_Unified_atom_Put(infoUUID, optarg, UTF8_iTunesStyle_Unlimited, 0, 0);
27112717
break;
27122718
}
@@ -2732,7 +2738,7 @@ int real_main(int argc, char *argv[]) {
27322738
// they match, it will print out or extract to a file; if not, only
27332739
// its name will be displayed in the tree.
27342740
//
2735-
// --meta-uuid "©foo" 1 'http://www.url.org' --meta-uuid "pdf1"
2741+
// --meta-uuid "\251foo" 1 'http://www.url.org' --meta-uuid "pdf1"
27362742
// file /some/path/pic.pdf description="My Booty, Your Booty,
27372743
// Djbouti"
27382744

0 commit comments

Comments
 (0)