Compare commits
6131 Commits
2010.07.14
...
2014.12.10
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
72e3ffeb74 | ||
|
|
2fc9f2b41d | ||
|
|
5f3544baa3 | ||
|
|
da27660014 | ||
|
|
b8a6114309 | ||
|
|
774e208f94 | ||
|
|
f20b52778b | ||
|
|
83e865a370 | ||
|
|
b89a938687 | ||
|
|
e89a2aabed | ||
|
|
f58766ce5c | ||
|
|
15644a40df | ||
|
|
d4800f3c3f | ||
|
|
09a5dd2d3b | ||
|
|
819039ee63 | ||
|
|
603c92080f | ||
|
|
16ae61f655 | ||
|
|
0ef4d4ab7e | ||
|
|
4542535f94 | ||
|
|
6a52eed80e | ||
|
|
acf5cbfe93 | ||
|
|
8d1c8cae9c | ||
|
|
c84890f708 | ||
|
|
6d0886204a | ||
|
|
04d02a9d57 | ||
|
|
b82f815f37 | ||
|
|
158f8cadc0 | ||
|
|
7d70cf4157 | ||
|
|
6591fdf51f | ||
|
|
47d7c64274 | ||
|
|
db175341c7 | ||
|
|
9ff6772790 | ||
|
|
5f9b83944d | ||
|
|
f6735be4da | ||
|
|
6a3e0103bb | ||
|
|
0b5cc1983e | ||
|
|
1a9f8b1ad4 | ||
|
|
7115599121 | ||
|
|
0df23ba9f9 | ||
|
|
58daf5ebed | ||
|
|
1a7c6c69d3 | ||
|
|
045c48847a | ||
|
|
90644a6843 | ||
|
|
122c2f87c1 | ||
|
|
a154eb3d15 | ||
|
|
81028ff9eb | ||
|
|
e8df5cee12 | ||
|
|
ab07963b5c | ||
|
|
7e26084d09 | ||
|
|
4349c07dd7 | ||
|
|
1139a54d9b | ||
|
|
b128c9ed68 | ||
|
|
9776bc7f57 | ||
|
|
e703fc66c2 | ||
|
|
39c52bbd32 | ||
|
|
6219802165 | ||
|
|
8b97115358 | ||
|
|
810fb84d5e | ||
|
|
5f5e993dc6 | ||
|
|
191cc41ba4 | ||
|
|
abe70fa044 | ||
|
|
7f142293df | ||
|
|
d4e06d4a83 | ||
|
|
ecd7ea1e6b | ||
|
|
b92c548693 | ||
|
|
eecd6a467d | ||
|
|
dce2a3cf9e | ||
|
|
9095aa38ac | ||
|
|
0403b06985 | ||
|
|
de9bd74bc2 | ||
|
|
233d37fb6b | ||
|
|
c627f7d48c | ||
|
|
163c8babaa | ||
|
|
6708542099 | ||
|
|
ea2ee40357 | ||
|
|
62d8b56655 | ||
|
|
c492970b4b | ||
|
|
ac5633592a | ||
|
|
706d7d4ee7 | ||
|
|
752c8c9b76 | ||
|
|
b1399a144d | ||
|
|
05177b34a6 | ||
|
|
c41a9650c3 | ||
|
|
df015c69ea | ||
|
|
1434bffa1f | ||
|
|
94aa25b995 | ||
|
|
d128cfe393 | ||
|
|
954f36f890 | ||
|
|
19e92770c9 | ||
|
|
95c673a148 | ||
|
|
a196a53265 | ||
|
|
3266f0c68e | ||
|
|
1940fadd53 | ||
|
|
03fd72d996 | ||
|
|
f2b44a2513 | ||
|
|
c522adb1f0 | ||
|
|
7160532d41 | ||
|
|
4e62ebe250 | ||
|
|
4472f84f0c | ||
|
|
b766eb2707 | ||
|
|
10a404c335 | ||
|
|
c056efa2e3 | ||
|
|
283ac8d592 | ||
|
|
313d4572ce | ||
|
|
42939b6129 | ||
|
|
37ea8164d3 | ||
|
|
8c810a7db3 | ||
|
|
248a0b890f | ||
|
|
96b7c7fe3f | ||
|
|
e987e91fcc | ||
|
|
cb6444e197 | ||
|
|
93b8a10e3b | ||
|
|
4207558e8b | ||
|
|
ad0d800fc3 | ||
|
|
e232f787f6 | ||
|
|
155f9550c0 | ||
|
|
72476fcc42 | ||
|
|
29e950f7c8 | ||
|
|
7c8ea53b96 | ||
|
|
dcddc10a50 | ||
|
|
a1008af412 | ||
|
|
61c0663c1e | ||
|
|
81a7a521c5 | ||
|
|
e293711802 | ||
|
|
ceb3367320 | ||
|
|
a03aaaed2e | ||
|
|
e075a44afb | ||
|
|
8865bdeb37 | ||
|
|
3aa578cad2 | ||
|
|
d3b5101a91 | ||
|
|
5c32110114 | ||
|
|
24144e3b8d | ||
|
|
b3034f9df7 | ||
|
|
4c6d2ff8dc | ||
|
|
faf3494894 | ||
|
|
535a66ef66 | ||
|
|
5c40bba82f | ||
|
|
855dc479c2 | ||
|
|
0792d5634e | ||
|
|
e91cdcae1a | ||
|
|
27e1400f55 | ||
|
|
e0938e7731 | ||
|
|
b72823a0a4 | ||
|
|
673cf0e773 | ||
|
|
f8aace93cd | ||
|
|
80310134e0 | ||
|
|
4d2d638df4 | ||
|
|
0e44f90e18 | ||
|
|
15938ab67a | ||
|
|
ab4ee31eb1 | ||
|
|
b061ea6e9f | ||
|
|
4aae94f9d0 | ||
|
|
acda92f6bc | ||
|
|
ddfd0f2727 | ||
|
|
d0720e7118 | ||
|
|
4e262a8838 | ||
|
|
b9ed3af343 | ||
|
|
63c9b2c1d9 | ||
|
|
65f3a228b1 | ||
|
|
3004ae2c3a | ||
|
|
d9836a5917 | ||
|
|
be64b5b098 | ||
|
|
c3e74731c2 | ||
|
|
c920d7f00d | ||
|
|
0bbf12239c | ||
|
|
70d68eb46f | ||
|
|
c553fe5d29 | ||
|
|
f0c3d729d7 | ||
|
|
1cdedfee10 | ||
|
|
93129d9442 | ||
|
|
e8c8653e9d | ||
|
|
fab89c67c5 | ||
|
|
3d960a22fa | ||
|
|
51bbb084d3 | ||
|
|
2c25a2bd29 | ||
|
|
355682be01 | ||
|
|
00e9d396ab | ||
|
|
14d4e90eb1 | ||
|
|
b74e86f48a | ||
|
|
3d36cea4ac | ||
|
|
380b822003 | ||
|
|
b66e699877 | ||
|
|
27f8b0994e | ||
|
|
e311b6389a | ||
|
|
fab6d4c048 | ||
|
|
4ffc31033e | ||
|
|
c1777d5cb3 | ||
|
|
9e1a5b8455 | ||
|
|
784b6d3a9b | ||
|
|
c66bdc4869 | ||
|
|
2514d2635e | ||
|
|
8bcc875676 | ||
|
|
5f6a1245ff | ||
|
|
f3a3407226 | ||
|
|
598c218f7b | ||
|
|
4698b14b76 | ||
|
|
835a22ef3f | ||
|
|
7d4111ed14 | ||
|
|
d37cab2a9d | ||
|
|
d16abf434a | ||
|
|
a8363f3ab7 | ||
|
|
010cd3a3ee | ||
|
|
b9042def9d | ||
|
|
aa79ac0c82 | ||
|
|
88125905cf | ||
|
|
dd60be2bf9 | ||
|
|
119b3caa46 | ||
|
|
49f0da7ae1 | ||
|
|
2cead7e7bc | ||
|
|
9262867e86 | ||
|
|
b9272e8f8f | ||
|
|
021a0db8f7 | ||
|
|
e1e8b6897b | ||
|
|
53d1cd1f77 | ||
|
|
cad985ab4d | ||
|
|
c52331f30c | ||
|
|
42e1ff8665 | ||
|
|
2c64b8ba63 | ||
|
|
42e12102a9 | ||
|
|
6127693ed9 | ||
|
|
71069d2157 | ||
|
|
f3391db889 | ||
|
|
9b32eca3ce | ||
|
|
ec06f0f610 | ||
|
|
e6c9c8f6ee | ||
|
|
85b9275517 | ||
|
|
dfd5313afd | ||
|
|
be53e2a737 | ||
|
|
a1c68b9ef2 | ||
|
|
4d46c1c68c | ||
|
|
d6f714f321 | ||
|
|
8569f3d629 | ||
|
|
fed5d03260 | ||
|
|
6adeffa7c6 | ||
|
|
b244b5c3f9 | ||
|
|
f42c190769 | ||
|
|
c9bf41145f | ||
|
|
5239075bb6 | ||
|
|
84437adfa3 | ||
|
|
732ea2f09b | ||
|
|
aff2f4f4f5 | ||
|
|
3b9f631c41 | ||
|
|
3ba098a6a5 | ||
|
|
1394646a0a | ||
|
|
61ee5aeb73 | ||
|
|
07e378fa18 | ||
|
|
e07e931375 | ||
|
|
480b7c32a9 | ||
|
|
f56875f271 | ||
|
|
92120217eb | ||
|
|
37eddd3143 | ||
|
|
02a12f9fe6 | ||
|
|
6fcd6e0e21 | ||
|
|
0857baade3 | ||
|
|
469d4c8968 | ||
|
|
23ad44b57b | ||
|
|
f48d3e9bbc | ||
|
|
fbf94a7815 | ||
|
|
1921b24551 | ||
|
|
28e614de5c | ||
|
|
cd9ad1d7e8 | ||
|
|
162f54eca6 | ||
|
|
33a266f4ba | ||
|
|
6b592d93a2 | ||
|
|
4686ae4b64 | ||
|
|
8d05f2c16a | ||
|
|
a4bb83956c | ||
|
|
eb5376044c | ||
|
|
3cbcff8a2d | ||
|
|
e983cf5277 | ||
|
|
0ab1ca5501 | ||
|
|
4baafa229d | ||
|
|
7f3e33a147 | ||
|
|
b7558d9881 | ||
|
|
a0f59cdcb4 | ||
|
|
a4bc433619 | ||
|
|
b6b70730bf | ||
|
|
6a68bb574a | ||
|
|
0cf166ad4f | ||
|
|
2707b50ffe | ||
|
|
939fe70de0 | ||
|
|
89c15fe0b3 | ||
|
|
ec5f601670 | ||
|
|
8caa0c9779 | ||
|
|
e2548b5b25 | ||
|
|
bbefcf04bf | ||
|
|
c7b0add86f | ||
|
|
a0155d93d9 | ||
|
|
00d9ef0b70 | ||
|
|
0cc8888038 | ||
|
|
c735450e07 | ||
|
|
71f8c7ce7a | ||
|
|
5fee0eeac0 | ||
|
|
eb4157fd17 | ||
|
|
69ede8ef81 | ||
|
|
609a61e3e6 | ||
|
|
bf951c5e29 | ||
|
|
af63fed7d8 | ||
|
|
68d1d41c03 | ||
|
|
3deed1e91a | ||
|
|
11b28e93d3 | ||
|
|
c3d582985f | ||
|
|
4c0924bb24 | ||
|
|
3fa5bb3802 | ||
|
|
c47ec62b83 | ||
|
|
e4bdb37ec6 | ||
|
|
3e6e4999ca | ||
|
|
0e15e725a0 | ||
|
|
437f68d868 | ||
|
|
d91d124081 | ||
|
|
2d42905b68 | ||
|
|
cbe71cb41d | ||
|
|
894dd8682e | ||
|
|
9e05d039e0 | ||
|
|
bbd5f2de5e | ||
|
|
73689dafbf | ||
|
|
4b50ba0989 | ||
|
|
5ccaddf5b1 | ||
|
|
0b201a3134 | ||
|
|
ffe38646ca | ||
|
|
b703ab4d7f | ||
|
|
c6afed48ff | ||
|
|
732c848c14 | ||
|
|
9d2a4dae90 | ||
|
|
7009a9047a | ||
|
|
498942f187 | ||
|
|
28465df1ff | ||
|
|
ef89dba58f | ||
|
|
13ba3a6461 | ||
|
|
8f6ec4bbe6 | ||
|
|
c295490830 | ||
|
|
eb4cb42a02 | ||
|
|
7a8cbc72b2 | ||
|
|
2774852c2f | ||
|
|
bbcc21efd1 | ||
|
|
60526d6bcb | ||
|
|
1d4df56d09 | ||
|
|
a1cf99d03a | ||
|
|
3c6af203cc | ||
|
|
1a92e086a7 | ||
|
|
519c73f267 | ||
|
|
a6dae6c09c | ||
|
|
f866e474f3 | ||
|
|
8bb9b97c97 | ||
|
|
d6fdc38682 | ||
|
|
c2b61af548 | ||
|
|
2fdbf27ad8 | ||
|
|
3898c8a7b2 | ||
|
|
29ed169cd6 | ||
|
|
b868c972d1 | ||
|
|
9908e03528 | ||
|
|
1fe8fb8c20 | ||
|
|
5d63b0aa93 | ||
|
|
4164f0117e | ||
|
|
37aab27808 | ||
|
|
6110bbbfdd | ||
|
|
cde9b380e6 | ||
|
|
dab647a7b6 | ||
|
|
a316a83d2b | ||
|
|
81b22aee8b | ||
|
|
a80c96eab0 | ||
|
|
20436c30c9 | ||
|
|
3828505646 | ||
|
|
11fba1751d | ||
|
|
12ea2f30cf | ||
|
|
9c3e870393 | ||
|
|
44789f2457 | ||
|
|
711ede6e1b | ||
|
|
a32f253112 | ||
|
|
94bd361318 | ||
|
|
acd40f64ed | ||
|
|
766306450d | ||
|
|
e7642ab572 | ||
|
|
bdf9701729 | ||
|
|
b5af6fcdad | ||
|
|
278143df5b | ||
|
|
fdca55fe34 | ||
|
|
4f195f55f0 | ||
|
|
ac35c26686 | ||
|
|
982a58d049 | ||
|
|
42f7d2f588 | ||
|
|
39f0a2a6b7 | ||
|
|
ecc0c5ee01 | ||
|
|
451948b28c | ||
|
|
baa708036c | ||
|
|
8c25f81bee | ||
|
|
4c83c96795 | ||
|
|
9580711841 | ||
|
|
c30ae9594c | ||
|
|
ffae28ae18 | ||
|
|
d9116714f2 | ||
|
|
08965906a8 | ||
|
|
ccdd0ffb80 | ||
|
|
5263cdfcf9 | ||
|
|
b2a68d14cf | ||
|
|
6e1cff9c33 | ||
|
|
72975729c8 | ||
|
|
d319948b6a | ||
|
|
9a4bf889f9 | ||
|
|
2a834bdb21 | ||
|
|
0d2c141865 | ||
|
|
5ec39d8b96 | ||
|
|
7b6de3728a | ||
|
|
a51d3aa001 | ||
|
|
2c8e03d937 | ||
|
|
fbb21cf528 | ||
|
|
b8a618f898 | ||
|
|
feb74960eb | ||
|
|
d65d628613 | ||
|
|
ac645ac7d0 | ||
|
|
7d11297f3f | ||
|
|
6ad4013d40 | ||
|
|
dbd1283d31 | ||
|
|
c451d4f553 | ||
|
|
8abec2c8bb | ||
|
|
a9bad429b3 | ||
|
|
50c8266ef0 | ||
|
|
00edd4f9be | ||
|
|
ee966928af | ||
|
|
e5193599ec | ||
|
|
01d663bca3 | ||
|
|
e0c51cdadc | ||
|
|
9334f8f17a | ||
|
|
632256d9ec | ||
|
|
03df7baa6a | ||
|
|
3511266bc3 | ||
|
|
9fdece5d34 | ||
|
|
bbf1092ad0 | ||
|
|
9ef55c5bbc | ||
|
|
48a24ab746 | ||
|
|
68acdbda9d | ||
|
|
27c542c06f | ||
|
|
aaa399d2f6 | ||
|
|
b2e6a1c14c | ||
|
|
8cc3eba79a | ||
|
|
b0fb6d4db1 | ||
|
|
81515ad9f6 | ||
|
|
8112d4b284 | ||
|
|
bf7aa6301b | ||
|
|
aea856621f | ||
|
|
f24a5a2faa | ||
|
|
ecfe623422 | ||
|
|
4a6c94288a | ||
|
|
10e3d73472 | ||
|
|
15956b5aa1 | ||
|
|
586f7082ef | ||
|
|
d6d9186f0d | ||
|
|
2e9ff8f362 | ||
|
|
6407432333 | ||
|
|
f744c0f398 | ||
|
|
249efaf44b | ||
|
|
8d32abff9e | ||
|
|
94f052cbf4 | ||
|
|
446a03bd96 | ||
|
|
6009b69f81 | ||
|
|
3d6047113c | ||
|
|
9dec99303d | ||
|
|
7706927370 | ||
|
|
3adba6fa2a | ||
|
|
f46a8702cc | ||
|
|
8d11b59bbb | ||
|
|
cf501a23d2 | ||
|
|
2bcae58d46 | ||
|
|
c9f08154a3 | ||
|
|
526b276fd7 | ||
|
|
77ec444d9a | ||
|
|
bfc2bedcfc | ||
|
|
83855f3a1f | ||
|
|
50b51830fb | ||
|
|
3d6eed9b52 | ||
|
|
1a253e134c | ||
|
|
6194bb1419 | ||
|
|
37d66e7f1e | ||
|
|
70b7e3fbb6 | ||
|
|
579657ad87 | ||
|
|
5f82b129e0 | ||
|
|
64269e4d01 | ||
|
|
d481699a7a | ||
|
|
5894a4f4ee | ||
|
|
09e5d6a6e5 | ||
|
|
274b12b5a8 | ||
|
|
23be51d8ce | ||
|
|
488447455d | ||
|
|
d28b517154 | ||
|
|
a7e97f6db1 | ||
|
|
639a422d21 | ||
|
|
f889cea109 | ||
|
|
1bdeb7be2e | ||
|
|
699151bcb1 | ||
|
|
911344e5ac | ||
|
|
03936f6e6d | ||
|
|
b13ccb1b87 | ||
|
|
f64f8a4662 | ||
|
|
681b9caa9c | ||
|
|
0eb9fb9f24 | ||
|
|
9a76f416ce | ||
|
|
603821161f | ||
|
|
d3c72db894 | ||
|
|
43d9718fb9 | ||
|
|
7fc54e5262 | ||
|
|
ec9c978481 | ||
|
|
d36cae46d8 | ||
|
|
fdfefa1b9c | ||
|
|
724d031893 | ||
|
|
63e0be3415 | ||
|
|
c64ed2a310 | ||
|
|
cdc5cb7c2b | ||
|
|
8efd06aa42 | ||
|
|
7f9ced64cb | ||
|
|
7608815cc2 | ||
|
|
5823eda139 | ||
|
|
e82c1e9a6e | ||
|
|
1ede5b2481 | ||
|
|
964ae0a122 | ||
|
|
98e1d28982 | ||
|
|
2c26df763c | ||
|
|
018e835594 | ||
|
|
e65e06fbe2 | ||
|
|
95ee84421e | ||
|
|
2acfe95f58 | ||
|
|
b5a14350b9 | ||
|
|
8d81f872fb | ||
|
|
36f1c90497 | ||
|
|
057a5206cc | ||
|
|
9e9bc793f3 | ||
|
|
5c565ac9e7 | ||
|
|
67500bf939 | ||
|
|
b1edd7a48a | ||
|
|
2c63ccec78 | ||
|
|
f2f2c0c2c6 | ||
|
|
4661e243f8 | ||
|
|
f3cd403c2b | ||
|
|
ad5f53ac72 | ||
|
|
75da98e9e1 | ||
|
|
281d3f1d68 | ||
|
|
6283c10b1c | ||
|
|
85d7b76586 | ||
|
|
2399535fd1 | ||
|
|
52cffcb186 | ||
|
|
8f3b5397a7 | ||
|
|
9bbec55255 | ||
|
|
6b445558ff | ||
|
|
bfd91588f3 | ||
|
|
6bf6962062 | ||
|
|
40bca5f927 | ||
|
|
74214d35c5 | ||
|
|
1b10a011ec | ||
|
|
d24a2b20b4 | ||
|
|
8230018c20 | ||
|
|
cc98a3f096 | ||
|
|
ce519b747e | ||
|
|
16efb3695f | ||
|
|
4510d14f0a | ||
|
|
0f175a932f | ||
|
|
849b269273 | ||
|
|
95fa5fb569 | ||
|
|
77c3c5c5ed | ||
|
|
159444a668 | ||
|
|
f9befee1f5 | ||
|
|
9471c44405 | ||
|
|
013bfdd84c | ||
|
|
46fd0dd5a5 | ||
|
|
4698f0d858 | ||
|
|
355d074ff9 | ||
|
|
7da224c907 | ||
|
|
1723edb1a5 | ||
|
|
4740864508 | ||
|
|
09a42738fc | ||
|
|
df928d500f | ||
|
|
a72cbfacf0 | ||
|
|
62a164e713 | ||
|
|
5f58165def | ||
|
|
a86c73cf80 | ||
|
|
bd4e40df1a | ||
|
|
1419fafd36 | ||
|
|
9b36dcbd65 | ||
|
|
2aefb886fa | ||
|
|
72961c2a8a | ||
|
|
4c1ce987b0 | ||
|
|
8a2300a597 | ||
|
|
1cc887cbf0 | ||
|
|
203fb43f36 | ||
|
|
4d7b03f1f2 | ||
|
|
72ebb5e4b4 | ||
|
|
8450c15c25 | ||
|
|
b88b45e46c | ||
|
|
2417dc1715 | ||
|
|
23d83ad4d5 | ||
|
|
772ece3571 | ||
|
|
2c9f31188b | ||
|
|
d18be55533 | ||
|
|
ac20fc047a | ||
|
|
b4c3c8c172 | ||
|
|
3357110a4c | ||
|
|
e29fdedb45 | ||
|
|
4828703f14 | ||
|
|
afe08e0d4a | ||
|
|
071420e136 | ||
|
|
f4cf848d1d | ||
|
|
b7b2ca6e2b | ||
|
|
1409704afa | ||
|
|
3741302a10 | ||
|
|
c8e390c2b0 | ||
|
|
823f1e015a | ||
|
|
3c06d3715e | ||
|
|
762958d5af | ||
|
|
53d9009bdb | ||
|
|
1b725173a5 | ||
|
|
0ca41c3d9c | ||
|
|
fc6861b175 | ||
|
|
b097b5f246 | ||
|
|
385009fc44 | ||
|
|
ced659bb4d | ||
|
|
842cca7d56 | ||
|
|
b3826f6c8d | ||
|
|
7bc8780c57 | ||
|
|
c59c3c84ed | ||
|
|
24f7fb5e1e | ||
|
|
3b700f8d43 | ||
|
|
31d06400ec | ||
|
|
642b76ac15 | ||
|
|
4c4de296d4 | ||
|
|
b10609d98c | ||
|
|
3ae165aa10 | ||
|
|
e4b85e35d0 | ||
|
|
bb0c206f59 | ||
|
|
b81f484b60 | ||
|
|
5e69192ef7 | ||
|
|
e9be9a6acd | ||
|
|
f47754f061 | ||
|
|
d838b1bd4a | ||
|
|
fe506288bd | ||
|
|
d397c0b3dd | ||
|
|
146c80e256 | ||
|
|
f78c01f68b | ||
|
|
8489578df4 | ||
|
|
10606050bc | ||
|
|
d9bf465200 | ||
|
|
01384d6e4b | ||
|
|
08d5230945 | ||
|
|
852f8641e8 | ||
|
|
18937a50a4 | ||
|
|
e4d6cca0c1 | ||
|
|
d5feab9aaa | ||
|
|
9e77c60c9a | ||
|
|
1414df5ce2 | ||
|
|
e80f40e5ca | ||
|
|
d3c9af84fc | ||
|
|
59d206ca2d | ||
|
|
fc66e4a0d5 | ||
|
|
e7b6d12254 | ||
|
|
410f3e73ab | ||
|
|
07e764439a | ||
|
|
f8fb4a7ca8 | ||
|
|
4644ac5527 | ||
|
|
e497a7f2ca | ||
|
|
a3b6be104d | ||
|
|
b7bb0df21e | ||
|
|
4dc19c0982 | ||
|
|
58ea7ec81e | ||
|
|
c0f64ac689 | ||
|
|
7a08ad7d59 | ||
|
|
2d29ac4f23 | ||
|
|
a7a747d687 | ||
|
|
fdb4d278bf | ||
|
|
59c03a9bfb | ||
|
|
e7db973328 | ||
|
|
99b67fecc5 | ||
|
|
89294b5f50 | ||
|
|
72d53356f6 | ||
|
|
9e1e67fc15 | ||
|
|
1e60e5546e | ||
|
|
457749a703 | ||
|
|
937f935db0 | ||
|
|
80bcefcd77 | ||
|
|
8c23945c72 | ||
|
|
989b4b2b86 | ||
|
|
2a7b4681c6 | ||
|
|
8157ae3904 | ||
|
|
e50e2fcd4d | ||
|
|
6be451f422 | ||
|
|
5e4f06197f | ||
|
|
761e1645e0 | ||
|
|
8ff14175e2 | ||
|
|
dbe3043cd6 | ||
|
|
a8eb5a8e61 | ||
|
|
6043f1df4e | ||
|
|
12548cd933 | ||
|
|
2593039522 | ||
|
|
35d3e63d24 | ||
|
|
27aede9074 | ||
|
|
f5b7e6a842 | ||
|
|
a1f934b171 | ||
|
|
a43ee88c6f | ||
|
|
e2dce53781 | ||
|
|
1770ed9e86 | ||
|
|
457ac58cc7 | ||
|
|
9c44d2429b | ||
|
|
d2e32f7df5 | ||
|
|
67077b182b | ||
|
|
5f4c318844 | ||
|
|
dfee83234b | ||
|
|
7f5c0c4a19 | ||
|
|
4bc77c8417 | ||
|
|
22dd3fad86 | ||
|
|
d6e6a42256 | ||
|
|
76e7d1e74b | ||
|
|
38c4d41b74 | ||
|
|
f0b8e3607d | ||
|
|
51ee08c4bb | ||
|
|
c841789772 | ||
|
|
c121a75b36 | ||
|
|
5a8b77551d | ||
|
|
0217aee154 | ||
|
|
b14f3a4c1d | ||
|
|
92f7963f6e | ||
|
|
88fbe4c2cc | ||
|
|
394599f422 | ||
|
|
ed9266db90 | ||
|
|
f4b1c7adb8 | ||
|
|
c95eeb7b80 | ||
|
|
5e43e3803c | ||
|
|
a89435a7a8 | ||
|
|
a0a90b3ba1 | ||
|
|
c664182323 | ||
|
|
6be1cd4ddb | ||
|
|
ee0d90707a | ||
|
|
f776d8f608 | ||
|
|
b3ac3a51ac | ||
|
|
0b75c2a88b | ||
|
|
7b7518124e | ||
|
|
68b0973046 | ||
|
|
3a203b8bfa | ||
|
|
70752ccefd | ||
|
|
0155549d6c | ||
|
|
b66745288e | ||
|
|
2a1325fdde | ||
|
|
2f9e8776df | ||
|
|
497339fa0e | ||
|
|
8e6f8051f0 | ||
|
|
11b3ce8509 | ||
|
|
6a5af6acb9 | ||
|
|
9a0d98bb40 | ||
|
|
fbd3162e49 | ||
|
|
54e9a4af95 | ||
|
|
8a32b82e46 | ||
|
|
fec02bcc90 | ||
|
|
c6e90caaa6 | ||
|
|
4bbf157794 | ||
|
|
6b08cdf626 | ||
|
|
b686fc18da | ||
|
|
0b97f3a936 | ||
|
|
eb73f2649f | ||
|
|
f0b5d6af74 | ||
|
|
2f771f6c99 | ||
|
|
3b2f933b01 | ||
|
|
cc746841e7 | ||
|
|
ac7553d031 | ||
|
|
cdc628a498 | ||
|
|
69ea8ca42c | ||
|
|
4bc3a23ec5 | ||
|
|
bd5650ac64 | ||
|
|
86916dae4b | ||
|
|
f7d159cf95 | ||
|
|
632e5684ce | ||
|
|
094d42fe44 | ||
|
|
63cddb6477 | ||
|
|
273dea4248 | ||
|
|
f90d95edeb | ||
|
|
45c85d7ba1 | ||
|
|
d0df92928b | ||
|
|
df8f53f752 | ||
|
|
e35cb78c40 | ||
|
|
3ef7d11acd | ||
|
|
224ce0d872 | ||
|
|
dd41e8c82b | ||
|
|
b509a4b176 | ||
|
|
b28c8403b2 | ||
|
|
7bd4b4229a | ||
|
|
72e450c555 | ||
|
|
522c55b7f2 | ||
|
|
58e7071a2c | ||
|
|
516812df41 | ||
|
|
752297631f | ||
|
|
34e14a9beb | ||
|
|
ffb5b05db1 | ||
|
|
3e8fcd9fa1 | ||
|
|
746c67d72f | ||
|
|
5aa38e75b2 | ||
|
|
532f5bff70 | ||
|
|
f566d9f1d5 | ||
|
|
7267bd536f | ||
|
|
589d3d7c7a | ||
|
|
46f74bcf5c | ||
|
|
37bfe8ace4 | ||
|
|
0529eef5a4 | ||
|
|
fd78a4d3e6 | ||
|
|
1de33fafd9 | ||
|
|
e2e5dae64d | ||
|
|
09b23c902b | ||
|
|
109a540e7a | ||
|
|
2914e5f00f | ||
|
|
2f834e9381 | ||
|
|
9296738f20 | ||
|
|
0e59b9fffb | ||
|
|
67abbe9527 | ||
|
|
944a3de278 | ||
|
|
5a13fe9ed2 | ||
|
|
6b6096d0b7 | ||
|
|
d0246d07f1 | ||
|
|
727a98c3ee | ||
|
|
997987d568 | ||
|
|
c001f939e4 | ||
|
|
e825c38082 | ||
|
|
a04aa7a9e6 | ||
|
|
7cdd5339b3 | ||
|
|
38349518f1 | ||
|
|
64892c0b79 | ||
|
|
dc9f356846 | ||
|
|
ed86ee3b4a | ||
|
|
7bb5df1cda | ||
|
|
37a81dff04 | ||
|
|
fc96eb4e21 | ||
|
|
ae369738b0 | ||
|
|
e2037b3f7d | ||
|
|
5419033935 | ||
|
|
2eebf060af | ||
|
|
acd9db5902 | ||
|
|
d0e8b3d59b | ||
|
|
c15dd15388 | ||
|
|
0003a5c416 | ||
|
|
21f2927f70 | ||
|
|
e5a79071a5 | ||
|
|
ca0e7a2b17 | ||
|
|
b523bb71ab | ||
|
|
a020a0dc20 | ||
|
|
6d1f2431bd | ||
|
|
fdea3abdf8 | ||
|
|
59d284c316 | ||
|
|
98703c7fbf | ||
|
|
b04c8f7358 | ||
|
|
56d1912f1d | ||
|
|
eb3bd7ba8d | ||
|
|
3b11e86eeb | ||
|
|
5ba693d082 | ||
|
|
11ab41658e | ||
|
|
ae91f6f99b | ||
|
|
3da0e1f8cd | ||
|
|
98676c08a1 | ||
|
|
5dbf3b5c60 | ||
|
|
b8d61935a0 | ||
|
|
20ff802c9b | ||
|
|
2bca84e345 | ||
|
|
e5a93354bc | ||
|
|
ceff3fd8ef | ||
|
|
984e8e14ea | ||
|
|
d05cfe0600 | ||
|
|
7e6a715380 | ||
|
|
d74bebd502 | ||
|
|
bf0ff93277 | ||
|
|
dc752ff442 | ||
|
|
3a36d3782e | ||
|
|
50317dbbad | ||
|
|
6539c91a78 | ||
|
|
4eefbfdbfd | ||
|
|
652f283135 | ||
|
|
2daabe4992 | ||
|
|
34a741a8ec | ||
|
|
78caa52aea | ||
|
|
310d75d141 | ||
|
|
67b7e712d8 | ||
|
|
1ad6efd9b6 | ||
|
|
c3c3fe4768 | ||
|
|
6f6ed04172 | ||
|
|
5309602106 | ||
|
|
9291475f7d | ||
|
|
81127aa55d | ||
|
|
9b583dca4c | ||
|
|
f4a3490cbc | ||
|
|
3d9fae1ed2 | ||
|
|
5c47fc6809 | ||
|
|
89fb6a9797 | ||
|
|
b734a87112 | ||
|
|
573585c234 | ||
|
|
da2e1f53e0 | ||
|
|
f24e740bb8 | ||
|
|
37419b4f99 | ||
|
|
64a450131b | ||
|
|
adf2c0989d | ||
|
|
8fb7ff25c5 | ||
|
|
473219a778 | ||
|
|
aa37e3d486 | ||
|
|
edb53e2dc3 | ||
|
|
f401a4173b | ||
|
|
de00ff6494 | ||
|
|
3616997929 | ||
|
|
eef93b0912 | ||
|
|
08d037309e | ||
|
|
6024b0f25e | ||
|
|
561266641f | ||
|
|
6899f2fe9e | ||
|
|
136c8bd275 | ||
|
|
1bf5423e82 | ||
|
|
2c5c1f48e9 | ||
|
|
d8e487fbd9 | ||
|
|
bc7ff0a8dd | ||
|
|
8e9da53140 | ||
|
|
f1d15e6dbc | ||
|
|
91ebb17ede | ||
|
|
c63b30901b | ||
|
|
f009f19ece | ||
|
|
68477e8839 | ||
|
|
0dc5365564 | ||
|
|
9face18d08 | ||
|
|
ff0ba8ce0f | ||
|
|
759c6293bd | ||
|
|
a8aa99442f | ||
|
|
94b539d155 | ||
|
|
b8874d4d4e | ||
|
|
3fbeb95e14 | ||
|
|
6e25f51cdf | ||
|
|
321c1e44f9 | ||
|
|
cc7fec5818 | ||
|
|
5fb9077e8c | ||
|
|
8e20f81c5b | ||
|
|
e154762c74 | ||
|
|
ba92ab3d05 | ||
|
|
a2f0cdc074 | ||
|
|
0933440086 | ||
|
|
70a1ecd2c1 | ||
|
|
88a23aef5a | ||
|
|
140d8d77b3 | ||
|
|
665cd96929 | ||
|
|
4d067a58ca | ||
|
|
1c1cff6a52 | ||
|
|
f063a04f07 | ||
|
|
af8812bb9b | ||
|
|
78149a962b | ||
|
|
f2d9e3a370 | ||
|
|
16e6f396b4 | ||
|
|
c6ec6b2e8b | ||
|
|
7bbc6428b6 | ||
|
|
c1a3c9ddb2 | ||
|
|
feec0f56f5 | ||
|
|
8029857d27 | ||
|
|
aa61802c1e | ||
|
|
f54aee0209 | ||
|
|
5df921b0e3 | ||
|
|
35d5b67876 | ||
|
|
674c869af4 | ||
|
|
10710ae386 | ||
|
|
a0e07d3161 | ||
|
|
88fc294f7f | ||
|
|
a232bb9551 | ||
|
|
eb833b7f5a | ||
|
|
f164038b79 | ||
|
|
f7a361c4f1 | ||
|
|
884ae74785 | ||
|
|
1dba4a2185 | ||
|
|
7d4d5f25ed | ||
|
|
33422c056d | ||
|
|
a7862a1bc8 | ||
|
|
3baa62e8d1 | ||
|
|
1bf8cf5c2c | ||
|
|
eade1d7eab | ||
|
|
1a94ff6865 | ||
|
|
b47ed50aaf | ||
|
|
1b8477729a | ||
|
|
ff6ade294c | ||
|
|
11fc065c57 | ||
|
|
94388f50b3 | ||
|
|
a444648202 | ||
|
|
7ca2e11f24 | ||
|
|
563f6dea59 | ||
|
|
e4039057be | ||
|
|
11342b54d6 | ||
|
|
49fa38adf2 | ||
|
|
9b330db7f0 | ||
|
|
d740f7e16f | ||
|
|
07e7dc4bdc | ||
|
|
4c59dc4c34 | ||
|
|
7260ea0705 | ||
|
|
35b1e44567 | ||
|
|
c9ea760e31 | ||
|
|
9ebf22b7d9 | ||
|
|
2582bebe06 | ||
|
|
c9cc0bf57b | ||
|
|
61edcfb0a2 | ||
|
|
a8be56ce3d | ||
|
|
329818484c | ||
|
|
8bdfddf641 | ||
|
|
36d65b61d4 | ||
|
|
7d48c06f27 | ||
|
|
d169e36f5c | ||
|
|
2d7af09487 | ||
|
|
48d4681efc | ||
|
|
9ea9b61448 | ||
|
|
04b4aa4a7b | ||
|
|
5a3f0d9aee | ||
|
|
1ed5b5c9c8 | ||
|
|
d10548b691 | ||
|
|
e990510e6b | ||
|
|
55f7bd2dcc | ||
|
|
f931e25959 | ||
|
|
ca9cd290c7 | ||
|
|
49e23e8b6a | ||
|
|
ae7246e7d5 | ||
|
|
43fd392413 | ||
|
|
3e7c12240c | ||
|
|
7eb21356f9 | ||
|
|
f30a38be8b | ||
|
|
2aebbccefc | ||
|
|
b170935a8f | ||
|
|
35241d05d1 | ||
|
|
be2dd0651e | ||
|
|
6a400a6339 | ||
|
|
7b53af7f70 | ||
|
|
ca7b3246b6 | ||
|
|
9c4c233b84 | ||
|
|
8a6c59865d | ||
|
|
1d57b2520c | ||
|
|
17b0b8a166 | ||
|
|
12c82cf9cb | ||
|
|
0bafcf6f46 | ||
|
|
bbc9dc56f6 | ||
|
|
72c65d39ff | ||
|
|
676e3ecf24 | ||
|
|
78272a076e | ||
|
|
723e04d0be | ||
|
|
08a36c3569 | ||
|
|
37709fae89 | ||
|
|
a81e4eb69d | ||
|
|
8e72edfb19 | ||
|
|
863f08a92e | ||
|
|
de2d9f5f1b | ||
|
|
a520c11241 | ||
|
|
b94744d157 | ||
|
|
753727cded | ||
|
|
daebaab692 | ||
|
|
3524cc25ca | ||
|
|
29a7e1f261 | ||
|
|
df53b6358d | ||
|
|
f1a9d64eea | ||
|
|
27f774862d | ||
|
|
b759a0d4d2 | ||
|
|
22a6f15061 | ||
|
|
259454525f | ||
|
|
ce6815aad3 | ||
|
|
4e408e479b | ||
|
|
a9d3890fcb | ||
|
|
2857084000 | ||
|
|
7798fad535 | ||
|
|
baf2907501 | ||
|
|
3c765c68c4 | ||
|
|
29153f49b3 | ||
|
|
071a236c5a | ||
|
|
10437550f4 | ||
|
|
2929b3e71d | ||
|
|
22449fa624 | ||
|
|
d36d3f420c | ||
|
|
60ac04e57c | ||
|
|
a7680bf330 | ||
|
|
6d3d3fc083 | ||
|
|
aff216edf4 | ||
|
|
1cb6dcdbbe | ||
|
|
3f514a353e | ||
|
|
da9ec3b932 | ||
|
|
191b7cbba9 | ||
|
|
e8c59b9642 | ||
|
|
6abb066128 | ||
|
|
8f1ea7cbb6 | ||
|
|
a204c85408 | ||
|
|
15a1f4b8fe | ||
|
|
c7bee2a725 | ||
|
|
dbc1366b50 | ||
|
|
704df56da7 | ||
|
|
33ac271ba7 | ||
|
|
0963f92f23 | ||
|
|
9a66c1079c | ||
|
|
f971dcbba0 | ||
|
|
0990305d2a | ||
|
|
bcc069a937 | ||
|
|
34708e1bb6 | ||
|
|
829476b80a | ||
|
|
1dd70fe330 | ||
|
|
067e922295 | ||
|
|
c28df2478f | ||
|
|
241f7a8ade | ||
|
|
b252735910 | ||
|
|
7adcbe7594 | ||
|
|
8d31fa3cce | ||
|
|
1f06864e9a | ||
|
|
348ae0a79e | ||
|
|
528d455632 | ||
|
|
ba5d51b340 | ||
|
|
7833d941bb | ||
|
|
a2360a4c80 | ||
|
|
a7cacbca2b | ||
|
|
c6b4132a0a | ||
|
|
ad260c90ab | ||
|
|
b8313f07bc | ||
|
|
92a17d28ac | ||
|
|
5f90042bd6 | ||
|
|
9480d1a566 | ||
|
|
36b0079f23 | ||
|
|
28028629b9 | ||
|
|
11f75cac3d | ||
|
|
e673db0194 | ||
|
|
ebab4520ff | ||
|
|
a71d1414eb | ||
|
|
423817c468 | ||
|
|
51ed9fce09 | ||
|
|
d43aeb1d00 | ||
|
|
4d805e063c | ||
|
|
24e5e24166 | ||
|
|
4d54ef20a2 | ||
|
|
54036b3991 | ||
|
|
e5402ac120 | ||
|
|
f56f8399c7 | ||
|
|
cf0c5fa3a1 | ||
|
|
8c2ccefae6 | ||
|
|
1f8b6af773 | ||
|
|
8f9b683eeb | ||
|
|
b5f4775b38 | ||
|
|
01d906ffe9 | ||
|
|
614582bcc4 | ||
|
|
e1ab5000b2 | ||
|
|
a5ed3e571e | ||
|
|
10eaeb20c5 | ||
|
|
fa8deaf38b | ||
|
|
6857590059 | ||
|
|
a3db22ebdf | ||
|
|
c8e9a235d9 | ||
|
|
30b871b0ca | ||
|
|
eb9da9b732 | ||
|
|
d769be6c96 | ||
|
|
a54bda3ae2 | ||
|
|
00558d9414 | ||
|
|
49f3c16543 | ||
|
|
2ef6fcb5d8 | ||
|
|
38fc045253 | ||
|
|
af1fd929c6 | ||
|
|
b7b04c9234 | ||
|
|
bc0bb6fd30 | ||
|
|
430826c9d4 | ||
|
|
68909f0c4e | ||
|
|
9d048a17d8 | ||
|
|
492641d10a | ||
|
|
2b9faf5542 | ||
|
|
ed2d6a1960 | ||
|
|
be843678b1 | ||
|
|
c71dfccc98 | ||
|
|
1a9ccac7c1 | ||
|
|
e330d59abb | ||
|
|
394df6d7d0 | ||
|
|
218f754940 | ||
|
|
a053c3493a | ||
|
|
50b294aab8 | ||
|
|
756b046f3e | ||
|
|
388ac0b18a | ||
|
|
ad06434bd3 | ||
|
|
bd9820c937 | ||
|
|
deda8ac376 | ||
|
|
e05f693942 | ||
|
|
b27295d2ab | ||
|
|
ace52c5713 | ||
|
|
e62e150f64 | ||
|
|
c44c0a775d | ||
|
|
5fcf2dbed0 | ||
|
|
91dff03217 | ||
|
|
a200f4cee2 | ||
|
|
ea6e8d5454 | ||
|
|
83d35817f5 | ||
|
|
76beff70a8 | ||
|
|
61882bf7c6 | ||
|
|
cab317a680 | ||
|
|
73159f99cc | ||
|
|
c15235cd07 | ||
|
|
12c3ec3382 | ||
|
|
55db73efdf | ||
|
|
af40ac054a | ||
|
|
a36819731b | ||
|
|
181c8655c7 | ||
|
|
3b95347bb6 | ||
|
|
3b88ee9a7d | ||
|
|
55c49908d2 | ||
|
|
db9b0b67b7 | ||
|
|
35f76e0061 | ||
|
|
3f338cd6de | ||
|
|
1d01f26ab1 | ||
|
|
266c71f971 | ||
|
|
e8ee972c6e | ||
|
|
f83dda12ad | ||
|
|
696d49815e | ||
|
|
fe556f1b0c | ||
|
|
d5638d974f | ||
|
|
938dd254e5 | ||
|
|
6493f5d704 | ||
|
|
cd6b48365e | ||
|
|
4d9bd478f9 | ||
|
|
165250ff5e | ||
|
|
83317f6938 | ||
|
|
c1d293cfa6 | ||
|
|
49807b4ac6 | ||
|
|
c990bb3633 | ||
|
|
af8322d2f9 | ||
|
|
df866e7f2a | ||
|
|
664718ff63 | ||
|
|
3258263371 | ||
|
|
3cfafc4a9b | ||
|
|
6f600ff5d6 | ||
|
|
90e075da3a | ||
|
|
9572013de9 | ||
|
|
3a5beb0ca1 | ||
|
|
a6da7b6b96 | ||
|
|
173a7026d5 | ||
|
|
40a90862f4 | ||
|
|
511c4325dc | ||
|
|
85a699246a | ||
|
|
4dc5286e13 | ||
|
|
c767dc74b8 | ||
|
|
56ca04f662 | ||
|
|
eb3680123a | ||
|
|
f5273890ee | ||
|
|
c7a088a816 | ||
|
|
fb17b60811 | ||
|
|
1e58804260 | ||
|
|
31bf213032 | ||
|
|
1cccc41ddc | ||
|
|
a91cf27767 | ||
|
|
64d02399d8 | ||
|
|
5961017202 | ||
|
|
d9760fd43c | ||
|
|
d42b2d2985 | ||
|
|
cccfab6412 | ||
|
|
4665664c92 | ||
|
|
0adc996bc3 | ||
|
|
b42a2a720b | ||
|
|
37edd7dd4a | ||
|
|
f87b3500c5 | ||
|
|
66420a2db4 | ||
|
|
6b8492a782 | ||
|
|
6de0595eb8 | ||
|
|
e48a2c646d | ||
|
|
0f831a1a92 | ||
|
|
1ce464aba9 | ||
|
|
6994e70651 | ||
|
|
3e510af38d | ||
|
|
5ecd7b0a92 | ||
|
|
a229909fa6 | ||
|
|
548f31d99c | ||
|
|
78b296b0ff | ||
|
|
be79b07907 | ||
|
|
5537dce84d | ||
|
|
493987fefe | ||
|
|
c97797a737 | ||
|
|
8d7d9d3452 | ||
|
|
7a5e7b303c | ||
|
|
61aabb9d70 | ||
|
|
62af3a0eb5 | ||
|
|
60064c53f1 | ||
|
|
98eb1c3fa2 | ||
|
|
201e9eaa0e | ||
|
|
9afa6ede21 | ||
|
|
f4776371ae | ||
|
|
328a20bf9c | ||
|
|
5622f29ae4 | ||
|
|
b4f23afbd1 | ||
|
|
0138968a6a | ||
|
|
c3f0b12b0f | ||
|
|
4f31d0f2b7 | ||
|
|
bff74bdd1a | ||
|
|
10b04ff7f4 | ||
|
|
1f7ccb9014 | ||
|
|
c7b3209668 | ||
|
|
895ba7d1dd | ||
|
|
a2a1b0baa2 | ||
|
|
8646eb790e | ||
|
|
27ace98f51 | ||
|
|
a00d73c8c8 | ||
|
|
f036a6328e | ||
|
|
31bb8d3f51 | ||
|
|
4958ae2058 | ||
|
|
7e8d73c183 | ||
|
|
1a9b9649fb | ||
|
|
65bc504db8 | ||
|
|
0fc74a0d91 | ||
|
|
8d2cc6fbb1 | ||
|
|
a954584f63 | ||
|
|
cb3ff6fb01 | ||
|
|
71aa656d13 | ||
|
|
366b1f3cfe | ||
|
|
64ce58db38 | ||
|
|
11b85ce62e | ||
|
|
1220352ff7 | ||
|
|
8f3034d871 | ||
|
|
7fa547ab02 | ||
|
|
3182f3e2dc | ||
|
|
cbf915f3f6 | ||
|
|
b490b8849a | ||
|
|
5d2519e5bf | ||
|
|
c3415d1bac | ||
|
|
36f3542883 | ||
|
|
4cb71e9b6a | ||
|
|
4bc7009e8a | ||
|
|
16f8e9df8a | ||
|
|
b081cebefa | ||
|
|
916c145217 | ||
|
|
4192b51c7c | ||
|
|
052421ff09 | ||
|
|
4e99f48817 | ||
|
|
a11165ecc6 | ||
|
|
fbb2fc5580 | ||
|
|
2fe3d240cc | ||
|
|
42f4dcfe41 | ||
|
|
892e3192fb | ||
|
|
7272eab9d0 | ||
|
|
ebe832dc37 | ||
|
|
825abb8175 | ||
|
|
8944ec0109 | ||
|
|
c084c93402 | ||
|
|
8c778adc39 | ||
|
|
71b6065009 | ||
|
|
7e660ac113 | ||
|
|
d799b47b82 | ||
|
|
b7f8116406 | ||
|
|
6db274e057 | ||
|
|
0c92b57398 | ||
|
|
becafcbf0f | ||
|
|
92a86f4c1a | ||
|
|
dfe029a62c | ||
|
|
b0472057a3 | ||
|
|
c081b35c27 | ||
|
|
9f43890bcd | ||
|
|
94a20aa5f8 | ||
|
|
94e8df3a7e | ||
|
|
37e64addc8 | ||
|
|
d82ba23ba5 | ||
|
|
0fd7fd71b4 | ||
|
|
eae12e3fe3 | ||
|
|
798a2cad4f | ||
|
|
41c0849429 | ||
|
|
a4e5af1184 | ||
|
|
b090af5922 | ||
|
|
388841f819 | ||
|
|
1a2ecbfbc4 | ||
|
|
38e292b112 | ||
|
|
c4f731262d | ||
|
|
07cc63f386 | ||
|
|
e42a692f00 | ||
|
|
6ec7538bb4 | ||
|
|
2871d489a9 | ||
|
|
1771ddd85d | ||
|
|
5198bf68fc | ||
|
|
e00fc35dbe | ||
|
|
8904e979df | ||
|
|
53eb217661 | ||
|
|
9dcb8f3fc7 | ||
|
|
1e8ac8364b | ||
|
|
754d8a035e | ||
|
|
f1f725c6a0 | ||
|
|
06c155420f | ||
|
|
7dabd2ac45 | ||
|
|
df8ba0d2cf | ||
|
|
ff1956e07b | ||
|
|
caf5a8817b | ||
|
|
a850fde1d8 | ||
|
|
0e6ebc13d1 | ||
|
|
6f5342a201 | ||
|
|
264a7044f5 | ||
|
|
1a30deca50 | ||
|
|
d8624e6a80 | ||
|
|
4f95d455ed | ||
|
|
468d19a9c1 | ||
|
|
9aeaf730ad | ||
|
|
db964a33a1 | ||
|
|
da8fb85859 | ||
|
|
54330a1c3c | ||
|
|
9732d77ed2 | ||
|
|
199ece7eb8 | ||
|
|
1997eb0078 | ||
|
|
eef4a7a304 | ||
|
|
246168bd72 | ||
|
|
7fbf54dc62 | ||
|
|
351f373865 | ||
|
|
72e785f36a | ||
|
|
727d2930f2 | ||
|
|
c13bf7c836 | ||
|
|
f3308e138d | ||
|
|
29546b345b | ||
|
|
2c57c7fa5a | ||
|
|
b6ea11b967 | ||
|
|
b8c74d606a | ||
|
|
a5d524ef46 | ||
|
|
cceb5ec237 | ||
|
|
71a6eaff83 | ||
|
|
7fd48d0413 | ||
|
|
1b38b5be86 | ||
|
|
decf2ae400 | ||
|
|
0d989011ff | ||
|
|
01b4b74574 | ||
|
|
70f767dc65 | ||
|
|
e75c24e889 | ||
|
|
0cb2056304 | ||
|
|
8adec2b9e0 | ||
|
|
604f292ab7 | ||
|
|
23d3c422ab | ||
|
|
0c1ffe980d | ||
|
|
5e95cb27d6 | ||
|
|
3b86f936c5 | ||
|
|
e0942e37aa | ||
|
|
c45a6caa95 | ||
|
|
61bbddbaa6 | ||
|
|
5425626790 | ||
|
|
5dc3552d85 | ||
|
|
3fbd27f73e | ||
|
|
0382ecb78d | ||
|
|
72edb6fc8c | ||
|
|
66149e3f2b | ||
|
|
6e74521d98 | ||
|
|
cf01013161 | ||
|
|
1e179c7528 | ||
|
|
530ed178b7 | ||
|
|
74aa18f68f | ||
|
|
d9222264a8 | ||
|
|
ca14211e93 | ||
|
|
b1d65c3369 | ||
|
|
b4c538b02b | ||
|
|
13059bceb2 | ||
|
|
d8894e24a4 | ||
|
|
3b09757bac | ||
|
|
2f97f76877 | ||
|
|
43f0537c06 | ||
|
|
a816da0dc3 | ||
|
|
7bb49d1057 | ||
|
|
1aa42fedee | ||
|
|
66aa382eae | ||
|
|
ee90ddab94 | ||
|
|
172240c0a4 | ||
|
|
ad25aee245 | ||
|
|
bd1f325b42 | ||
|
|
00a82ea805 | ||
|
|
b1b01841af | ||
|
|
816930c485 | ||
|
|
76233cda34 | ||
|
|
9dcea39985 | ||
|
|
10d00a756a | ||
|
|
eb50741129 | ||
|
|
3804b01276 | ||
|
|
b1298d8e06 | ||
|
|
c065fd35ae | ||
|
|
6a46dc8db7 | ||
|
|
36cb99f958 | ||
|
|
81650f95e2 | ||
|
|
34dbcb8505 | ||
|
|
c993c829e2 | ||
|
|
0d90e0f067 | ||
|
|
678f58de4b | ||
|
|
c961a0e63e | ||
|
|
aaefb347c0 | ||
|
|
09018e19a5 | ||
|
|
345e37831c | ||
|
|
00ac799b68 | ||
|
|
133af9385b | ||
|
|
40c696e5c6 | ||
|
|
d6d5028922 | ||
|
|
38ad119f97 | ||
|
|
4e415288d7 | ||
|
|
fada438acf | ||
|
|
1df0ae2170 | ||
|
|
d96b9d40f0 | ||
|
|
fa19dfccf9 | ||
|
|
cdc22cb886 | ||
|
|
04c77a54b0 | ||
|
|
64a8c39a1f | ||
|
|
3d55f2806e | ||
|
|
1eb867f33f | ||
|
|
e93f4f7578 | ||
|
|
45ead916d1 | ||
|
|
3a0879c8c8 | ||
|
|
ebf361ce18 | ||
|
|
953b358668 | ||
|
|
3dfd25b3aa | ||
|
|
6f66eedc5d | ||
|
|
4094b6e36d | ||
|
|
c09cbf0ed9 | ||
|
|
391d53e1dd | ||
|
|
f64ebfe3e5 | ||
|
|
fc040bfd05 | ||
|
|
c8bf86d50d | ||
|
|
61989fb5e9 | ||
|
|
6f9d4d542f | ||
|
|
b3a8878080 | ||
|
|
f4d66a99cf | ||
|
|
537ba6f381 | ||
|
|
411f691b21 | ||
|
|
d6aa1967ad | ||
|
|
6e1e0e4b5b | ||
|
|
3941669d69 | ||
|
|
1aac03797e | ||
|
|
459af43494 | ||
|
|
f4f7e3cf41 | ||
|
|
1fd015516e | ||
|
|
76bafa8ffe | ||
|
|
8d5797b00f | ||
|
|
7571c02c8a | ||
|
|
49cbe7c8e3 | ||
|
|
ba4133c9eb | ||
|
|
b67f1840a1 | ||
|
|
165c46690f | ||
|
|
16bc9ab601 | ||
|
|
15ce1338b4 | ||
|
|
0ff30c5333 | ||
|
|
6feb2d5e80 | ||
|
|
1e07fea200 | ||
|
|
7aeb67b39b | ||
|
|
93881db22a | ||
|
|
64ed7a38f9 | ||
|
|
2fd466fcfc | ||
|
|
dc2fc73691 | ||
|
|
c4808c6009 | ||
|
|
c67f584eb3 | ||
|
|
29f6ed78e8 | ||
|
|
7807ee664d | ||
|
|
d518d06efd | ||
|
|
25a0cc44b9 | ||
|
|
825cdcec3c | ||
|
|
41b610acab | ||
|
|
0364fa8b65 | ||
|
|
849086a1ae | ||
|
|
36fbc6887f | ||
|
|
a8a98e43f2 | ||
|
|
57bdc730e2 | ||
|
|
31a196d7f5 | ||
|
|
9b27e6c3b4 | ||
|
|
62f1f9507f | ||
|
|
ee8dda41ae | ||
|
|
01ba178097 | ||
|
|
78ff59d052 | ||
|
|
f3f1cd6b3b | ||
|
|
803540e811 | ||
|
|
458ade6361 | ||
|
|
a69969ee05 | ||
|
|
f2b8db57eb | ||
|
|
331ae266ff | ||
|
|
4242001863 | ||
|
|
78338f71ca | ||
|
|
f5172a3084 | ||
|
|
c7df67edbd | ||
|
|
d410fee91d | ||
|
|
ba7aa464de | ||
|
|
8333034dce | ||
|
|
637b6af80f | ||
|
|
1044f8afd2 | ||
|
|
2f775107f9 | ||
|
|
85342674b2 | ||
|
|
fd69098a45 | ||
|
|
8867f908fc | ||
|
|
b7c33124c8 | ||
|
|
89a8c423c7 | ||
|
|
cea2582df2 | ||
|
|
e423e0baaa | ||
|
|
60b2dd1285 | ||
|
|
36ddd8b3f7 | ||
|
|
7575d52a73 | ||
|
|
9a2dc4f7ac | ||
|
|
c5cd249e41 | ||
|
|
8940c1c058 | ||
|
|
27ec04b232 | ||
|
|
d2824416aa | ||
|
|
18061bbab0 | ||
|
|
4ecbbcbcea | ||
|
|
55c97a03e1 | ||
|
|
98aeac6ea9 | ||
|
|
8bfb6723cb | ||
|
|
a20575e8ae | ||
|
|
7724572519 | ||
|
|
d763637f6a | ||
|
|
c26e9ac4b2 | ||
|
|
896bf55352 | ||
|
|
a23ba9b53c | ||
|
|
38a9339baf | ||
|
|
def8b4039f | ||
|
|
a14e1538fe | ||
|
|
5f28a1acad | ||
|
|
25e9953c6f | ||
|
|
f9df094ca5 | ||
|
|
b60a469023 | ||
|
|
7012631257 | ||
|
|
e6c9f80c48 | ||
|
|
895ce482b1 | ||
|
|
e5da4021eb | ||
|
|
2371053565 | ||
|
|
33bf9033e0 | ||
|
|
35eacd0dae | ||
|
|
96bef88f5f | ||
|
|
5524b242a7 | ||
|
|
a013eba65f | ||
|
|
36755d40b4 | ||
|
|
7d568f5ab8 | ||
|
|
a7207cd580 | ||
|
|
e8ef659cd9 | ||
|
|
b0adbe98fb | ||
|
|
0c361c41b8 | ||
|
|
e66ab17a36 | ||
|
|
cb437dc2ad | ||
|
|
0d933b2ad5 | ||
|
|
c5469e046a | ||
|
|
4d2f143ce5 | ||
|
|
8f93030c85 | ||
|
|
fdb9aebead | ||
|
|
3141feb73b | ||
|
|
9706f3f802 | ||
|
|
d5e944359e | ||
|
|
826ec77fb2 | ||
|
|
2656f4eb6a | ||
|
|
2b88feedf7 | ||
|
|
23566e0d78 | ||
|
|
828553b614 | ||
|
|
3048e82a94 | ||
|
|
09ffa08ba1 | ||
|
|
e0b4cc489f | ||
|
|
15e423407f | ||
|
|
702e522044 | ||
|
|
77abae55df | ||
|
|
617c0b2239 | ||
|
|
814d4257df | ||
|
|
23ae281b31 | ||
|
|
94128d6b0d | ||
|
|
059009c592 | ||
|
|
9cc977f104 | ||
|
|
1c0ade7afa | ||
|
|
f2741c8d3a | ||
|
|
6ab8f3584a | ||
|
|
8ae5ce1726 | ||
|
|
eb92077720 | ||
|
|
90e0fd4bad | ||
|
|
05741e05d9 | ||
|
|
9aa6637644 | ||
|
|
d30d28156d | ||
|
|
be6d722904 | ||
|
|
d551980823 | ||
|
|
f0a6c3d2bc | ||
|
|
4e0fb1280a | ||
|
|
24f5251cce | ||
|
|
ac1390eee8 | ||
|
|
4a5b4d34dc | ||
|
|
63adb0cc61 | ||
|
|
3c80377b69 | ||
|
|
24577db241 | ||
|
|
566bd96da8 | ||
|
|
ebdb64d605 | ||
|
|
a6ffb92f0b | ||
|
|
3217377b3c | ||
|
|
24da5893fc | ||
|
|
087ca2cb07 | ||
|
|
b4e7447458 | ||
|
|
a45e6aadd7 | ||
|
|
70e322695d | ||
|
|
6a15923b77 | ||
|
|
7ffad0af5a | ||
|
|
0e3ae92441 | ||
|
|
b3ae826f7a | ||
|
|
dede691aca | ||
|
|
fb6a5b965b | ||
|
|
6340716b3a | ||
|
|
b675b32e6b | ||
|
|
6a3fa81ffb | ||
|
|
df53a98f2b | ||
|
|
db23d8d2a2 | ||
|
|
0d69795014 | ||
|
|
3374f3fdc2 | ||
|
|
4bf0727b1f | ||
|
|
263bd4ec50 | ||
|
|
b7e8b6e37a | ||
|
|
ceb7a17f34 | ||
|
|
1a2f2e1e66 | ||
|
|
6803016858 | ||
|
|
9b7c4fd981 | ||
|
|
dc31942f42 | ||
|
|
1f6b8f3115 | ||
|
|
9c7b79acd9 | ||
|
|
9168308579 | ||
|
|
37e3cbe22e | ||
|
|
7e8fdb1aae | ||
|
|
386ba39cac | ||
|
|
236d0cd07c | ||
|
|
ed86f38a11 | ||
|
|
6db80ad2db | ||
|
|
14470ac87b | ||
|
|
0cdf576d86 | ||
|
|
4ffeca4ea2 | ||
|
|
211fd6c674 | ||
|
|
6ebb46c106 | ||
|
|
0f97c9a06f | ||
|
|
77fb72646f | ||
|
|
aae74e3832 | ||
|
|
894e730911 | ||
|
|
63961d87a6 | ||
|
|
87fe568c28 | ||
|
|
46531b374d | ||
|
|
9e8753911c | ||
|
|
5c6b1e578c | ||
|
|
8f0c8fb452 | ||
|
|
b702ecebf0 | ||
|
|
950dc95e97 | ||
|
|
d9dd3584e1 | ||
|
|
15a9f36849 | ||
|
|
d0087d4ff2 | ||
|
|
cc5ada6f4c | ||
|
|
dfb2e1a325 | ||
|
|
65bab327b4 | ||
|
|
9eeb7abc6b | ||
|
|
c70df21099 | ||
|
|
418424e5f5 | ||
|
|
8477466125 | ||
|
|
865dbd4a26 | ||
|
|
b1e6f55912 | ||
|
|
4d78f3b770 | ||
|
|
7f739999e9 | ||
|
|
0f8a01d4f3 | ||
|
|
e2bf499b14 | ||
|
|
7cf4547ab6 | ||
|
|
8ae980807a | ||
|
|
eec4d8ef96 | ||
|
|
610134730a | ||
|
|
212a5e28ba | ||
|
|
1c783bca88 | ||
|
|
ac73651f66 | ||
|
|
ee1a7032d5 | ||
|
|
e5ceb3bfda | ||
|
|
c2ef29234c | ||
|
|
1a1826c1af | ||
|
|
c7c6d43fe1 | ||
|
|
2902d44f99 | ||
|
|
d6e4ba287b | ||
|
|
7ed806d241 | ||
|
|
dd06c95e43 | ||
|
|
e5c3a4b549 | ||
|
|
f50ee8d1c3 | ||
|
|
0e67ab0d8e | ||
|
|
1d0668ed5a | ||
|
|
d415299a80 | ||
|
|
77541837e5 | ||
|
|
48fbb1003d | ||
|
|
e3a6576f35 | ||
|
|
89bb8e97ee | ||
|
|
3442b30ab2 | ||
|
|
375696b1b1 | ||
|
|
4ea5c7b70d | ||
|
|
305d068362 | ||
|
|
a231ce87b5 | ||
|
|
a84d20fc14 | ||
|
|
9e30092361 | ||
|
|
10d5c7aa5f | ||
|
|
412f356e04 | ||
|
|
8dfa187b8a | ||
|
|
c1ed1f7055 | ||
|
|
1514f74967 | ||
|
|
2e8323e3f7 | ||
|
|
69f8364042 | ||
|
|
79981f039b | ||
|
|
34d863f3fc | ||
|
|
91994c2c81 | ||
|
|
3ee4b60d56 | ||
|
|
76e92371ac | ||
|
|
08af0205f9 | ||
|
|
a725fb1f43 | ||
|
|
05ee2b6dad | ||
|
|
b74feacac5 | ||
|
|
426b52fc5d | ||
|
|
5c30b26846 | ||
|
|
f07b74fc18 | ||
|
|
a5a45015ba | ||
|
|
beee53de06 | ||
|
|
8712f2bea7 | ||
|
|
ea102818c9 | ||
|
|
0a871f6880 | ||
|
|
481efc84a8 | ||
|
|
01ed5c9be3 | ||
|
|
ad3bc6acd5 | ||
|
|
5afa7f8bee | ||
|
|
ec8deefc27 | ||
|
|
a2d5a4ee64 | ||
|
|
dffcc2ea0c | ||
|
|
1800eeefed | ||
|
|
d7e7dedbde | ||
|
|
d19bb9c0aa | ||
|
|
3ef79a974a | ||
|
|
bc6800fbed | ||
|
|
65314dccf8 | ||
|
|
feb7221209 | ||
|
|
56a94d8cbb | ||
|
|
24e6ec8ac8 | ||
|
|
87724af7a8 | ||
|
|
b65c3e77e8 | ||
|
|
5301304bf2 | ||
|
|
948bcc60df | ||
|
|
25dfe0eb10 | ||
|
|
8e71456a81 | ||
|
|
ccdd34ed78 | ||
|
|
26d886354f | ||
|
|
a172b258ac | ||
|
|
7b93c2c204 | ||
|
|
57c7411f46 | ||
|
|
d0a122348e | ||
|
|
e4cbb5f382 | ||
|
|
c1bce22f23 | ||
|
|
e3abbbe301 | ||
|
|
55b36e3710 | ||
|
|
877bea9ce1 | ||
|
|
33c7ff861e | ||
|
|
749fe60c1e | ||
|
|
63b31b059c | ||
|
|
1476b497eb | ||
|
|
e399853d0c | ||
|
|
fdb205b19e | ||
|
|
fbe8053120 | ||
|
|
ea783d01e1 | ||
|
|
b7d73595dc | ||
|
|
e97e53eeed | ||
|
|
342f630dbf | ||
|
|
69c8fb9e5d | ||
|
|
5f0f8013ac | ||
|
|
b5368acee8 | ||
|
|
f71959fcf5 | ||
|
|
5c9f3b8b16 | ||
|
|
bebd6f9308 | ||
|
|
84a2806c16 | ||
|
|
d0111a7409 | ||
|
|
aab8874c55 | ||
|
|
fcf5b01746 | ||
|
|
4de9e9a6db | ||
|
|
0067d6c4be | ||
|
|
2099125333 | ||
|
|
b48f147d5a | ||
|
|
4f3e943080 | ||
|
|
7558830fa3 | ||
|
|
867274e997 | ||
|
|
6515778305 | ||
|
|
3b1dfc0f2f | ||
|
|
d664de44b7 | ||
|
|
bbe99d26ec | ||
|
|
50fc59968e | ||
|
|
b8b01bb92a | ||
|
|
eb45133451 | ||
|
|
10c0e2d818 | ||
|
|
669f0e7cda | ||
|
|
32fd27ec98 | ||
|
|
0c13f378de | ||
|
|
0049594efb | ||
|
|
113c7d3eb0 | ||
|
|
549371fc99 | ||
|
|
957f27e5bb | ||
|
|
1f8c19767b | ||
|
|
a383a98af6 | ||
|
|
acd69589a5 | ||
|
|
b30b8698ea | ||
|
|
f1f25be6db | ||
|
|
deab8c1960 | ||
|
|
c57f775710 | ||
|
|
e75cafe9fb | ||
|
|
33ab8453c4 | ||
|
|
ebd3c7b370 | ||
|
|
29645a1d44 | ||
|
|
22d99a801a | ||
|
|
57b8d84cd9 | ||
|
|
65e4ad5bfe | ||
|
|
98b7d476d9 | ||
|
|
201e3c99b9 | ||
|
|
8a7a4a9796 | ||
|
|
df297c8794 | ||
|
|
3f53a75f02 | ||
|
|
7c360e3a04 | ||
|
|
d2176c8011 | ||
|
|
aa92f06308 | ||
|
|
e00c9cf599 | ||
|
|
ba60a3ebe0 | ||
|
|
efb7e11988 | ||
|
|
a55c8b7aac | ||
|
|
a980bc4324 | ||
|
|
4b10aadffc | ||
|
|
5bec574859 | ||
|
|
d11271dd29 | ||
|
|
1d9d26d09b | ||
|
|
c0292e8ab7 | ||
|
|
f44e5d8b43 | ||
|
|
6ea74538e3 | ||
|
|
24b8924b46 | ||
|
|
86a3c67112 | ||
|
|
8be874370d | ||
|
|
aec74dd95a | ||
|
|
6890574256 | ||
|
|
d03745c684 | ||
|
|
28746fbd59 | ||
|
|
0321213c11 | ||
|
|
3f0aae4244 | ||
|
|
48099643cc | ||
|
|
621f33c9d0 | ||
|
|
f07a9f6f43 | ||
|
|
e51880fd32 | ||
|
|
88ce273da4 | ||
|
|
b9ba5dfa28 | ||
|
|
4086f11929 | ||
|
|
478c2c6193 | ||
|
|
d2d6481afb | ||
|
|
43acb120f3 | ||
|
|
e8f2025edf | ||
|
|
a4eb9578af | ||
|
|
fa35cdad02 | ||
|
|
d1b9c912a4 | ||
|
|
edec83a025 | ||
|
|
c0a7c60815 | ||
|
|
117a7d1944 | ||
|
|
a40e0dd434 | ||
|
|
188b086dd9 | ||
|
|
1f27d2c0e1 | ||
|
|
7560096db5 | ||
|
|
282cb9c7ba | ||
|
|
3a9d6790ad | ||
|
|
0610a3e0b2 | ||
|
|
7f9c31df88 | ||
|
|
3fa6b6e293 | ||
|
|
3c50b99ab4 | ||
|
|
52fadd5fb2 | ||
|
|
5367fe7f4d | ||
|
|
427588f6e7 | ||
|
|
51745be312 | ||
|
|
d7f1e7c88f | ||
|
|
4145a257be | ||
|
|
525dc9809e | ||
|
|
1bf3210816 | ||
|
|
e6c6d10d99 | ||
|
|
f270256e06 | ||
|
|
f401c6f69f | ||
|
|
b075d25bed | ||
|
|
3d1bb6b4dd | ||
|
|
1db2666916 | ||
|
|
8f5c0218d8 | ||
|
|
d7666dff82 | ||
|
|
2d4c98dbd1 | ||
|
|
fd50bf623c | ||
|
|
d360a14678 | ||
|
|
d0f2ab6969 | ||
|
|
de906ef543 | ||
|
|
2fb3deeca1 | ||
|
|
66398056f1 | ||
|
|
77477fa4c9 | ||
|
|
a169e18ce1 | ||
|
|
381640e3ac | ||
|
|
37e3410137 | ||
|
|
97b5196960 | ||
|
|
6a4f3528c8 | ||
|
|
b9c76aa1a9 | ||
|
|
0d3070d364 | ||
|
|
7753cadbfa | ||
|
|
3950450342 | ||
|
|
c82b1fdad6 | ||
|
|
b0fb63abe8 | ||
|
|
3ab34c603e | ||
|
|
7d6413341a | ||
|
|
140012d0f6 | ||
|
|
4be9f8c814 | ||
|
|
5c802bac37 | ||
|
|
6c30ff756a | ||
|
|
62749e4708 | ||
|
|
6b7dee4b38 | ||
|
|
ef2041eb4e | ||
|
|
29e3e682af | ||
|
|
f983c44199 | ||
|
|
e4db19511a | ||
|
|
c47d21da80 | ||
|
|
269aecd0c0 | ||
|
|
aafddb2b0a | ||
|
|
6262ac8ac5 | ||
|
|
89938c719e | ||
|
|
ec0fafbb19 | ||
|
|
a5863bdf33 | ||
|
|
b58ddb32ba | ||
|
|
b9e12a8140 | ||
|
|
104aa7388a | ||
|
|
c3855d28b0 | ||
|
|
734f90bb41 | ||
|
|
91a6addeeb | ||
|
|
9afb76c5ad | ||
|
|
dfb2cb5cfd | ||
|
|
650d688d10 | ||
|
|
0ba77818f3 | ||
|
|
09baa7da7e | ||
|
|
85e787f51d | ||
|
|
2a9e1e453a | ||
|
|
ee1e199685 | ||
|
|
17c5a00774 | ||
|
|
15c0e8e7b2 | ||
|
|
cca37fba48 | ||
|
|
9d0993ec4a | ||
|
|
342f33bf9e | ||
|
|
7cd3bc5f99 | ||
|
|
931055e6cb | ||
|
|
d0e4cf82f1 | ||
|
|
6f88df2c57 | ||
|
|
4479bf2762 | ||
|
|
1ff7c0f7d8 | ||
|
|
610e47c87e | ||
|
|
50f566076f | ||
|
|
92810ff497 | ||
|
|
60ccc59a1c | ||
|
|
91745595d3 | ||
|
|
d6e40507d0 | ||
|
|
deed48b472 | ||
|
|
e4d41bfca5 | ||
|
|
a355b70f27 | ||
|
|
f8514f6186 | ||
|
|
e09b8fcd9d | ||
|
|
7d1b527ff9 | ||
|
|
f943c7b622 | ||
|
|
676eb3f2dd | ||
|
|
98b7cf1ace | ||
|
|
c465afd736 | ||
|
|
b84d6e7fc4 | ||
|
|
2efd5d78c1 | ||
|
|
c8edf47b3a | ||
|
|
3b4c26a428 | ||
|
|
1525148114 | ||
|
|
9e0c5791c1 | ||
|
|
29a1ab2afc | ||
|
|
fa387d2d99 | ||
|
|
6d0d573eca | ||
|
|
bb799e811b | ||
|
|
04ee53eca1 | ||
|
|
659eb98a53 | ||
|
|
ca6aada48e | ||
|
|
43df5a7e71 | ||
|
|
88f1c6de7b | ||
|
|
65a40ab82b | ||
|
|
4b9cced103 | ||
|
|
5c38625259 | ||
|
|
6344fa04bb | ||
|
|
e3ced9ed61 | ||
|
|
5075d598bc | ||
|
|
68eb8e90e6 | ||
|
|
d3a96346c4 | ||
|
|
0e518e2fea | ||
|
|
1e0a235f39 | ||
|
|
9ad400f75e | ||
|
|
3537b93d8a | ||
|
|
56eca2e956 | ||
|
|
2ad4d1ba07 | ||
|
|
4853de808b | ||
|
|
6ff5f12218 | ||
|
|
52a180684f | ||
|
|
b21e25702f | ||
|
|
983af2600f | ||
|
|
f34e6a2cd6 | ||
|
|
a9f304031b | ||
|
|
9271bc8355 | ||
|
|
d1b3e3dd75 | ||
|
|
968ed2a777 | ||
|
|
24de5d2556 | ||
|
|
d26e981df4 | ||
|
|
e45d40b171 | ||
|
|
4a419b8851 | ||
|
|
5fbd672c38 | ||
|
|
bec1fad223 | ||
|
|
177fed41bc | ||
|
|
b900e7cba4 | ||
|
|
14cb4979f0 | ||
|
|
69e61e30fe | ||
|
|
cce929eaac | ||
|
|
b6cfde99b7 | ||
|
|
1be99f052d | ||
|
|
2410c43d83 | ||
|
|
aea6e7fc3c | ||
|
|
91a76c40c0 | ||
|
|
d2b194607c | ||
|
|
f6177462db | ||
|
|
9ddaf4ef8c | ||
|
|
97b5573848 | ||
|
|
18c95c1ab0 | ||
|
|
0479c625a4 | ||
|
|
f659951e22 | ||
|
|
5853a7316e | ||
|
|
a612753db9 | ||
|
|
c8fc3fb524 | ||
|
|
5912c639df | ||
|
|
017e4dd58c | ||
|
|
651486621d | ||
|
|
28d9032c88 | ||
|
|
16f4eb723a | ||
|
|
1cbd410620 | ||
|
|
d41ac5f5dc | ||
|
|
9c1fc022ae | ||
|
|
83d548ef0f | ||
|
|
c72477bd32 | ||
|
|
9a7b072e38 | ||
|
|
cbc4a6cc7e | ||
|
|
cd7481a39e | ||
|
|
acd213ed6d | ||
|
|
77ffa95701 | ||
|
|
2b25cb5d76 | ||
|
|
62fec3b2ff | ||
|
|
e79162558e | ||
|
|
2da67107ee | ||
|
|
2ff7f8975e | ||
|
|
87a2566048 | ||
|
|
986f56736b | ||
|
|
2583a0308b | ||
|
|
40c716d2a2 | ||
|
|
79bfd01001 | ||
|
|
f2bcdd8e02 | ||
|
|
8c5850eeb4 | ||
|
|
bd3e077a2d | ||
|
|
7e70ac36b3 | ||
|
|
2cc0082dc0 | ||
|
|
056b56688a | ||
|
|
b17418313f | ||
|
|
e9a6fd6a68 | ||
|
|
bf30f3bd9d | ||
|
|
330edf2d84 | ||
|
|
43f775e4ca | ||
|
|
8f6562448c | ||
|
|
263f4b514b | ||
|
|
f0da3f1ef9 | ||
|
|
cb3ac1c610 | ||
|
|
8efd15f477 | ||
|
|
d26ebe990f | ||
|
|
28acf5500a | ||
|
|
214c22c704 | ||
|
|
8cdafb47b9 | ||
|
|
0dae5083f1 | ||
|
|
4c89bbd22c | ||
|
|
e2b06e76c1 | ||
|
|
e9c076c317 | ||
|
|
6c072e7d25 | ||
|
|
ac6c104871 | ||
|
|
69c01a9f68 | ||
|
|
e55213ce35 | ||
|
|
24a2aac445 | ||
|
|
784763c565 | ||
|
|
39c68260c0 | ||
|
|
149254d0d5 | ||
|
|
0c14e2fbe3 | ||
|
|
98acdc895b | ||
|
|
bd3b5b8b10 | ||
|
|
9a90636805 | ||
|
|
6a66ae96ed | ||
|
|
2c8a4ba6b5 | ||
|
|
ad8915b729 | ||
|
|
34cbc7ee8d | ||
|
|
a59e40a1ea | ||
|
|
ad0a75db6b | ||
|
|
1d0e49e1c7 | ||
|
|
b4461b6ebe | ||
|
|
80959224fe | ||
|
|
865cbf4fc5 | ||
|
|
196f061cac | ||
|
|
99b380c33b | ||
|
|
02e4482e22 | ||
|
|
b8a792de80 | ||
|
|
fac55558ad | ||
|
|
b2799ff96d | ||
|
|
7a249480b4 | ||
|
|
f605128d13 | ||
|
|
ba40a74666 | ||
|
|
fb8ae2d438 | ||
|
|
893f8832b5 | ||
|
|
878d11ec29 | ||
|
|
515bbe4b5b | ||
|
|
75f2e25ba9 | ||
|
|
0d466d34a3 | ||
|
|
6949d81095 | ||
|
|
f847ca02d3 | ||
|
|
510243ba58 | ||
|
|
b540697a8a | ||
|
|
0d3641e589 | ||
|
|
72546c831e | ||
|
|
d26db9269d | ||
|
|
4c0941853a | ||
|
|
c11726364e | ||
|
|
c577d735c6 | ||
|
|
9f0375f61a | ||
|
|
5e114e4bfe | ||
|
|
83622b6d2f | ||
|
|
3d87426c2d | ||
|
|
ce328530a9 | ||
|
|
f70daac108 | ||
|
|
912b38b428 | ||
|
|
6e25c58ed7 | ||
|
|
51fb2e98d2 | ||
|
|
38d63d846e | ||
|
|
07cec9776e | ||
|
|
ea38e55fff | ||
|
|
257cfebfe6 | ||
|
|
6eefe53329 | ||
|
|
1986025d2b | ||
|
|
c9aa111b4f | ||
|
|
bfcb6e3917 | ||
|
|
2c1396073e | ||
|
|
401983c6a0 | ||
|
|
391dc3ee07 | ||
|
|
be3b8fa30f | ||
|
|
9f5809b3e8 | ||
|
|
0320ddc192 | ||
|
|
56dd55721c | ||
|
|
231f76b530 | ||
|
|
55442a7812 | ||
|
|
43b81eb98a | ||
|
|
bfd718793c | ||
|
|
a9c2896e22 | ||
|
|
278229d195 | ||
|
|
fa154d1dbe | ||
|
|
7e2ede9891 | ||
|
|
74af99fc2f | ||
|
|
0f2a2ba14b | ||
|
|
e24b5a8610 | ||
|
|
750f9020ae | ||
|
|
f82863851e | ||
|
|
933a5b3792 | ||
|
|
aa488e1385 | ||
|
|
d77650525d | ||
|
|
3e50c29984 | ||
|
|
64e7ad6045 | ||
|
|
23f4a93bb4 | ||
|
|
6f13b055f1 | ||
|
|
1f91bd15c3 | ||
|
|
11a15be4ce | ||
|
|
14e17e18cb | ||
|
|
1b124d1942 | ||
|
|
747373d4ae | ||
|
|
18d367c0a5 | ||
|
|
a1a530b067 | ||
|
|
cb9722cb3f | ||
|
|
773c0b4bb8 | ||
|
|
23c322a531 | ||
|
|
7e8c0af004 | ||
|
|
d2983ccb25 | ||
|
|
f24e9833dc | ||
|
|
bc2bdf5709 | ||
|
|
627a209f74 | ||
|
|
1a4895453a | ||
|
|
aab74fa106 | ||
|
|
2bd9efd4c2 | ||
|
|
39a743fb9b | ||
|
|
4966a0b22d | ||
|
|
fc26023120 | ||
|
|
8d7c0cca13 | ||
|
|
f66ede4328 | ||
|
|
cc88b90ec8 | ||
|
|
b6c5fa9a0b | ||
|
|
dff10eaa77 | ||
|
|
4e6f9aeca1 | ||
|
|
e68301af21 | ||
|
|
17286a96f2 | ||
|
|
0892363e6d | ||
|
|
f102372b5f | ||
|
|
ecbe1ad207 | ||
|
|
410afb2003 | ||
|
|
9d840c43b5 | ||
|
|
6f50f63382 | ||
|
|
ff14fc4964 | ||
|
|
e125c21531 | ||
|
|
93d020dd65 | ||
|
|
a7515ec265 | ||
|
|
b6c1ceccc2 | ||
|
|
4056ad8f36 | ||
|
|
6563837ee1 | ||
|
|
fd5e6f7ef2 | ||
|
|
685052fc7b | ||
|
|
15fd51b37c | ||
|
|
d95e35d659 | ||
|
|
1439073049 | ||
|
|
1f7659dbe9 | ||
|
|
f1cef7a9ff | ||
|
|
8264223511 | ||
|
|
bc6d597828 | ||
|
|
aba77bbfc2 | ||
|
|
955c451456 | ||
|
|
e5de3f6c89 | ||
|
|
2a1db721d4 | ||
|
|
1e0eb60f1a | ||
|
|
87a29e6f25 | ||
|
|
c3d36f134f | ||
|
|
84769e708c | ||
|
|
9d2ecdbc71 | ||
|
|
9b69af5342 | ||
|
|
c21215b421 | ||
|
|
cddcfd90b4 | ||
|
|
f36aacba0f | ||
|
|
355271fb61 | ||
|
|
2a5b502364 | ||
|
|
98ff9d82d4 | ||
|
|
b1ff87224c | ||
|
|
b461641fb9 | ||
|
|
b047de6f6e | ||
|
|
34ca5d9ba0 | ||
|
|
60cc4dc4b4 | ||
|
|
db95dc13a1 | ||
|
|
777ac90791 | ||
|
|
04f9bebbcb | ||
|
|
4ea3137e41 | ||
|
|
a0792b738e | ||
|
|
19a41fc613 | ||
|
|
3ee52157fb | ||
|
|
c4d197ee2d | ||
|
|
a33932cfe3 | ||
|
|
bcf89ce62c | ||
|
|
e3899d0e00 | ||
|
|
dcb00da49c | ||
|
|
aa51d20d19 | ||
|
|
ae7ed92057 | ||
|
|
e45b31d9bd | ||
|
|
5a25f39653 | ||
|
|
963d7ec412 | ||
|
|
e712d94adf | ||
|
|
6a72423955 | ||
|
|
4126826b10 | ||
|
|
b773ead7fd | ||
|
|
855e2750bc | ||
|
|
805ef3c60b | ||
|
|
fbc2dcb40b | ||
|
|
5375d7ad84 | ||
|
|
90f3476180 | ||
|
|
ee95c09333 | ||
|
|
75d06db9fc | ||
|
|
439a1fffcb | ||
|
|
9d9d70c462 | ||
|
|
b4a186b7be | ||
|
|
bdebf51c8f | ||
|
|
264b86f9b4 | ||
|
|
9e55e37a2e | ||
|
|
1471956573 | ||
|
|
27865b2169 | ||
|
|
6d07ce0162 | ||
|
|
edb7fc5435 | ||
|
|
31f77343f2 | ||
|
|
63ad031583 | ||
|
|
957688cee6 | ||
|
|
806d6c2e8c | ||
|
|
0ef68e04d9 | ||
|
|
a496524db2 | ||
|
|
935c7360cc | ||
|
|
340b046876 | ||
|
|
cc1db7f9b7 | ||
|
|
a4ff6c4762 | ||
|
|
1060425cbb | ||
|
|
e9c092f125 | ||
|
|
22ff5d2105 | ||
|
|
136db7881b | ||
|
|
dae313e725 | ||
|
|
b74fa8cd2c | ||
|
|
94eae04c94 | ||
|
|
16ff7ebc77 | ||
|
|
c361c505b0 | ||
|
|
d37c07c575 | ||
|
|
9d6105c9f0 | ||
|
|
8dec03ecba | ||
|
|
826547870b | ||
|
|
52d6a9a61d | ||
|
|
ad242b5fbc | ||
|
|
3524175625 | ||
|
|
7b9965ea93 | ||
|
|
0a5bce566f | ||
|
|
8012bd2424 | ||
|
|
f55a1f0a88 | ||
|
|
bacac173a9 | ||
|
|
ca1fee34f2 | ||
|
|
6dadaa9930 | ||
|
|
553f6e4633 | ||
|
|
652bee05f0 | ||
|
|
d63516e9cd | ||
|
|
e477dcf649 | ||
|
|
9d3f7781f3 | ||
|
|
c7095dada3 | ||
|
|
607dbbad76 | ||
|
|
17b75c0de1 | ||
|
|
ab24f4f3be | ||
|
|
e1a52d9e10 | ||
|
|
d0ff838433 | ||
|
|
b37b94501c | ||
|
|
cb3bb2cfef | ||
|
|
e2cc7983e9 | ||
|
|
c9ae7b9565 | ||
|
|
86fb4347f7 | ||
|
|
2fcec131f5 | ||
|
|
9f62eaf4ef | ||
|
|
f92259c026 | ||
|
|
0afef30b23 | ||
|
|
dcdfd1c711 | ||
|
|
2acc1f8f50 | ||
|
|
2c39b0c695 | ||
|
|
e77c5b4f63 | ||
|
|
409a16cb72 | ||
|
|
94d5e90b4f | ||
|
|
2d73b45805 | ||
|
|
271a2dbfa2 | ||
|
|
bf4adcac66 | ||
|
|
fb8b8fdd62 | ||
|
|
5a0b26252e | ||
|
|
7d78f0cc48 | ||
|
|
f00fc78674 | ||
|
|
392017874c | ||
|
|
c3cb92d1ab | ||
|
|
aa5590fa07 | ||
|
|
8cfb5bbf92 | ||
|
|
69bb54ebf9 | ||
|
|
ca97a56e4b | ||
|
|
fc26f3b4c2 | ||
|
|
f604c93c64 | ||
|
|
dc3727b65c | ||
|
|
aba3231de1 | ||
|
|
9193bab91d | ||
|
|
fbcf3e416d | ||
|
|
c0e5d85631 | ||
|
|
ca7fa3dcb3 | ||
|
|
4ccfba28d9 | ||
|
|
abb82f1ddc | ||
|
|
cda008cff1 | ||
|
|
1877a14049 | ||
|
|
546582ec3e | ||
|
|
4534485586 | ||
|
|
a9ab8855e4 | ||
|
|
8a44ef6868 | ||
|
|
0c7214c404 | ||
|
|
4cf9654693 | ||
|
|
50a138d95c | ||
|
|
1b86cc41cf | ||
|
|
91346358b0 | ||
|
|
f3783d4b77 | ||
|
|
89ef304bed | ||
|
|
83cebb8b7a | ||
|
|
9e68f9fdf1 | ||
|
|
2acea5c03d | ||
|
|
978177527e | ||
|
|
2648c436f3 | ||
|
|
33f1f2c455 | ||
|
|
995befe0e9 | ||
|
|
1bb92aff55 | ||
|
|
b8e1471d3a | ||
|
|
60daf7f0bb | ||
|
|
a83a3139d1 | ||
|
|
fdb7ca3b8d | ||
|
|
0d7caf5cdf | ||
|
|
a339d7ba91 | ||
|
|
7216de55d6 | ||
|
|
2437fbca64 | ||
|
|
7d75d06b78 | ||
|
|
13ef5648c4 | ||
|
|
5b2478e2ba | ||
|
|
8b286571c3 | ||
|
|
f3ac523794 | ||
|
|
020cf5ebfd | ||
|
|
54ab193970 | ||
|
|
8f563f32ab | ||
|
|
151bae3566 | ||
|
|
76df418cba | ||
|
|
d0a72674c6 | ||
|
|
1d430674c7 | ||
|
|
70cb73922b | ||
|
|
344400951c | ||
|
|
ea5a0be811 | ||
|
|
3c7fd0bdb2 | ||
|
|
6cadf8c858 | ||
|
|
27579b9e4c | ||
|
|
4d756a9cc0 | ||
|
|
3e668e05be | ||
|
|
60d3a2e0f8 | ||
|
|
cc3a3b6b47 | ||
|
|
eda1d49a62 | ||
|
|
62e609ab77 | ||
|
|
2bfe4ead4b | ||
|
|
b1c6c32f78 | ||
|
|
f6acbdecf4 | ||
|
|
f1c9dfcc01 | ||
|
|
ce78943ae1 | ||
|
|
d6f0d86649 | ||
|
|
5bb67dbfea | ||
|
|
47610c4d3e | ||
|
|
b732f3581f | ||
|
|
9e57ce716f | ||
|
|
cd7ee7aa44 | ||
|
|
3cfe791473 | ||
|
|
973f2532f5 | ||
|
|
bc3be21d59 | ||
|
|
0bf5cf9886 | ||
|
|
919052d094 | ||
|
|
a2dafe2887 | ||
|
|
92661c994b | ||
|
|
ffe8fe356a | ||
|
|
bc2f773b4f | ||
|
|
f919201ecc | ||
|
|
7ff5d5c2e2 | ||
|
|
9b77f951c7 | ||
|
|
a25f2f990a | ||
|
|
78b373975d | ||
|
|
2fcc873c4c | ||
|
|
23c2baadb3 | ||
|
|
521ee82334 | ||
|
|
1df96e59ce | ||
|
|
3e123c1e28 | ||
|
|
f38da66731 | ||
|
|
06aabfc422 | ||
|
|
1052d2bfec | ||
|
|
5e0b652344 | ||
|
|
0f8f097183 | ||
|
|
491ed3dda2 | ||
|
|
af284c6d1b | ||
|
|
41d3ec5fba | ||
|
|
0568c352f3 | ||
|
|
2e7b4cb714 | ||
|
|
9767726b66 | ||
|
|
9ddfd84e41 | ||
|
|
1cf563d84b | ||
|
|
7928024f57 | ||
|
|
3eb38acb43 | ||
|
|
f7300c5c90 | ||
|
|
3489b7d26c | ||
|
|
acd2bcc384 | ||
|
|
43e77ca455 | ||
|
|
da36297988 | ||
|
|
dbb94fb044 | ||
|
|
d68f0cdb23 | ||
|
|
eae16eb67b | ||
|
|
4fc946b546 | ||
|
|
280bc5dad6 | ||
|
|
f43770d8c9 | ||
|
|
98c4b8fa1b | ||
|
|
ccb079ee67 | ||
|
|
2ea237472c | ||
|
|
0d4b4865cc | ||
|
|
fe52f9f956 | ||
|
|
882907a818 | ||
|
|
572a89cc4e | ||
|
|
c377110539 | ||
|
|
a9c7198a0b | ||
|
|
f6f01ea17b | ||
|
|
f2d0fc6823 | ||
|
|
f7000f3a1b | ||
|
|
c7f0177fa7 | ||
|
|
09c4d50944 | ||
|
|
2eb5d315d4 | ||
|
|
ad5976b4d9 | ||
|
|
a0dfcdce5e | ||
|
|
96d1637082 | ||
|
|
960f317171 | ||
|
|
4412ca751d | ||
|
|
cbffec0c95 | ||
|
|
0cea52cc18 | ||
|
|
6d784e87f4 | ||
|
|
ae6cae78f1 | ||
|
|
0f99566c01 | ||
|
|
2db806b4aa | ||
|
|
3f32c0ba4c | ||
|
|
541cb26c0d | ||
|
|
5544e038ab | ||
|
|
9032dc28a6 | ||
|
|
03635e2a71 | ||
|
|
00cf938aa5 | ||
|
|
a5f707c495 | ||
|
|
1824b48169 | ||
|
|
07ad22b8af | ||
|
|
b53466e168 | ||
|
|
6a7a389679 | ||
|
|
4edff78531 | ||
|
|
99043c2ea5 | ||
|
|
e68abba910 | ||
|
|
3165dc4d9f | ||
|
|
66c43a53e4 | ||
|
|
463b334616 | ||
|
|
b71dbc57c4 | ||
|
|
72ca1d7f45 | ||
|
|
76e461f395 | ||
|
|
1074982e6e | ||
|
|
29b2aaf035 | ||
|
|
6f90d098c5 | ||
|
|
0715161450 | ||
|
|
896583517f | ||
|
|
713d31fac8 | ||
|
|
96cb10a5f5 | ||
|
|
c207c1044e | ||
|
|
79629ec717 | ||
|
|
008fda0f08 | ||
|
|
0ae6b01937 | ||
|
|
def630e523 | ||
|
|
c5ba203e23 | ||
|
|
2317e6b2b3 | ||
|
|
cb38928974 | ||
|
|
fa78f13302 | ||
|
|
18395217c4 | ||
|
|
34bd987811 | ||
|
|
af6ba6a1c4 | ||
|
|
85409a0c69 | ||
|
|
ebfe352b62 | ||
|
|
fde56d2f17 | ||
|
|
3501423dfe | ||
|
|
0de668af51 | ||
|
|
2a584ea90a | ||
|
|
0f6ed94a15 | ||
|
|
bcb891e82b | ||
|
|
ac6e4ca1ed | ||
|
|
2e20bba708 | ||
|
|
e70dc1d14b | ||
|
|
0793a7b3c7 | ||
|
|
026fcc0495 | ||
|
|
81c2f20b53 | ||
|
|
1afe753462 | ||
|
|
524c2c716a | ||
|
|
b542d4bbd7 | ||
|
|
cf1eb45153 | ||
|
|
a97bcd80ba | ||
|
|
17968e444c | ||
|
|
2e3fd9ec2f | ||
|
|
d6a283b025 | ||
|
|
9766538124 | ||
|
|
98dbee8681 | ||
|
|
e421491b3b | ||
|
|
6828d37c41 | ||
|
|
bf5f610099 | ||
|
|
8b7f73404a | ||
|
|
85cacb2f51 | ||
|
|
b3fa3917e2 | ||
|
|
082c6c867a | ||
|
|
03fcf1ab57 | ||
|
|
3b00dea5eb | ||
|
|
8bc6c8e3c0 | ||
|
|
79bc27b53a | ||
|
|
84dd703199 | ||
|
|
c6fdba23a6 | ||
|
|
b19fe521a9 | ||
|
|
c1e672d121 | ||
|
|
f4371f4784 | ||
|
|
d914d9d187 | ||
|
|
845d14d377 | ||
|
|
4a9540b6d2 | ||
|
|
9f31be7000 | ||
|
|
41fa1b627d | ||
|
|
c0c4e66b29 | ||
|
|
cd8662de22 | ||
|
|
3587159614 | ||
|
|
d67cc9fa7c | ||
|
|
bf3a2fe923 | ||
|
|
e9ea0bf123 | ||
|
|
63424b6233 | ||
|
|
0bf35c5cf5 | ||
|
|
95c29381eb | ||
|
|
94c4abce7f | ||
|
|
f2dffe55f8 | ||
|
|
46a073bfac | ||
|
|
df872ec4e7 | ||
|
|
5de90176d9 | ||
|
|
dcf3eec47a | ||
|
|
e9e4f30d26 | ||
|
|
83cebd73d4 | ||
|
|
1df4229bd7 | ||
|
|
3c995527e9 | ||
|
|
7c62b568a2 | ||
|
|
ccf9114e84 | ||
|
|
d8061908bb | ||
|
|
211e17dd43 | ||
|
|
6cb38a9994 | ||
|
|
fa7df757a7 | ||
|
|
8c82077619 | ||
|
|
e5d1f9e50a | ||
|
|
7ee50ae7b5 | ||
|
|
de563c9da0 | ||
|
|
50451f2a18 | ||
|
|
9bc70948e1 | ||
|
|
5dc733f071 | ||
|
|
bc4850908c | ||
|
|
20650c8654 | ||
|
|
56dced2670 | ||
|
|
eef726c04b | ||
|
|
acf1555d76 | ||
|
|
22e7f1a6ec | ||
|
|
3c49325658 | ||
|
|
bb1cd2bea1 | ||
|
|
fdf1f8d4ce | ||
|
|
117c8c6b97 | ||
|
|
5cef4ff09b | ||
|
|
91264ce572 | ||
|
|
c79ef8e1ae | ||
|
|
58d915df51 | ||
|
|
7881a64499 | ||
|
|
90159f5561 | ||
|
|
99877772d0 | ||
|
|
b0268cb6ce | ||
|
|
4edff4cfa8 | ||
|
|
1eac553e7e | ||
|
|
9d3ac7444d | ||
|
|
588128d054 | ||
|
|
8e93b9b9aa | ||
|
|
b4bcffefa3 | ||
|
|
2b39af9b4f | ||
|
|
23fe495feb | ||
|
|
b5dbe89bba | ||
|
|
dbe80ca7ad | ||
|
|
009a3408f5 | ||
|
|
b58e3c8918 | ||
|
|
56b6faf91e | ||
|
|
7ac1f877a7 | ||
|
|
d55433bbfd | ||
|
|
f0ce2bc1c5 | ||
|
|
c3bc00b90e | ||
|
|
ff6b7b049b | ||
|
|
f46359121f | ||
|
|
37c1525c17 | ||
|
|
c85e4cf7b4 | ||
|
|
c66dcda287 | ||
|
|
6d845922ab | ||
|
|
2949cbe036 | ||
|
|
c3309a7774 | ||
|
|
7aed837595 | ||
|
|
0eb799bae9 | ||
|
|
4baff4a4ae | ||
|
|
45d7bc2f8b | ||
|
|
c0c2ddddcd | ||
|
|
a96ed91610 | ||
|
|
c1206423c4 | ||
|
|
659aa21ba1 | ||
|
|
efd02e858a | ||
|
|
3bf8bc7f37 | ||
|
|
8ccda826d5 | ||
|
|
b9381e43c2 | ||
|
|
fcdea2666d | ||
|
|
c4db377cbb | ||
|
|
90dc5e8693 | ||
|
|
c81a855b0f | ||
|
|
c8d8ec8567 | ||
|
|
4f879a5be0 | ||
|
|
1a0648b4a9 | ||
|
|
3c1b4669d0 | ||
|
|
24b3d5e538 | ||
|
|
ab083b08ab | ||
|
|
89acb96927 | ||
|
|
79752e18b1 | ||
|
|
55b41c723c | ||
|
|
9f8928d032 | ||
|
|
3effa7ceaa | ||
|
|
ed9cc2f1e0 | ||
|
|
975fa541c2 | ||
|
|
251974e44c | ||
|
|
38a40276ec | ||
|
|
57b6288358 | ||
|
|
c3f51436bf | ||
|
|
0c708f11cb | ||
|
|
fb2a706d11 | ||
|
|
0b76600deb | ||
|
|
245b612a36 | ||
|
|
d882161d5a | ||
|
|
d4a21e0b49 | ||
|
|
26a78d4bbf | ||
|
|
8db69786c2 | ||
|
|
b11cec4162 | ||
|
|
7eeb5bef24 | ||
|
|
9d2032932c | ||
|
|
6490306017 | ||
|
|
ceb2b7d257 | ||
|
|
459a53c2c2 | ||
|
|
adc267eebf | ||
|
|
ffe8f62d27 | ||
|
|
ed85007039 | ||
|
|
5aaca50d60 | ||
|
|
869baf3565 | ||
|
|
e299f6d27f | ||
|
|
4a192f817e | ||
|
|
bc1d1a5a71 | ||
|
|
456895d9cf | ||
|
|
218c15ab59 | ||
|
|
17ab4d3b5e | ||
|
|
31ef0ff038 | ||
|
|
37e3b90d59 | ||
|
|
00ff8f92a5 | ||
|
|
4857beba3a | ||
|
|
c1e60cc2bf | ||
|
|
98669ed79c | ||
|
|
a3978a6159 | ||
|
|
e3a9f32f52 | ||
|
|
87fac3238d | ||
|
|
a2fb2a2134 | ||
|
|
9e8ee54553 | ||
|
|
117bec936c | ||
|
|
1547c8cc88 | ||
|
|
075911d48e | ||
|
|
b21a918984 | ||
|
|
f9b8549609 | ||
|
|
d1b30713fb | ||
|
|
e2ba07024f | ||
|
|
9b05bd42e5 | ||
|
|
b6d3a99678 | ||
|
|
96d7b8873a | ||
|
|
efc867775e | ||
|
|
5ab772f09c | ||
|
|
2a89386232 | ||
|
|
4d9be98dbc | ||
|
|
6737907826 | ||
|
|
c060b77446 | ||
|
|
7e8caf30c0 | ||
|
|
ca3e054750 | ||
|
|
1da1558f46 | ||
|
|
25c67d257c | ||
|
|
a17d16d59c | ||
|
|
d16076ff3e | ||
|
|
6c57e8a063 | ||
|
|
db1f388878 | ||
|
|
0f2999fe2b | ||
|
|
53bfd6b24c | ||
|
|
5700e7792a | ||
|
|
38c2e5b8d5 | ||
|
|
48f9678a32 | ||
|
|
beddbc2ad1 | ||
|
|
f89197d73e | ||
|
|
944d65c762 | ||
|
|
f945612bd0 | ||
|
|
59188de113 | ||
|
|
352d08e3e5 | ||
|
|
bacb5e4f44 | ||
|
|
008af8660b | ||
|
|
886fa72324 | ||
|
|
2c5bae429a | ||
|
|
f265fc1238 | ||
|
|
1394ce65b4 | ||
|
|
67ccb77197 | ||
|
|
63ef36e8d8 | ||
|
|
0b65e5d40f | ||
|
|
629be17af4 | ||
|
|
fd28827864 | ||
|
|
8c61d9a9b1 | ||
|
|
975d35dbab | ||
|
|
8b769664c4 | ||
|
|
76f270a46a | ||
|
|
9dab1b7f28 | ||
|
|
d3e5bbf437 | ||
|
|
18a25c5d78 | ||
|
|
924f47f7b6 | ||
|
|
22ff1c4a93 | ||
|
|
35409e1101 | ||
|
|
65d781128a | ||
|
|
c35b1b07e2 | ||
|
|
066f6a0630 | ||
|
|
12ed57418c | ||
|
|
8b1be5cd73 | ||
|
|
780083dbc6 | ||
|
|
4919603f66 | ||
|
|
dd26ced164 | ||
|
|
bd2d82a5d3 | ||
|
|
c4cd138b92 | ||
|
|
65697b3bf3 | ||
|
|
50317b111d | ||
|
|
d7975ea287 | ||
|
|
714d709a31 | ||
|
|
11577ec054 | ||
|
|
79bf58f9b5 | ||
|
|
cd8a562267 | ||
|
|
de3ef3ed58 | ||
|
|
8908741806 | ||
|
|
ba7678f9cc | ||
|
|
a70c83768e | ||
|
|
04b4d394d9 | ||
|
|
130f12985a | ||
|
|
4ca5d43cd8 | ||
|
|
4bbf139aa7 | ||
|
|
47739636a9 | ||
|
|
407ae733ab | ||
|
|
c39f7013e1 | ||
|
|
a4a028323e | ||
|
|
780ee4e501 | ||
|
|
d7b51547c0 | ||
|
|
43030f36db | ||
|
|
48c63f1653 | ||
|
|
90f479b6d5 | ||
|
|
6fd2957163 | ||
|
|
d3a1c71917 | ||
|
|
af1588c05f | ||
|
|
2250865fb0 | ||
|
|
99f770caa8 | ||
|
|
00122de6a9 | ||
|
|
a70515c0fd | ||
|
|
398edd0689 | ||
|
|
6562df768d | ||
|
|
06769acd71 | ||
|
|
32dac6943d | ||
|
|
90834c78fe | ||
|
|
47917f24c4 | ||
|
|
d614aa40e3 | ||
|
|
bc4ba05fcb | ||
|
|
8d9453b9e8 | ||
|
|
e4f320a4d0 | ||
|
|
ef9f2ba7af | ||
|
|
4a3b72771f | ||
|
|
913f32929b | ||
|
|
9834872bf6 | ||
|
|
94a23d2a1e | ||
|
|
608bf69880 | ||
|
|
032b3df5af | ||
|
|
9d11a41fe4 | ||
|
|
2989501131 | ||
|
|
7b0817e8e1 | ||
|
|
9d4288b2d4 | ||
|
|
3486df383b | ||
|
|
b60016e831 | ||
|
|
5aafe895fc | ||
|
|
b853d2e155 | ||
|
|
b7ab059084 | ||
|
|
c91778f8c0 | ||
|
|
5016f3eac8 | ||
|
|
efb1bb90a0 | ||
|
|
4cf393bb4b | ||
|
|
ce4e242a6f | ||
|
|
b27bec212f | ||
|
|
704519c7e3 | ||
|
|
6b79f40c3d | ||
|
|
dd27fd1739 | ||
|
|
dfa50793d8 | ||
|
|
2a7c35dd46 | ||
|
|
f2ffd10bb2 | ||
|
|
8da531359e | ||
|
|
e2b944cf43 | ||
|
|
3ec05685f7 | ||
|
|
e103fd46ca | ||
|
|
877bfd69d1 | ||
|
|
e0ef49f205 | ||
|
|
f68cd00fe3 | ||
|
|
ca70d215cf | ||
|
|
d0390a0c92 | ||
|
|
dd2535c38a | ||
|
|
b78d180170 | ||
|
|
26dca1661e | ||
|
|
f853f8594d | ||
|
|
8307aa73fb | ||
|
|
d0da491e1e | ||
|
|
6e249060cf | ||
|
|
fbcd7b5f83 | ||
|
|
9ac0a67581 | ||
|
|
befdc8f3b6 | ||
|
|
bb198c95e2 | ||
|
|
c1195541b7 | ||
|
|
26844eb57b | ||
|
|
a7732b672e | ||
|
|
677b3ce82f | ||
|
|
fabfe17d5e | ||
|
|
82696d5d5d | ||
|
|
9eea4fb835 | ||
|
|
484aaeb204 | ||
|
|
8e589a8a47 | ||
|
|
2f21eb2db6 | ||
|
|
c11529618a | ||
|
|
58c3c7ae38 | ||
|
|
c8650f7ecd | ||
|
|
14e7543a5a | ||
|
|
bf6705f584 | ||
|
|
a9f53ce7ea | ||
|
|
a45ea17042 | ||
|
|
4950f30890 | ||
|
|
7df7f00385 | ||
|
|
d2250ea7fd | ||
|
|
17093b83ca | ||
|
|
5d8683a5cd | ||
|
|
cede88e5bb | ||
|
|
aadc71642a | ||
|
|
67d28bff12 | ||
|
|
7ee40b5d1c | ||
|
|
db22af36ec | ||
|
|
f8b5ab8cfa | ||
|
|
298f16f954 | ||
|
|
3d97cbbdaf | ||
|
|
ce6b9a2dba | ||
|
|
c3197e3e5c | ||
|
|
d420d8dd1b | ||
|
|
3fabeaa1f4 | ||
|
|
35aa7098cd | ||
|
|
9d6192a5b8 | ||
|
|
76b1bd672d | ||
|
|
469ec9416a | ||
|
|
70af3439e9 | ||
|
|
bb3c20965e | ||
|
|
5f59ee7942 | ||
|
|
8f89e68781 | ||
|
|
10bff13a66 | ||
|
|
166ff8a3c7 | ||
|
|
b4622a328b | ||
|
|
cc253000e4 | ||
|
|
42e4fcf23a | ||
|
|
9c63128668 | ||
|
|
9933b57430 | ||
|
|
84c92dc00f | ||
|
|
42154ad5bc | ||
|
|
96f1b0741c | ||
|
|
bac268e243 | ||
|
|
3798eadccd | ||
|
|
2537186d43 | ||
|
|
0eecc6a417 | ||
|
|
0dc13f4c4a | ||
|
|
f577e0ce15 | ||
|
|
bd1b906527 | ||
|
|
ecfef3e5bf | ||
|
|
3d3538e422 | ||
|
|
0cdad20c75 | ||
|
|
50144133c5 | ||
|
|
089cb705e8 | ||
|
|
525e1076ad | ||
|
|
282962bd36 | ||
|
|
c93c2ab1c3 | ||
|
|
7b09a4d847 | ||
|
|
73a25b30ea | ||
|
|
ac260dd81e | ||
|
|
48a2034671 | ||
|
|
a9ce0c631e | ||
|
|
afc7bc33cb | ||
|
|
168da92b9a | ||
|
|
d70ad093af | ||
|
|
2a2e2770cc | ||
|
|
42cc71e80b | ||
|
|
496c19234c | ||
|
|
4f81667d76 | ||
|
|
56327689a2 | ||
|
|
ad84831537 | ||
|
|
5f263296ea | ||
|
|
89650ea3a6 | ||
|
|
79f8295303 | ||
|
|
400e58103d | ||
|
|
fcee8ee784 | ||
|
|
9148eb002b | ||
|
|
559e370f44 | ||
|
|
cdeb10b5cd | ||
|
|
e6162a90e6 | ||
|
|
9a6422a81e | ||
|
|
fcea44c6d5 | ||
|
|
5d73273f6f | ||
|
|
c11a0611d9 | ||
|
|
796495886e | ||
|
|
fa27f667c8 | ||
|
|
fc9713a1d2 | ||
|
|
62bcfa8c57 | ||
|
|
7f9886379c | ||
|
|
c6e4b225b1 | ||
|
|
1c0f31f9f7 | ||
|
|
41292a3827 | ||
|
|
20f1be02df | ||
|
|
a339e5cfb5 | ||
|
|
f46f4a995b | ||
|
|
4ddba33f78 | ||
|
|
e3b7aa8428 | ||
|
|
d981cef6b9 | ||
|
|
6fa81ee96e | ||
|
|
a1a337ade9 | ||
|
|
c774b3c696 | ||
|
|
3e34db3170 | ||
|
|
317d4edfa8 | ||
|
|
9b12003c35 | ||
|
|
4ea170b8a0 | ||
|
|
49f2bf76a8 | ||
|
|
01c62591d1 | ||
|
|
1e91866f77 | ||
|
|
9656ee5d1d | ||
|
|
a5f1e12a02 | ||
|
|
ca9e792253 | ||
|
|
aff24732b9 | ||
|
|
455fa214b6 | ||
|
|
a9c5e5ca6e | ||
|
|
cefcb9fde3 | ||
|
|
bca4e93076 | ||
|
|
67c20aebb7 | ||
|
|
448711e39f | ||
|
|
8bf48f237d | ||
|
|
7c0578dc86 | ||
|
|
55033ffb0a | ||
|
|
b4a9bf701a | ||
|
|
a015dce0e2 | ||
|
|
28ab2e48ae | ||
|
|
6febd1c1df | ||
|
|
6350728be2 | ||
|
|
a7c26e7338 | ||
|
|
c880557666 | ||
|
|
85689a531f | ||
|
|
cc14dfb8ec | ||
|
|
91d7d0b333 | ||
|
|
9887c9b2d6 | ||
|
|
d2fee313ec | ||
|
|
fa7f58e433 | ||
|
|
71cd2a571e | ||
|
|
7c094bfe2f | ||
|
|
0f30658329 | ||
|
|
31c1cf5a9d | ||
|
|
e63fc1bed4 | ||
|
|
efa1739b74 | ||
|
|
5ffecde73f | ||
|
|
08d13955dd | ||
|
|
531147dd5e | ||
|
|
a17c95f5e4 | ||
|
|
eadaf08c16 | ||
|
|
4a9c9b6fdb | ||
|
|
b969ab48d9 | ||
|
|
8fa8a6299b | ||
|
|
b2b0870b3a | ||
|
|
4fb757d1e0 | ||
|
|
241bce7aaf | ||
|
|
33ec2ae8d9 | ||
|
|
c801b2051a | ||
|
|
7976fcac55 | ||
|
|
e9f9a10fba | ||
|
|
1cdfc31e1f | ||
|
|
19dab5e6cc | ||
|
|
c0f9969b9e | ||
|
|
a0ddb8a2fa | ||
|
|
c1d1facd06 | ||
|
|
b26559878f | ||
|
|
fd46a318a2 | ||
|
|
5d4f3985be | ||
|
|
360babf799 | ||
|
|
a1b92edbb3 | ||
|
|
12c978739a | ||
|
|
4bc60dafeb | ||
|
|
bf5b0a1bfb | ||
|
|
bfe9de8510 | ||
|
|
5ecd3c6a09 | ||
|
|
608d11f515 | ||
|
|
c7f8537dd9 | ||
|
|
723f839911 | ||
|
|
61224dbcdd | ||
|
|
c3afc93a69 | ||
|
|
7b8af56340 | ||
|
|
539179f45b | ||
|
|
7217e148fb | ||
|
|
d29b5e812b | ||
|
|
1e923b0d29 | ||
|
|
f7e9d77f34 | ||
|
|
41cc67c542 | ||
|
|
c645c7658d | ||
|
|
b874fe2da8 | ||
|
|
c7deaa4c74 | ||
|
|
e6812ac99d | ||
|
|
719d3927d7 | ||
|
|
55e663a8d7 | ||
|
|
2c62dc26c8 | ||
|
|
3d4a70b821 | ||
|
|
4bcc7bd1f2 | ||
|
|
f49d89ee04 | ||
|
|
dabc127362 | ||
|
|
c25c991809 | ||
|
|
f45f96f8f8 | ||
|
|
1538eff6d8 | ||
|
|
00b2685b9c | ||
|
|
8e3e03229e | ||
|
|
9d8d675e0e | ||
|
|
933605d7e8 | ||
|
|
b3d9ef88ec | ||
|
|
8958b6916c | ||
|
|
9fc3bef87a | ||
|
|
d80044c235 | ||
|
|
bc2103f3bf | ||
|
|
f82b18efc1 | ||
|
|
504c668d3b | ||
|
|
466617f539 | ||
|
|
196938835a | ||
|
|
a94e129a65 | ||
|
|
5d681e960d | ||
|
|
c7b487d96b | ||
|
|
7dbf5ae587 | ||
|
|
8d0bdeba18 | ||
|
|
1b969041d7 | ||
|
|
e302f9ce32 | ||
|
|
5a94982abe | ||
|
|
7115ca84aa | ||
|
|
04ff34ab89 | ||
|
|
bbafbe20c2 | ||
|
|
c4d55a33fc | ||
|
|
147e4aece0 | ||
|
|
bd1488ae64 | ||
|
|
79fed2a4df | ||
|
|
304cbe981e | ||
|
|
3fefbf50e3 | ||
|
|
f65c1d2be0 | ||
|
|
aa94a6d315 | ||
|
|
768df74538 | ||
|
|
1f9da9049b | ||
|
|
c0d0b01f0e | ||
|
|
7c86a5b864 | ||
|
|
97e302a419 | ||
|
|
71507a11c8 | ||
|
|
a51e37af62 | ||
|
|
1fb8f09273 | ||
|
|
6c6db72ed4 | ||
|
|
0cc83dc54b | ||
|
|
5ce54a8205 | ||
|
|
8c21b7c647 | ||
|
|
77aa6b329d | ||
|
|
62d68c43ed | ||
|
|
bfaae0a768 | ||
|
|
e56f22ae20 | ||
|
|
dbd1988ed9 | ||
|
|
4ea3be0a5c | ||
|
|
3e78514568 | ||
|
|
e029b8bd43 | ||
|
|
f5567e401c | ||
|
|
9b8aaeed85 | ||
|
|
6086d121cb | ||
|
|
7de6e075b4 | ||
|
|
946135aa2a | ||
|
|
42393ce234 | ||
|
|
d6c7a367e8 | ||
|
|
cecaaf3f58 | ||
|
|
f09828b4e1 | ||
|
|
29eb517403 | ||
|
|
44c471c3b8 | ||
|
|
46374a56b2 | ||
|
|
ec98946ef9 | ||
|
|
fa77b742ac | ||
|
|
8b4e274610 | ||
|
|
d6756d3758 | ||
|
|
11b68f6e1b | ||
|
|
88bb52ee18 | ||
|
|
d90df974c3 | ||
|
|
5c541b2cb7 | ||
|
|
87a28127d2 | ||
|
|
ebce53b3d8 | ||
|
|
83c632dc43 | ||
|
|
ff07a05575 | ||
|
|
f25571ffbf | ||
|
|
f7a6892572 | ||
|
|
8fe56478f8 | ||
|
|
0e2a436dce | ||
|
|
24050dd11c | ||
|
|
8c8e3eec79 | ||
|
|
7ebc9dee69 | ||
|
|
ee3e63e477 | ||
|
|
e9c424c144 | ||
|
|
0a9ce268ba | ||
|
|
4b2da48ea7 | ||
|
|
e64eaaa97d | ||
|
|
780603027f | ||
|
|
00902cd601 | ||
|
|
d67b0b1596 | ||
|
|
d7dda16888 | ||
|
|
a19fd00cc4 | ||
|
|
d66152a898 | ||
|
|
8c5f0c9fbc | ||
|
|
6888a874a1 | ||
|
|
09dacfa57f | ||
|
|
b2ae513586 | ||
|
|
e4a0489f6e | ||
|
|
b83be81d27 | ||
|
|
6f5dcd4eee | ||
|
|
1bb2fc98e0 | ||
|
|
e3946f989e | ||
|
|
8863d0de91 | ||
|
|
7b6fefc9d4 | ||
|
|
525ef9227f | ||
|
|
c0ba0f4859 | ||
|
|
b466b7029d | ||
|
|
fa3ae234e0 | ||
|
|
48462108f3 | ||
|
|
f8b56e95b8 | ||
|
|
5fe18bdbde | ||
|
|
dca02c80bc | ||
|
|
9ee859b683 | ||
|
|
8e05c870b4 | ||
|
|
5d574e143f | ||
|
|
2a203a6cda | ||
|
|
dadb8184e4 | ||
|
|
7a563df90a | ||
|
|
24b173fa5c | ||
|
|
9b17ba0fa5 | ||
|
|
211f555d4c | ||
|
|
4d2ebb6bd7 | ||
|
|
df53747436 | ||
|
|
3bc2ddccc8 | ||
|
|
8ab470f1b2 | ||
|
|
f2c36ee43e | ||
|
|
00381b4ccb | ||
|
|
fca1ef19c1 | ||
|
|
357ddadbf5 | ||
|
|
08d03235f9 | ||
|
|
1825836235 | ||
|
|
a0088bdf93 | ||
|
|
48ad51b243 | ||
|
|
5458b4cefb | ||
|
|
7c86cd5ab1 | ||
|
|
df1d7da2af | ||
|
|
cbfc470228 | ||
|
|
f67ca84d4a | ||
|
|
e2b38da931 | ||
|
|
a30a60d8eb | ||
|
|
5a3ea17c94 | ||
|
|
475700acfe | ||
|
|
45598aab08 | ||
|
|
26e6393134 | ||
|
|
49929a20a7 | ||
|
|
f8bd0194a7 | ||
|
|
77526143e7 | ||
|
|
4ff50ef846 | ||
|
|
caefb1de87 | ||
|
|
1e1f84dac9 | ||
|
|
1d87e3a1c6 | ||
|
|
df8ae1e3a2 | ||
|
|
f7d8d4a116 | ||
|
|
1c088fa89d | ||
|
|
de2dd4c502 | ||
|
|
395293a889 | ||
|
|
db4da14027 | ||
|
|
2101830c0d | ||
|
|
977887469c | ||
|
|
ffa8f0df0a | ||
|
|
693b8b2d31 | ||
|
|
a0d96c9843 | ||
|
|
2a18bc9a4b | ||
|
|
eaa1a7bde3 | ||
|
|
0783b09b92 | ||
|
|
ffe62508e4 | ||
|
|
ac79fa02b8 | ||
|
|
7cc3570e53 | ||
|
|
baa7b1978b | ||
|
|
ac5118bcb9 | ||
|
|
5adb818947 | ||
|
|
52defb0c9b | ||
|
|
56a8ab7d60 | ||
|
|
22686b91f0 | ||
|
|
31812a9e0e | ||
|
|
11bf848191 | ||
|
|
d4df5ed14c | ||
|
|
303b479e0a | ||
|
|
4c52160646 | ||
|
|
a213880aaf | ||
|
|
42d3bf844a | ||
|
|
b860967ce4 | ||
|
|
8ca6b8fba1 | ||
|
|
c4d9e6731a | ||
|
|
0d9ec5d963 | ||
|
|
870fc4e578 | ||
|
|
f623530d6e | ||
|
|
ca9e02dc00 | ||
|
|
fb30ec22fd | ||
|
|
5cc14c2fd7 | ||
|
|
d349cd2240 | ||
|
|
0b6a9f639f | ||
|
|
715c8e7bdb | ||
|
|
7d4afc557f | ||
|
|
563e405411 | ||
|
|
f53c966a73 | ||
|
|
336c3a69bd | ||
|
|
4e76179476 | ||
|
|
ef4fd84857 | ||
|
|
72135030d1 | ||
|
|
3514813d5b | ||
|
|
9e60602084 | ||
|
|
19e3dfc9f8 | ||
|
|
a1ef7e85d6 | ||
|
|
ef2fac6f4a | ||
|
|
7fc3fa0545 | ||
|
|
673d1273ff | ||
|
|
b9a2c53833 | ||
|
|
e9bf7479d2 | ||
|
|
bfb9f7bc4c | ||
|
|
6a656a843a | ||
|
|
29030c0a4c | ||
|
|
c0ade33e16 | ||
|
|
671c0f151d | ||
|
|
27dcce1904 | ||
|
|
8aff7b9bc4 | ||
|
|
55f6597c67 | ||
|
|
d494389821 | ||
|
|
1dcc4c0cad | ||
|
|
84db81815a | ||
|
|
fb7abb31af | ||
|
|
ce93879a9b | ||
|
|
938384c587 | ||
|
|
e9d8e302aa | ||
|
|
cb7fb54600 | ||
|
|
cf6758d204 | ||
|
|
731e3dde29 | ||
|
|
a0eaa341e1 | ||
|
|
fb27c2295e | ||
|
|
1b753cb334 | ||
|
|
36a826a50d | ||
|
|
8796857429 | ||
|
|
aaebed13a8 | ||
|
|
25939ffe56 | ||
|
|
5270d8cb13 | ||
|
|
0037e02921 | ||
|
|
6ad14cab59 | ||
|
|
a9be0cc736 | ||
|
|
55a10eab48 | ||
|
|
e344693b65 | ||
|
|
355e4fd07e | ||
|
|
5e09d6abbd | ||
|
|
0a688bc0b2 | ||
|
|
b138de72f2 | ||
|
|
06dcbb71d8 | ||
|
|
c5171c454b | ||
|
|
323ec6ae56 | ||
|
|
befd88b786 | ||
|
|
a3fb4675fb | ||
|
|
5f077efcb1 | ||
|
|
9986238ba9 | ||
|
|
e1f900d6a4 | ||
|
|
acf37ca151 | ||
|
|
17769d5a6c | ||
|
|
677c18092d | ||
|
|
3862402ff3 | ||
|
|
b03d0d064c | ||
|
|
d8d6148628 | ||
|
|
2be54167d0 | ||
|
|
4e0084d92e | ||
|
|
fc9e1cc697 | ||
|
|
f8f60d2793 | ||
|
|
ea07dbb8b1 | ||
|
|
2a275ab007 | ||
|
|
a2e6db365c | ||
|
|
9d93e7da6c | ||
|
|
0e44d8381a | ||
|
|
35907e23ec | ||
|
|
76d1700b28 | ||
|
|
dcca796ce4 | ||
|
|
4b19e38954 | ||
|
|
5f09bbff4d | ||
|
|
c1f9c59d11 | ||
|
|
652cdaa269 | ||
|
|
e26f871228 | ||
|
|
6e47b51eef | ||
|
|
4a98cdbf3b | ||
|
|
c5ed4e8f7e | ||
|
|
c2e52508cc | ||
|
|
d8ec4959c8 | ||
|
|
d31209a144 | ||
|
|
529a2e2cc3 | ||
|
|
781a7d0546 | ||
|
|
fb04e40396 | ||
|
|
d9b011f201 | ||
|
|
b0b9eaa196 | ||
|
|
8b134b1062 | ||
|
|
0c75c3fa7a | ||
|
|
a3927cf7ee | ||
|
|
1a62c18f65 | ||
|
|
2a15e7063b | ||
|
|
d46cc192d7 | ||
|
|
bb2bebdbe1 | ||
|
|
5db07df634 | ||
|
|
ea36cbac5e | ||
|
|
d0d2b49ab7 | ||
|
|
31cb6d8fef | ||
|
|
daa0dd2973 | ||
|
|
de79c46c8f | ||
|
|
94ccb6fa2e | ||
|
|
07e4035879 | ||
|
|
d0efb9ec9a | ||
|
|
ac05067d3d | ||
|
|
113577e155 | ||
|
|
79d09f47c2 | ||
|
|
c059bdd432 | ||
|
|
02dbf93f0e | ||
|
|
1fb2bcbbf7 | ||
|
|
16e055849e | ||
|
|
66cfab4226 | ||
|
|
6d88bc37a3 | ||
|
|
b7553b2554 | ||
|
|
e03db0a077 | ||
|
|
a1ee09e815 | ||
|
|
267ed0c5d3 | ||
|
|
f459d17018 | ||
|
|
dc65dcbb6d | ||
|
|
d214fdb8fe | ||
|
|
138df537ff | ||
|
|
0c7c19d6bc | ||
|
|
eaaafc59c2 | ||
|
|
382ed50e0e | ||
|
|
66ec019240 | ||
|
|
bd49928f7a | ||
|
|
23e6d50d73 | ||
|
|
2e767313e4 | ||
|
|
38b2db6a66 | ||
|
|
13ebea791f | ||
|
|
4c9c57428f | ||
|
|
8bf9319e9c | ||
|
|
4914120727 | ||
|
|
36de0a0e1a | ||
|
|
e5c146d586 | ||
|
|
52ad14aeb0 | ||
|
|
43afe28588 | ||
|
|
a87b0615aa | ||
|
|
d7386f6276 | ||
|
|
081640940e | ||
|
|
7012b23c94 | ||
|
|
d3b30148ed | ||
|
|
9f79463803 | ||
|
|
d35dc6d3b5 | ||
|
|
50123be421 | ||
|
|
3f8ced5144 | ||
|
|
00ea0f11eb | ||
|
|
dca0872056 | ||
|
|
0b63aed8df | ||
|
|
15c3adbb16 | ||
|
|
f143a42fe6 | ||
|
|
241650c7ff | ||
|
|
bfe7439a20 | ||
|
|
cffa6aa107 | ||
|
|
02e4ebbbad | ||
|
|
ab009f59ef | ||
|
|
0980426559 | ||
|
|
b1c9c66936 | ||
|
|
a6a173c2fd | ||
|
|
2bb683c201 | ||
|
|
64bb5187f5 | ||
|
|
9e4f50a8ae | ||
|
|
0190eecc00 | ||
|
|
ca872a4c0b | ||
|
|
f2e87ef4fa | ||
|
|
0ad97bbc05 | ||
|
|
c4864091a1 | ||
|
|
9a98a466b3 | ||
|
|
f99e0f1ed6 | ||
|
|
d323bcb152 | ||
|
|
da6a795fdb | ||
|
|
c5edcde21f | ||
|
|
15ff3c831e | ||
|
|
100959a6d9 | ||
|
|
0a120f74b2 | ||
|
|
8f05351984 | ||
|
|
4eb92208a3 | ||
|
|
71791f414c | ||
|
|
f3682997d7 | ||
|
|
cc13cc0251 | ||
|
|
86bd5f2ca9 | ||
|
|
8694c60000 | ||
|
|
9d1538182f | ||
|
|
5904088811 | ||
|
|
69545c2aff | ||
|
|
495da337ae | ||
|
|
34b3afc7be | ||
|
|
00373a4c5d | ||
|
|
cb7dfeeac4 | ||
|
|
efd6c574a2 | ||
|
|
4113e6ab56 | ||
|
|
9a942a4671 | ||
|
|
9906d397a0 | ||
|
|
ae8f787141 | ||
|
|
a81b4d5c8f | ||
|
|
887c6acdf2 | ||
|
|
83aa529330 | ||
|
|
96b31b6533 | ||
|
|
fccd377198 | ||
|
|
2b35c9ef74 | ||
|
|
73c566695f | ||
|
|
63b7b7224a | ||
|
|
ce80c8b8ee | ||
|
|
749febf4d1 | ||
|
|
bdde425cbe | ||
|
|
746f491f82 | ||
|
|
1672647ade | ||
|
|
90b6bbc38c | ||
|
|
ce02ed60f2 | ||
|
|
1e5b9a95fd | ||
|
|
1d699755e0 | ||
|
|
ddf49c6344 | ||
|
|
ba3881dffd | ||
|
|
d1c252048b | ||
|
|
eab2724138 | ||
|
|
21ea3e06c9 | ||
|
|
52d703d3d1 | ||
|
|
ce152341a1 | ||
|
|
f058e34011 | ||
|
|
b5349e8721 | ||
|
|
7150858d49 | ||
|
|
91c7271aab | ||
|
|
aa13b2dffd | ||
|
|
fc2ef392be | ||
|
|
463a908705 | ||
|
|
d24ffe1cfa | ||
|
|
78fb87b283 | ||
|
|
ab2d524780 | ||
|
|
85d61685f1 | ||
|
|
b9643eed7c | ||
|
|
feee2ecfa9 | ||
|
|
a25a5cfeec | ||
|
|
0e145dd541 | ||
|
|
9f9be844fc | ||
|
|
e3b9ab5e18 | ||
|
|
c66d2baa9c | ||
|
|
08bc37cdd0 | ||
|
|
9771cceb2c | ||
|
|
ca715127a2 | ||
|
|
ea7a7af1d4 | ||
|
|
880e1c529d | ||
|
|
dcbb45803f | ||
|
|
80b9bbce86 | ||
|
|
d37936386f | ||
|
|
c3a3028f9f | ||
|
|
6c5ad80cdc | ||
|
|
b5bdc2699a | ||
|
|
384b98cd8f | ||
|
|
eb9b5bffef | ||
|
|
0bd59f3723 | ||
|
|
8b8cbd8f6d | ||
|
|
72b18c5d34 | ||
|
|
eb0a839866 | ||
|
|
1777d5a952 | ||
|
|
d4b7da84c3 | ||
|
|
801dbbdffd | ||
|
|
0ed05a1d2d | ||
|
|
1008bebade | ||
|
|
ae84f879d7 | ||
|
|
be6dfd1b49 | ||
|
|
231516b6c9 | ||
|
|
fb53d58dcf | ||
|
|
2a9e9b210b | ||
|
|
897d6cc43a | ||
|
|
f470c6c812 | ||
|
|
566d4e0425 | ||
|
|
81be02d2f9 | ||
|
|
c2b6a482d5 | ||
|
|
12c167c881 | ||
|
|
20aafee7fa | ||
|
|
be07375b66 | ||
|
|
c8434e8316 | ||
|
|
4894fe8c5b | ||
|
|
dd5bcdc4c9 | ||
|
|
6161d17579 | ||
|
|
4ac5306ae7 | ||
|
|
b1a80ec1a9 | ||
|
|
672fe94dcb | ||
|
|
51040b72ed | ||
|
|
4f045eef8f | ||
|
|
5d7b253ea0 | ||
|
|
b0759f0c19 | ||
|
|
065472936a | ||
|
|
fc4a0c2aec | ||
|
|
eeb165e674 | ||
|
|
9ee2b5f6f2 | ||
|
|
da54be877a | ||
|
|
50a886b7ab | ||
|
|
76e67c2cb6 | ||
|
|
5137ebac0b | ||
|
|
a8eeb0597b | ||
|
|
4ed3e51080 | ||
|
|
7f34001d57 | ||
|
|
2dcf7d8f99 | ||
|
|
19b0668251 | ||
|
|
e7e6b54d8a | ||
|
|
2a1a8ffe41 | ||
|
|
08fb86c49b | ||
|
|
3633d77c0f | ||
|
|
165e179764 | ||
|
|
12ebdd1506 | ||
|
|
1baf9a5938 | ||
|
|
a56f9de156 | ||
|
|
fa5d47af4b | ||
|
|
d607038753 | ||
|
|
9ac6a01aaf | ||
|
|
be97abc247 | ||
|
|
9103bbc5cd | ||
|
|
b6c45014ae | ||
|
|
a3dd924871 | ||
|
|
137bbb3e37 | ||
|
|
86ad94bb2e | ||
|
|
3e56add7c9 | ||
|
|
f52f01b5d2 | ||
|
|
98d7efb537 | ||
|
|
cf51923545 | ||
|
|
38fcd4597a | ||
|
|
165e3bb67a | ||
|
|
38db46794f | ||
|
|
a9a3876d55 | ||
|
|
1f343eaabb | ||
|
|
72a5b4f702 | ||
|
|
0a43ddf320 | ||
|
|
31366066bd | ||
|
|
aa2484e390 | ||
|
|
8eddf3e91d | ||
|
|
60d142aa8d | ||
|
|
66cf3ac342 | ||
|
|
ab4e151347 | ||
|
|
ac2547f5ff | ||
|
|
5f1ea943ab | ||
|
|
0ef7ad5cd4 | ||
|
|
9f1109a564 | ||
|
|
33b1d9595d | ||
|
|
7193498811 | ||
|
|
72321ead7b | ||
|
|
b5d0d817bc | ||
|
|
94badb2599 | ||
|
|
b9a836515f | ||
|
|
21c924f406 | ||
|
|
e54fd4b23b | ||
|
|
57dd9a8f2f | ||
|
|
912cbf5d4e | ||
|
|
43d7895ea0 | ||
|
|
f7ff55aa78 | ||
|
|
795f28f871 | ||
|
|
f6cc16f5d8 | ||
|
|
321a01f971 | ||
|
|
646e17a53d | ||
|
|
dd508b7c4f | ||
|
|
2563bcc85c | ||
|
|
702665c085 | ||
|
|
dcc2a706ef | ||
|
|
2bc67c35ac | ||
|
|
77ae65877e | ||
|
|
32a35e4418 | ||
|
|
369a759acc | ||
|
|
79b3f61228 | ||
|
|
216d71d001 | ||
|
|
78a3a9f89e | ||
|
|
a7685f3bf4 | ||
|
|
f088ea5486 | ||
|
|
1003d108d5 | ||
|
|
8abeeb9449 | ||
|
|
c1002e96e9 | ||
|
|
77d0a82fef | ||
|
|
ebc14f251c | ||
|
|
d41e6efc85 | ||
|
|
8ffa13e03e | ||
|
|
db477d3a37 | ||
|
|
750e9833b8 | ||
|
|
82f0ac657c | ||
|
|
eb6a2277a2 | ||
|
|
f8778fb0fa | ||
|
|
e2f9de207c | ||
|
|
a93cc0d943 | ||
|
|
7d8c2e07f2 | ||
|
|
efb4c36b18 | ||
|
|
29526d0d2b | ||
|
|
198e370f23 | ||
|
|
c19f7764a5 | ||
|
|
bc63d9d329 | ||
|
|
aa929c37d5 | ||
|
|
af4d506eb3 | ||
|
|
5da0549581 | ||
|
|
749a4fd2fd | ||
|
|
6f71ef580c | ||
|
|
67874aeffa | ||
|
|
3e6a330d38 | ||
|
|
aee5e18c8f | ||
|
|
5b11143d05 | ||
|
|
7b2212e954 | ||
|
|
71865091ab | ||
|
|
125cfd78e8 | ||
|
|
8cb57d9b91 | ||
|
|
14e10b2b6e | ||
|
|
6e76104d66 | ||
|
|
1d45a23b74 | ||
|
|
7df286540f | ||
|
|
5d0c97541a | ||
|
|
49a25557b0 | ||
|
|
b5936c0059 | ||
|
|
600cc1a4f0 | ||
|
|
ea32fbacc8 | ||
|
|
00fe14fc75 | ||
|
|
fcc28edb2f | ||
|
|
fac6be2dd5 | ||
|
|
1cf64ee468 | ||
|
|
cdec0190c4 | ||
|
|
2450bcb28b | ||
|
|
3126050c0f | ||
|
|
93b22c7828 | ||
|
|
0a89b2852e | ||
|
|
55b3e45bba | ||
|
|
365bcf6d97 | ||
|
|
71907db3ba | ||
|
|
6803655ced | ||
|
|
df1c39ec5c | ||
|
|
80f55a9511 | ||
|
|
7853cc5ae1 | ||
|
|
586a91b67f | ||
|
|
b028e96144 | ||
|
|
ce68b5907c | ||
|
|
fe7e0c9825 | ||
|
|
12893efe01 | ||
|
|
a6387bfd3c | ||
|
|
f6a54188c2 | ||
|
|
cbbd9a9c69 | ||
|
|
685a9cd2f1 | ||
|
|
182a107877 | ||
|
|
8c51aa6506 | ||
|
|
3fd39e37f2 | ||
|
|
49e86983e7 | ||
|
|
a9c58ad945 | ||
|
|
f8b45beacc | ||
|
|
9d92015d43 | ||
|
|
50a6150ed9 | ||
|
|
d5a9bb4ea9 | ||
|
|
b0505eb611 | ||
|
|
284acd57d6 | ||
|
|
8ed6b34477 | ||
|
|
f6f1fc9286 | ||
|
|
8e590a117f | ||
|
|
d5594202aa | ||
|
|
b186d949cf | ||
|
|
3d2986063c | ||
|
|
41fd7c7e60 | ||
|
|
fdefe96bf2 | ||
|
|
16f36a6fc9 | ||
|
|
f44415360e | ||
|
|
cce722b79c | ||
|
|
82697fb2ab | ||
|
|
53c1d3ef49 | ||
|
|
8e55e9abfc | ||
|
|
7c58ef3275 | ||
|
|
416a5efce7 | ||
|
|
f4d96df0f1 | ||
|
|
5d254f776a | ||
|
|
1c1218fefc | ||
|
|
d21ab29200 | ||
|
|
54ed626cf8 | ||
|
|
a733eb6c53 | ||
|
|
591454798d | ||
|
|
38604f1a4f | ||
|
|
2d0efe70a6 | ||
|
|
bfd14b1b2f | ||
|
|
76965512da | ||
|
|
996d1c3242 | ||
|
|
8abbf43f21 | ||
|
|
10eaae48ff | ||
|
|
9d4660cab1 | ||
|
|
9d74e308f7 | ||
|
|
e772692ffd | ||
|
|
8381a92120 | ||
|
|
cd054fc491 | ||
|
|
f219743e33 | ||
|
|
4f41664de8 | ||
|
|
a4fd04158e | ||
|
|
44a5f1718a | ||
|
|
a623df4c7b | ||
|
|
7cf67fbe29 | ||
|
|
3ddf1a6d01 | ||
|
|
850555c484 | ||
|
|
9ed3bdc64d | ||
|
|
c45aa56080 | ||
|
|
7394b8db3b | ||
|
|
f9b3d7af47 | ||
|
|
ea62a2da46 | ||
|
|
7468b6b71d | ||
|
|
1fb07d10a3 | ||
|
|
9378ae6e1d | ||
|
|
06723d47c4 | ||
|
|
69a0c470b5 | ||
|
|
c40f5cf45c | ||
|
|
4b7b839f24 | ||
|
|
3d60d33773 | ||
|
|
d7e66d39a0 | ||
|
|
d3f46b9aa5 | ||
|
|
f5e54a1fda | ||
|
|
4eb7f1d12e | ||
|
|
0f6d12e43c | ||
|
|
b4cdc245cf | ||
|
|
3283533149 | ||
|
|
8032e31f2d | ||
|
|
d2f9cdb205 | ||
|
|
8016c92297 | ||
|
|
e028d0d1e3 | ||
|
|
79819f58f2 | ||
|
|
6ff000b888 | ||
|
|
99e206d508 | ||
|
|
dd82ffea0c | ||
|
|
3823342d9d | ||
|
|
91dbaef406 | ||
|
|
9026dd3858 | ||
|
|
81d7f1928c | ||
|
|
bc4f29170f | ||
|
|
cb354c8f62 | ||
|
|
1cbb27b151 | ||
|
|
0ab4ff6378 | ||
|
|
63da13e829 | ||
|
|
4193a453c2 | ||
|
|
2e1fa03bf5 | ||
|
|
8f1ae18a18 | ||
|
|
57da92b7df | ||
|
|
df4f632dbc | ||
|
|
a34c2faae4 | ||
|
|
1d368c7589 | ||
|
|
88bd97e34c | ||
|
|
2ae3edb1cf | ||
|
|
b2ad967e45 | ||
|
|
a27b9e8bd5 | ||
|
|
4481a754e4 | ||
|
|
faa6ef6bc8 | ||
|
|
15870e90b0 | ||
|
|
8e4f824365 | ||
|
|
387ae5f30b | ||
|
|
ad7a071ab6 | ||
|
|
1310bf2474 | ||
|
|
b24f347190 | ||
|
|
ee6c9f95e1 | ||
|
|
2a69c6b879 | ||
|
|
cfadd183c4 | ||
|
|
e484c81f0c | ||
|
|
7e5e8306fd | ||
|
|
41e8bca4d0 | ||
|
|
8dbe9899a9 | ||
|
|
f4aac741d5 | ||
|
|
c1c9a79c49 | ||
|
|
226113c880 | ||
|
|
8932a66e49 | ||
|
|
79cfb46d42 | ||
|
|
00fcc17aee | ||
|
|
e94b783c74 | ||
|
|
97dae9ae07 | ||
|
|
ca215e0a4f | ||
|
|
91a26ca559 | ||
|
|
1ece880d7c | ||
|
|
400afddaf4 | ||
|
|
c3fef636b5 | ||
|
|
46e28a84ca | ||
|
|
17ad2b3fb1 | ||
|
|
5e2a60db4a | ||
|
|
cd214418f6 | ||
|
|
ba2d9f213e | ||
|
|
7f8ae73a5d | ||
|
|
466880f531 | ||
|
|
9f1f6d2437 | ||
|
|
9e0f897f6b | ||
|
|
c0f6aa876f | ||
|
|
d93bdee9a6 | ||
|
|
f13d09332d | ||
|
|
2f5865cc6d | ||
|
|
deefc05b88 | ||
|
|
0d8cb1cc14 | ||
|
|
a90b9fd209 | ||
|
|
829493439a | ||
|
|
73b4fafd82 | ||
|
|
b039775057 | ||
|
|
5c1d63b737 | ||
|
|
3cd022f6e6 | ||
|
|
abefd1f7c4 | ||
|
|
c21315f273 | ||
|
|
9ab1018b1a | ||
|
|
da0a5d2d6e | ||
|
|
ee6adb166c | ||
|
|
be8fe32c92 | ||
|
|
c38b1e776d | ||
|
|
4f8bf17f23 | ||
|
|
ca40186c75 | ||
|
|
a8c6b24155 | ||
|
|
bd8e5c7ca2 | ||
|
|
7c61bd36bb | ||
|
|
c54283824c | ||
|
|
52f15da2ca | ||
|
|
44d466559e | ||
|
|
05751eb047 | ||
|
|
f10503db67 | ||
|
|
adfeafe9e1 | ||
|
|
4c62a16f4f | ||
|
|
c0de39e6d4 | ||
|
|
fa55675593 | ||
|
|
d4d9920a26 | ||
|
|
47192f92d8 | ||
|
|
722076a123 | ||
|
|
bb4aa62cf7 | ||
|
|
843530568f | ||
|
|
138a5454b5 | ||
|
|
d279037036 | ||
|
|
46353f6783 | ||
|
|
70922df8b5 | ||
|
|
9c15e9de84 | ||
|
|
123c10608d | ||
|
|
0b7c2485b6 | ||
|
|
9abb32045a | ||
|
|
f490e77e77 | ||
|
|
2dc592991a | ||
|
|
0a60edcfa9 | ||
|
|
c53f9d30c8 | ||
|
|
509f398292 | ||
|
|
74bab3f0a4 | ||
|
|
8574862991 | ||
|
|
2de957c7e1 | ||
|
|
920de7a27d | ||
|
|
63efc427cd | ||
|
|
ce65fb6c76 | ||
|
|
4de1994b6e | ||
|
|
592882aa9f | ||
|
|
b98d6a1e19 | ||
|
|
29c7a63df8 | ||
|
|
8b25323ae2 | ||
|
|
f426de8460 | ||
|
|
695dc094ab | ||
|
|
e80d861064 | ||
|
|
2cdeb20135 | ||
|
|
7f74773254 | ||
|
|
f2c327fd39 | ||
|
|
e35e4ddc9a | ||
|
|
c3c88a2664 | ||
|
|
bb0eee71e7 | ||
|
|
6f56389b88 | ||
|
|
5b333c1ce6 | ||
|
|
a825f33030 | ||
|
|
92f618f2e2 | ||
|
|
81ec7c7901 | ||
|
|
dd5d2eb03c | ||
|
|
4ae720042c | ||
|
|
c705320f48 | ||
|
|
d2d8f89531 | ||
|
|
bdde940e90 | ||
|
|
45f4a76dbc | ||
|
|
13dc64ce74 | ||
|
|
c35f9e72ce | ||
|
|
f8061589e6 | ||
|
|
0ca96d48c7 | ||
|
|
4ba146f35d | ||
|
|
edf3e38ebd | ||
|
|
c4417ddb61 | ||
|
|
4a2080e407 | ||
|
|
2f2ffea9ca | ||
|
|
ba552f542f | ||
|
|
8379969834 | ||
|
|
95dbd2f990 | ||
|
|
a7177865b1 | ||
|
|
e0df6211cc | ||
|
|
b00ca882a4 | ||
|
|
39baacc49f | ||
|
|
3a1d48d6de | ||
|
|
34308b30d6 | ||
|
|
bc1506f8c0 | ||
|
|
b61067fa4f | ||
|
|
69b227a9bc | ||
|
|
0fd49457f5 | ||
|
|
58f289d013 | ||
|
|
3d60bb96e1 | ||
|
|
38d025b3f0 | ||
|
|
c40c6aaaaa | ||
|
|
1a810f0d4e | ||
|
|
63037593c0 | ||
|
|
7a878d47fa | ||
|
|
bc4b900898 | ||
|
|
c5e743f66f | ||
|
|
6c36d8d6fb | ||
|
|
71c82637e7 | ||
|
|
2dad310e2c | ||
|
|
d0ae9e3a8d | ||
|
|
a19413c311 | ||
|
|
1ef80b55dd | ||
|
|
eb03f4dad3 | ||
|
|
830dd1944a | ||
|
|
cc6943e86a | ||
|
|
1237c9a3a5 | ||
|
|
8f77093262 | ||
|
|
5d13df79a5 | ||
|
|
d79a0e233a | ||
|
|
6523223a4c | ||
|
|
4a67aafb7e | ||
|
|
f3f34c5b0f | ||
|
|
6ae8ee3f54 | ||
|
|
e8f8e80097 | ||
|
|
4dc0ff3ecf | ||
|
|
4b6462fc1e | ||
|
|
c4ece78564 | ||
|
|
0761d02b0b | ||
|
|
71c107fc57 | ||
|
|
7459e3a290 | ||
|
|
f9e66fb993 | ||
|
|
6c603ccce3 | ||
|
|
ef66b0c6ef | ||
|
|
22b50ecb2f | ||
|
|
5a6fecc3de | ||
|
|
cdbccafed9 | ||
|
|
e69ae5b9e7 | ||
|
|
92790f4e54 | ||
|
|
471a5ee908 | ||
|
|
19e1d35989 | ||
|
|
0b7f31184d | ||
|
|
fad84d50fe | ||
|
|
9a1c32dc54 | ||
|
|
a921f40799 | ||
|
|
74ac9bdd82 | ||
|
|
94518f2087 | ||
|
|
535f59bbcf | ||
|
|
71cedb3c0c | ||
|
|
dd01d6558a | ||
|
|
ce85f022d2 | ||
|
|
ad94a6fe44 | ||
|
|
353ba14060 | ||
|
|
83de794223 | ||
|
|
bfd5c93af9 | ||
|
|
c247d87ef3 | ||
|
|
07ac9e2cc2 | ||
|
|
6bc520c207 | ||
|
|
f1d20fa39f | ||
|
|
e3dc22ca3a | ||
|
|
d665f8d3cb | ||
|
|
055e6f3657 | ||
|
|
ac4f319ba1 | ||
|
|
542cca0e8c | ||
|
|
6a2449df3b | ||
|
|
7fad1c6328 | ||
|
|
d82134c339 | ||
|
|
54d39d8b2f | ||
|
|
de7f3446e0 | ||
|
|
f8e52269c1 | ||
|
|
cf1dd0c59e | ||
|
|
22c8b52545 | ||
|
|
1f7dc42cd0 | ||
|
|
aa8f2641da | ||
|
|
648d25d43d | ||
|
|
df3e61003a | ||
|
|
6b361ad5ee | ||
|
|
5d8afe69f7 | ||
|
|
a1ab553858 | ||
|
|
07463ea162 | ||
|
|
6d2d21f713 | ||
|
|
061b2889a9 | ||
|
|
8963d9c266 | ||
|
|
890f62e868 | ||
|
|
8f362589a5 | ||
|
|
a27a2470cd | ||
|
|
72836fcee4 | ||
|
|
a7130543fa | ||
|
|
a490fda746 | ||
|
|
7e77275293 | ||
|
|
d6e203b3dc | ||
|
|
e3ea479087 | ||
|
|
faab1d3836 | ||
|
|
8851a574a3 | ||
|
|
59282080c8 | ||
|
|
98f3da4040 | ||
|
|
1d213233cd | ||
|
|
fd9cf73836 | ||
|
|
0638ad9999 | ||
|
|
1eb527692a | ||
|
|
09bb17e108 | ||
|
|
1cf911bc82 | ||
|
|
f4b052321b | ||
|
|
a636203ea5 | ||
|
|
c215217e39 | ||
|
|
08e291b54d | ||
|
|
6b95b065be | ||
|
|
9363169b67 | ||
|
|
085bea4513 | ||
|
|
150f20828b | ||
|
|
08523ee20a | ||
|
|
5d5171d26a | ||
|
|
96fb5605b2 | ||
|
|
7011de0bc2 | ||
|
|
c3dd69eab4 | ||
|
|
025171c476 | ||
|
|
c8dbccde30 | ||
|
|
4ff7a0f1f6 | ||
|
|
9c2ade40de | ||
|
|
aa32314d09 | ||
|
|
52afe99665 | ||
|
|
b0446d6a33 | ||
|
|
8e4e89f1c2 | ||
|
|
6c758d79de | ||
|
|
691008087b | ||
|
|
85f03346eb | ||
|
|
bdc6b3fc64 | ||
|
|
847f582290 | ||
|
|
10f5c016ec | ||
|
|
2e756879f1 | ||
|
|
c7a7750d3b | ||
|
|
9193c1eede | ||
|
|
b3f0e53048 | ||
|
|
3243d0f7b6 | ||
|
|
23b00bc0e4 | ||
|
|
52e1eea18b | ||
|
|
ee80d66727 | ||
|
|
f1fb2d12b3 | ||
|
|
deb2c73212 | ||
|
|
8928491074 | ||
|
|
545434670b | ||
|
|
54fda45bac | ||
|
|
c7bf7366bc | ||
|
|
b7052e5087 | ||
|
|
0d75ae2ce3 | ||
|
|
b5ba7b9dcf | ||
|
|
483e0ddd4d | ||
|
|
2891932bf0 | ||
|
|
591078babf | ||
|
|
9868c781a1 | ||
|
|
c257baff85 | ||
|
|
878e83c5a4 | ||
|
|
0012690aae | ||
|
|
6e74bc41ca | ||
|
|
cba892fa1f | ||
|
|
550bfd4cbd | ||
|
|
920ef0779b | ||
|
|
48ea9cea77 | ||
|
|
ccf4b799df | ||
|
|
f143d86ad2 | ||
|
|
8ae97d76ee | ||
|
|
f8b362739e | ||
|
|
6d69d03bac | ||
|
|
204da0d3e3 | ||
|
|
c496ca96e7 | ||
|
|
67b22dd036 | ||
|
|
ce6a696e4d | ||
|
|
a5caba1eb0 | ||
|
|
cd9c100963 | ||
|
|
edde6c56ac | ||
|
|
b7f89fe692 | ||
|
|
ae3531adf9 | ||
|
|
8cf5ee7831 | ||
|
|
aa3e950764 | ||
|
|
1301a0dd42 | ||
|
|
af8bd6a82d | ||
|
|
6d38616e67 | ||
|
|
4f5f18acb9 | ||
|
|
3e223834d9 | ||
|
|
a1bb0f8773 | ||
|
|
0e283428f7 | ||
|
|
2eabb80254 | ||
|
|
44586389e4 | ||
|
|
06a401c845 | ||
|
|
273f603efb | ||
|
|
1619e22f40 | ||
|
|
88a79ce6a6 | ||
|
|
acebc9cd6b | ||
|
|
443c12a703 | ||
|
|
7f3c4f4f65 | ||
|
|
0bc56fa66a | ||
|
|
1a582dd49d | ||
|
|
c5b921b597 | ||
|
|
e86ea47c02 | ||
|
|
aa5a63a5b5 | ||
|
|
2a7b4da9b2 | ||
|
|
069d098f84 | ||
|
|
b3889f7023 | ||
|
|
65883c8dbd | ||
|
|
341ca8d74c | ||
|
|
99859d436c | ||
|
|
1b01e2b085 | ||
|
|
976fc7d137 | ||
|
|
c3b7b29c23 | ||
|
|
627a91a9a8 | ||
|
|
6dc6302599 | ||
|
|
7a20e2e1f8 | ||
|
|
90648143c3 | ||
|
|
5c6658d4dd | ||
|
|
9585f890f8 | ||
|
|
0838239e8e | ||
|
|
36399e8576 | ||
|
|
9460db832c | ||
|
|
d68730a56e | ||
|
|
f2aeefe29c | ||
|
|
39c6f507df | ||
|
|
d2d1eb5b0a | ||
|
|
8ae7be3ef4 | ||
|
|
306170518f | ||
|
|
aa6a10c44a | ||
|
|
9af73dc4fc | ||
|
|
fc483bb6af | ||
|
|
53b0f3e4e2 | ||
|
|
4353cf51a0 | ||
|
|
ce34e9ce5e | ||
|
|
d4051a8e05 | ||
|
|
df3df7fb64 | ||
|
|
9e9c164052 | ||
|
|
066090dd3f | ||
|
|
614d9c19c1 | ||
|
|
bd2dee6c67 | ||
|
|
74e6672beb | ||
|
|
02bcf0d389 | ||
|
|
18b4e04f1c | ||
|
|
10204dc898 | ||
|
|
1865ed31b9 | ||
|
|
3669cdba10 | ||
|
|
939fbd26ac | ||
|
|
b4e60dac23 | ||
|
|
e6ddb4e7af | ||
|
|
83390b83d9 | ||
|
|
ff2424595a | ||
|
|
adeb9c73d6 | ||
|
|
cd0abcc0bb | ||
|
|
4a55479fa9 | ||
|
|
f527115b5f | ||
|
|
75e1b46add | ||
|
|
05a2926c5c | ||
|
|
7070b83687 | ||
|
|
8d212e604a | ||
|
|
063fcc9676 | ||
|
|
8403612258 | ||
|
|
25b51c7816 | ||
|
|
9779b63bb6 | ||
|
|
d81aef3adf | ||
|
|
5af7e056a7 | ||
|
|
45ed795cb0 | ||
|
|
683e98a8a4 | ||
|
|
e0cfeb2ea7 | ||
|
|
75340ee383 | ||
|
|
668de34c6b | ||
|
|
a91b954bb4 | ||
|
|
a3f62b8255 | ||
|
|
37b6d5f684 | ||
|
|
b7a6838407 | ||
|
|
cde846b3d3 | ||
|
|
6c3e6e88d3 | ||
|
|
739674cd77 | ||
|
|
4b2d7cae11 | ||
|
|
7fea7156cb | ||
|
|
3093468977 | ||
|
|
79cb25776f | ||
|
|
87f78946a5 | ||
|
|
211fbc1328 | ||
|
|
836a086ce9 | ||
|
|
90d3989b99 | ||
|
|
d741e55a42 | ||
|
|
17d3aaaf16 | ||
|
|
ea55b2a4ca | ||
|
|
3f0537dd4a | ||
|
|
943f7f7a39 | ||
|
|
12e895fc5a | ||
|
|
bda2c49d75 | ||
|
|
01b32990da | ||
|
|
dbda1b5147 | ||
|
|
ddf3bd328b | ||
|
|
b9c37b92cf | ||
|
|
5a27ecdd2e | ||
|
|
f9c3c90ca8 | ||
|
|
6daccbe317 | ||
|
|
71ea844c0e | ||
|
|
3a7256697e | ||
|
|
d1ba998274 | ||
|
|
718ced8d8c | ||
|
|
e1842025d0 | ||
|
|
2b9213cdc1 | ||
|
|
e3a88568b0 | ||
|
|
0577177e3e | ||
|
|
298f833b16 | ||
|
|
97b3656c2e | ||
|
|
f3bcebb1d2 | ||
|
|
0f399e6e5e | ||
|
|
5b075e27cb | ||
|
|
8a9d86a2a7 | ||
|
|
d80a064eff | ||
|
|
d468a09789 | ||
|
|
9f4ab73d7f | ||
|
|
02cf62e240 | ||
|
|
d55de6eec2 | ||
|
|
69df680b97 | ||
|
|
447591e1ae | ||
|
|
33eb0ce4c4 | ||
|
|
505c28aac9 | ||
|
|
67fb0c5495 | ||
|
|
4efba05c56 | ||
|
|
8377574c9c | ||
|
|
0f90943e45 | ||
|
|
526e638c8a | ||
|
|
372297e713 | ||
|
|
356e067390 | ||
|
|
e2f48f9643 | ||
|
|
b513a251f8 | ||
|
|
953e32b2c1 | ||
|
|
5898e28272 | ||
|
|
67dfbc0cb9 | ||
|
|
36cb11f068 | ||
|
|
7a4c6cc92f | ||
|
|
7edcb8f39c | ||
|
|
d5b00ee6e0 | ||
|
|
461cead4f7 | ||
|
|
b5a6d40818 | ||
|
|
968b5e0112 | ||
|
|
39b782b390 | ||
|
|
577664c8e8 | ||
|
|
bba12cec89 | ||
|
|
70c4c03cb8 | ||
|
|
f5791ed136 | ||
|
|
4ec929dc9b | ||
|
|
fbf189a6ee | ||
|
|
09825cb5c0 | ||
|
|
ed27d35674 | ||
|
|
fd5539eb41 | ||
|
|
04bca64bde | ||
|
|
03cc7c20c1 | ||
|
|
4075311d94 | ||
|
|
6624a2b07d | ||
|
|
6d3a7d03e1 | ||
|
|
95fdc7d69c | ||
|
|
86fe61c8f9 | ||
|
|
9bb6d2f21d | ||
|
|
e3f4593e76 | ||
|
|
1d043b93cf | ||
|
|
b15d4f624f | ||
|
|
4aa16a50f5 | ||
|
|
bbcbf4d459 | ||
|
|
930ad9eecc | ||
|
|
b072a9defd | ||
|
|
75952c6e3d | ||
|
|
05afc96b73 | ||
|
|
fa80026915 | ||
|
|
2bc3de0f28 | ||
|
|
99c7bc94af | ||
|
|
152c8f349d | ||
|
|
d75654c15e | ||
|
|
0725f584e1 | ||
|
|
8cda9241d1 | ||
|
|
a3124ba49f | ||
|
|
579e2691fe | ||
|
|
63f05de10b | ||
|
|
caeefc29eb | ||
|
|
a3c736def2 | ||
|
|
58261235f0 | ||
|
|
da70877a1b | ||
|
|
5c468ca8a8 | ||
|
|
aedd6bb97d | ||
|
|
733d9cacb8 | ||
|
|
42f2805e48 | ||
|
|
0ffcb7c6fc | ||
|
|
27669bd11d | ||
|
|
6625f82940 | ||
|
|
d0866f0bb4 | ||
|
|
09eeb75130 | ||
|
|
0a99956f71 | ||
|
|
12ef6aefa8 | ||
|
|
e93aa81aa6 | ||
|
|
755eb0320e | ||
|
|
43ba5456b1 | ||
|
|
156d5ad6da | ||
|
|
c626a3d9fa | ||
|
|
b2e8bc1b20 | ||
|
|
771822ebb8 | ||
|
|
eb6a41ba0f | ||
|
|
7d2392691c | ||
|
|
c216c1894d | ||
|
|
3e1ad508eb | ||
|
|
a052c1d785 | ||
|
|
16484d4923 | ||
|
|
32a09b4382 | ||
|
|
870a7e6156 | ||
|
|
239e3e0cca | ||
|
|
b1ca5e3ffa | ||
|
|
b9a1252c96 | ||
|
|
fc492de31d | ||
|
|
a9c0f9bc63 | ||
|
|
b7cc9f5026 | ||
|
|
252580c561 | ||
|
|
acc47c1a3f | ||
|
|
70fa830e4d | ||
|
|
a7af0ebaf5 | ||
|
|
67ae7b4760 | ||
|
|
de48addae2 | ||
|
|
ddbfd0f0c5 | ||
|
|
d7ae0639b4 | ||
|
|
6804038d06 | ||
|
|
2f799533ae | ||
|
|
88ae5991cd | ||
|
|
5d51a883c2 | ||
|
|
c4a91be726 | ||
|
|
0382435990 | ||
|
|
b390d85d95 | ||
|
|
be925dc64c | ||
|
|
de7a91bfe3 | ||
|
|
a4358cbabd | ||
|
|
177ed935a9 | ||
|
|
c364f15ff1 | ||
|
|
e1f6e61e6a | ||
|
|
0932300e3a | ||
|
|
3f40217704 | ||
|
|
f631c3311a | ||
|
|
ad433bb372 | ||
|
|
3e0b3a1428 | ||
|
|
444b116597 | ||
|
|
2aea08eda1 | ||
|
|
8e5e059d7d | ||
|
|
2b1b511f6b | ||
|
|
233ad24ecf | ||
|
|
c4949c50f9 | ||
|
|
b6ef402905 | ||
|
|
ccf365475a | ||
|
|
e1fb245690 | ||
|
|
5a76c6517e | ||
|
|
1bb9568776 | ||
|
|
ecd1c2f7e9 | ||
|
|
466de68801 | ||
|
|
88d4111cfa | ||
|
|
51fb64bab1 | ||
|
|
be547e1d3b | ||
|
|
bf85454116 | ||
|
|
5910724b11 | ||
|
|
7e24b09da9 | ||
|
|
f085f960e7 | ||
|
|
f38de77f6e | ||
|
|
58e7d46d1b | ||
|
|
2a5201638d | ||
|
|
fe6fad1242 | ||
|
|
ec00e1d8a0 | ||
|
|
de29c4144e | ||
|
|
f3bab0044e | ||
|
|
ffd1833b87 | ||
|
|
896d5b63e8 | ||
|
|
67de24e449 | ||
|
|
66400c470c | ||
|
|
7665010267 | ||
|
|
5d9b75051a | ||
|
|
ab2f744b90 | ||
|
|
300fcad8a6 | ||
|
|
f7e025958a | ||
|
|
0ab5531363 | ||
|
|
b4444d5ca2 | ||
|
|
0025da15cf | ||
|
|
b9d3e1635f | ||
|
|
aa6b734e02 | ||
|
|
73b57f0ccb | ||
|
|
3c4e6d8337 | ||
|
|
36034aecc2 | ||
|
|
ffca4b5c32 | ||
|
|
b0e72bcf34 | ||
|
|
7fd930c0c8 | ||
|
|
2e78b2bead | ||
|
|
44dbe89035 | ||
|
|
2d5a8b5512 | ||
|
|
159736c1b8 | ||
|
|
46720279c2 | ||
|
|
d8269e1dfb | ||
|
|
cbdbb76665 | ||
|
|
6543f0dca5 | ||
|
|
232eb88bfe | ||
|
|
a95967f8b7 | ||
|
|
2ef648d3d3 | ||
|
|
33f6830fd5 | ||
|
|
606d7e67fd | ||
|
|
fd87ff26b9 | ||
|
|
85347e1cb6 | ||
|
|
41897817cc | ||
|
|
45ff2d51d0 | ||
|
|
5de3ece225 | ||
|
|
df50a41289 | ||
|
|
59ae56fad5 | ||
|
|
690e872c51 | ||
|
|
81082e046e | ||
|
|
3fa9550837 | ||
|
|
b1082f01a6 | ||
|
|
f35b84c807 | ||
|
|
117adb0f0f | ||
|
|
abb285fb1b | ||
|
|
a431154706 | ||
|
|
cfe50f04ed | ||
|
|
a7055eb956 | ||
|
|
0a1be1e997 | ||
|
|
c93898dae9 | ||
|
|
ebdf2af727 | ||
|
|
c108eb73cc | ||
|
|
3a1375dacf | ||
|
|
41bece30b4 | ||
|
|
16ea58cbda | ||
|
|
99e350d902 | ||
|
|
13e06d298c | ||
|
|
56c7366547 | ||
|
|
81f0259b9e | ||
|
|
fefcb5d314 | ||
|
|
345b0c9b46 | ||
|
|
20c3893f0e | ||
|
|
29293c1e09 | ||
|
|
5fe3a3c3fb | ||
|
|
b04621d155 | ||
|
|
b227060388 | ||
|
|
d93e4dcbb7 | ||
|
|
73e79f2a1b | ||
|
|
fc79158de2 | ||
|
|
7763b04e5f | ||
|
|
9d7b44b4cc | ||
|
|
897f36d179 | ||
|
|
94c3637f6d | ||
|
|
04cc96173c | ||
|
|
fbaaad49d7 | ||
|
|
b29f3b250d | ||
|
|
fa343954d4 | ||
|
|
2491f5898e | ||
|
|
b27c856fbc | ||
|
|
9941ceb331 | ||
|
|
c536d38059 | ||
|
|
8de64cac98 | ||
|
|
6d6d286539 | ||
|
|
5d2eac9eba | ||
|
|
9826925a20 | ||
|
|
24a267b562 | ||
|
|
d4da3d6116 | ||
|
|
d5a62e4f5f | ||
|
|
9a82b2389f | ||
|
|
8dba13f7e8 | ||
|
|
deacef651f | ||
|
|
2e1b3afeca | ||
|
|
652e776893 | ||
|
|
d055fe4cb0 | ||
|
|
131842bb0b | ||
|
|
59fc531f78 | ||
|
|
5c44c15438 | ||
|
|
62067cb9b8 | ||
|
|
0f81866329 | ||
|
|
2db67bc0f4 | ||
|
|
7dba9cd039 | ||
|
|
75dff0eef7 | ||
|
|
d828f3a550 | ||
|
|
bcd6e4bd07 | ||
|
|
53936f3d57 | ||
|
|
0beb3add18 | ||
|
|
f9bd64c098 | ||
|
|
d7f44b5bdb | ||
|
|
48bfb5f238 | ||
|
|
97ebe8dcaf | ||
|
|
d4409747ba | ||
|
|
37b6a6617f | ||
|
|
ca1c9cfe11 | ||
|
|
adeb4d7469 | ||
|
|
50587ee8ec | ||
|
|
8244288dfe | ||
|
|
6ffe72835a | ||
|
|
8ba5e990a5 | ||
|
|
9afb1afcc6 | ||
|
|
0e21093a8f | ||
|
|
9c5cd0948f | ||
|
|
1083705fe8 | ||
|
|
f3d294617f | ||
|
|
de33a30858 | ||
|
|
887a227953 | ||
|
|
705f6f35bc | ||
|
|
e648b22dbd | ||
|
|
257a2501fa | ||
|
|
99afb3ddd4 | ||
|
|
a3c776203f | ||
|
|
53f350c165 | ||
|
|
f46d31f948 | ||
|
|
bf64ff72db | ||
|
|
bc2884afc1 | ||
|
|
023fa8c440 | ||
|
|
427023a1e6 | ||
|
|
a924876fed | ||
|
|
3f223f7b2e | ||
|
|
fc2c063e1e | ||
|
|
20db33e299 | ||
|
|
c0109aa497 | ||
|
|
ba7a1de04d | ||
|
|
4269e78a80 | ||
|
|
6f5ac90cf3 | ||
|
|
de282fc217 | ||
|
|
ddbd903576 | ||
|
|
0c56a3f773 | ||
|
|
9d069c4778 | ||
|
|
0d843f796b | ||
|
|
67f51b3d8c | ||
|
|
5c5de1c79a | ||
|
|
0821771466 | ||
|
|
83f6f68e79 | ||
|
|
27473d18da | ||
|
|
0c6c096c20 | ||
|
|
52c8ade4ad | ||
|
|
0e853ca4c4 | ||
|
|
41beccbab0 | ||
|
|
2eb88d953f | ||
|
|
1f0483b4b1 | ||
|
|
6b47c7f24e | ||
|
|
d798e1c7a9 | ||
|
|
3a8736bd74 | ||
|
|
c8c5163618 | ||
|
|
500f3d2432 | ||
|
|
ed4a915e08 | ||
|
|
b8f7b1579a | ||
|
|
ed54491c60 | ||
|
|
e4decf2750 | ||
|
|
c90f13d106 | ||
|
|
62008f69c1 | ||
|
|
e88f5e0b4e | ||
|
|
769fda3c5a | ||
|
|
23300d7149 | ||
|
|
f5756f388a | ||
|
|
ee313cdcbf | ||
|
|
8b50fed04b | ||
|
|
5b66de8859 | ||
|
|
e38af9e00c | ||
|
|
6b37f0be55 | ||
|
|
6e5d5f2fc1 | ||
|
|
75c9481224 | ||
|
|
5746f9da99 | ||
|
|
112da0a0ce | ||
|
|
bcd606c0fe | ||
|
|
ed92bc9f6e | ||
|
|
9b0756f8f2 | ||
|
|
aa0c87391c | ||
|
|
b1dfdc51b1 | ||
|
|
2e32528012 | ||
|
|
f64e7695a1 | ||
|
|
5abeaf0650 | ||
|
|
8bcc355972 | ||
|
|
6b4642fae3 | ||
|
|
d1bd37deac | ||
|
|
405ec05cb2 | ||
|
|
52e8e1dc88 | ||
|
|
b98a6b2f72 | ||
|
|
0ca45b233f | ||
|
|
65cceef8f4 | ||
|
|
b004821fa9 | ||
|
|
81b42336ad | ||
|
|
c6c1974672 | ||
|
|
a545d1d262 | ||
|
|
037fcd0047 | ||
|
|
318452bc0c | ||
|
|
d746cd88c2 | ||
|
|
9c42603b5a | ||
|
|
ea93cce4f6 | ||
|
|
f4daa18152 | ||
|
|
9caa687d81 | ||
|
|
3b58c6fb54 | ||
|
|
5926c10690 | ||
|
|
df725153d2 | ||
|
|
d662896090 | ||
|
|
db241e8645 | ||
|
|
ead28ff30a | ||
|
|
515d7a5e73 | ||
|
|
14fbdc9cdd | ||
|
|
98bcd2834a | ||
|
|
f7ab6cbe16 | ||
|
|
28ef06f7c2 | ||
|
|
577d02370d | ||
|
|
50be92c11c | ||
|
|
d18596baf4 | ||
|
|
7ce7e39476 | ||
|
|
93eb15c573 | ||
|
|
9f4d83e3b1 | ||
|
|
1c251cd948 | ||
|
|
70d1924f8b | ||
|
|
7b4948b05f | ||
|
|
878b5d9f0d | ||
|
|
2bc1820660 | ||
|
|
8bf8b5a577 | ||
|
|
8222d8de88 | ||
|
|
c7253e2e8c | ||
|
|
d69cf69a6a | ||
|
|
d02ecdefab | ||
|
|
bc857bfce0 | ||
|
|
f8bf74575a | ||
|
|
964ac8b584 | ||
|
|
a3522dfddd | ||
|
|
d3a8613b6e | ||
|
|
200b388752 | ||
|
|
dabcaf3b06 | ||
|
|
e646ffe795 | ||
|
|
b0dcc3c47f | ||
|
|
b07d9c23c5 | ||
|
|
d71cae62cc | ||
|
|
633a50cf4b | ||
|
|
825e0984e2 | ||
|
|
d1cade5ade | ||
|
|
190717e31f | ||
|
|
0824c28c8b | ||
|
|
c59b4aaeef | ||
|
|
f9c6cbf002 | ||
|
|
b8fe71ab86 | ||
|
|
cb10cded2a | ||
|
|
cd8b830292 | ||
|
|
1ac4004f3a | ||
|
|
e17d368ae2 | ||
|
|
27110b0567 | ||
|
|
9fe4de3471 | ||
|
|
d26d440e19 | ||
|
|
9f5daf0006 | ||
|
|
eb1634cbf8 | ||
|
|
01c10ca26e | ||
|
|
45aef47281 | ||
|
|
ae287755b7 | ||
|
|
a37f27ae99 | ||
|
|
49f5f315fd | ||
|
|
97d2db017c | ||
|
|
2c64df0399 | ||
|
|
828400422a | ||
|
|
c3c77cec30 | ||
|
|
1183b85f50 | ||
|
|
0143dc029c | ||
|
|
e10e576fed | ||
|
|
78af8eb1d1 | ||
|
|
79e93125d0 | ||
|
|
48db0b1f4a | ||
|
|
8f0578f0fc | ||
|
|
250f557872 | ||
|
|
462dc88b17 | ||
|
|
570fa151fc | ||
|
|
9c286cfa00 | ||
|
|
80cbb6ddbb | ||
|
|
9fd5ce0cbe | ||
|
|
1736dec629 | ||
|
|
b8a360837a | ||
|
|
fc28721960 | ||
|
|
51ce3a75c9 | ||
|
|
335056663a | ||
|
|
5b286728de | ||
|
|
291a168bcc | ||
|
|
fda7d31aa0 | ||
|
|
cbf46c737c | ||
|
|
7beb36a529 | ||
|
|
153697660d | ||
|
|
60a72e8d45 | ||
|
|
426ff04282 | ||
|
|
a50e1b32e4 | ||
|
|
9eae41ddef | ||
|
|
aad0d6d5ba | ||
|
|
7aca14a1ec | ||
|
|
d1596ef439 | ||
|
|
ea63e4998b | ||
|
|
a08dfd27a8 | ||
|
|
f58848011e | ||
|
|
934858ad86 | ||
|
|
3c25b9abae | ||
|
|
3fc03845a1 | ||
|
|
9b122384e9 | ||
|
|
9f4e6bbaeb | ||
|
|
b05654f0e3 | ||
|
|
9b3a760bbb | ||
|
|
d5822b96b0 | ||
|
|
b3d14cbfa7 | ||
|
|
d6039175e5 | ||
|
|
97d6faaced | ||
|
|
219b8130df | ||
|
|
38cbc40a64 | ||
|
|
93d3a642a9 | ||
|
|
c5e8d7af0e | ||
|
|
d6983cb460 | ||
|
|
dd9829292e | ||
|
|
89cb0eb0b6 | ||
|
|
9b5fffb149 | ||
|
|
1f90438025 | ||
|
|
a130adb25b | ||
|
|
8756c5fe7a | ||
|
|
828dba2983 | ||
|
|
6b3f5a329b | ||
|
|
63ef586b05 | ||
|
|
383a6a61b1 | ||
|
|
4fdd4e6f6f | ||
|
|
01ba4b80a7 | ||
|
|
de66764e4e | ||
|
|
1037d53988 | ||
|
|
c3ab8f866c | ||
|
|
94eb2dd1fe | ||
|
|
346b5ce8fd | ||
|
|
b37fbb990b | ||
|
|
ef75f76f5c | ||
|
|
e296100005 | ||
|
|
953dd93a48 | ||
|
|
e704f4d378 | ||
|
|
77d0f05f71 | ||
|
|
50d2376769 | ||
|
|
759d525301 | ||
|
|
fcfa188548 | ||
|
|
f4c8bbcfc2 | ||
|
|
31eead52e7 | ||
|
|
038a3a1a61 | ||
|
|
587c68b2cd | ||
|
|
377fdf5dde | ||
|
|
5c67601931 | ||
|
|
68f54207a3 | ||
|
|
bb47437686 | ||
|
|
213b715893 | ||
|
|
449d5c910c | ||
|
|
0251f9c9c0 | ||
|
|
8bc7c3d858 | ||
|
|
af44c94862 | ||
|
|
36ed7177f0 | ||
|
|
32aa88bcae | ||
|
|
51090d636b | ||
|
|
31513ea6b9 | ||
|
|
88cebbd7b8 | ||
|
|
fb8f7280bc | ||
|
|
f380401bbd | ||
|
|
9abc6c8b31 | ||
|
|
8cd252f115 | ||
|
|
53f72b11e5 | ||
|
|
ee55fcbe12 | ||
|
|
78d3442b12 | ||
|
|
979a9dd4c4 | ||
|
|
d5979c5d55 | ||
|
|
8027175600 | ||
|
|
3054ff0cbe | ||
|
|
cd453d38bb | ||
|
|
f5a290eed9 | ||
|
|
ecb3e676a5 | ||
|
|
8b59a98610 | ||
|
|
8409501206 | ||
|
|
be95cac157 | ||
|
|
476203d025 | ||
|
|
468e2e926b | ||
|
|
ac3e9394e7 | ||
|
|
868d62a509 | ||
|
|
157b864a01 | ||
|
|
951b9dfd94 | ||
|
|
1142d31164 | ||
|
|
9131bde941 | ||
|
|
1132c10dc2 | ||
|
|
c978a96c02 | ||
|
|
71e458d437 | ||
|
|
57bde0d9c7 | ||
|
|
50b4d25980 | ||
|
|
eda60e8251 | ||
|
|
c794cbbb19 | ||
|
|
4a76d1dbe5 | ||
|
|
418f734a58 | ||
|
|
dc1c355b72 | ||
|
|
1b2b22ed9f | ||
|
|
f2cd958c0a | ||
|
|
57adeaea87 | ||
|
|
8f3f1aef05 | ||
|
|
51d2453c7a | ||
|
|
45014296be | ||
|
|
afef36c950 | ||
|
|
b31756c18e | ||
|
|
f008688520 | ||
|
|
5b68ea215b | ||
|
|
b1d568f0bc | ||
|
|
17bd1b2f41 | ||
|
|
5b0d3cc0cd | ||
|
|
d4f76f1674 | ||
|
|
340fa21198 | ||
|
|
de5d66d431 | ||
|
|
7bdb17d4d5 | ||
|
|
419c64b107 | ||
|
|
99a5ae3f8e | ||
|
|
c7563c528b | ||
|
|
e30e9318da | ||
|
|
5c51028d38 | ||
|
|
c1d58e1c67 | ||
|
|
02030ff7fe | ||
|
|
f45c185fa9 | ||
|
|
1bd96c3a60 | ||
|
|
929f85d851 | ||
|
|
98d4a4e6bc | ||
|
|
fb2f83360c | ||
|
|
3c5e7729e1 | ||
|
|
5a853e1423 | ||
|
|
2f58b12dad | ||
|
|
59f4fd4dc6 | ||
|
|
5738240ee8 | ||
|
|
86fd453ea8 | ||
|
|
c83411b9ee | ||
|
|
057c9938a1 | ||
|
|
9259966132 | ||
|
|
b08980412e | ||
|
|
532a1e0429 | ||
|
|
2a36c352a0 | ||
|
|
1a2adf3f49 | ||
|
|
43b62accbb | ||
|
|
be74864ace | ||
|
|
0ae456f08a | ||
|
|
0f75d25991 | ||
|
|
67129e4a15 | ||
|
|
dfb9323cf9 | ||
|
|
7f5bd09baf | ||
|
|
02d5eb935f | ||
|
|
94ca71b7cc | ||
|
|
b338f1b154 | ||
|
|
486f0c9476 | ||
|
|
d96680f58d | ||
|
|
f8602d3242 | ||
|
|
0c021ad171 | ||
|
|
086d7b4500 | ||
|
|
891629c84a | ||
|
|
ea6d901e51 | ||
|
|
4539dd30e6 | ||
|
|
c43e57242e | ||
|
|
db8fd71ca9 | ||
|
|
f4f316881d | ||
|
|
0e16f09474 | ||
|
|
09dd418f53 | ||
|
|
decd1d1737 | ||
|
|
180e689f7e | ||
|
|
7da5556ac2 | ||
|
|
f23a03a89b | ||
|
|
84e4682f0e | ||
|
|
1f99511210 | ||
|
|
0d94f2474c | ||
|
|
480b6c1e8b | ||
|
|
95464f14d1 | ||
|
|
c34407d16c | ||
|
|
5e34d2ebbf | ||
|
|
815dd2ffa8 | ||
|
|
ecd5fb49c5 | ||
|
|
b86174e7a3 | ||
|
|
2e2038dc35 | ||
|
|
46bfb42258 | ||
|
|
feecf22511 | ||
|
|
4c4f15eb78 | ||
|
|
104ccdb8b4 | ||
|
|
6ccff79594 | ||
|
|
aed523ecc1 | ||
|
|
d496a75d0a | ||
|
|
5c01dd1e73 | ||
|
|
11d9224e3b | ||
|
|
34c29ba1d7 | ||
|
|
6cd657f9f2 | ||
|
|
4ae9e55822 | ||
|
|
8749b71273 | ||
|
|
dbc50fdf82 | ||
|
|
b1d2ef9255 | ||
|
|
5fb16555af | ||
|
|
ba7c775a04 | ||
|
|
fe348844d9 | ||
|
|
767e00277f | ||
|
|
6ce533a220 | ||
|
|
08b2ac745a | ||
|
|
46a127eecb | ||
|
|
fc63faf070 | ||
|
|
9665577802 | ||
|
|
434aca5b14 | ||
|
|
e31852aba9 | ||
|
|
37254abc36 | ||
|
|
a11ea50319 | ||
|
|
81df121dd3 | ||
|
|
50f6412eb8 | ||
|
|
bf50b0383e | ||
|
|
bd55852517 | ||
|
|
4c9f7a9988 | ||
|
|
aba8df23ed | ||
|
|
3820df0106 | ||
|
|
e74c504f91 | ||
|
|
fa70605db2 | ||
|
|
0d173446ff | ||
|
|
320e26a0af | ||
|
|
a3d689cfb3 | ||
|
|
59cc5d9380 | ||
|
|
28535652ab | ||
|
|
7b670a4483 | ||
|
|
69fc019f26 | ||
|
|
613bf66939 | ||
|
|
9edb0916f4 | ||
|
|
f4b659f782 | ||
|
|
c70446c7df | ||
|
|
c76cb6d548 | ||
|
|
71f37e90ef | ||
|
|
75b5c590a8 | ||
|
|
4469666780 | ||
|
|
c15e024141 | ||
|
|
8cb94542f4 | ||
|
|
c681a03918 | ||
|
|
30f2999962 | ||
|
|
74e3452b9e | ||
|
|
9e1cf0c200 | ||
|
|
e11eb11906 | ||
|
|
c04bca6f60 | ||
|
|
b0936ef423 | ||
|
|
41a6eb949a | ||
|
|
f17ce13a92 | ||
|
|
8c416ad29a | ||
|
|
c72938240e | ||
|
|
e905b6f80e | ||
|
|
6de8f1afb7 | ||
|
|
9341212642 | ||
|
|
f7a9721e16 | ||
|
|
089e843b0f | ||
|
|
c8056d866a | ||
|
|
49da66e459 | ||
|
|
fb6c319904 | ||
|
|
5a8d13199c | ||
|
|
dce9027045 | ||
|
|
feba604e92 | ||
|
|
d22f65413a | ||
|
|
0599ef8c08 | ||
|
|
bfdf469295 | ||
|
|
32c96387c1 | ||
|
|
c8c5443bb5 | ||
|
|
a60b854d90 | ||
|
|
b8ad4f02a2 | ||
|
|
d281274bf2 | ||
|
|
b625bc2c31 | ||
|
|
f4381ab88a | ||
|
|
744435f2a4 | ||
|
|
855703e55e | ||
|
|
927c8c4924 | ||
|
|
0ba994e9e3 | ||
|
|
af9ad45cd4 | ||
|
|
e0fee250c3 | ||
|
|
72ca05016d | ||
|
|
844d1f9fa1 | ||
|
|
213c31ae16 | ||
|
|
04f3d551a0 | ||
|
|
e8600d69fd | ||
|
|
b03d65c237 | ||
|
|
8743974189 | ||
|
|
dc36bc9434 | ||
|
|
bce878a7c1 | ||
|
|
532d797824 | ||
|
|
146c12a2da | ||
|
|
d39919c03e | ||
|
|
df2dedeefb | ||
|
|
adb029ed81 | ||
|
|
43ff1a347d | ||
|
|
14294236bf | ||
|
|
c2b293ba30 | ||
|
|
37cd9f522f | ||
|
|
f33154cd39 | ||
|
|
bafeed9f5d | ||
|
|
ef767f9fd5 | ||
|
|
bc97f6d60c | ||
|
|
90a99c1b5e | ||
|
|
f375d4b7de | ||
|
|
fa41fbd318 | ||
|
|
6a205c8876 | ||
|
|
0fb3756409 | ||
|
|
fbbdf475b1 | ||
|
|
c238be3e3a | ||
|
|
1bf2801e6a | ||
|
|
c9c8402093 | ||
|
|
6060788083 | ||
|
|
e3700fc9e4 | ||
|
|
b693216d8d | ||
|
|
46b9d8295d | ||
|
|
7decf8951c | ||
|
|
1f46c15262 | ||
|
|
0cd358676c | ||
|
|
43113d92cc | ||
|
|
7eab8dc750 | ||
|
|
44e939514e | ||
|
|
95506f1235 | ||
|
|
a91556fd74 | ||
|
|
1447f728b5 | ||
|
|
d2c690828a | ||
|
|
cfa90f4adc | ||
|
|
898280a056 | ||
|
|
59b4a2f0e4 | ||
|
|
1ee9778405 | ||
|
|
db74c11d2b | ||
|
|
5011cded16 | ||
|
|
f10b2a9c14 | ||
|
|
5cb3c0b319 | ||
|
|
b9fc428494 | ||
|
|
c0ba104674 | ||
|
|
2a4093eaf3 | ||
|
|
9e62bc4439 | ||
|
|
553d097442 | ||
|
|
ae608b8076 | ||
|
|
c397187061 | ||
|
|
e32b06e977 | ||
|
|
8c42c506cd | ||
|
|
8cc83b8dbe | ||
|
|
51af426d89 | ||
|
|
08ec0af7c6 | ||
|
|
3b221c5406 | ||
|
|
3d3423574d | ||
|
|
e5edd51de4 | ||
|
|
64c78d50cc | ||
|
|
b3bcca0844 | ||
|
|
61e40c88a9 | ||
|
|
40634747f7 | ||
|
|
c2e21f2f0d | ||
|
|
47dcd621c0 | ||
|
|
a0d6fe7b92 | ||
|
|
c9fa1cbab6 | ||
|
|
8a38a194fb | ||
|
|
6ac7f082c4 | ||
|
|
f6e6da9525 | ||
|
|
597cc8a455 | ||
|
|
3370abd509 | ||
|
|
631f73978c | ||
|
|
e5f30ade10 | ||
|
|
6622d22c79 | ||
|
|
4e1582f372 | ||
|
|
967897fd22 | ||
|
|
f918ec7ea2 | ||
|
|
a2ae43a55f | ||
|
|
7ae153ee9c | ||
|
|
f7b567ff84 | ||
|
|
f2e237adc8 | ||
|
|
2e5457be1d | ||
|
|
7f9d41a55e | ||
|
|
8207626bbe | ||
|
|
df8db1aa21 | ||
|
|
691db5ba02 | ||
|
|
acb8752f80 | ||
|
|
679790eee1 | ||
|
|
6bf48bd866 | ||
|
|
790d4fcbe1 | ||
|
|
89de9eb125 | ||
|
|
6324fd1d74 | ||
|
|
9e07cf2955 | ||
|
|
f03b88b3fb | ||
|
|
97d0365f49 | ||
|
|
12887875a2 | ||
|
|
450e709972 | ||
|
|
9befce2b8c | ||
|
|
cb99797798 | ||
|
|
f82b28146a | ||
|
|
4dc72b830c | ||
|
|
ea05129ebd | ||
|
|
35d217133f | ||
|
|
d1b7a24354 | ||
|
|
c85538dba1 | ||
|
|
60bd48b175 | ||
|
|
4be0aa3539 | ||
|
|
f636c34481 | ||
|
|
3bf79c752e | ||
|
|
cdb130b09a | ||
|
|
2e5d60b7db | ||
|
|
8271226a55 | ||
|
|
1013186a17 | ||
|
|
7c038b3c32 | ||
|
|
c8cd8e5f55 | ||
|
|
471cf47796 | ||
|
|
d8f64574a4 | ||
|
|
e711babbd1 | ||
|
|
a72b0f2b6f | ||
|
|
434eb6f26b | ||
|
|
197080b10b | ||
|
|
7796e8c2cb | ||
|
|
6d4363368a | ||
|
|
414638cd50 | ||
|
|
2a9983b78f | ||
|
|
b17c974a88 | ||
|
|
5717d91ab7 | ||
|
|
79eb0287ab | ||
|
|
58994225bc | ||
|
|
59d4c2fe1b | ||
|
|
3a468f2d8b | ||
|
|
1ad5d872b9 | ||
|
|
355fc8e944 | ||
|
|
380a29dbf7 | ||
|
|
1528d6642d | ||
|
|
7311fef854 | ||
|
|
906417c7c5 | ||
|
|
6aabe82035 | ||
|
|
f0877a445e | ||
|
|
da06e2daf8 | ||
|
|
d3f5f9f6b9 | ||
|
|
bfc6ea7935 | ||
|
|
8edc2cf8ca | ||
|
|
fb778e66df | ||
|
|
3a9918d37f | ||
|
|
ccb0cae134 | ||
|
|
085c8b75a6 | ||
|
|
dbf2ba3d61 | ||
|
|
b47bbac393 | ||
|
|
229cac754a | ||
|
|
0e33684194 | ||
|
|
9e982f9e4e | ||
|
|
c7a725cfad | ||
|
|
450a30cae8 | ||
|
|
9cd5e4fce8 | ||
|
|
edba5137b8 | ||
|
|
233a22960a | ||
|
|
3b024e17af | ||
|
|
a32b573ccb | ||
|
|
ec71c13ab8 | ||
|
|
f0bad2b026 | ||
|
|
25580f3251 | ||
|
|
da4de959df | ||
|
|
d0d51a8afa | ||
|
|
c67598c3e1 | ||
|
|
811d253bc2 | ||
|
|
c3a1642ead | ||
|
|
ccf65f9dee | ||
|
|
b954070d70 | ||
|
|
30e9f4496b | ||
|
|
271d3fbdaa | ||
|
|
6df40dcbe0 | ||
|
|
97f194c1fb | ||
|
|
4da769ccca | ||
|
|
253d96f2e2 | ||
|
|
bbc3e2753a | ||
|
|
67353612ba | ||
|
|
bffbd5f038 | ||
|
|
d8bbf2018e | ||
|
|
187f491ad2 | ||
|
|
335959e778 | ||
|
|
3b83bf8f6a | ||
|
|
51719893bf | ||
|
|
1841f65e64 | ||
|
|
bb28998920 | ||
|
|
fbc5f99db9 | ||
|
|
ca0a0bbeec | ||
|
|
6119f78cb9 | ||
|
|
539679c7f9 | ||
|
|
b642cd44c1 | ||
|
|
fffec3b9d9 | ||
|
|
3446dfb7cb | ||
|
|
db16276b7c | ||
|
|
629fcdd135 | ||
|
|
64ce2aada8 | ||
|
|
565f751967 | ||
|
|
6017964580 | ||
|
|
1d16b0c3fe | ||
|
|
7851b37993 | ||
|
|
d81edc573e | ||
|
|
ef0c8d5f9f | ||
|
|
db30f02b50 | ||
|
|
4ba7262467 | ||
|
|
67d0c25eab | ||
|
|
09f9552b40 | ||
|
|
142d38f776 | ||
|
|
6dd3471900 | ||
|
|
280d67896a | ||
|
|
510e6f6dc1 | ||
|
|
712e86b999 | ||
|
|
74fdba620d | ||
|
|
dc1c479a6f | ||
|
|
119d536e07 | ||
|
|
fa1bf9c653 | ||
|
|
814eed0ea1 | ||
|
|
0aa3068e9e | ||
|
|
db2d6124b1 | ||
|
|
039dc61bd2 | ||
|
|
4b879984ea | ||
|
|
55e286ba55 | ||
|
|
9450bfa26e | ||
|
|
18be482a6f | ||
|
|
ca6710ee41 | ||
|
|
9314810243 | ||
|
|
7717ae19fa | ||
|
|
32635ec685 | ||
|
|
caec7618a1 | ||
|
|
7e7ab2815c | ||
|
|
d7744f2219 | ||
|
|
7161829de5 | ||
|
|
991ba7fae3 | ||
|
|
a7539296ce | ||
|
|
258d5850c9 | ||
|
|
20759b340a | ||
|
|
8e5f761870 | ||
|
|
26714799c9 | ||
|
|
5e9d042d8f | ||
|
|
9cf98a2bcc | ||
|
|
f5ebb61495 | ||
|
|
431d88dd31 | ||
|
|
876f1a86af | ||
|
|
01951dda7a | ||
|
|
6e3dba168b | ||
|
|
d851e895d5 | ||
|
|
b962b76f43 | ||
|
|
26cf040827 | ||
|
|
8e241d1a1a | ||
|
|
3a648b209c | ||
|
|
c80f0a417a | ||
|
|
4fcca4bb18 | ||
|
|
511eda8eda | ||
|
|
5f9551719c | ||
|
|
d830b7c297 | ||
|
|
1c256f7047 | ||
|
|
a34dd63beb | ||
|
|
4aeae91f86 | ||
|
|
c073e35b1e | ||
|
|
5c892b0ba9 | ||
|
|
6985325e01 | ||
|
|
911ee27e83 | ||
|
|
2069acc6a4 | ||
|
|
278986ea0f | ||
|
|
6535e9511f | ||
|
|
60c7520a51 | ||
|
|
deb594a9a0 | ||
|
|
e314ba675b | ||
|
|
0214ce7c75 | ||
|
|
95fedbf86b | ||
|
|
b7769a05ec | ||
|
|
067f6a3536 | ||
|
|
8cad53e84c | ||
|
|
d5ed35b664 | ||
|
|
f427df17ab | ||
|
|
4e38899e97 | ||
|
|
cb6ff87fbb | ||
|
|
0deac3a2d8 | ||
|
|
92e3e18a1d | ||
|
|
3bb6165927 | ||
|
|
d0d4f277da | ||
|
|
99b0a1292b | ||
|
|
dc23886a77 | ||
|
|
b7298b6e2a | ||
|
|
3e6c3f52a9 | ||
|
|
0c0074328b | ||
|
|
f0648fc18c | ||
|
|
a7c0f8602e | ||
|
|
21a9c6aaac | ||
|
|
162e3c5261 | ||
|
|
6b3aef80ce | ||
|
|
77c4beab8a | ||
|
|
1a2c3c0f3e | ||
|
|
0eaf520d77 | ||
|
|
056d857571 | ||
|
|
69a3883199 | ||
|
|
0dcfb234ed | ||
|
|
43e8fafd49 | ||
|
|
314d506b96 | ||
|
|
af42895612 | ||
|
|
bfa6389b74 | ||
|
|
9b14f51a3e | ||
|
|
f4bfd65ff2 | ||
|
|
3cc687d486 | ||
|
|
cdb3076445 | ||
|
|
8a2f13c304 | ||
|
|
77bd7968ea | ||
|
|
993693aa79 | ||
|
|
ce4be3a91d | ||
|
|
937021133f | ||
|
|
f7b111b7d1 | ||
|
|
80d3177e5c | ||
|
|
5e5ddcfbcf | ||
|
|
5910e210f4 | ||
|
|
b375c8b946 | ||
|
|
88f6c78b02 | ||
|
|
4096b60948 | ||
|
|
2ab1c5ed1a | ||
|
|
0b40544f29 | ||
|
|
187da2c093 | ||
|
|
9a2cf56d51 | ||
|
|
0be41ec241 | ||
|
|
f1171f7c2d | ||
|
|
28ca6b5afa | ||
|
|
bec102a843 | ||
|
|
8f6f40d991 | ||
|
|
e2a8ff24a9 | ||
|
|
8588a86f9e | ||
|
|
5cb9c3129b | ||
|
|
4cc3d07426 | ||
|
|
5d01a64719 | ||
|
|
a276e06080 | ||
|
|
fd5ff02042 | ||
|
|
2b5b2cb84c | ||
|
|
ca6849e65d | ||
|
|
1535ac2ae9 | ||
|
|
a4680a590f | ||
|
|
fedb6816cd | ||
|
|
f6152b4b64 | ||
|
|
4b618047ce | ||
|
|
2c6945be30 | ||
|
|
9a6f4429a0 | ||
|
|
4c21c56bfe | ||
|
|
2a298b72eb | ||
|
|
55c0539872 | ||
|
|
9789a05c20 | ||
|
|
d050de77f9 | ||
|
|
95eb771dcd | ||
|
|
4fb1acc212 | ||
|
|
d3d3199870 | ||
|
|
1ca63e3ae3 | ||
|
|
59ce201915 | ||
|
|
8d5d3a5d00 | ||
|
|
37c8fd4842 | ||
|
|
3c6ffbaedb | ||
|
|
c7287a3caf | ||
|
|
5a304a7637 | ||
|
|
4c1d273e88 | ||
|
|
a9d2f7e894 | ||
|
|
682407f2d5 | ||
|
|
bdff345529 | ||
|
|
23109d6a9c | ||
|
|
4bb028f48e | ||
|
|
fec89790b1 | ||
|
|
a5741a3f5e | ||
|
|
863baa16ec | ||
|
|
c7214f9a6f | ||
|
|
8fd3afd56c | ||
|
|
f9b2f2b955 | ||
|
|
633b4a5ff6 | ||
|
|
b4cd069d5e | ||
|
|
0f8d03f81c | ||
|
|
077174f4ed | ||
|
|
e387eb5aba | ||
|
|
4083bf81a0 | ||
|
|
796173d08b | ||
|
|
e575b6821e | ||
|
|
d78be7e331 | ||
|
|
15c8d83358 | ||
|
|
e91d2338d8 | ||
|
|
4b235346d6 | ||
|
|
ad348291bb | ||
|
|
2f1765c4ea | ||
|
|
3c5b63d2d6 | ||
|
|
cc51a7d4e0 | ||
|
|
8af4ed7b4f | ||
|
|
8192ebe1f8 | ||
|
|
20ba04267c | ||
|
|
743b28ce11 | ||
|
|
caaa47d372 | ||
|
|
10f100ac8a | ||
|
|
8176041605 | ||
|
|
87bec4c715 | ||
|
|
190e8e27d8 | ||
|
|
4efe62a016 | ||
|
|
c64de2c980 | ||
|
|
6ad98fb3fd | ||
|
|
b08e09c370 | ||
|
|
cdab8aa389 | ||
|
|
3cd69a54b2 | ||
|
|
627dcfff39 | ||
|
|
df5cff3751 | ||
|
|
79ae0a06d5 | ||
|
|
2d2fa229ec | ||
|
|
5a59fd6392 | ||
|
|
0eb0faa26f | ||
|
|
32761d863c | ||
|
|
799c076384 | ||
|
|
f1cb5bcad2 | ||
|
|
9e8056d5a7 | ||
|
|
c6f3620859 | ||
|
|
59ae15a507 | ||
|
|
40b35b4aa6 | ||
|
|
be0f77d075 | ||
|
|
0f00efed4c | ||
|
|
e6137fd61d | ||
|
|
8cd10ac4ef | ||
|
|
64a57846d3 | ||
|
|
72f976701a | ||
|
|
5bd9cc7a6a | ||
|
|
f660c89d51 | ||
|
|
73dce4b2e4 | ||
|
|
9f37a95941 | ||
|
|
a130bc6d02 | ||
|
|
348d0a7a18 | ||
|
|
03f9daab34 | ||
|
|
a8156c1d2e | ||
|
|
3e669f369f | ||
|
|
da779b4924 | ||
|
|
89fb51dd2d | ||
|
|
01ba00ca42 | ||
|
|
e08bee320e | ||
|
|
96731798db | ||
|
|
c116339ddb | ||
|
|
e643e2c6b7 | ||
|
|
c63cc10ffa | ||
|
|
dae7c920f6 | ||
|
|
f462df021a | ||
|
|
1a84d8675b | ||
|
|
18ea0cefc3 | ||
|
|
c806f804d8 | ||
|
|
03c5b0fbd4 | ||
|
|
95649b3936 | ||
|
|
3aeb78ea4e | ||
|
|
dd109dee8e | ||
|
|
b514df2034 | ||
|
|
0969bdd305 | ||
|
|
1a9c655e3b | ||
|
|
88db5ef279 | ||
|
|
f8d8b39bba | ||
|
|
dcd60025f8 | ||
|
|
7e4674830e | ||
|
|
9ce5d9ee75 | ||
|
|
b49e75ff9a | ||
|
|
abe7a3ac2a | ||
|
|
717b1f72ed | ||
|
|
26396311b5 | ||
|
|
dffe658bac | ||
|
|
33d94a6c99 | ||
|
|
4d47921c9e | ||
|
|
d94adc2638 | ||
|
|
5c5d06d31d | ||
|
|
cc872b68a8 | ||
|
|
17cb14a336 | ||
|
|
877f4c45d3 | ||
|
|
02531431f2 | ||
|
|
e02066e7ff | ||
|
|
c9128b353d | ||
|
|
e7c6f1a2dc | ||
|
|
1a911e60a4 | ||
|
|
46cbda0be4 | ||
|
|
fa59f4b6a9 | ||
|
|
4a702f3819 | ||
|
|
6bac102a4d | ||
|
|
958a22b7cf | ||
|
|
97cd3afc75 | ||
|
|
aa2a94ed81 | ||
|
|
c7032546f1 | ||
|
|
56781d3d2e | ||
|
|
feb22fe5fe | ||
|
|
d8dddb7c02 | ||
|
|
4408d996fb | ||
|
|
ed7516c69d | ||
|
|
89af8e9d32 | ||
|
|
36a9c0b5ff | ||
|
|
9fb3bfb45a | ||
|
|
d479e34043 | ||
|
|
240089e5df | ||
|
|
1c469a9480 | ||
|
|
71f36332dd | ||
|
|
8179d2ba74 | ||
|
|
df4bad3245 | ||
|
|
a7b5c8d6a8 | ||
|
|
92b91c1878 | ||
|
|
7ec1a206ea | ||
|
|
51937c0869 | ||
|
|
6b50761222 | ||
|
|
6571408dc6 | ||
|
|
b6fab35b9f | ||
|
|
baec15387c | ||
|
|
297d7fd9c0 | ||
|
|
5002aea371 | ||
|
|
5f7ad21633 | ||
|
|
089d47f8d5 | ||
|
|
74033a662d | ||
|
|
fdef722fa1 | ||
|
|
110d4f4c91 | ||
|
|
0526e4f55a | ||
|
|
39973a0236 | ||
|
|
5d40a470a2 | ||
|
|
4cc391461a | ||
|
|
bf95333e5e | ||
|
|
b7a34316d2 | ||
|
|
74e453bdea | ||
|
|
156a59e7a9 | ||
|
|
aeca861f22 | ||
|
|
42cb53fcfa | ||
|
|
fe4d68e196 | ||
|
|
25b7fd9c01 | ||
|
|
e79e8b7dc4 | ||
|
|
965a8b2bc4 | ||
|
|
a8ac2f8664 | ||
|
|
fb0e99b884 | ||
|
|
9c6e9a4532 | ||
|
|
67af74992e | ||
|
|
103c508ffa | ||
|
|
2876773381 | ||
|
|
f06eaa873e | ||
|
|
ece34e8951 | ||
|
|
2262a32dd7 | ||
|
|
c6c0e23a32 | ||
|
|
02b324a23d | ||
|
|
b8005afc20 | ||
|
|
073522bc6c | ||
|
|
9248cb0549 | ||
|
|
6b41b61119 | ||
|
|
591bbe9c90 | ||
|
|
fc7376016c | ||
|
|
97a37c2319 | ||
|
|
3afed78a6a | ||
|
|
4279a0ca98 | ||
|
|
edcc7d2dd3 | ||
|
|
7f60b5aa40 | ||
|
|
65adb79fb6 | ||
|
|
aeeb29a356 | ||
|
|
902b2a0a45 | ||
|
|
6d9c22cd26 | ||
|
|
729baf58b2 | ||
|
|
4c9afeca34 | ||
|
|
6da7877bf5 | ||
|
|
b4e5de51ec | ||
|
|
a4b5f22554 | ||
|
|
ff08984246 | ||
|
|
137c5803c3 | ||
|
|
3eec021a1f | ||
|
|
5a33b73309 | ||
|
|
0b4e98490b | ||
|
|
80a846e119 | ||
|
|
434d60cd95 | ||
|
|
efe8902f0b | ||
|
|
44fb345437 | ||
|
|
9993976ae4 | ||
|
|
b387fb0385 | ||
|
|
10daa766a1 | ||
|
|
7b107eea51 | ||
|
|
646b885cbf | ||
|
|
0bfd0b598a | ||
|
|
fd873c69a4 | ||
|
|
d64db7409b | ||
|
|
27fec0e3bd | ||
|
|
65f934dc93 | ||
|
|
d51d784f85 | ||
|
|
aa85963987 | ||
|
|
413575f7a5 | ||
|
|
b7b4796bf2 | ||
|
|
fcbc8c830e | ||
|
|
f48ce130c7 | ||
|
|
13e69f546c | ||
|
|
63ec7b7479 | ||
|
|
7b6d7001d8 | ||
|
|
39ce6e79e7 | ||
|
|
5c961d89df | ||
|
|
3c4d6c9eba | ||
|
|
349e2e3e21 | ||
|
|
551fa9dfbf | ||
|
|
ce3674430b | ||
|
|
5cdfaeb37b | ||
|
|
38612b4edc | ||
|
|
6c5b442a9b | ||
|
|
5a5523698d | ||
|
|
05a2c206be | ||
|
|
8ca21983d8 | ||
|
|
20326b8b1b | ||
|
|
5d534e2fe6 | ||
|
|
234e230c87 | ||
|
|
34ae0f9d20 | ||
|
|
df09e5f9e1 | ||
|
|
3af2f7656c | ||
|
|
74e716bb64 | ||
|
|
85f76ac90b | ||
|
|
7f36e39676 | ||
|
|
ebe3f89ea4 | ||
|
|
b5de8af234 | ||
|
|
eb817499b0 | ||
|
|
e2af9232b2 | ||
|
|
9ca667065e | ||
|
|
ae16f68f4a | ||
|
|
3cd98c7894 | ||
|
|
2866e68838 | ||
|
|
be8786a6a4 | ||
|
|
0e841bdc54 | ||
|
|
225dceb046 | ||
|
|
b0d4f95899 | ||
|
|
d443aca863 | ||
|
|
2ebc6e6a92 | ||
|
|
f2ad10a97d | ||
|
|
ea46fe2dd4 | ||
|
|
202e76cfb0 | ||
|
|
3a68d7b467 | ||
|
|
795cc5059a | ||
|
|
5dc846fad0 | ||
|
|
d5c4c4c10e | ||
|
|
1ac3e3315e | ||
|
|
0e4dc2fc74 | ||
|
|
9bb8dc8e42 | ||
|
|
154b55dae3 | ||
|
|
6de7ef9b8d | ||
|
|
392105265c | ||
|
|
51661d8600 | ||
|
|
b5809a68bf | ||
|
|
7733d455c8 | ||
|
|
0a98b09bc2 | ||
|
|
302efc19ea | ||
|
|
55a1fa8a56 | ||
|
|
dce1088450 | ||
|
|
a171dbfc27 | ||
|
|
11a141dec9 | ||
|
|
818282710b | ||
|
|
7a7c093ab0 | ||
|
|
ce7b2a40d0 | ||
|
|
cfcec69331 | ||
|
|
91645066e2 | ||
|
|
dee5d76923 | ||
|
|
363a4e1114 | ||
|
|
ef0c08cdfe | ||
|
|
3210735c49 | ||
|
|
aab4fca422 | ||
|
|
891d7f2329 | ||
|
|
b24676ce88 | ||
|
|
cca4828ac9 | ||
|
|
bae611f216 | ||
|
|
d4e16d3e97 | ||
|
|
65dc7d0272 | ||
|
|
5404179338 | ||
|
|
7df97fb59f | ||
|
|
3187e42a23 | ||
|
|
f1927d71e4 | ||
|
|
eeeb4daabc | ||
|
|
3c4fc580bb | ||
|
|
17f3c40a31 | ||
|
|
505ed3088f | ||
|
|
0b976545c7 | ||
|
|
a047951477 | ||
|
|
6ab92c8b62 | ||
|
|
f36cd07685 | ||
|
|
668d975039 | ||
|
|
9ab3406ddb | ||
|
|
1b91a2e2cf | ||
|
|
2c288bda42 | ||
|
|
0b8c922da9 | ||
|
|
3fe294e4ef | ||
|
|
921a145592 | ||
|
|
0c24eed73a | ||
|
|
29ce2c1201 | ||
|
|
532c74ae86 | ||
|
|
9beb5af82e | ||
|
|
9e6dd23876 | ||
|
|
7a8501e307 | ||
|
|
781cc523af | ||
|
|
c6f45d4314 | ||
|
|
d11d05d07a | ||
|
|
e179aadfdf | ||
|
|
d6a9615347 | ||
|
|
c6306eb798 | ||
|
|
bcfde70d73 | ||
|
|
53e893615d | ||
|
|
303692b5ed | ||
|
|
58ca755f40 | ||
|
|
770234afa2 | ||
|
|
d77c3dfd02 | ||
|
|
c23d8a74dc | ||
|
|
74a5ff5f43 | ||
|
|
071940680f | ||
|
|
69d3b2d824 | ||
|
|
d891ff9fd9 | ||
|
|
6af22cf0ef | ||
|
|
fff24d5e35 | ||
|
|
ceba827e9a | ||
|
|
a0432a1e80 | ||
|
|
cfcf32d038 | ||
|
|
a67bdc34fa | ||
|
|
b3a653c245 | ||
|
|
4a34b7252e | ||
|
|
7e45ec57a8 | ||
|
|
afbaa80b8b | ||
|
|
115d243428 | ||
|
|
7151f63a5f | ||
|
|
597e7b1805 | ||
|
|
2934c2ce43 | ||
|
|
0f6e296a8e | ||
|
|
9c228928b6 | ||
|
|
ff3a2b8eab | ||
|
|
c4105fa035 | ||
|
|
871dbd3c92 | ||
|
|
c9ed14e6d6 | ||
|
|
1ad85e5061 | ||
|
|
09fbc6c952 | ||
|
|
895ec266bb | ||
|
|
d85448f3bb | ||
|
|
99d46e8c27 | ||
|
|
4afdff39d7 | ||
|
|
661a807c65 | ||
|
|
6d58c4546e | ||
|
|
38ffbc0222 | ||
|
|
fefb166c52 | ||
|
|
dcb3c22e0b | ||
|
|
47a53c9e46 | ||
|
|
1413cd87eb | ||
|
|
c92e184f75 | ||
|
|
3906e6ce60 | ||
|
|
c7d3c3db0d | ||
|
|
d6639d05c2 | ||
|
|
633cf7cbad | ||
|
|
a5647b79ce | ||
|
|
ba5059dd66 | ||
|
|
bb8abbbbae | ||
|
|
561504fffa | ||
|
|
23e6b8adc8 | ||
|
|
3e0ea7d07a | ||
|
|
94fd3201b2 | ||
|
|
0b3f3e1ad9 | ||
|
|
a05d2a0c05 | ||
|
|
0b14e0b367 | ||
|
|
66e8777769 | ||
|
|
348486ced4 | ||
|
|
f1f300e629 | ||
|
|
dd17922afc | ||
|
|
40fd4cb86a | ||
|
|
9e9b75ae4d | ||
|
|
8abf76ddb9 | ||
|
|
c95da745bc | ||
|
|
0cd235eef6 | ||
|
|
77315556f1 | ||
|
|
c379c181e0 | ||
|
|
31a2ec2d88 | ||
|
|
b88a52504e | ||
|
|
a95567af99 | ||
|
|
849edab8ec | ||
|
|
b158a1d946 | ||
|
|
fa2672f9fc | ||
|
|
28e3614bc0 | ||
|
|
208e095f72 | ||
|
|
0ae7abe57c | ||
|
|
dc0a294a73 | ||
|
|
468c99257c | ||
|
|
af8e8d63f9 | ||
|
|
e092418d8b | ||
|
|
e33e3045c6 | ||
|
|
cb6568bf21 | ||
|
|
235b3ba479 | ||
|
|
5b3330e0cf | ||
|
|
aab771fbdf | ||
|
|
00f95a93f5 | ||
|
|
1724e7c461 | ||
|
|
3b98a5ddac | ||
|
|
8b59cc93d5 | ||
|
|
c3e4e7c182 | ||
|
|
38348005b3 | ||
|
|
208c4b9128 | ||
|
|
ec574c2c41 | ||
|
|
871be928a8 | ||
|
|
b20d4f8626 | ||
|
|
073d7a5985 | ||
|
|
40306424b1 | ||
|
|
ecb3bfe543 | ||
|
|
abeac45abe | ||
|
|
0fca93ac60 | ||
|
|
857e5f329a | ||
|
|
053419cd24 | ||
|
|
99e207bab0 | ||
|
|
0067bbe7a7 | ||
|
|
45aa690868 | ||
|
|
beb245e92f | ||
|
|
c424df0d2f | ||
|
|
87929e4b35 | ||
|
|
d76736fc5e | ||
|
|
0f9b77223e | ||
|
|
9f47175a40 | ||
|
|
a1a8713aad | ||
|
|
6501a06d46 | ||
|
|
8d89fbae5a | ||
|
|
7a2cf5455c | ||
|
|
7125a7ca8b | ||
|
|
54d47874f7 | ||
|
|
2761012f69 | ||
|
|
3de2a1e635 | ||
|
|
1eff9ac0c5 | ||
|
|
54f329fe93 | ||
|
|
9baa2ef53b | ||
|
|
6bde5972c3 | ||
|
|
36f6cb369b | ||
|
|
b845d58b04 | ||
|
|
efb113c736 | ||
|
|
3ce59dae88 | ||
|
|
f0b0caa3fa | ||
|
|
58384838c3 | ||
|
|
abb870d1ad | ||
|
|
daa982bc01 | ||
|
|
767414a292 | ||
|
|
7b417b388a | ||
|
|
44424ceee9 | ||
|
|
08a5b7f800 | ||
|
|
1cde6f1d52 | ||
|
|
2d8acd8039 | ||
|
|
67035ede49 | ||
|
|
eb6c37da43 | ||
|
|
2736595628 | ||
|
|
7b1a2bbe17 | ||
|
|
c25303c3d5 | ||
|
|
cc025e1226 | ||
|
|
eca1b76f01 | ||
|
|
366cbfb04a | ||
|
|
18bb3d1e35 | ||
|
|
10e7194db1 | ||
|
|
ef357c4bf2 | ||
|
|
5260e68f64 | ||
|
|
6a1ca41e17 | ||
|
|
c99dcbd2d6 | ||
|
|
da0db53a75 | ||
|
|
c52b01f326 | ||
|
|
36597dc40f | ||
|
|
9b4556c469 | ||
|
|
f3098c4d8a | ||
|
|
bdb3f7a769 | ||
|
|
afb5b55de6 | ||
|
|
c23cec29a3 | ||
|
|
e5b9fac281 | ||
|
|
08c1d0d3bc | ||
|
|
20e91e8375 | ||
|
|
f9c6878714 | ||
|
|
8c5dc3ad40 | ||
|
|
1d2e86aed9 | ||
|
|
a2f7e3a5bb | ||
|
|
f2a3a3522c | ||
|
|
b487ef0833 | ||
|
|
d0922f29a3 | ||
|
|
b90bcbe79e | ||
|
|
8236e85178 | ||
|
|
803abae206 | ||
|
|
50bdd8a9e7 | ||
|
|
34554a7ad4 | ||
|
|
93e1659586 | ||
|
|
b576abb457 | ||
|
|
f166bccc8f | ||
|
|
5a2ba45e09 | ||
|
|
e133e1213f | ||
|
|
454d6691d8 | ||
|
|
d793aebaed | ||
|
|
5991ddfd7a | ||
|
|
a88bc6bbd3 | ||
|
|
46c8c43266 | ||
|
|
fedf9f3902 | ||
|
|
0f862ea18c | ||
|
|
c8e30044b8 | ||
|
|
cec3a53cbd | ||
|
|
6fc5b0bb17 | ||
|
|
9b0a8bc198 | ||
|
|
e5e74ffb97 | ||
|
|
eb99a7ee5f | ||
|
|
50891fece7 | ||
|
|
ef53099e35 | ||
|
|
c0a10ca8dc | ||
|
|
8f88eb1fa7 | ||
|
|
447b1d7170 | ||
|
|
dbddab2799 | ||
|
|
802622ac1c | ||
|
|
e0e56865a0 | ||
|
|
eb11aaccbb | ||
|
|
d207e7cf88 | ||
|
|
36cf7bccde | ||
|
|
5fd5ce0838 | ||
|
|
6ae796b1ee | ||
|
|
9c3e23fb64 | ||
|
|
5f9f2b7396 | ||
|
|
4618f3da74 | ||
|
|
eb0387a848 | ||
|
|
fe6dc08b79 | ||
|
|
4f2a5e06da | ||
|
|
2c8d32de33 | ||
|
|
2b70537d7b | ||
|
|
6a4f0a114d | ||
|
|
5adcaa4385 | ||
|
|
51c8e53ffe | ||
|
|
4f9f96f646 | ||
|
|
5fb3df4aff | ||
|
|
7a9054ec79 | ||
|
|
2770590d5a | ||
|
|
e9cb9c2811 | ||
|
|
1cab2c6dcf | ||
|
|
86e709d3de | ||
|
|
8519c32d25 | ||
|
|
f3dc18d874 | ||
|
|
1293ce58ac | ||
|
|
0a3c8b6291 | ||
|
|
134cff47ab | ||
|
|
f137bef973 | ||
|
|
2bf94b3116 | ||
|
|
6bcd846b52 | ||
|
|
2fb47e073a | ||
|
|
05b4029662 | ||
|
|
33d507f1fe | ||
|
|
c44b9ee95e | ||
|
|
8126094cf1 | ||
|
|
0ac22e4f5a | ||
|
|
c31b124d7a | ||
|
|
47b8dab29e | ||
|
|
91e6a3855b | ||
|
|
5623100e43 | ||
|
|
6eb08fbf8b | ||
|
|
437d76c19a | ||
|
|
2152ee8601 | ||
|
|
a1cab7cead | ||
|
|
8b95c38707 | ||
|
|
c6b55a8d48 | ||
|
|
aded78d9e2 | ||
|
|
7745f5d881 | ||
|
|
18b7f87409 | ||
|
|
62a29bbf7b | ||
|
|
2fc31a4872 | ||
|
|
44c636df89 | ||
|
|
1e055db69c | ||
|
|
0ecedbdb03 | ||
|
|
43c0a396a2 | ||
|
|
00f3977f77 | ||
|
|
e26005adea | ||
|
|
4b0d9eed45 | ||
|
|
3efa45c3a2 | ||
|
|
2727dbf78d | ||
|
|
e3f7e05c27 | ||
|
|
da54ed4412 | ||
|
|
d8edbf3a93 | ||
|
|
a62db07f58 | ||
|
|
b58faab5e7 | ||
|
|
854cad639e | ||
|
|
cb25a0e30c | ||
|
|
377086af3d | ||
|
|
820eedcb50 | ||
|
|
da273188f3 | ||
|
|
1bd9258272 | ||
|
|
c076845454 | ||
|
|
afd233c05c | ||
|
|
3072fab115 | ||
|
|
87cbd21323 | ||
|
|
3b84a43076 | ||
|
|
2c8bedd12c | ||
|
|
1a3fe4212f | ||
|
|
c4cfbdf5a5 | ||
|
|
ef9f8451c8 | ||
|
|
9f5f960213 | ||
|
|
a4a590b5b1 | ||
|
|
7f69fd3b39 | ||
|
|
a7e5259c33 | ||
|
|
7cc3c6fd62 | ||
|
|
d119b54df6 | ||
|
|
8cc98b2358 | ||
|
|
f24c674b04 | ||
|
|
58b53721af | ||
|
|
f74e22ae28 | ||
|
|
16c73c2e51 | ||
|
|
5776c3295b | ||
|
|
9e0dd8692e | ||
|
|
5aba6ea4fe | ||
|
|
c5a088d341 | ||
|
|
92743d423a | ||
|
|
9e1ee3364a | ||
|
|
e0edf1e041 | ||
|
|
6025795d95 | ||
|
|
e30189021d | ||
|
|
09bd408c28 | ||
|
|
9f7963468b | ||
|
|
b940c84a24 | ||
|
|
0f7099a59b | ||
|
|
c02d8e4040 | ||
|
|
0f6b00b587 | ||
|
|
7b531c0be6 | ||
|
|
0d14e225fa | ||
|
|
0fe64c04f8 | ||
|
|
0d8d9877ad | ||
|
|
8cc42e7c1a | ||
|
|
1987c2325a | ||
|
|
aac3fe0f4a | ||
|
|
3fb2c487c0 | ||
|
|
d3975459d1 | ||
|
|
ccbd296bee | ||
|
|
e7cf18cb6b | ||
|
|
09cc744c90 | ||
|
|
a57ed21f6d | ||
|
|
975a91d0ac | ||
|
|
b905e5f583 | ||
|
|
ef4f4544a2 | ||
|
|
5c1327931a | ||
|
|
106d091e80 | ||
|
|
f83ae7816b | ||
|
|
f148ea4473 | ||
|
|
7d950ca1d6 | ||
|
|
d157d2597a | ||
|
|
e567ef93d8 | ||
|
|
27179cfdba | ||
|
|
6f0ff3bab9 | ||
|
|
a9806fd83d | ||
|
|
62cf7aaf9a | ||
|
|
a1f03c7b06 | ||
|
|
f8dc441430 | ||
|
|
010ebaf783 | ||
|
|
138b11f36e | ||
|
|
05df0c1d4a | ||
|
|
b04bb07c94 | ||
|
|
b620a5f811 | ||
|
|
b3a27b5217 | ||
|
|
5e596cac0a | ||
|
|
1e47d226e1 | ||
|
|
817e8f523f | ||
|
|
8cc4434116 | ||
|
|
893a13df55 | ||
|
|
c34e358456 | ||
|
|
a6a61601de | ||
|
|
e0c982c8d0 | ||
|
|
331ce0a05d | ||
|
|
80066952bc | ||
|
|
e08878f498 | ||
|
|
a949a3ae6b | ||
|
|
7df4635faf | ||
|
|
f79007e542 | ||
|
|
ac249f421f | ||
|
|
e86e9474bf | ||
|
|
bbd4bb037a | ||
|
|
5c44af1875 | ||
|
|
33407be7d6 | ||
|
|
8e686771af | ||
|
|
2933532c5b | ||
|
|
6b57e8c5ac | ||
|
|
c6c555cf8a | ||
|
|
db7e31b853 | ||
|
|
d67e097462 | ||
|
|
38ed13444a | ||
|
|
8a9f53bebf | ||
|
|
80cc23304f | ||
|
|
813962f85a | ||
|
|
109626fcc0 | ||
|
|
204c9398ab | ||
|
|
2962317dea | ||
|
|
268fb2bdd8 | ||
|
|
101e0d1e91 | ||
|
|
f95f29fd25 | ||
|
|
06f34701fe | ||
|
|
5ce7d172d7 | ||
|
|
2e3a32e4ac | ||
|
|
8190e3631b | ||
|
|
e4db6fd042 | ||
|
|
497cd3e68e | ||
|
|
460d8acbaa | ||
|
|
9bf7fa5213 | ||
|
|
73f4e7afba | ||
|
|
9715661c19 |
33
.gitignore
vendored
Normal file
33
.gitignore
vendored
Normal file
@@ -0,0 +1,33 @@
|
||||
*.pyc
|
||||
*.pyo
|
||||
*~
|
||||
*.DS_Store
|
||||
wine-py2exe/
|
||||
py2exe.log
|
||||
*.kate-swp
|
||||
build/
|
||||
dist/
|
||||
MANIFEST
|
||||
README.txt
|
||||
youtube-dl.1
|
||||
youtube-dl.bash-completion
|
||||
youtube-dl.fish
|
||||
youtube-dl
|
||||
youtube-dl.exe
|
||||
youtube-dl.tar.gz
|
||||
.coverage
|
||||
cover/
|
||||
updates_key.pem
|
||||
*.egg-info
|
||||
*.srt
|
||||
*.sbv
|
||||
*.vtt
|
||||
*.flv
|
||||
*.mp4
|
||||
*.m4a
|
||||
*.m4v
|
||||
*.part
|
||||
*.swp
|
||||
test/testdata
|
||||
.tox
|
||||
youtube-dl.zsh
|
||||
17
.travis.yml
Normal file
17
.travis.yml
Normal file
@@ -0,0 +1,17 @@
|
||||
language: python
|
||||
python:
|
||||
- "2.6"
|
||||
- "2.7"
|
||||
- "3.3"
|
||||
- "3.4"
|
||||
script: nosetests test --verbose
|
||||
notifications:
|
||||
email:
|
||||
- filippo.valsorda@gmail.com
|
||||
- phihag@phihag.de
|
||||
- jaime.marquinez.ferrandiz+travis@gmail.com
|
||||
- yasoob.khld@gmail.com
|
||||
# irc:
|
||||
# channels:
|
||||
# - "irc.freenode.org#youtube-dl"
|
||||
# skip_join: true
|
||||
94
AUTHORS
Normal file
94
AUTHORS
Normal file
@@ -0,0 +1,94 @@
|
||||
Ricardo Garcia Gonzalez
|
||||
Danny Colligan
|
||||
Benjamin Johnson
|
||||
Vasyl' Vavrychuk
|
||||
Witold Baryluk
|
||||
Paweł Paprota
|
||||
Gergely Imreh
|
||||
Rogério Brito
|
||||
Philipp Hagemeister
|
||||
Sören Schulze
|
||||
Kevin Ngo
|
||||
Ori Avtalion
|
||||
shizeeg
|
||||
Filippo Valsorda
|
||||
Christian Albrecht
|
||||
Dave Vasilevsky
|
||||
Jaime Marquínez Ferrándiz
|
||||
Jeff Crouse
|
||||
Osama Khalid
|
||||
Michael Walter
|
||||
M. Yasoob Ullah Khalid
|
||||
Julien Fraichard
|
||||
Johny Mo Swag
|
||||
Axel Noack
|
||||
Albert Kim
|
||||
Pierre Rudloff
|
||||
Huarong Huo
|
||||
Ismael Mejía
|
||||
Steffan 'Ruirize' James
|
||||
Andras Elso
|
||||
Jelle van der Waa
|
||||
Marcin Cieślak
|
||||
Anton Larionov
|
||||
Takuya Tsuchida
|
||||
Sergey M.
|
||||
Michael Orlitzky
|
||||
Chris Gahan
|
||||
Saimadhav Heblikar
|
||||
Mike Col
|
||||
Oleg Prutz
|
||||
pulpe
|
||||
Andreas Schmitz
|
||||
Michael Kaiser
|
||||
Niklas Laxström
|
||||
David Triendl
|
||||
Anthony Weems
|
||||
David Wagner
|
||||
Juan C. Olivares
|
||||
Mattias Harrysson
|
||||
phaer
|
||||
Sainyam Kapoor
|
||||
Nicolas Évrard
|
||||
Jason Normore
|
||||
Hoje Lee
|
||||
Adam Thalhammer
|
||||
Georg Jähnig
|
||||
Ralf Haring
|
||||
Koki Takahashi
|
||||
Ariset Llerena
|
||||
Adam Malcontenti-Wilson
|
||||
Tobias Bell
|
||||
Naglis Jonaitis
|
||||
Charles Chen
|
||||
Hassaan Ali
|
||||
Dobrosław Żybort
|
||||
David Fabijan
|
||||
Sebastian Haas
|
||||
Alexander Kirk
|
||||
Erik Johnson
|
||||
Keith Beckman
|
||||
Ole Ernst
|
||||
Aaron McDaniel (mcd1992)
|
||||
Magnus Kolstad
|
||||
Hari Padmanaban
|
||||
Carlos Ramos
|
||||
5moufl
|
||||
lenaten
|
||||
Dennis Scheiba
|
||||
Damon Timm
|
||||
winwon
|
||||
Xavier Beynon
|
||||
Gabriel Schubiner
|
||||
xantares
|
||||
Jan Matějka
|
||||
Mauroy Sébastien
|
||||
William Sewell
|
||||
Dao Hoang Son
|
||||
Oskar Jauch
|
||||
Matthew Rayfield
|
||||
t0mm0
|
||||
Tithen-Firion
|
||||
Zack Fernandes
|
||||
cryptonaut
|
||||
Adrian Kretz
|
||||
@@ -1 +0,0 @@
|
||||
2010.07.14
|
||||
24
LICENSE
Normal file
24
LICENSE
Normal file
@@ -0,0 +1,24 @@
|
||||
This is free and unencumbered software released into the public domain.
|
||||
|
||||
Anyone is free to copy, modify, publish, use, compile, sell, or
|
||||
distribute this software, either in source code form or as a compiled
|
||||
binary, for any purpose, commercial or non-commercial, and by any
|
||||
means.
|
||||
|
||||
In jurisdictions that recognize copyright laws, the author or authors
|
||||
of this software dedicate any and all copyright interest in the
|
||||
software to the public domain. We make this dedication for the benefit
|
||||
of the public at large and to the detriment of our heirs and
|
||||
successors. We intend this dedication to be an overt act of
|
||||
relinquishment in perpetuity of all present and future rights to this
|
||||
software under copyright law.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
For more information, please refer to <http://unlicense.org/>
|
||||
7
MANIFEST.in
Normal file
7
MANIFEST.in
Normal file
@@ -0,0 +1,7 @@
|
||||
include README.md
|
||||
include test/*.py
|
||||
include test/*.json
|
||||
include youtube-dl.bash-completion
|
||||
include youtube-dl.fish
|
||||
include youtube-dl.1
|
||||
recursive-include docs Makefile conf.py *.rst
|
||||
98
Makefile
Normal file
98
Makefile
Normal file
@@ -0,0 +1,98 @@
|
||||
all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
|
||||
|
||||
clean:
|
||||
rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish *.dump *.part
|
||||
|
||||
cleanall: clean
|
||||
rm -f youtube-dl youtube-dl.exe
|
||||
|
||||
PREFIX ?= /usr/local
|
||||
BINDIR ?= $(PREFIX)/bin
|
||||
MANDIR ?= $(PREFIX)/man
|
||||
SHAREDIR ?= $(PREFIX)/share
|
||||
PYTHON ?= /usr/bin/env python
|
||||
|
||||
# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
|
||||
ifeq ($(PREFIX),/usr)
|
||||
SYSCONFDIR=/etc
|
||||
else
|
||||
ifeq ($(PREFIX),/usr/local)
|
||||
SYSCONFDIR=/etc
|
||||
else
|
||||
SYSCONFDIR=$(PREFIX)/etc
|
||||
endif
|
||||
endif
|
||||
|
||||
install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
|
||||
install -d $(DESTDIR)$(BINDIR)
|
||||
install -m 755 youtube-dl $(DESTDIR)$(BINDIR)
|
||||
install -d $(DESTDIR)$(MANDIR)/man1
|
||||
install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1
|
||||
install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
|
||||
install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
|
||||
install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
|
||||
install -m 644 youtube-dl.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dl
|
||||
install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions
|
||||
install -m 644 youtube-dl.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dl.fish
|
||||
|
||||
test:
|
||||
#nosetests --with-coverage --cover-package=youtube_dl --cover-html --verbose --processes 4 test
|
||||
nosetests --verbose test
|
||||
|
||||
tar: youtube-dl.tar.gz
|
||||
|
||||
.PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion
|
||||
|
||||
pypi-files: youtube-dl.bash-completion README.txt youtube-dl.1 youtube-dl.fish
|
||||
|
||||
youtube-dl: youtube_dl/*.py youtube_dl/*/*.py
|
||||
zip --quiet youtube-dl youtube_dl/*.py youtube_dl/*/*.py
|
||||
zip --quiet --junk-paths youtube-dl youtube_dl/__main__.py
|
||||
echo '#!$(PYTHON)' > youtube-dl
|
||||
cat youtube-dl.zip >> youtube-dl
|
||||
rm youtube-dl.zip
|
||||
chmod a+x youtube-dl
|
||||
|
||||
README.md: youtube_dl/*.py youtube_dl/*/*.py
|
||||
COLUMNS=80 python -m youtube_dl --help | python devscripts/make_readme.py
|
||||
|
||||
README.txt: README.md
|
||||
pandoc -f markdown -t plain README.md -o README.txt
|
||||
|
||||
youtube-dl.1: README.md
|
||||
python devscripts/prepare_manpage.py >youtube-dl.1.temp.md
|
||||
pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1
|
||||
rm -f youtube-dl.1.temp.md
|
||||
|
||||
youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
|
||||
python devscripts/bash-completion.py
|
||||
|
||||
bash-completion: youtube-dl.bash-completion
|
||||
|
||||
youtube-dl.zsh: youtube_dl/*.py youtube_dl/*/*.py devscripts/zsh-completion.in
|
||||
python devscripts/zsh-completion.py
|
||||
|
||||
zsh-completion: youtube-dl.zsh
|
||||
|
||||
youtube-dl.fish: youtube_dl/*.py youtube_dl/*/*.py devscripts/fish-completion.in
|
||||
python devscripts/fish-completion.py
|
||||
|
||||
fish-completion: youtube-dl.fish
|
||||
|
||||
youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
|
||||
@tar -czf youtube-dl.tar.gz --transform "s|^|youtube-dl/|" --owner 0 --group 0 \
|
||||
--exclude '*.DS_Store' \
|
||||
--exclude '*.kate-swp' \
|
||||
--exclude '*.pyc' \
|
||||
--exclude '*.pyo' \
|
||||
--exclude '*~' \
|
||||
--exclude '__pycache' \
|
||||
--exclude '.git' \
|
||||
--exclude 'testdata' \
|
||||
--exclude 'docs/_build' \
|
||||
-- \
|
||||
bin devscripts test youtube_dl docs \
|
||||
LICENSE README.md README.txt \
|
||||
Makefile MANIFEST.in youtube-dl.1 youtube-dl.bash-completion \
|
||||
youtube-dl.zsh youtube-dl.fish setup.py \
|
||||
youtube-dl
|
||||
599
README.md
Normal file
599
README.md
Normal file
@@ -0,0 +1,599 @@
|
||||
youtube-dl - download videos from youtube.com or other video platforms
|
||||
|
||||
# SYNOPSIS
|
||||
**youtube-dl** [OPTIONS] URL [URL...]
|
||||
|
||||
# INSTALLATION
|
||||
|
||||
To install it right away for all UNIX users (Linux, OS X, etc.), type:
|
||||
|
||||
sudo curl https://yt-dl.org/latest/youtube-dl -o /usr/local/bin/youtube-dl
|
||||
sudo chmod a+x /usr/local/bin/youtube-dl
|
||||
|
||||
If you do not have curl, you can alternatively use a recent wget:
|
||||
|
||||
sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O /usr/local/bin/youtube-dl
|
||||
sudo chmod a+x /usr/local/bin/youtube-dl
|
||||
|
||||
Windows users can [download a .exe file](https://yt-dl.org/latest/youtube-dl.exe) and place it in their home directory or any other location on their [PATH](http://en.wikipedia.org/wiki/PATH_%28variable%29).
|
||||
|
||||
OS X users can install **youtube-dl** with [Homebrew](http://brew.sh/).
|
||||
|
||||
brew install youtube-dl
|
||||
|
||||
You can also use pip:
|
||||
|
||||
sudo pip install youtube-dl
|
||||
|
||||
Alternatively, refer to the developer instructions below for how to check out and work with the git repository. For further options, including PGP signatures, see https://rg3.github.io/youtube-dl/download.html .
|
||||
|
||||
# DESCRIPTION
|
||||
**youtube-dl** is a small command-line program to download videos from
|
||||
YouTube.com and a few more sites. It requires the Python interpreter, version
|
||||
2.6, 2.7, or 3.2+, and it is not platform specific. It should work on
|
||||
your Unix box, on Windows or on Mac OS X. It is released to the public domain,
|
||||
which means you can modify it, redistribute it or use it however you like.
|
||||
|
||||
# OPTIONS
|
||||
-h, --help print this help text and exit
|
||||
--version print program version and exit
|
||||
-U, --update update this program to latest version. Make
|
||||
sure that you have sufficient permissions
|
||||
(run with sudo if needed)
|
||||
-i, --ignore-errors continue on download errors, for example to
|
||||
skip unavailable videos in a playlist
|
||||
--abort-on-error Abort downloading of further videos (in the
|
||||
playlist or the command line) if an error
|
||||
occurs
|
||||
--dump-user-agent display the current browser identification
|
||||
--list-extractors List all supported extractors and the URLs
|
||||
they would handle
|
||||
--extractor-descriptions Output descriptions of all supported
|
||||
extractors
|
||||
--proxy URL Use the specified HTTP/HTTPS proxy. Pass in
|
||||
an empty string (--proxy "") for direct
|
||||
connection
|
||||
--socket-timeout None Time to wait before giving up, in seconds
|
||||
--default-search PREFIX Use this prefix for unqualified URLs. For
|
||||
example "gvsearch2:" downloads two videos
|
||||
from google videos for youtube-dl "large
|
||||
apple". Use the value "auto" to let
|
||||
youtube-dl guess ("auto_warning" to emit a
|
||||
warning when guessing). "error" just throws
|
||||
an error. The default value "fixup_error"
|
||||
repairs broken URLs, but emits an error if
|
||||
this is not possible instead of searching.
|
||||
--ignore-config Do not read configuration files. When given
|
||||
in the global configuration file /etc
|
||||
/youtube-dl.conf: Do not read the user
|
||||
configuration in ~/.config/youtube-
|
||||
dl/config (%APPDATA%/youtube-dl/config.txt
|
||||
on Windows)
|
||||
--flat-playlist Do not extract the videos of a playlist,
|
||||
only list them.
|
||||
|
||||
## Video Selection:
|
||||
--playlist-start NUMBER playlist video to start at (default is 1)
|
||||
--playlist-end NUMBER playlist video to end at (default is last)
|
||||
--match-title REGEX download only matching titles (regex or
|
||||
caseless sub-string)
|
||||
--reject-title REGEX skip download for matching titles (regex or
|
||||
caseless sub-string)
|
||||
--max-downloads NUMBER Abort after downloading NUMBER files
|
||||
--min-filesize SIZE Do not download any videos smaller than
|
||||
SIZE (e.g. 50k or 44.6m)
|
||||
--max-filesize SIZE Do not download any videos larger than SIZE
|
||||
(e.g. 50k or 44.6m)
|
||||
--date DATE download only videos uploaded in this date
|
||||
--datebefore DATE download only videos uploaded on or before
|
||||
this date (i.e. inclusive)
|
||||
--dateafter DATE download only videos uploaded on or after
|
||||
this date (i.e. inclusive)
|
||||
--min-views COUNT Do not download any videos with less than
|
||||
COUNT views
|
||||
--max-views COUNT Do not download any videos with more than
|
||||
COUNT views
|
||||
--no-playlist If the URL refers to a video and a
|
||||
playlist, download only the video.
|
||||
--age-limit YEARS download only videos suitable for the given
|
||||
age
|
||||
--download-archive FILE Download only videos not listed in the
|
||||
archive file. Record the IDs of all
|
||||
downloaded videos in it.
|
||||
--include-ads Download advertisements as well
|
||||
(experimental)
|
||||
|
||||
## Download Options:
|
||||
-r, --rate-limit LIMIT maximum download rate in bytes per second
|
||||
(e.g. 50K or 4.2M)
|
||||
-R, --retries RETRIES number of retries (default is 10)
|
||||
--buffer-size SIZE size of download buffer (e.g. 1024 or 16K)
|
||||
(default is 1024)
|
||||
--no-resize-buffer do not automatically adjust the buffer
|
||||
size. By default, the buffer size is
|
||||
automatically resized from an initial value
|
||||
of SIZE.
|
||||
|
||||
## Filesystem Options:
|
||||
-a, --batch-file FILE file containing URLs to download ('-' for
|
||||
stdin)
|
||||
--id use only video ID in file name
|
||||
-A, --auto-number number downloaded files starting from 00000
|
||||
-o, --output TEMPLATE output filename template. Use %(title)s to
|
||||
get the title, %(uploader)s for the
|
||||
uploader name, %(uploader_id)s for the
|
||||
uploader nickname if different,
|
||||
%(autonumber)s to get an automatically
|
||||
incremented number, %(ext)s for the
|
||||
filename extension, %(format)s for the
|
||||
format description (like "22 - 1280x720" or
|
||||
"HD"), %(format_id)s for the unique id of
|
||||
the format (like Youtube's itags: "137"),
|
||||
%(upload_date)s for the upload date
|
||||
(YYYYMMDD), %(extractor)s for the provider
|
||||
(youtube, metacafe, etc), %(id)s for the
|
||||
video id, %(playlist_title)s,
|
||||
%(playlist_id)s, or %(playlist)s (=title if
|
||||
present, ID otherwise) for the playlist the
|
||||
video is in, %(playlist_index)s for the
|
||||
position in the playlist. %(height)s and
|
||||
%(width)s for the width and height of the
|
||||
video format. %(resolution)s for a textual
|
||||
description of the resolution of the video
|
||||
format. %% for a literal percent. Use - to
|
||||
output to stdout. Can also be used to
|
||||
download to a different directory, for
|
||||
example with -o '/my/downloads/%(uploader)s
|
||||
/%(title)s-%(id)s.%(ext)s' .
|
||||
--autonumber-size NUMBER Specifies the number of digits in
|
||||
%(autonumber)s when it is present in output
|
||||
filename template or --auto-number option
|
||||
is given
|
||||
--restrict-filenames Restrict filenames to only ASCII
|
||||
characters, and avoid "&" and spaces in
|
||||
filenames
|
||||
-t, --title [deprecated] use title in file name
|
||||
(default)
|
||||
-l, --literal [deprecated] alias of --title
|
||||
-w, --no-overwrites do not overwrite files
|
||||
-c, --continue force resume of partially downloaded files.
|
||||
By default, youtube-dl will resume
|
||||
downloads if possible.
|
||||
--no-continue do not resume partially downloaded files
|
||||
(restart from beginning)
|
||||
--no-part do not use .part files - write directly
|
||||
into output file
|
||||
--no-mtime do not use the Last-modified header to set
|
||||
the file modification time
|
||||
--write-description write video description to a .description
|
||||
file
|
||||
--write-info-json write video metadata to a .info.json file
|
||||
--write-annotations write video annotations to a .annotation
|
||||
file
|
||||
--write-thumbnail write thumbnail image to disk
|
||||
--load-info FILE json file containing the video information
|
||||
(created with the "--write-json" option)
|
||||
--cookies FILE file to read cookies from and dump cookie
|
||||
jar in
|
||||
--cache-dir DIR Location in the filesystem where youtube-dl
|
||||
can store some downloaded information
|
||||
permanently. By default $XDG_CACHE_HOME
|
||||
/youtube-dl or ~/.cache/youtube-dl . At the
|
||||
moment, only YouTube player files (for
|
||||
videos with obfuscated signatures) are
|
||||
cached, but that may change.
|
||||
--no-cache-dir Disable filesystem caching
|
||||
--rm-cache-dir Delete all filesystem cache files
|
||||
|
||||
## Verbosity / Simulation Options:
|
||||
-q, --quiet activates quiet mode
|
||||
--no-warnings Ignore warnings
|
||||
-s, --simulate do not download the video and do not write
|
||||
anything to disk
|
||||
--skip-download do not download the video
|
||||
-g, --get-url simulate, quiet but print URL
|
||||
-e, --get-title simulate, quiet but print title
|
||||
--get-id simulate, quiet but print id
|
||||
--get-thumbnail simulate, quiet but print thumbnail URL
|
||||
--get-description simulate, quiet but print video description
|
||||
--get-duration simulate, quiet but print video length
|
||||
--get-filename simulate, quiet but print output filename
|
||||
--get-format simulate, quiet but print output format
|
||||
-j, --dump-json simulate, quiet but print JSON information.
|
||||
See --output for a description of available
|
||||
keys.
|
||||
-J, --dump-single-json simulate, quiet but print JSON information
|
||||
for each command-line argument. If the URL
|
||||
refers to a playlist, dump the whole
|
||||
playlist information in a single line.
|
||||
--newline output progress bar as new lines
|
||||
--no-progress do not print progress bar
|
||||
--console-title display progress in console titlebar
|
||||
-v, --verbose print various debugging information
|
||||
--dump-intermediate-pages print downloaded pages to debug problems
|
||||
(very verbose)
|
||||
--write-pages Write downloaded intermediary pages to
|
||||
files in the current directory to debug
|
||||
problems
|
||||
--print-traffic Display sent and read HTTP traffic
|
||||
|
||||
## Workarounds:
|
||||
--encoding ENCODING Force the specified encoding (experimental)
|
||||
--no-check-certificate Suppress HTTPS certificate validation.
|
||||
--prefer-insecure Use an unencrypted connection to retrieve
|
||||
information about the video. (Currently
|
||||
supported only for YouTube)
|
||||
--user-agent UA specify a custom user agent
|
||||
--referer URL specify a custom referer, use if the video
|
||||
access is restricted to one domain
|
||||
--add-header FIELD:VALUE specify a custom HTTP header and its value,
|
||||
separated by a colon ':'. You can use this
|
||||
option multiple times
|
||||
--bidi-workaround Work around terminals that lack
|
||||
bidirectional text support. Requires bidiv
|
||||
or fribidi executable in PATH
|
||||
|
||||
## Video Format Options:
|
||||
-f, --format FORMAT video format code, specify the order of
|
||||
preference using slashes: -f 22/17/18 . -f
|
||||
mp4 , -f m4a and -f flv are also
|
||||
supported. You can also use the special
|
||||
names "best", "bestvideo", "bestaudio",
|
||||
"worst", "worstvideo" and "worstaudio". By
|
||||
default, youtube-dl will pick the best
|
||||
quality. Use commas to download multiple
|
||||
audio formats, such as -f
|
||||
136/137/mp4/bestvideo,140/m4a/bestaudio.
|
||||
You can merge the video and audio of two
|
||||
formats into a single file using -f <video-
|
||||
format>+<audio-format> (requires ffmpeg or
|
||||
avconv), for example -f
|
||||
bestvideo+bestaudio.
|
||||
--all-formats download all available video formats
|
||||
--prefer-free-formats prefer free video formats unless a specific
|
||||
one is requested
|
||||
--max-quality FORMAT highest quality format to download
|
||||
-F, --list-formats list all available formats
|
||||
--youtube-skip-dash-manifest Do not download the DASH manifest on
|
||||
YouTube videos
|
||||
|
||||
## Subtitle Options:
|
||||
--write-sub write subtitle file
|
||||
--write-auto-sub write automatic subtitle file (youtube
|
||||
only)
|
||||
--all-subs downloads all the available subtitles of
|
||||
the video
|
||||
--list-subs lists all available subtitles for the video
|
||||
--sub-format FORMAT subtitle format (default=srt) ([sbv/vtt]
|
||||
youtube only)
|
||||
--sub-lang LANGS languages of the subtitles to download
|
||||
(optional) separated by commas, use IETF
|
||||
language tags like 'en,pt'
|
||||
|
||||
## Authentication Options:
|
||||
-u, --username USERNAME login with this account ID
|
||||
-p, --password PASSWORD account password
|
||||
-2, --twofactor TWOFACTOR two-factor auth code
|
||||
-n, --netrc use .netrc authentication data
|
||||
--video-password PASSWORD video password (vimeo, smotri)
|
||||
|
||||
## Post-processing Options:
|
||||
-x, --extract-audio convert video files to audio-only files
|
||||
(requires ffmpeg or avconv and ffprobe or
|
||||
avprobe)
|
||||
--audio-format FORMAT "best", "aac", "vorbis", "mp3", "m4a",
|
||||
"opus", or "wav"; "best" by default
|
||||
--audio-quality QUALITY ffmpeg/avconv audio quality specification,
|
||||
insert a value between 0 (better) and 9
|
||||
(worse) for VBR or a specific bitrate like
|
||||
128K (default 5)
|
||||
--recode-video FORMAT Encode the video to another format if
|
||||
necessary (currently supported:
|
||||
mp4|flv|ogg|webm|mkv)
|
||||
-k, --keep-video keeps the video file on disk after the
|
||||
post-processing; the video is erased by
|
||||
default
|
||||
--no-post-overwrites do not overwrite post-processed files; the
|
||||
post-processed files are overwritten by
|
||||
default
|
||||
--embed-subs embed subtitles in the video (only for mp4
|
||||
videos)
|
||||
--embed-thumbnail embed thumbnail in the audio as cover art
|
||||
--add-metadata write metadata to the video file
|
||||
--xattrs write metadata to the video file's xattrs
|
||||
(using dublin core and xdg standards)
|
||||
--prefer-avconv Prefer avconv over ffmpeg for running the
|
||||
postprocessors (default)
|
||||
--prefer-ffmpeg Prefer ffmpeg over avconv for running the
|
||||
postprocessors
|
||||
--exec CMD Execute a command on the file after
|
||||
downloading, similar to find's -exec
|
||||
syntax. Example: --exec 'adb push {}
|
||||
/sdcard/Music/ && rm {}'
|
||||
|
||||
# CONFIGURATION
|
||||
|
||||
You can configure youtube-dl by placing default arguments (such as `--extract-audio --no-mtime` to always extract the audio and not copy the mtime) into `/etc/youtube-dl.conf` and/or `~/.config/youtube-dl/config`. On Windows, the configuration file locations are `%APPDATA%\youtube-dl\config.txt` and `C:\Users\<Yourname>\youtube-dl.conf`.
|
||||
|
||||
# OUTPUT TEMPLATE
|
||||
|
||||
The `-o` option allows users to indicate a template for the output file names. The basic usage is not to set any template arguments when downloading a single file, like in `youtube-dl -o funny_video.flv "http://some/video"`. However, it may contain special sequences that will be replaced when downloading each video. The special sequences have the format `%(NAME)s`. To clarify, that is a percent symbol followed by a name in parenthesis, followed by a lowercase S. Allowed names are:
|
||||
|
||||
- `id`: The sequence will be replaced by the video identifier.
|
||||
- `url`: The sequence will be replaced by the video URL.
|
||||
- `uploader`: The sequence will be replaced by the nickname of the person who uploaded the video.
|
||||
- `upload_date`: The sequence will be replaced by the upload date in YYYYMMDD format.
|
||||
- `title`: The sequence will be replaced by the video title.
|
||||
- `ext`: The sequence will be replaced by the appropriate extension (like flv or mp4).
|
||||
- `epoch`: The sequence will be replaced by the Unix epoch when creating the file.
|
||||
- `autonumber`: The sequence will be replaced by a five-digit number that will be increased with each download, starting at zero.
|
||||
- `playlist`: The name or the id of the playlist that contains the video.
|
||||
- `playlist_index`: The index of the video in the playlist, a five-digit number.
|
||||
|
||||
The current default template is `%(title)s-%(id)s.%(ext)s`.
|
||||
|
||||
In some cases, you don't want special characters such as 中, spaces, or &, such as when transferring the downloaded filename to a Windows system or the filename through an 8bit-unsafe channel. In these cases, add the `--restrict-filenames` flag to get a shorter title:
|
||||
|
||||
```bash
|
||||
$ youtube-dl --get-filename -o "%(title)s.%(ext)s" BaW_jenozKc
|
||||
youtube-dl test video ''_ä↭𝕐.mp4 # All kinds of weird characters
|
||||
$ youtube-dl --get-filename -o "%(title)s.%(ext)s" BaW_jenozKc --restrict-filenames
|
||||
youtube-dl_test_video_.mp4 # A simple file name
|
||||
```
|
||||
|
||||
# VIDEO SELECTION
|
||||
|
||||
Videos can be filtered by their upload date using the options `--date`, `--datebefore` or `--dateafter`, they accept dates in two formats:
|
||||
|
||||
- Absolute dates: Dates in the format `YYYYMMDD`.
|
||||
- Relative dates: Dates in the format `(now|today)[+-][0-9](day|week|month|year)(s)?`
|
||||
|
||||
Examples:
|
||||
|
||||
```bash
|
||||
# Download only the videos uploaded in the last 6 months
|
||||
$ youtube-dl --dateafter now-6months
|
||||
|
||||
# Download only the videos uploaded on January 1, 1970
|
||||
$ youtube-dl --date 19700101
|
||||
|
||||
$ # will only download the videos uploaded in the 200x decade
|
||||
$ youtube-dl --dateafter 20000101 --datebefore 20091231
|
||||
```
|
||||
|
||||
# FAQ
|
||||
|
||||
### How do I update youtube-dl?
|
||||
|
||||
If you've followed [our manual installation instructions](http://rg3.github.io/youtube-dl/download.html), you can simply run `youtube-dl -U` (or, on Linux, `sudo youtube-dl -U`).
|
||||
|
||||
If you have used pip, a simple `sudo pip install -U youtube-dl` is sufficient to update.
|
||||
|
||||
If you have installed youtube-dl using a package manager like *apt-get* or *yum*, use the standard system update mechanism to update. Note that distribution packages are often outdated. As a rule of thumb, youtube-dl releases at least once a month, and often weekly or even daily. Simply go to http://yt-dl.org/ to find out the current version. Unfortunately, there is nothing we youtube-dl developers can do if your distributions serves a really outdated version. You can (and should) complain to your distribution in their bugtracker or support forum.
|
||||
|
||||
As a last resort, you can also uninstall the version installed by your package manager and follow our manual installation instructions. For that, remove the distribution's package, with a line like
|
||||
|
||||
sudo apt-get remove -y youtube-dl
|
||||
|
||||
Afterwards, simply follow [our manual installation instructions](http://rg3.github.io/youtube-dl/download.html):
|
||||
|
||||
```
|
||||
sudo wget https://yt-dl.org/latest/youtube-dl -O /usr/local/bin/youtube-dl
|
||||
sudo chmod a+x /usr/local/bin/youtube-dl
|
||||
hash -r
|
||||
```
|
||||
|
||||
Again, from then on you'll be able to update with `sudo youtube-dl -U`.
|
||||
|
||||
### I'm getting an error `Unable to extract OpenGraph title` on YouTube playlists
|
||||
|
||||
YouTube changed their playlist format in March 2014 and later on, so you'll need at least youtube-dl 2014.07.25 to download all YouTube videos.
|
||||
|
||||
If you have installed youtube-dl with a package manager, pip, setup.py or a tarball, please use that to update. Note that Ubuntu packages do not seem to get updated anymore. Since we are not affiliated with Ubuntu, there is little we can do. Feel free to [report bugs](https://bugs.launchpad.net/ubuntu/+source/youtube-dl/+filebug) to the [Ubuntu packaging guys](mailto:ubuntu-motu@lists.ubuntu.com?subject=outdated%20version%20of%20youtube-dl) - all they have to do is update the package to a somewhat recent version. See above for a way to update.
|
||||
|
||||
### Do I always have to pass in `--max-quality FORMAT`, or `-citw`?
|
||||
|
||||
By default, youtube-dl intends to have the best options (incidentally, if you have a convincing case that these should be different, [please file an issue where you explain that](https://yt-dl.org/bug)). Therefore, it is unnecessary and sometimes harmful to copy long option strings from webpages. In particular, `--max-quality` *limits* the video quality (so if you want the best quality, do NOT pass it in), and the only option out of `-citw` that is regularly useful is `-i`.
|
||||
|
||||
### Can you please put the -b option back?
|
||||
|
||||
Most people asking this question are not aware that youtube-dl now defaults to downloading the highest available quality as reported by YouTube, which will be 1080p or 720p in some cases, so you no longer need the `-b` option. For some specific videos, maybe YouTube does not report them to be available in a specific high quality format you're interested in. In that case, simply request it with the `-f` option and youtube-dl will try to download it.
|
||||
|
||||
### I get HTTP error 402 when trying to download a video. What's this?
|
||||
|
||||
Apparently YouTube requires you to pass a CAPTCHA test if you download too much. We're [considering to provide a way to let you solve the CAPTCHA](https://github.com/rg3/youtube-dl/issues/154), but at the moment, your best course of action is pointing a webbrowser to the youtube URL, solving the CAPTCHA, and restart youtube-dl.
|
||||
|
||||
### I have downloaded a video but how can I play it?
|
||||
|
||||
Once the video is fully downloaded, use any video player, such as [vlc](http://www.videolan.org) or [mplayer](http://www.mplayerhq.hu/).
|
||||
|
||||
### The links provided by youtube-dl -g are not working anymore
|
||||
|
||||
The URLs youtube-dl outputs require the downloader to have the correct cookies. Use the `--cookies` option to write the required cookies into a file, and advise your downloader to read cookies from that file. Some sites also require a common user agent to be used, use `--dump-user-agent` to see the one in use by youtube-dl.
|
||||
|
||||
### ERROR: no fmt_url_map or conn information found in video info
|
||||
|
||||
youtube has switched to a new video info format in July 2011 which is not supported by old versions of youtube-dl. You can update youtube-dl with `sudo youtube-dl --update`.
|
||||
|
||||
### ERROR: unable to download video ###
|
||||
|
||||
youtube requires an additional signature since September 2012 which is not supported by old versions of youtube-dl. You can update youtube-dl with `sudo youtube-dl --update`.
|
||||
|
||||
### SyntaxError: Non-ASCII character ###
|
||||
|
||||
The error
|
||||
|
||||
File "youtube-dl", line 2
|
||||
SyntaxError: Non-ASCII character '\x93' ...
|
||||
|
||||
means you're using an outdated version of Python. Please update to Python 2.6 or 2.7.
|
||||
|
||||
### What is this binary file? Where has the code gone?
|
||||
|
||||
Since June 2012 (#342) youtube-dl is packed as an executable zipfile, simply unzip it (might need renaming to `youtube-dl.zip` first on some systems) or clone the git repository, as laid out above. If you modify the code, you can run it by executing the `__main__.py` file. To recompile the executable, run `make youtube-dl`.
|
||||
|
||||
### The exe throws a *Runtime error from Visual C++*
|
||||
|
||||
To run the exe you need to install first the [Microsoft Visual C++ 2008 Redistributable Package](http://www.microsoft.com/en-us/download/details.aspx?id=29).
|
||||
|
||||
# DEVELOPER INSTRUCTIONS
|
||||
|
||||
Most users do not need to build youtube-dl and can [download the builds](http://rg3.github.io/youtube-dl/download.html) or get them from their distribution.
|
||||
|
||||
To run youtube-dl as a developer, you don't need to build anything either. Simply execute
|
||||
|
||||
python -m youtube_dl
|
||||
|
||||
To run the test, simply invoke your favorite test runner, or execute a test file directly; any of the following work:
|
||||
|
||||
python -m unittest discover
|
||||
python test/test_download.py
|
||||
nosetests
|
||||
|
||||
If you want to create a build of youtube-dl yourself, you'll need
|
||||
|
||||
* python
|
||||
* make
|
||||
* pandoc
|
||||
* zip
|
||||
* nosetests
|
||||
|
||||
### Adding support for a new site
|
||||
|
||||
If you want to add support for a new site, you can follow this quick list (assuming your service is called `yourextractor`):
|
||||
|
||||
1. [Fork this repository](https://github.com/rg3/youtube-dl/fork)
|
||||
2. Check out the source code with `git clone git@github.com:YOUR_GITHUB_USERNAME/youtube-dl.git`
|
||||
3. Start a new git branch with `cd youtube-dl; git checkout -b yourextractor`
|
||||
4. Start with this simple template and save it to `youtube_dl/extractor/yourextractor.py`:
|
||||
```python
|
||||
# coding: utf-8
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from .common import InfoExtractor
|
||||
|
||||
|
||||
class YourExtractorIE(InfoExtractor):
|
||||
_VALID_URL = r'https?://(?:www\.)?yourextractor\.com/watch/(?P<id>[0-9]+)'
|
||||
_TEST = {
|
||||
'url': 'http://yourextractor.com/watch/42',
|
||||
'md5': 'TODO: md5 sum of the first 10241 bytes of the video file (use --test)',
|
||||
'info_dict': {
|
||||
'id': '42',
|
||||
'ext': 'mp4',
|
||||
'title': 'Video title goes here',
|
||||
'thumbnail': 're:^https?://.*\.jpg$',
|
||||
# TODO more properties, either as:
|
||||
# * A value
|
||||
# * MD5 checksum; start the string with md5:
|
||||
# * A regular expression; start the string with re:
|
||||
# * Any Python type (for example int or float)
|
||||
}
|
||||
}
|
||||
|
||||
def _real_extract(self, url):
|
||||
video_id = self._match_id(url)
|
||||
webpage = self._download_webpage(url, video_id)
|
||||
|
||||
# TODO more code goes here, for example ...
|
||||
title = self._html_search_regex(r'<h1>(.*?)</h1>', webpage, 'title')
|
||||
|
||||
return {
|
||||
'id': video_id,
|
||||
'title': title,
|
||||
'description': self._og_search_description(webpage),
|
||||
# TODO more properties (see youtube_dl/extractor/common.py)
|
||||
}
|
||||
```
|
||||
5. Add an import in [`youtube_dl/extractor/__init__.py`](https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/__init__.py).
|
||||
6. Run `python test/test_download.py TestDownload.test_YourExtractor`. This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, then rename ``_TEST`` to ``_TESTS`` and make it into a list of dictionaries. The tests will be then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc.
|
||||
7. Have a look at [`youtube_dl/common/extractor/common.py`](https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should return](https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/common.py#L38). Add tests and code for as many as you want.
|
||||
8. If you can, check the code with [pyflakes](https://pypi.python.org/pypi/pyflakes) (a good idea) and [pep8](https://pypi.python.org/pypi/pep8) (optional, ignore E501).
|
||||
9. When the tests pass, [add](http://git-scm.com/docs/git-add) the new files and [commit](http://git-scm.com/docs/git-commit) them and [push](http://git-scm.com/docs/git-push) the result, like this:
|
||||
|
||||
$ git add youtube_dl/extractor/__init__.py
|
||||
$ git add youtube_dl/extractor/yourextractor.py
|
||||
$ git commit -m '[yourextractor] Add new extractor'
|
||||
$ git push origin yourextractor
|
||||
|
||||
10. Finally, [create a pull request](https://help.github.com/articles/creating-a-pull-request). We'll then review and merge it.
|
||||
|
||||
In any case, thank you very much for your contributions!
|
||||
|
||||
# EMBEDDING YOUTUBE-DL
|
||||
|
||||
youtube-dl makes the best effort to be a good command-line program, and thus should be callable from any programming language. If you encounter any problems parsing its output, feel free to [create a report](https://github.com/rg3/youtube-dl/issues/new).
|
||||
|
||||
From a Python program, you can embed youtube-dl in a more powerful fashion, like this:
|
||||
|
||||
import youtube_dl
|
||||
|
||||
ydl_opts = {}
|
||||
with youtube_dl.YoutubeDL(ydl_opts) as ydl:
|
||||
ydl.download(['http://www.youtube.com/watch?v=BaW_jenozKc'])
|
||||
|
||||
Most likely, you'll want to use various options. For a list of what can be done, have a look at [youtube_dl/YoutubeDL.py](https://github.com/rg3/youtube-dl/blob/master/youtube_dl/YoutubeDL.py#L69). For a start, if you want to intercept youtube-dl's output, set a `logger` object.
|
||||
|
||||
# BUGS
|
||||
|
||||
Bugs and suggestions should be reported at: <https://github.com/rg3/youtube-dl/issues> . Unless you were prompted so or there is another pertinent reason (e.g. GitHub fails to accept the bug report), please do not send bug reports via personal email.
|
||||
|
||||
Please include the full output of the command when run with `--verbose`. The output (including the first lines) contain important debugging information. Issues without the full output are often not reproducible and therefore do not get solved in short order, if ever.
|
||||
|
||||
For discussions, join us in the irc channel #youtube-dl on freenode.
|
||||
|
||||
When you submit a request, please re-read it once to avoid a couple of mistakes (you can and should use this as a checklist):
|
||||
|
||||
### Is the description of the issue itself sufficient?
|
||||
|
||||
We often get issue reports that we cannot really decipher. While in most cases we eventually get the required information after asking back multiple times, this poses an unnecessary drain on our resources. Many contributors, including myself, are also not native speakers, so we may misread some parts.
|
||||
|
||||
So please elaborate on what feature you are requesting, or what bug you want to be fixed. Make sure that it's obvious
|
||||
|
||||
- What the problem is
|
||||
- How it could be fixed
|
||||
- How your proposed solution would look like
|
||||
|
||||
If your report is shorter than two lines, it is almost certainly missing some of these, which makes it hard for us to respond to it. We're often too polite to close the issue outright, but the missing info makes misinterpretation likely. As a commiter myself, I often get frustrated by these issues, since the only possible way for me to move forward on them is to ask for clarification over and over.
|
||||
|
||||
For bug reports, this means that your report should contain the *complete* output of youtube-dl when called with the -v flag. The error message you get for (most) bugs even says so, but you would not believe how many of our bug reports do not contain this information.
|
||||
|
||||
Site support requests **must contain an example URL**. An example URL is a URL you might want to download, like http://www.youtube.com/watch?v=BaW_jenozKc . There should be an obvious video present. Except under very special circumstances, the main page of a video service (e.g. http://www.youtube.com/ ) is *not* an example URL.
|
||||
|
||||
### Are you using the latest version?
|
||||
|
||||
Before reporting any issue, type youtube-dl -U. This should report that you're up-to-date. About 20% of the reports we receive are already fixed, but people are using outdated versions. This goes for feature requests as well.
|
||||
|
||||
### Is the issue already documented?
|
||||
|
||||
Make sure that someone has not already opened the issue you're trying to open. Search at the top of the window or at https://github.com/rg3/youtube-dl/search?type=Issues . If there is an issue, feel free to write something along the lines of "This affects me as well, with version 2015.01.01. Here is some more information on the issue: ...". While some issues may be old, a new post into them often spurs rapid activity.
|
||||
|
||||
### Why are existing options not enough?
|
||||
|
||||
Before requesting a new feature, please have a quick peek at [the list of supported options](https://github.com/rg3/youtube-dl/blob/master/README.md#synopsis). Many feature requests are for features that actually exist already! Please, absolutely do show off your work in the issue report and detail how the existing similar options do *not* solve your problem.
|
||||
|
||||
### Is there enough context in your bug report?
|
||||
|
||||
People want to solve problems, and often think they do us a favor by breaking down their larger problems (e.g. wanting to skip already downloaded files) to a specific request (e.g. requesting us to look whether the file exists before downloading the info page). However, what often happens is that they break down the problem into two steps: One simple, and one impossible (or extremely complicated one).
|
||||
|
||||
We are then presented with a very complicated request when the original problem could be solved far easier, e.g. by recording the downloaded video IDs in a separate file. To avoid this, you must include the greater context where it is non-obvious. In particular, every feature request that does not consist of adding support for a new site should contain a use case scenario that explains in what situation the missing feature would be useful.
|
||||
|
||||
### Does the issue involve one problem, and one problem only?
|
||||
|
||||
Some of our users seem to think there is a limit of issues they can or should open. There is no limit of issues they can or should open. While it may seem appealing to be able to dump all your issues into one ticket, that means that someone who solves one of your issues cannot mark the issue as closed. Typically, reporting a bunch of issues leads to the ticket lingering since nobody wants to attack that behemoth, until someone mercifully splits the issue into multiple ones.
|
||||
|
||||
In particular, every site support request issue should only pertain to services at one site (generally under a common domain, but always using the same backend technology). Do not request support for vimeo user videos, Whitehouse podcasts, and Google Plus pages in the same issue. Also, make sure that you don't post bug reports alongside feature requests. As a rule of thumb, a feature request does not include outputs of youtube-dl that are not immediately related to the feature at hand. Do not post reports of a network error alongside the request for a new video service.
|
||||
|
||||
### Is anyone going to need the feature?
|
||||
|
||||
Only post features that you (or an incapicated friend you can personally talk to) require. Do not post features because they seem like a good idea. If they are really useful, they will be requested by someone who requires them.
|
||||
|
||||
### Is your question about youtube-dl?
|
||||
|
||||
It may sound strange, but some bug reports we receive are completely unrelated to youtube-dl and relate to a different or even the reporter's own application. Please make sure that you are actually using youtube-dl. If you are using a UI for youtube-dl, report the bug to the maintainer of the actual application providing the UI. On the other hand, if your UI for youtube-dl fails in some way you believe is related to youtube-dl, by all means, go ahead and report the bug.
|
||||
|
||||
# COPYRIGHT
|
||||
|
||||
youtube-dl is released into the public domain by the copyright holders.
|
||||
|
||||
This README file was originally written by Daniel Bolton (<https://github.com/dbbolton>) and is likewise released into the public domain.
|
||||
6
bin/youtube-dl
Executable file
6
bin/youtube-dl
Executable file
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
import youtube_dl
|
||||
|
||||
if __name__ == '__main__':
|
||||
youtube_dl.main()
|
||||
BIN
devscripts/SizeOfImage.patch
Normal file
BIN
devscripts/SizeOfImage.patch
Normal file
Binary file not shown.
BIN
devscripts/SizeOfImage_w.patch
Normal file
BIN
devscripts/SizeOfImage_w.patch
Normal file
Binary file not shown.
29
devscripts/bash-completion.in
Normal file
29
devscripts/bash-completion.in
Normal file
@@ -0,0 +1,29 @@
|
||||
__youtube_dl()
|
||||
{
|
||||
local cur prev opts fileopts diropts keywords
|
||||
COMPREPLY=()
|
||||
cur="${COMP_WORDS[COMP_CWORD]}"
|
||||
prev="${COMP_WORDS[COMP_CWORD-1]}"
|
||||
opts="{{flags}}"
|
||||
keywords=":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"
|
||||
fileopts="-a|--batch-file|--download-archive|--cookies|--load-info"
|
||||
diropts="--cache-dir"
|
||||
|
||||
if [[ ${prev} =~ ${fileopts} ]]; then
|
||||
COMPREPLY=( $(compgen -f -- ${cur}) )
|
||||
return 0
|
||||
elif [[ ${prev} =~ ${diropts} ]]; then
|
||||
COMPREPLY=( $(compgen -d -- ${cur}) )
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [[ ${cur} =~ : ]]; then
|
||||
COMPREPLY=( $(compgen -W "${keywords}" -- ${cur}) )
|
||||
return 0
|
||||
elif [[ ${cur} == * ]] ; then
|
||||
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
|
||||
return 0
|
||||
fi
|
||||
}
|
||||
|
||||
complete -F __youtube_dl youtube-dl
|
||||
29
devscripts/bash-completion.py
Executable file
29
devscripts/bash-completion.py
Executable file
@@ -0,0 +1,29 @@
|
||||
#!/usr/bin/env python
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import os
|
||||
from os.path import dirname as dirn
|
||||
import sys
|
||||
|
||||
sys.path.append(dirn(dirn((os.path.abspath(__file__)))))
|
||||
import youtube_dl
|
||||
|
||||
BASH_COMPLETION_FILE = "youtube-dl.bash-completion"
|
||||
BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.in"
|
||||
|
||||
|
||||
def build_completion(opt_parser):
|
||||
opts_flag = []
|
||||
for group in opt_parser.option_groups:
|
||||
for option in group.option_list:
|
||||
# for every long flag
|
||||
opts_flag.append(option.get_opt_string())
|
||||
with open(BASH_COMPLETION_TEMPLATE) as f:
|
||||
template = f.read()
|
||||
with open(BASH_COMPLETION_FILE, "w") as f:
|
||||
# just using the special char
|
||||
filled_template = template.replace("{{flags}}", " ".join(opts_flag))
|
||||
f.write(filled_template)
|
||||
|
||||
parser = youtube_dl.parseOpts()[0]
|
||||
build_completion(parser)
|
||||
406
devscripts/buildserver.py
Normal file
406
devscripts/buildserver.py
Normal file
@@ -0,0 +1,406 @@
|
||||
#!/usr/bin/python3
|
||||
|
||||
from http.server import HTTPServer, BaseHTTPRequestHandler
|
||||
from socketserver import ThreadingMixIn
|
||||
import argparse
|
||||
import ctypes
|
||||
import functools
|
||||
import sys
|
||||
import threading
|
||||
import traceback
|
||||
import os.path
|
||||
|
||||
|
||||
class BuildHTTPServer(ThreadingMixIn, HTTPServer):
|
||||
allow_reuse_address = True
|
||||
|
||||
|
||||
advapi32 = ctypes.windll.advapi32
|
||||
|
||||
SC_MANAGER_ALL_ACCESS = 0xf003f
|
||||
SC_MANAGER_CREATE_SERVICE = 0x02
|
||||
SERVICE_WIN32_OWN_PROCESS = 0x10
|
||||
SERVICE_AUTO_START = 0x2
|
||||
SERVICE_ERROR_NORMAL = 0x1
|
||||
DELETE = 0x00010000
|
||||
SERVICE_STATUS_START_PENDING = 0x00000002
|
||||
SERVICE_STATUS_RUNNING = 0x00000004
|
||||
SERVICE_ACCEPT_STOP = 0x1
|
||||
|
||||
SVCNAME = 'youtubedl_builder'
|
||||
|
||||
LPTSTR = ctypes.c_wchar_p
|
||||
START_CALLBACK = ctypes.WINFUNCTYPE(None, ctypes.c_int, ctypes.POINTER(LPTSTR))
|
||||
|
||||
|
||||
class SERVICE_TABLE_ENTRY(ctypes.Structure):
|
||||
_fields_ = [
|
||||
('lpServiceName', LPTSTR),
|
||||
('lpServiceProc', START_CALLBACK)
|
||||
]
|
||||
|
||||
|
||||
HandlerEx = ctypes.WINFUNCTYPE(
|
||||
ctypes.c_int, # return
|
||||
ctypes.c_int, # dwControl
|
||||
ctypes.c_int, # dwEventType
|
||||
ctypes.c_void_p, # lpEventData,
|
||||
ctypes.c_void_p, # lpContext,
|
||||
)
|
||||
|
||||
|
||||
def _ctypes_array(c_type, py_array):
|
||||
ar = (c_type * len(py_array))()
|
||||
ar[:] = py_array
|
||||
return ar
|
||||
|
||||
|
||||
def win_OpenSCManager():
|
||||
res = advapi32.OpenSCManagerW(None, None, SC_MANAGER_ALL_ACCESS)
|
||||
if not res:
|
||||
raise Exception('Opening service manager failed - '
|
||||
'are you running this as administrator?')
|
||||
return res
|
||||
|
||||
|
||||
def win_install_service(service_name, cmdline):
|
||||
manager = win_OpenSCManager()
|
||||
try:
|
||||
h = advapi32.CreateServiceW(
|
||||
manager, service_name, None,
|
||||
SC_MANAGER_CREATE_SERVICE, SERVICE_WIN32_OWN_PROCESS,
|
||||
SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
|
||||
cmdline, None, None, None, None, None)
|
||||
if not h:
|
||||
raise OSError('Service creation failed: %s' % ctypes.FormatError())
|
||||
|
||||
advapi32.CloseServiceHandle(h)
|
||||
finally:
|
||||
advapi32.CloseServiceHandle(manager)
|
||||
|
||||
|
||||
def win_uninstall_service(service_name):
|
||||
manager = win_OpenSCManager()
|
||||
try:
|
||||
h = advapi32.OpenServiceW(manager, service_name, DELETE)
|
||||
if not h:
|
||||
raise OSError('Could not find service %s: %s' % (
|
||||
service_name, ctypes.FormatError()))
|
||||
|
||||
try:
|
||||
if not advapi32.DeleteService(h):
|
||||
raise OSError('Deletion failed: %s' % ctypes.FormatError())
|
||||
finally:
|
||||
advapi32.CloseServiceHandle(h)
|
||||
finally:
|
||||
advapi32.CloseServiceHandle(manager)
|
||||
|
||||
|
||||
def win_service_report_event(service_name, msg, is_error=True):
|
||||
with open('C:/sshkeys/log', 'a', encoding='utf-8') as f:
|
||||
f.write(msg + '\n')
|
||||
|
||||
event_log = advapi32.RegisterEventSourceW(None, service_name)
|
||||
if not event_log:
|
||||
raise OSError('Could not report event: %s' % ctypes.FormatError())
|
||||
|
||||
try:
|
||||
type_id = 0x0001 if is_error else 0x0004
|
||||
event_id = 0xc0000000 if is_error else 0x40000000
|
||||
lines = _ctypes_array(LPTSTR, [msg])
|
||||
|
||||
if not advapi32.ReportEventW(
|
||||
event_log, type_id, 0, event_id, None, len(lines), 0,
|
||||
lines, None):
|
||||
raise OSError('Event reporting failed: %s' % ctypes.FormatError())
|
||||
finally:
|
||||
advapi32.DeregisterEventSource(event_log)
|
||||
|
||||
|
||||
def win_service_handler(stop_event, *args):
|
||||
try:
|
||||
raise ValueError('Handler called with args ' + repr(args))
|
||||
TODO
|
||||
except Exception as e:
|
||||
tb = traceback.format_exc()
|
||||
msg = str(e) + '\n' + tb
|
||||
win_service_report_event(service_name, msg, is_error=True)
|
||||
raise
|
||||
|
||||
|
||||
def win_service_set_status(handle, status_code):
|
||||
svcStatus = SERVICE_STATUS()
|
||||
svcStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS
|
||||
svcStatus.dwCurrentState = status_code
|
||||
svcStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP
|
||||
|
||||
svcStatus.dwServiceSpecificExitCode = 0
|
||||
|
||||
if not advapi32.SetServiceStatus(handle, ctypes.byref(svcStatus)):
|
||||
raise OSError('SetServiceStatus failed: %r' % ctypes.FormatError())
|
||||
|
||||
|
||||
def win_service_main(service_name, real_main, argc, argv_raw):
|
||||
try:
|
||||
# args = [argv_raw[i].value for i in range(argc)]
|
||||
stop_event = threading.Event()
|
||||
handler = HandlerEx(functools.partial(stop_event, win_service_handler))
|
||||
h = advapi32.RegisterServiceCtrlHandlerExW(service_name, handler, None)
|
||||
if not h:
|
||||
raise OSError('Handler registration failed: %s' %
|
||||
ctypes.FormatError())
|
||||
|
||||
TODO
|
||||
except Exception as e:
|
||||
tb = traceback.format_exc()
|
||||
msg = str(e) + '\n' + tb
|
||||
win_service_report_event(service_name, msg, is_error=True)
|
||||
raise
|
||||
|
||||
|
||||
def win_service_start(service_name, real_main):
|
||||
try:
|
||||
cb = START_CALLBACK(
|
||||
functools.partial(win_service_main, service_name, real_main))
|
||||
dispatch_table = _ctypes_array(SERVICE_TABLE_ENTRY, [
|
||||
SERVICE_TABLE_ENTRY(
|
||||
service_name,
|
||||
cb
|
||||
),
|
||||
SERVICE_TABLE_ENTRY(None, ctypes.cast(None, START_CALLBACK))
|
||||
])
|
||||
|
||||
if not advapi32.StartServiceCtrlDispatcherW(dispatch_table):
|
||||
raise OSError('ctypes start failed: %s' % ctypes.FormatError())
|
||||
except Exception as e:
|
||||
tb = traceback.format_exc()
|
||||
msg = str(e) + '\n' + tb
|
||||
win_service_report_event(service_name, msg, is_error=True)
|
||||
raise
|
||||
|
||||
|
||||
def main(args=None):
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('-i', '--install',
|
||||
action='store_const', dest='action', const='install',
|
||||
help='Launch at Windows startup')
|
||||
parser.add_argument('-u', '--uninstall',
|
||||
action='store_const', dest='action', const='uninstall',
|
||||
help='Remove Windows service')
|
||||
parser.add_argument('-s', '--service',
|
||||
action='store_const', dest='action', const='service',
|
||||
help='Run as a Windows service')
|
||||
parser.add_argument('-b', '--bind', metavar='<host:port>',
|
||||
action='store', default='localhost:8142',
|
||||
help='Bind to host:port (default %default)')
|
||||
options = parser.parse_args(args=args)
|
||||
|
||||
if options.action == 'install':
|
||||
fn = os.path.abspath(__file__).replace('v:', '\\\\vboxsrv\\vbox')
|
||||
cmdline = '%s %s -s -b %s' % (sys.executable, fn, options.bind)
|
||||
win_install_service(SVCNAME, cmdline)
|
||||
return
|
||||
|
||||
if options.action == 'uninstall':
|
||||
win_uninstall_service(SVCNAME)
|
||||
return
|
||||
|
||||
if options.action == 'service':
|
||||
win_service_start(SVCNAME, main)
|
||||
return
|
||||
|
||||
host, port_str = options.bind.split(':')
|
||||
port = int(port_str)
|
||||
|
||||
print('Listening on %s:%d' % (host, port))
|
||||
srv = BuildHTTPServer((host, port), BuildHTTPRequestHandler)
|
||||
thr = threading.Thread(target=srv.serve_forever)
|
||||
thr.start()
|
||||
input('Press ENTER to shut down')
|
||||
srv.shutdown()
|
||||
thr.join()
|
||||
|
||||
|
||||
def rmtree(path):
|
||||
for name in os.listdir(path):
|
||||
fname = os.path.join(path, name)
|
||||
if os.path.isdir(fname):
|
||||
rmtree(fname)
|
||||
else:
|
||||
os.chmod(fname, 0o666)
|
||||
os.remove(fname)
|
||||
os.rmdir(path)
|
||||
|
||||
#==============================================================================
|
||||
|
||||
|
||||
class BuildError(Exception):
|
||||
def __init__(self, output, code=500):
|
||||
self.output = output
|
||||
self.code = code
|
||||
|
||||
def __str__(self):
|
||||
return self.output
|
||||
|
||||
|
||||
class HTTPError(BuildError):
|
||||
pass
|
||||
|
||||
|
||||
class PythonBuilder(object):
|
||||
def __init__(self, **kwargs):
|
||||
pythonVersion = kwargs.pop('python', '2.7')
|
||||
try:
|
||||
key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, r'SOFTWARE\Python\PythonCore\%s\InstallPath' % pythonVersion)
|
||||
try:
|
||||
self.pythonPath, _ = _winreg.QueryValueEx(key, '')
|
||||
finally:
|
||||
_winreg.CloseKey(key)
|
||||
except Exception:
|
||||
raise BuildError('No such Python version: %s' % pythonVersion)
|
||||
|
||||
super(PythonBuilder, self).__init__(**kwargs)
|
||||
|
||||
|
||||
class GITInfoBuilder(object):
|
||||
def __init__(self, **kwargs):
|
||||
try:
|
||||
self.user, self.repoName = kwargs['path'][:2]
|
||||
self.rev = kwargs.pop('rev')
|
||||
except ValueError:
|
||||
raise BuildError('Invalid path')
|
||||
except KeyError as e:
|
||||
raise BuildError('Missing mandatory parameter "%s"' % e.args[0])
|
||||
|
||||
path = os.path.join(os.environ['APPDATA'], 'Build archive', self.repoName, self.user)
|
||||
if not os.path.exists(path):
|
||||
os.makedirs(path)
|
||||
self.basePath = tempfile.mkdtemp(dir=path)
|
||||
self.buildPath = os.path.join(self.basePath, 'build')
|
||||
|
||||
super(GITInfoBuilder, self).__init__(**kwargs)
|
||||
|
||||
|
||||
class GITBuilder(GITInfoBuilder):
|
||||
def build(self):
|
||||
try:
|
||||
subprocess.check_output(['git', 'clone', 'git://github.com/%s/%s.git' % (self.user, self.repoName), self.buildPath])
|
||||
subprocess.check_output(['git', 'checkout', self.rev], cwd=self.buildPath)
|
||||
except subprocess.CalledProcessError as e:
|
||||
raise BuildError(e.output)
|
||||
|
||||
super(GITBuilder, self).build()
|
||||
|
||||
|
||||
class YoutubeDLBuilder(object):
|
||||
authorizedUsers = ['fraca7', 'phihag', 'rg3', 'FiloSottile']
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
if self.repoName != 'youtube-dl':
|
||||
raise BuildError('Invalid repository "%s"' % self.repoName)
|
||||
if self.user not in self.authorizedUsers:
|
||||
raise HTTPError('Unauthorized user "%s"' % self.user, 401)
|
||||
|
||||
super(YoutubeDLBuilder, self).__init__(**kwargs)
|
||||
|
||||
def build(self):
|
||||
try:
|
||||
subprocess.check_output([os.path.join(self.pythonPath, 'python.exe'), 'setup.py', 'py2exe'],
|
||||
cwd=self.buildPath)
|
||||
except subprocess.CalledProcessError as e:
|
||||
raise BuildError(e.output)
|
||||
|
||||
super(YoutubeDLBuilder, self).build()
|
||||
|
||||
|
||||
class DownloadBuilder(object):
|
||||
def __init__(self, **kwargs):
|
||||
self.handler = kwargs.pop('handler')
|
||||
self.srcPath = os.path.join(self.buildPath, *tuple(kwargs['path'][2:]))
|
||||
self.srcPath = os.path.abspath(os.path.normpath(self.srcPath))
|
||||
if not self.srcPath.startswith(self.buildPath):
|
||||
raise HTTPError(self.srcPath, 401)
|
||||
|
||||
super(DownloadBuilder, self).__init__(**kwargs)
|
||||
|
||||
def build(self):
|
||||
if not os.path.exists(self.srcPath):
|
||||
raise HTTPError('No such file', 404)
|
||||
if os.path.isdir(self.srcPath):
|
||||
raise HTTPError('Is a directory: %s' % self.srcPath, 401)
|
||||
|
||||
self.handler.send_response(200)
|
||||
self.handler.send_header('Content-Type', 'application/octet-stream')
|
||||
self.handler.send_header('Content-Disposition', 'attachment; filename=%s' % os.path.split(self.srcPath)[-1])
|
||||
self.handler.send_header('Content-Length', str(os.stat(self.srcPath).st_size))
|
||||
self.handler.end_headers()
|
||||
|
||||
with open(self.srcPath, 'rb') as src:
|
||||
shutil.copyfileobj(src, self.handler.wfile)
|
||||
|
||||
super(DownloadBuilder, self).build()
|
||||
|
||||
|
||||
class CleanupTempDir(object):
|
||||
def build(self):
|
||||
try:
|
||||
rmtree(self.basePath)
|
||||
except Exception as e:
|
||||
print('WARNING deleting "%s": %s' % (self.basePath, e))
|
||||
|
||||
super(CleanupTempDir, self).build()
|
||||
|
||||
|
||||
class Null(object):
|
||||
def __init__(self, **kwargs):
|
||||
pass
|
||||
|
||||
def start(self):
|
||||
pass
|
||||
|
||||
def close(self):
|
||||
pass
|
||||
|
||||
def build(self):
|
||||
pass
|
||||
|
||||
|
||||
class Builder(PythonBuilder, GITBuilder, YoutubeDLBuilder, DownloadBuilder, CleanupTempDir, Null):
|
||||
pass
|
||||
|
||||
|
||||
class BuildHTTPRequestHandler(BaseHTTPRequestHandler):
|
||||
actionDict = {'build': Builder, 'download': Builder} # They're the same, no more caching.
|
||||
|
||||
def do_GET(self):
|
||||
path = urlparse.urlparse(self.path)
|
||||
paramDict = dict([(key, value[0]) for key, value in urlparse.parse_qs(path.query).items()])
|
||||
action, _, path = path.path.strip('/').partition('/')
|
||||
if path:
|
||||
path = path.split('/')
|
||||
if action in self.actionDict:
|
||||
try:
|
||||
builder = self.actionDict[action](path=path, handler=self, **paramDict)
|
||||
builder.start()
|
||||
try:
|
||||
builder.build()
|
||||
finally:
|
||||
builder.close()
|
||||
except BuildError as e:
|
||||
self.send_response(e.code)
|
||||
msg = unicode(e).encode('UTF-8')
|
||||
self.send_header('Content-Type', 'text/plain; charset=UTF-8')
|
||||
self.send_header('Content-Length', len(msg))
|
||||
self.end_headers()
|
||||
self.wfile.write(msg)
|
||||
except HTTPError as e:
|
||||
self.send_response(e.code, str(e))
|
||||
else:
|
||||
self.send_response(500, 'Unknown build method "%s"' % action)
|
||||
else:
|
||||
self.send_response(500, 'Malformed URL')
|
||||
|
||||
#==============================================================================
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
60
devscripts/check-porn.py
Normal file
60
devscripts/check-porn.py
Normal file
@@ -0,0 +1,60 @@
|
||||
#!/usr/bin/env python
|
||||
from __future__ import unicode_literals
|
||||
|
||||
"""
|
||||
This script employs a VERY basic heuristic ('porn' in webpage.lower()) to check
|
||||
if we are not 'age_limit' tagging some porn site
|
||||
|
||||
A second approach implemented relies on a list of porn domains, to activate it
|
||||
pass the list filename as the only argument
|
||||
"""
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from test.helper import get_testcases
|
||||
from youtube_dl.utils import compat_urllib_parse_urlparse
|
||||
from youtube_dl.utils import compat_urllib_request
|
||||
|
||||
if len(sys.argv) > 1:
|
||||
METHOD = 'LIST'
|
||||
LIST = open(sys.argv[1]).read().decode('utf8').strip()
|
||||
else:
|
||||
METHOD = 'EURISTIC'
|
||||
|
||||
for test in get_testcases():
|
||||
if METHOD == 'EURISTIC':
|
||||
try:
|
||||
webpage = compat_urllib_request.urlopen(test['url'], timeout=10).read()
|
||||
except:
|
||||
print('\nFail: {0}'.format(test['name']))
|
||||
continue
|
||||
|
||||
webpage = webpage.decode('utf8', 'replace')
|
||||
|
||||
RESULT = 'porn' in webpage.lower()
|
||||
|
||||
elif METHOD == 'LIST':
|
||||
domain = compat_urllib_parse_urlparse(test['url']).netloc
|
||||
if not domain:
|
||||
print('\nFail: {0}'.format(test['name']))
|
||||
continue
|
||||
domain = '.'.join(domain.split('.')[-2:])
|
||||
|
||||
RESULT = ('.' + domain + '\n' in LIST or '\n' + domain + '\n' in LIST)
|
||||
|
||||
if RESULT and ('info_dict' not in test or 'age_limit' not in test['info_dict']
|
||||
or test['info_dict']['age_limit'] != 18):
|
||||
print('\nPotential missing age_limit check: {0}'.format(test['name']))
|
||||
|
||||
elif not RESULT and ('info_dict' in test and 'age_limit' in test['info_dict']
|
||||
and test['info_dict']['age_limit'] == 18):
|
||||
print('\nPotential false negative: {0}'.format(test['name']))
|
||||
|
||||
else:
|
||||
sys.stdout.write('.')
|
||||
sys.stdout.flush()
|
||||
|
||||
print()
|
||||
5
devscripts/fish-completion.in
Normal file
5
devscripts/fish-completion.in
Normal file
@@ -0,0 +1,5 @@
|
||||
|
||||
{{commands}}
|
||||
|
||||
|
||||
complete --command youtube-dl --arguments ":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"
|
||||
48
devscripts/fish-completion.py
Executable file
48
devscripts/fish-completion.py
Executable file
@@ -0,0 +1,48 @@
|
||||
#!/usr/bin/env python
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import optparse
|
||||
import os
|
||||
from os.path import dirname as dirn
|
||||
import sys
|
||||
|
||||
sys.path.append(dirn(dirn((os.path.abspath(__file__)))))
|
||||
import youtube_dl
|
||||
from youtube_dl.utils import shell_quote
|
||||
|
||||
FISH_COMPLETION_FILE = 'youtube-dl.fish'
|
||||
FISH_COMPLETION_TEMPLATE = 'devscripts/fish-completion.in'
|
||||
|
||||
EXTRA_ARGS = {
|
||||
'recode-video': ['--arguments', 'mp4 flv ogg webm mkv', '--exclusive'],
|
||||
|
||||
# Options that need a file parameter
|
||||
'download-archive': ['--require-parameter'],
|
||||
'cookies': ['--require-parameter'],
|
||||
'load-info': ['--require-parameter'],
|
||||
'batch-file': ['--require-parameter'],
|
||||
}
|
||||
|
||||
|
||||
def build_completion(opt_parser):
|
||||
commands = []
|
||||
|
||||
for group in opt_parser.option_groups:
|
||||
for option in group.option_list:
|
||||
long_option = option.get_opt_string().strip('-')
|
||||
complete_cmd = ['complete', '--command', 'youtube-dl', '--long-option', long_option]
|
||||
if option._short_opts:
|
||||
complete_cmd += ['--short-option', option._short_opts[0].strip('-')]
|
||||
if option.help != optparse.SUPPRESS_HELP:
|
||||
complete_cmd += ['--description', option.help]
|
||||
complete_cmd.extend(EXTRA_ARGS.get(long_option, []))
|
||||
commands.append(shell_quote(complete_cmd))
|
||||
|
||||
with open(FISH_COMPLETION_TEMPLATE) as f:
|
||||
template = f.read()
|
||||
filled_template = template.replace('{{commands}}', '\n'.join(commands))
|
||||
with open(FISH_COMPLETION_FILE, 'w') as f:
|
||||
f.write(filled_template)
|
||||
|
||||
parser = youtube_dl.parseOpts()[0]
|
||||
build_completion(parser)
|
||||
43
devscripts/gh-pages/add-version.py
Executable file
43
devscripts/gh-pages/add-version.py
Executable file
@@ -0,0 +1,43 @@
|
||||
#!/usr/bin/env python3
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import json
|
||||
import sys
|
||||
import hashlib
|
||||
import os.path
|
||||
|
||||
|
||||
if len(sys.argv) <= 1:
|
||||
print('Specify the version number as parameter')
|
||||
sys.exit()
|
||||
version = sys.argv[1]
|
||||
|
||||
with open('update/LATEST_VERSION', 'w') as f:
|
||||
f.write(version)
|
||||
|
||||
versions_info = json.load(open('update/versions.json'))
|
||||
if 'signature' in versions_info:
|
||||
del versions_info['signature']
|
||||
|
||||
new_version = {}
|
||||
|
||||
filenames = {
|
||||
'bin': 'youtube-dl',
|
||||
'exe': 'youtube-dl.exe',
|
||||
'tar': 'youtube-dl-%s.tar.gz' % version}
|
||||
build_dir = os.path.join('..', '..', 'build', version)
|
||||
for key, filename in filenames.items():
|
||||
url = 'https://yt-dl.org/downloads/%s/%s' % (version, filename)
|
||||
fn = os.path.join(build_dir, filename)
|
||||
with open(fn, 'rb') as f:
|
||||
data = f.read()
|
||||
if not data:
|
||||
raise ValueError('File %s is empty!' % fn)
|
||||
sha256sum = hashlib.sha256(data).hexdigest()
|
||||
new_version[key] = (url, sha256sum)
|
||||
|
||||
versions_info['versions'][version] = new_version
|
||||
versions_info['latest'] = version
|
||||
|
||||
with open('update/versions.json', 'w') as jsonf:
|
||||
json.dump(versions_info, jsonf, indent=4, sort_keys=True)
|
||||
31
devscripts/gh-pages/generate-download.py
Executable file
31
devscripts/gh-pages/generate-download.py
Executable file
@@ -0,0 +1,31 @@
|
||||
#!/usr/bin/env python3
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import hashlib
|
||||
import urllib.request
|
||||
import json
|
||||
|
||||
versions_info = json.load(open('update/versions.json'))
|
||||
version = versions_info['latest']
|
||||
URL = versions_info['versions'][version]['bin'][0]
|
||||
|
||||
data = urllib.request.urlopen(URL).read()
|
||||
|
||||
# Read template page
|
||||
with open('download.html.in', 'r', encoding='utf-8') as tmplf:
|
||||
template = tmplf.read()
|
||||
|
||||
md5sum = hashlib.md5(data).hexdigest()
|
||||
sha1sum = hashlib.sha1(data).hexdigest()
|
||||
sha256sum = hashlib.sha256(data).hexdigest()
|
||||
template = template.replace('@PROGRAM_VERSION@', version)
|
||||
template = template.replace('@PROGRAM_URL@', URL)
|
||||
template = template.replace('@PROGRAM_MD5SUM@', md5sum)
|
||||
template = template.replace('@PROGRAM_SHA1SUM@', sha1sum)
|
||||
template = template.replace('@PROGRAM_SHA256SUM@', sha256sum)
|
||||
template = template.replace('@EXE_URL@', versions_info['versions'][version]['exe'][0])
|
||||
template = template.replace('@EXE_SHA256SUM@', versions_info['versions'][version]['exe'][1])
|
||||
template = template.replace('@TAR_URL@', versions_info['versions'][version]['tar'][0])
|
||||
template = template.replace('@TAR_SHA256SUM@', versions_info['versions'][version]['tar'][1])
|
||||
with open('download.html', 'w', encoding='utf-8') as dlf:
|
||||
dlf.write(template)
|
||||
34
devscripts/gh-pages/sign-versions.py
Executable file
34
devscripts/gh-pages/sign-versions.py
Executable file
@@ -0,0 +1,34 @@
|
||||
#!/usr/bin/env python3
|
||||
from __future__ import unicode_literals, with_statement
|
||||
|
||||
import rsa
|
||||
import json
|
||||
from binascii import hexlify
|
||||
|
||||
try:
|
||||
input = raw_input
|
||||
except NameError:
|
||||
pass
|
||||
|
||||
versions_info = json.load(open('update/versions.json'))
|
||||
if 'signature' in versions_info:
|
||||
del versions_info['signature']
|
||||
|
||||
print('Enter the PKCS1 private key, followed by a blank line:')
|
||||
privkey = b''
|
||||
while True:
|
||||
try:
|
||||
line = input()
|
||||
except EOFError:
|
||||
break
|
||||
if line == '':
|
||||
break
|
||||
privkey += line.encode('ascii') + b'\n'
|
||||
privkey = rsa.PrivateKey.load_pkcs1(privkey)
|
||||
|
||||
signature = hexlify(rsa.pkcs1.sign(json.dumps(versions_info, sort_keys=True).encode('utf-8'), privkey, 'SHA-256')).decode()
|
||||
print('signature: ' + signature)
|
||||
|
||||
versions_info['signature'] = signature
|
||||
with open('update/versions.json', 'w') as versionsf:
|
||||
json.dump(versions_info, versionsf, indent=4, sort_keys=True)
|
||||
21
devscripts/gh-pages/update-copyright.py
Executable file
21
devscripts/gh-pages/update-copyright.py
Executable file
@@ -0,0 +1,21 @@
|
||||
#!/usr/bin/env python
|
||||
# coding: utf-8
|
||||
|
||||
from __future__ import with_statement, unicode_literals
|
||||
|
||||
import datetime
|
||||
import glob
|
||||
import io # For Python 2 compatibilty
|
||||
import os
|
||||
import re
|
||||
|
||||
year = str(datetime.datetime.now().year)
|
||||
for fn in glob.glob('*.html*'):
|
||||
with io.open(fn, encoding='utf-8') as f:
|
||||
content = f.read()
|
||||
newc = re.sub(r'(?P<copyright>Copyright © 2006-)(?P<year>[0-9]{4})', 'Copyright © 2006-' + year, content)
|
||||
if content != newc:
|
||||
tmpFn = fn + '.part'
|
||||
with io.open(tmpFn, 'wt', encoding='utf-8') as outf:
|
||||
outf.write(newc)
|
||||
os.rename(tmpFn, fn)
|
||||
76
devscripts/gh-pages/update-feed.py
Executable file
76
devscripts/gh-pages/update-feed.py
Executable file
@@ -0,0 +1,76 @@
|
||||
#!/usr/bin/env python3
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import datetime
|
||||
import io
|
||||
import json
|
||||
import textwrap
|
||||
|
||||
|
||||
atom_template = textwrap.dedent("""\
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<feed xmlns="http://www.w3.org/2005/Atom">
|
||||
<link rel="self" href="http://rg3.github.io/youtube-dl/update/releases.atom" />
|
||||
<title>youtube-dl releases</title>
|
||||
<id>https://yt-dl.org/feed/youtube-dl-updates-feed</id>
|
||||
<updated>@TIMESTAMP@</updated>
|
||||
@ENTRIES@
|
||||
</feed>""")
|
||||
|
||||
entry_template = textwrap.dedent("""
|
||||
<entry>
|
||||
<id>https://yt-dl.org/feed/youtube-dl-updates-feed/youtube-dl-@VERSION@</id>
|
||||
<title>New version @VERSION@</title>
|
||||
<link href="http://rg3.github.io/youtube-dl" />
|
||||
<content type="xhtml">
|
||||
<div xmlns="http://www.w3.org/1999/xhtml">
|
||||
Downloads available at <a href="https://yt-dl.org/downloads/@VERSION@/">https://yt-dl.org/downloads/@VERSION@/</a>
|
||||
</div>
|
||||
</content>
|
||||
<author>
|
||||
<name>The youtube-dl maintainers</name>
|
||||
</author>
|
||||
<updated>@TIMESTAMP@</updated>
|
||||
</entry>
|
||||
""")
|
||||
|
||||
now = datetime.datetime.now()
|
||||
now_iso = now.isoformat() + 'Z'
|
||||
|
||||
atom_template = atom_template.replace('@TIMESTAMP@', now_iso)
|
||||
|
||||
versions_info = json.load(open('update/versions.json'))
|
||||
versions = list(versions_info['versions'].keys())
|
||||
versions.sort()
|
||||
|
||||
entries = []
|
||||
for v in versions:
|
||||
fields = v.split('.')
|
||||
year, month, day = map(int, fields[:3])
|
||||
faked = 0
|
||||
patchlevel = 0
|
||||
while True:
|
||||
try:
|
||||
datetime.date(year, month, day)
|
||||
except ValueError:
|
||||
day -= 1
|
||||
faked += 1
|
||||
assert day > 0
|
||||
continue
|
||||
break
|
||||
if len(fields) >= 4:
|
||||
try:
|
||||
patchlevel = int(fields[3])
|
||||
except ValueError:
|
||||
patchlevel = 1
|
||||
timestamp = '%04d-%02d-%02dT00:%02d:%02dZ' % (year, month, day, faked, patchlevel)
|
||||
|
||||
entry = entry_template.replace('@TIMESTAMP@', timestamp)
|
||||
entry = entry.replace('@VERSION@', v)
|
||||
entries.append(entry)
|
||||
|
||||
entries_str = textwrap.indent(''.join(entries), '\t')
|
||||
atom_template = atom_template.replace('@ENTRIES@', entries_str)
|
||||
|
||||
with io.open('update/releases.atom', 'w', encoding='utf-8') as atom_file:
|
||||
atom_file.write(atom_template)
|
||||
36
devscripts/gh-pages/update-sites.py
Executable file
36
devscripts/gh-pages/update-sites.py
Executable file
@@ -0,0 +1,36 @@
|
||||
#!/usr/bin/env python3
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import sys
|
||||
import os
|
||||
import textwrap
|
||||
|
||||
# We must be able to import youtube_dl
|
||||
sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
|
||||
|
||||
import youtube_dl
|
||||
|
||||
|
||||
def main():
|
||||
with open('supportedsites.html.in', 'r', encoding='utf-8') as tmplf:
|
||||
template = tmplf.read()
|
||||
|
||||
ie_htmls = []
|
||||
for ie in sorted(youtube_dl.gen_extractors(), key=lambda i: i.IE_NAME.lower()):
|
||||
ie_html = '<b>{}</b>'.format(ie.IE_NAME)
|
||||
ie_desc = getattr(ie, 'IE_DESC', None)
|
||||
if ie_desc is False:
|
||||
continue
|
||||
elif ie_desc is not None:
|
||||
ie_html += ': {}'.format(ie.IE_DESC)
|
||||
if not ie.working():
|
||||
ie_html += ' (Currently broken)'
|
||||
ie_htmls.append('<li>{}</li>'.format(ie_html))
|
||||
|
||||
template = template.replace('@SITES@', textwrap.indent('\n'.join(ie_htmls), '\t'))
|
||||
|
||||
with open('supportedsites.html', 'w', encoding='utf-8') as sitesf:
|
||||
sitesf.write(template)
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
26
devscripts/make_readme.py
Executable file
26
devscripts/make_readme.py
Executable file
@@ -0,0 +1,26 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import io
|
||||
import sys
|
||||
import re
|
||||
|
||||
README_FILE = 'README.md'
|
||||
helptext = sys.stdin.read()
|
||||
|
||||
if isinstance(helptext, bytes):
|
||||
helptext = helptext.decode('utf-8')
|
||||
|
||||
with io.open(README_FILE, encoding='utf-8') as f:
|
||||
oldreadme = f.read()
|
||||
|
||||
header = oldreadme[:oldreadme.index('# OPTIONS')]
|
||||
footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
|
||||
|
||||
options = helptext[helptext.index(' General Options:') + 19:]
|
||||
options = re.sub(r'(?m)^ (\w.+)$', r'## \1', options)
|
||||
options = '# OPTIONS\n' + options + '\n'
|
||||
|
||||
with io.open(README_FILE, 'w', encoding='utf-8') as f:
|
||||
f.write(header)
|
||||
f.write(options)
|
||||
f.write(footer)
|
||||
6
devscripts/posix-locale.sh
Executable file
6
devscripts/posix-locale.sh
Executable file
@@ -0,0 +1,6 @@
|
||||
|
||||
# source this file in your shell to get a POSIX locale (which will break many programs, but that's kind of the point)
|
||||
|
||||
export LC_ALL=POSIX
|
||||
export LANG=POSIX
|
||||
export LANGUAGE=POSIX
|
||||
21
devscripts/prepare_manpage.py
Normal file
21
devscripts/prepare_manpage.py
Normal file
@@ -0,0 +1,21 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import io
|
||||
import os.path
|
||||
import sys
|
||||
import re
|
||||
|
||||
ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
README_FILE = os.path.join(ROOT_DIR, 'README.md')
|
||||
|
||||
with io.open(README_FILE, encoding='utf-8') as f:
|
||||
readme = f.read()
|
||||
|
||||
PREFIX = '%YOUTUBE-DL(1)\n\n# NAME\n'
|
||||
readme = re.sub(r'(?s)# INSTALLATION.*?(?=# DESCRIPTION)', '', readme)
|
||||
readme = PREFIX + readme
|
||||
|
||||
if sys.version_info < (3, 0):
|
||||
print(readme.encode('utf-8'))
|
||||
else:
|
||||
print(readme)
|
||||
108
devscripts/release.sh
Executable file
108
devscripts/release.sh
Executable file
@@ -0,0 +1,108 @@
|
||||
#!/bin/bash
|
||||
|
||||
# IMPORTANT: the following assumptions are made
|
||||
# * the GH repo is on the origin remote
|
||||
# * the gh-pages branch is named so locally
|
||||
# * the git config user.signingkey is properly set
|
||||
|
||||
# You will need
|
||||
# pip install coverage nose rsa
|
||||
|
||||
# TODO
|
||||
# release notes
|
||||
# make hash on local files
|
||||
|
||||
set -e
|
||||
|
||||
skip_tests=true
|
||||
if [ "$1" = '--run-tests' ]; then
|
||||
skip_tests=false
|
||||
shift
|
||||
fi
|
||||
|
||||
if [ -z "$1" ]; then echo "ERROR: specify version number like this: $0 1994.09.06"; exit 1; fi
|
||||
version="$1"
|
||||
major_version=$(echo "$version" | sed -n 's#^\([0-9]*\.[0-9]*\.[0-9]*\).*#\1#p')
|
||||
if test "$major_version" '!=' "$(date '+%Y.%m.%d')"; then
|
||||
echo "$version does not start with today's date!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -z "`git tag | grep "$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi
|
||||
if [ ! -z "`git status --porcelain | grep -v CHANGELOG`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi
|
||||
useless_files=$(find youtube_dl -type f -not -name '*.py')
|
||||
if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in youtube_dl: $useless_files"; exit 1; fi
|
||||
if [ ! -f "updates_key.pem" ]; then echo 'ERROR: updates_key.pem missing'; exit 1; fi
|
||||
|
||||
/bin/echo -e "\n### First of all, testing..."
|
||||
make cleanall
|
||||
if $skip_tests ; then
|
||||
echo 'SKIPPING TESTS'
|
||||
else
|
||||
nosetests --verbose --with-coverage --cover-package=youtube_dl --cover-html test --stop || exit 1
|
||||
fi
|
||||
|
||||
/bin/echo -e "\n### Changing version in version.py..."
|
||||
sed -i "s/__version__ = '.*'/__version__ = '$version'/" youtube_dl/version.py
|
||||
|
||||
/bin/echo -e "\n### Committing README.md and youtube_dl/version.py..."
|
||||
make README.md
|
||||
git add README.md youtube_dl/version.py
|
||||
git commit -m "release $version"
|
||||
|
||||
/bin/echo -e "\n### Now tagging, signing and pushing..."
|
||||
git tag -s -m "Release $version" "$version"
|
||||
git show "$version"
|
||||
read -p "Is it good, can I push? (y/n) " -n 1
|
||||
if [[ ! $REPLY =~ ^[Yy]$ ]]; then exit 1; fi
|
||||
echo
|
||||
MASTER=$(git rev-parse --abbrev-ref HEAD)
|
||||
git push origin $MASTER:master
|
||||
git push origin "$version"
|
||||
|
||||
/bin/echo -e "\n### OK, now it is time to build the binaries..."
|
||||
REV=$(git rev-parse HEAD)
|
||||
make youtube-dl youtube-dl.tar.gz
|
||||
read -p "VM running? (y/n) " -n 1
|
||||
wget "http://localhost:8142/build/rg3/youtube-dl/youtube-dl.exe?rev=$REV" -O youtube-dl.exe
|
||||
mkdir -p "build/$version"
|
||||
mv youtube-dl youtube-dl.exe "build/$version"
|
||||
mv youtube-dl.tar.gz "build/$version/youtube-dl-$version.tar.gz"
|
||||
RELEASE_FILES="youtube-dl youtube-dl.exe youtube-dl-$version.tar.gz"
|
||||
(cd build/$version/ && md5sum $RELEASE_FILES > MD5SUMS)
|
||||
(cd build/$version/ && sha1sum $RELEASE_FILES > SHA1SUMS)
|
||||
(cd build/$version/ && sha256sum $RELEASE_FILES > SHA2-256SUMS)
|
||||
(cd build/$version/ && sha512sum $RELEASE_FILES > SHA2-512SUMS)
|
||||
|
||||
/bin/echo -e "\n### Signing and uploading the new binaries to yt-dl.org ..."
|
||||
for f in $RELEASE_FILES; do gpg --passphrase-repeat 5 --detach-sig "build/$version/$f"; done
|
||||
scp -r "build/$version" ytdl@yt-dl.org:html/tmp/
|
||||
ssh ytdl@yt-dl.org "mv html/tmp/$version html/downloads/"
|
||||
ssh ytdl@yt-dl.org "sh html/update_latest.sh $version"
|
||||
|
||||
/bin/echo -e "\n### Now switching to gh-pages..."
|
||||
git clone --branch gh-pages --single-branch . build/gh-pages
|
||||
ROOT=$(pwd)
|
||||
(
|
||||
set -e
|
||||
ORIGIN_URL=$(git config --get remote.origin.url)
|
||||
cd build/gh-pages
|
||||
"$ROOT/devscripts/gh-pages/add-version.py" $version
|
||||
"$ROOT/devscripts/gh-pages/update-feed.py"
|
||||
"$ROOT/devscripts/gh-pages/sign-versions.py" < "$ROOT/updates_key.pem"
|
||||
"$ROOT/devscripts/gh-pages/generate-download.py"
|
||||
"$ROOT/devscripts/gh-pages/update-copyright.py"
|
||||
"$ROOT/devscripts/gh-pages/update-sites.py"
|
||||
git add *.html *.html.in update
|
||||
git commit -m "release $version"
|
||||
git push "$ROOT" gh-pages
|
||||
git push "$ORIGIN_URL" gh-pages
|
||||
)
|
||||
rm -rf build
|
||||
|
||||
make pypi-files
|
||||
echo "Uploading to PyPi ..."
|
||||
python setup.py sdist bdist_wheel upload
|
||||
make clean
|
||||
|
||||
/bin/echo -e "\n### DONE!"
|
||||
56
devscripts/wine-py2exe.sh
Executable file
56
devscripts/wine-py2exe.sh
Executable file
@@ -0,0 +1,56 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Run with as parameter a setup.py that works in the current directory
|
||||
# e.g. no os.chdir()
|
||||
# It will run twice, the first time will crash
|
||||
|
||||
set -e
|
||||
|
||||
SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
|
||||
|
||||
if [ ! -d wine-py2exe ]; then
|
||||
|
||||
sudo apt-get install wine1.3 axel bsdiff
|
||||
|
||||
mkdir wine-py2exe
|
||||
cd wine-py2exe
|
||||
export WINEPREFIX=`pwd`
|
||||
|
||||
axel -a "http://www.python.org/ftp/python/2.7/python-2.7.msi"
|
||||
axel -a "http://downloads.sourceforge.net/project/py2exe/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe"
|
||||
#axel -a "http://winetricks.org/winetricks"
|
||||
|
||||
# http://appdb.winehq.org/objectManager.php?sClass=version&iId=21957
|
||||
echo "Follow python setup on screen"
|
||||
wine msiexec /i python-2.7.msi
|
||||
|
||||
echo "Follow py2exe setup on screen"
|
||||
wine py2exe-0.6.9.win32-py2.7.exe
|
||||
|
||||
#echo "Follow Microsoft Visual C++ 2008 Redistributable Package setup on screen"
|
||||
#bash winetricks vcrun2008
|
||||
|
||||
rm py2exe-0.6.9.win32-py2.7.exe
|
||||
rm python-2.7.msi
|
||||
#rm winetricks
|
||||
|
||||
# http://bugs.winehq.org/show_bug.cgi?id=3591
|
||||
|
||||
mv drive_c/Python27/Lib/site-packages/py2exe/run.exe drive_c/Python27/Lib/site-packages/py2exe/run.exe.backup
|
||||
bspatch drive_c/Python27/Lib/site-packages/py2exe/run.exe.backup drive_c/Python27/Lib/site-packages/py2exe/run.exe "$SCRIPT_DIR/SizeOfImage.patch"
|
||||
mv drive_c/Python27/Lib/site-packages/py2exe/run_w.exe drive_c/Python27/Lib/site-packages/py2exe/run_w.exe.backup
|
||||
bspatch drive_c/Python27/Lib/site-packages/py2exe/run_w.exe.backup drive_c/Python27/Lib/site-packages/py2exe/run_w.exe "$SCRIPT_DIR/SizeOfImage_w.patch"
|
||||
|
||||
cd -
|
||||
|
||||
else
|
||||
|
||||
export WINEPREFIX="$( cd wine-py2exe && pwd )"
|
||||
|
||||
fi
|
||||
|
||||
wine "C:\\Python27\\python.exe" "$1" py2exe > "py2exe.log" 2>&1 || true
|
||||
echo '# Copying python27.dll' >> "py2exe.log"
|
||||
cp "$WINEPREFIX/drive_c/windows/system32/python27.dll" build/bdist.win32/winexe/bundle-2.7/
|
||||
wine "C:\\Python27\\python.exe" "$1" py2exe >> "py2exe.log" 2>&1
|
||||
|
||||
28
devscripts/zsh-completion.in
Normal file
28
devscripts/zsh-completion.in
Normal file
@@ -0,0 +1,28 @@
|
||||
#compdef youtube-dl
|
||||
|
||||
__youtube_dl() {
|
||||
local curcontext="$curcontext" fileopts diropts cur prev
|
||||
typeset -A opt_args
|
||||
fileopts="{{fileopts}}"
|
||||
diropts="{{diropts}}"
|
||||
cur=$words[CURRENT]
|
||||
case $cur in
|
||||
:)
|
||||
_arguments '*: :(::ytfavorites ::ytrecommended ::ytsubscriptions ::ytwatchlater ::ythistory)'
|
||||
;;
|
||||
*)
|
||||
prev=$words[CURRENT-1]
|
||||
if [[ ${prev} =~ ${fileopts} ]]; then
|
||||
_path_files
|
||||
elif [[ ${prev} =~ ${diropts} ]]; then
|
||||
_path_files -/
|
||||
elif [[ ${prev} == "--recode-video" ]]; then
|
||||
_arguments '*: :(mp4 flv ogg webm mkv)'
|
||||
else
|
||||
_arguments '*: :({{flags}})'
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
__youtube_dl
|
||||
48
devscripts/zsh-completion.py
Executable file
48
devscripts/zsh-completion.py
Executable file
@@ -0,0 +1,48 @@
|
||||
#!/usr/bin/env python
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import os
|
||||
from os.path import dirname as dirn
|
||||
import sys
|
||||
|
||||
sys.path.append(dirn(dirn((os.path.abspath(__file__)))))
|
||||
import youtube_dl
|
||||
|
||||
ZSH_COMPLETION_FILE = "youtube-dl.zsh"
|
||||
ZSH_COMPLETION_TEMPLATE = "devscripts/zsh-completion.in"
|
||||
|
||||
|
||||
def build_completion(opt_parser):
|
||||
opts = [opt for group in opt_parser.option_groups
|
||||
for opt in group.option_list]
|
||||
opts_file = [opt for opt in opts if opt.metavar == "FILE"]
|
||||
opts_dir = [opt for opt in opts if opt.metavar == "DIR"]
|
||||
|
||||
fileopts = []
|
||||
for opt in opts_file:
|
||||
if opt._short_opts:
|
||||
fileopts.extend(opt._short_opts)
|
||||
if opt._long_opts:
|
||||
fileopts.extend(opt._long_opts)
|
||||
|
||||
diropts = []
|
||||
for opt in opts_dir:
|
||||
if opt._short_opts:
|
||||
diropts.extend(opt._short_opts)
|
||||
if opt._long_opts:
|
||||
diropts.extend(opt._long_opts)
|
||||
|
||||
flags = [opt.get_opt_string() for opt in opts]
|
||||
|
||||
with open(ZSH_COMPLETION_TEMPLATE) as f:
|
||||
template = f.read()
|
||||
|
||||
template = template.replace("{{fileopts}}", "|".join(fileopts))
|
||||
template = template.replace("{{diropts}}", "|".join(diropts))
|
||||
template = template.replace("{{flags}}", " ".join(flags))
|
||||
|
||||
with open(ZSH_COMPLETION_FILE, "w") as f:
|
||||
f.write(template)
|
||||
|
||||
parser = youtube_dl.parseOpts()[0]
|
||||
build_completion(parser)
|
||||
1
docs/.gitignore
vendored
Normal file
1
docs/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
_build/
|
||||
177
docs/Makefile
Normal file
177
docs/Makefile
Normal file
@@ -0,0 +1,177 @@
|
||||
# Makefile for Sphinx documentation
|
||||
#
|
||||
|
||||
# You can set these variables from the command line.
|
||||
SPHINXOPTS =
|
||||
SPHINXBUILD = sphinx-build
|
||||
PAPER =
|
||||
BUILDDIR = _build
|
||||
|
||||
# User-friendly check for sphinx-build
|
||||
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
|
||||
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
|
||||
endif
|
||||
|
||||
# Internal variables.
|
||||
PAPEROPT_a4 = -D latex_paper_size=a4
|
||||
PAPEROPT_letter = -D latex_paper_size=letter
|
||||
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
|
||||
# the i18n builder cannot share the environment and doctrees with the others
|
||||
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
|
||||
|
||||
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
|
||||
|
||||
help:
|
||||
@echo "Please use \`make <target>' where <target> is one of"
|
||||
@echo " html to make standalone HTML files"
|
||||
@echo " dirhtml to make HTML files named index.html in directories"
|
||||
@echo " singlehtml to make a single large HTML file"
|
||||
@echo " pickle to make pickle files"
|
||||
@echo " json to make JSON files"
|
||||
@echo " htmlhelp to make HTML files and a HTML help project"
|
||||
@echo " qthelp to make HTML files and a qthelp project"
|
||||
@echo " devhelp to make HTML files and a Devhelp project"
|
||||
@echo " epub to make an epub"
|
||||
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
|
||||
@echo " latexpdf to make LaTeX files and run them through pdflatex"
|
||||
@echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
|
||||
@echo " text to make text files"
|
||||
@echo " man to make manual pages"
|
||||
@echo " texinfo to make Texinfo files"
|
||||
@echo " info to make Texinfo files and run them through makeinfo"
|
||||
@echo " gettext to make PO message catalogs"
|
||||
@echo " changes to make an overview of all changed/added/deprecated items"
|
||||
@echo " xml to make Docutils-native XML files"
|
||||
@echo " pseudoxml to make pseudoxml-XML files for display purposes"
|
||||
@echo " linkcheck to check all external links for integrity"
|
||||
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
|
||||
|
||||
clean:
|
||||
rm -rf $(BUILDDIR)/*
|
||||
|
||||
html:
|
||||
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
|
||||
@echo
|
||||
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
|
||||
|
||||
dirhtml:
|
||||
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
|
||||
@echo
|
||||
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
|
||||
|
||||
singlehtml:
|
||||
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
|
||||
@echo
|
||||
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
|
||||
|
||||
pickle:
|
||||
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
|
||||
@echo
|
||||
@echo "Build finished; now you can process the pickle files."
|
||||
|
||||
json:
|
||||
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
|
||||
@echo
|
||||
@echo "Build finished; now you can process the JSON files."
|
||||
|
||||
htmlhelp:
|
||||
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
|
||||
@echo
|
||||
@echo "Build finished; now you can run HTML Help Workshop with the" \
|
||||
".hhp project file in $(BUILDDIR)/htmlhelp."
|
||||
|
||||
qthelp:
|
||||
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
|
||||
@echo
|
||||
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
|
||||
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
|
||||
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/youtube-dl.qhcp"
|
||||
@echo "To view the help file:"
|
||||
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/youtube-dl.qhc"
|
||||
|
||||
devhelp:
|
||||
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
|
||||
@echo
|
||||
@echo "Build finished."
|
||||
@echo "To view the help file:"
|
||||
@echo "# mkdir -p $$HOME/.local/share/devhelp/youtube-dl"
|
||||
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/youtube-dl"
|
||||
@echo "# devhelp"
|
||||
|
||||
epub:
|
||||
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
|
||||
@echo
|
||||
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
|
||||
|
||||
latex:
|
||||
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
|
||||
@echo
|
||||
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
|
||||
@echo "Run \`make' in that directory to run these through (pdf)latex" \
|
||||
"(use \`make latexpdf' here to do that automatically)."
|
||||
|
||||
latexpdf:
|
||||
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
|
||||
@echo "Running LaTeX files through pdflatex..."
|
||||
$(MAKE) -C $(BUILDDIR)/latex all-pdf
|
||||
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
|
||||
|
||||
latexpdfja:
|
||||
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
|
||||
@echo "Running LaTeX files through platex and dvipdfmx..."
|
||||
$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
|
||||
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
|
||||
|
||||
text:
|
||||
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
|
||||
@echo
|
||||
@echo "Build finished. The text files are in $(BUILDDIR)/text."
|
||||
|
||||
man:
|
||||
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
|
||||
@echo
|
||||
@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
|
||||
|
||||
texinfo:
|
||||
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
|
||||
@echo
|
||||
@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
|
||||
@echo "Run \`make' in that directory to run these through makeinfo" \
|
||||
"(use \`make info' here to do that automatically)."
|
||||
|
||||
info:
|
||||
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
|
||||
@echo "Running Texinfo files through makeinfo..."
|
||||
make -C $(BUILDDIR)/texinfo info
|
||||
@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
|
||||
|
||||
gettext:
|
||||
$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
|
||||
@echo
|
||||
@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
|
||||
|
||||
changes:
|
||||
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
|
||||
@echo
|
||||
@echo "The overview file is in $(BUILDDIR)/changes."
|
||||
|
||||
linkcheck:
|
||||
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
|
||||
@echo
|
||||
@echo "Link check complete; look for any errors in the above output " \
|
||||
"or in $(BUILDDIR)/linkcheck/output.txt."
|
||||
|
||||
doctest:
|
||||
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
|
||||
@echo "Testing of doctests in the sources finished, look at the " \
|
||||
"results in $(BUILDDIR)/doctest/output.txt."
|
||||
|
||||
xml:
|
||||
$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
|
||||
@echo
|
||||
@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
|
||||
|
||||
pseudoxml:
|
||||
$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
|
||||
@echo
|
||||
@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
|
||||
71
docs/conf.py
Normal file
71
docs/conf.py
Normal file
@@ -0,0 +1,71 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# youtube-dl documentation build configuration file, created by
|
||||
# sphinx-quickstart on Fri Mar 14 21:05:43 2014.
|
||||
#
|
||||
# This file is execfile()d with the current directory set to its
|
||||
# containing dir.
|
||||
#
|
||||
# Note that not all possible configuration values are present in this
|
||||
# autogenerated file.
|
||||
#
|
||||
# All configuration values have a default; values that are commented out
|
||||
# serve to show the default.
|
||||
|
||||
import sys
|
||||
import os
|
||||
# Allows to import youtube_dl
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
# -- General configuration ------------------------------------------------
|
||||
|
||||
# Add any Sphinx extension module names here, as strings. They can be
|
||||
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
|
||||
# ones.
|
||||
extensions = [
|
||||
'sphinx.ext.autodoc',
|
||||
]
|
||||
|
||||
# Add any paths that contain templates here, relative to this directory.
|
||||
templates_path = ['_templates']
|
||||
|
||||
# The suffix of source filenames.
|
||||
source_suffix = '.rst'
|
||||
|
||||
# The master toctree document.
|
||||
master_doc = 'index'
|
||||
|
||||
# General information about the project.
|
||||
project = u'youtube-dl'
|
||||
copyright = u'2014, Ricardo Garcia Gonzalez'
|
||||
|
||||
# The version info for the project you're documenting, acts as replacement for
|
||||
# |version| and |release|, also used in various other places throughout the
|
||||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
from youtube_dl.version import __version__
|
||||
version = __version__
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = version
|
||||
|
||||
# List of patterns, relative to source directory, that match files and
|
||||
# directories to ignore when looking for source files.
|
||||
exclude_patterns = ['_build']
|
||||
|
||||
# The name of the Pygments (syntax highlighting) style to use.
|
||||
pygments_style = 'sphinx'
|
||||
|
||||
# -- Options for HTML output ----------------------------------------------
|
||||
|
||||
# The theme to use for HTML and HTML Help pages. See the documentation for
|
||||
# a list of builtin themes.
|
||||
html_theme = 'default'
|
||||
|
||||
# Add any paths that contain custom static files (such as style sheets) here,
|
||||
# relative to this directory. They are copied after the builtin static files,
|
||||
# so a file named "default.css" will overwrite the builtin "default.css".
|
||||
html_static_path = ['_static']
|
||||
|
||||
# Output file base name for HTML help builder.
|
||||
htmlhelp_basename = 'youtube-dldoc'
|
||||
23
docs/index.rst
Normal file
23
docs/index.rst
Normal file
@@ -0,0 +1,23 @@
|
||||
Welcome to youtube-dl's documentation!
|
||||
======================================
|
||||
|
||||
*youtube-dl* is a command-line program to download videos from YouTube.com and more sites.
|
||||
It can also be used in Python code.
|
||||
|
||||
Developer guide
|
||||
---------------
|
||||
|
||||
This section contains information for using *youtube-dl* from Python programs.
|
||||
|
||||
.. toctree::
|
||||
:maxdepth: 2
|
||||
|
||||
module_guide
|
||||
|
||||
Indices and tables
|
||||
==================
|
||||
|
||||
* :ref:`genindex`
|
||||
* :ref:`modindex`
|
||||
* :ref:`search`
|
||||
|
||||
67
docs/module_guide.rst
Normal file
67
docs/module_guide.rst
Normal file
@@ -0,0 +1,67 @@
|
||||
Using the ``youtube_dl`` module
|
||||
===============================
|
||||
|
||||
When using the ``youtube_dl`` module, you start by creating an instance of :class:`YoutubeDL` and adding all the available extractors:
|
||||
|
||||
.. code-block:: python
|
||||
|
||||
>>> from youtube_dl import YoutubeDL
|
||||
>>> ydl = YoutubeDL()
|
||||
>>> ydl.add_default_info_extractors()
|
||||
|
||||
Extracting video information
|
||||
----------------------------
|
||||
|
||||
You use the :meth:`YoutubeDL.extract_info` method for getting the video information, which returns a dictionary:
|
||||
|
||||
.. code-block:: python
|
||||
|
||||
>>> info = ydl.extract_info('http://www.youtube.com/watch?v=BaW_jenozKc', download=False)
|
||||
[youtube] Setting language
|
||||
[youtube] BaW_jenozKc: Downloading webpage
|
||||
[youtube] BaW_jenozKc: Downloading video info webpage
|
||||
[youtube] BaW_jenozKc: Extracting video information
|
||||
>>> info['title']
|
||||
'youtube-dl test video "\'/\\ä↭𝕐'
|
||||
>>> info['height'], info['width']
|
||||
(720, 1280)
|
||||
|
||||
If you want to download or play the video you can get its url:
|
||||
|
||||
.. code-block:: python
|
||||
|
||||
>>> info['url']
|
||||
'https://...'
|
||||
|
||||
Extracting playlist information
|
||||
-------------------------------
|
||||
|
||||
The playlist information is extracted in a similar way, but the dictionary is a bit different:
|
||||
|
||||
.. code-block:: python
|
||||
|
||||
>>> playlist = ydl.extract_info('http://www.ted.com/playlists/13/open_source_open_world', download=False)
|
||||
[TED] open_source_open_world: Downloading playlist webpage
|
||||
...
|
||||
>>> playlist['title']
|
||||
'Open-source, open world'
|
||||
|
||||
|
||||
|
||||
You can access the videos in the playlist with the ``entries`` field:
|
||||
|
||||
.. code-block:: python
|
||||
|
||||
>>> for video in playlist['entries']:
|
||||
... print('Video #%d: %s' % (video['playlist_index'], video['title']))
|
||||
|
||||
Video #1: How Arduino is open-sourcing imagination
|
||||
Video #2: The year open data went worldwide
|
||||
Video #3: Massive-scale online collaboration
|
||||
Video #4: The art of asking
|
||||
Video #5: How cognitive surplus will change the world
|
||||
Video #6: The birth of Wikipedia
|
||||
Video #7: Coding a better government
|
||||
Video #8: The era of open innovation
|
||||
Video #9: The currency of the new economy is trust
|
||||
|
||||
111
setup.py
Normal file
111
setup.py
Normal file
@@ -0,0 +1,111 @@
|
||||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import os.path
|
||||
import warnings
|
||||
import sys
|
||||
|
||||
try:
|
||||
from setuptools import setup
|
||||
setuptools_available = True
|
||||
except ImportError:
|
||||
from distutils.core import setup
|
||||
setuptools_available = False
|
||||
|
||||
try:
|
||||
# This will create an exe that needs Microsoft Visual C++ 2008
|
||||
# Redistributable Package
|
||||
import py2exe
|
||||
except ImportError:
|
||||
if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
|
||||
print("Cannot import py2exe", file=sys.stderr)
|
||||
exit(1)
|
||||
|
||||
py2exe_options = {
|
||||
"bundle_files": 1,
|
||||
"compressed": 1,
|
||||
"optimize": 2,
|
||||
"dist_dir": '.',
|
||||
"dll_excludes": ['w9xpopen.exe'],
|
||||
}
|
||||
|
||||
py2exe_console = [{
|
||||
"script": "./youtube_dl/__main__.py",
|
||||
"dest_base": "youtube-dl",
|
||||
}]
|
||||
|
||||
py2exe_params = {
|
||||
'console': py2exe_console,
|
||||
'options': {"py2exe": py2exe_options},
|
||||
'zipfile': None
|
||||
}
|
||||
|
||||
if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
|
||||
params = py2exe_params
|
||||
else:
|
||||
files_spec = [
|
||||
('etc/bash_completion.d', ['youtube-dl.bash-completion']),
|
||||
('etc/fish/completions', ['youtube-dl.fish']),
|
||||
('share/doc/youtube_dl', ['README.txt']),
|
||||
('share/man/man1', ['youtube-dl.1'])
|
||||
]
|
||||
root = os.path.dirname(os.path.abspath(__file__))
|
||||
data_files = []
|
||||
for dirname, files in files_spec:
|
||||
resfiles = []
|
||||
for fn in files:
|
||||
if not os.path.exists(fn):
|
||||
warnings.warn('Skipping file %s since it is not present. Type make to build all automatically generated files.' % fn)
|
||||
else:
|
||||
resfiles.append(fn)
|
||||
data_files.append((dirname, resfiles))
|
||||
|
||||
params = {
|
||||
'data_files': data_files,
|
||||
}
|
||||
if setuptools_available:
|
||||
params['entry_points'] = {'console_scripts': ['youtube-dl = youtube_dl:main']}
|
||||
else:
|
||||
params['scripts'] = ['bin/youtube-dl']
|
||||
|
||||
# Get the version from youtube_dl/version.py without importing the package
|
||||
exec(compile(open('youtube_dl/version.py').read(),
|
||||
'youtube_dl/version.py', 'exec'))
|
||||
|
||||
setup(
|
||||
name='youtube_dl',
|
||||
version=__version__,
|
||||
description='YouTube video downloader',
|
||||
long_description='Small command-line program to download videos from'
|
||||
' YouTube.com and other video sites.',
|
||||
url='https://github.com/rg3/youtube-dl',
|
||||
author='Ricardo Garcia',
|
||||
author_email='ytdl@yt-dl.org',
|
||||
maintainer='Philipp Hagemeister',
|
||||
maintainer_email='phihag@phihag.de',
|
||||
packages=[
|
||||
'youtube_dl',
|
||||
'youtube_dl.extractor', 'youtube_dl.downloader',
|
||||
'youtube_dl.postprocessor'],
|
||||
|
||||
# Provokes warning on most systems (why?!)
|
||||
# test_suite = 'nose.collector',
|
||||
# test_requires = ['nosetest'],
|
||||
|
||||
classifiers=[
|
||||
"Topic :: Multimedia :: Video",
|
||||
"Development Status :: 5 - Production/Stable",
|
||||
"Environment :: Console",
|
||||
"License :: Public Domain",
|
||||
"Programming Language :: Python :: 2.6",
|
||||
"Programming Language :: Python :: 2.7",
|
||||
"Programming Language :: Python :: 3",
|
||||
"Programming Language :: Python :: 3.2",
|
||||
"Programming Language :: Python :: 3.3",
|
||||
"Programming Language :: Python :: 3.4",
|
||||
],
|
||||
|
||||
**params
|
||||
)
|
||||
0
test/__init__.py
Normal file
0
test/__init__.py
Normal file
186
test/helper.py
Normal file
186
test/helper.py
Normal file
@@ -0,0 +1,186 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import errno
|
||||
import io
|
||||
import hashlib
|
||||
import json
|
||||
import os.path
|
||||
import re
|
||||
import types
|
||||
import sys
|
||||
|
||||
import youtube_dl.extractor
|
||||
from youtube_dl import YoutubeDL
|
||||
from youtube_dl.utils import (
|
||||
compat_str,
|
||||
preferredencoding,
|
||||
write_string,
|
||||
)
|
||||
|
||||
|
||||
def get_params(override=None):
|
||||
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)),
|
||||
"parameters.json")
|
||||
with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
|
||||
parameters = json.load(pf)
|
||||
if override:
|
||||
parameters.update(override)
|
||||
return parameters
|
||||
|
||||
|
||||
def try_rm(filename):
|
||||
""" Remove a file if it exists """
|
||||
try:
|
||||
os.remove(filename)
|
||||
except OSError as ose:
|
||||
if ose.errno != errno.ENOENT:
|
||||
raise
|
||||
|
||||
|
||||
def report_warning(message):
|
||||
'''
|
||||
Print the message to stderr, it will be prefixed with 'WARNING:'
|
||||
If stderr is a tty file the 'WARNING:' will be colored
|
||||
'''
|
||||
if sys.stderr.isatty() and os.name != 'nt':
|
||||
_msg_header = '\033[0;33mWARNING:\033[0m'
|
||||
else:
|
||||
_msg_header = 'WARNING:'
|
||||
output = '%s %s\n' % (_msg_header, message)
|
||||
if 'b' in getattr(sys.stderr, 'mode', '') or sys.version_info[0] < 3:
|
||||
output = output.encode(preferredencoding())
|
||||
sys.stderr.write(output)
|
||||
|
||||
|
||||
class FakeYDL(YoutubeDL):
|
||||
def __init__(self, override=None):
|
||||
# Different instances of the downloader can't share the same dictionary
|
||||
# some test set the "sublang" parameter, which would break the md5 checks.
|
||||
params = get_params(override=override)
|
||||
super(FakeYDL, self).__init__(params, auto_init=False)
|
||||
self.result = []
|
||||
|
||||
def to_screen(self, s, skip_eol=None):
|
||||
print(s)
|
||||
|
||||
def trouble(self, s, tb=None):
|
||||
raise Exception(s)
|
||||
|
||||
def download(self, x):
|
||||
self.result.append(x)
|
||||
|
||||
def expect_warning(self, regex):
|
||||
# Silence an expected warning matching a regex
|
||||
old_report_warning = self.report_warning
|
||||
|
||||
def report_warning(self, message):
|
||||
if re.match(regex, message):
|
||||
return
|
||||
old_report_warning(message)
|
||||
self.report_warning = types.MethodType(report_warning, self)
|
||||
|
||||
|
||||
def gettestcases(include_onlymatching=False):
|
||||
for ie in youtube_dl.extractor.gen_extractors():
|
||||
t = getattr(ie, '_TEST', None)
|
||||
if t:
|
||||
assert not hasattr(ie, '_TESTS'), \
|
||||
'%s has _TEST and _TESTS' % type(ie).__name__
|
||||
tests = [t]
|
||||
else:
|
||||
tests = getattr(ie, '_TESTS', [])
|
||||
for t in tests:
|
||||
if not include_onlymatching and t.get('only_matching', False):
|
||||
continue
|
||||
t['name'] = type(ie).__name__[:-len('IE')]
|
||||
yield t
|
||||
|
||||
|
||||
md5 = lambda s: hashlib.md5(s.encode('utf-8')).hexdigest()
|
||||
|
||||
|
||||
def expect_info_dict(self, expected_dict, got_dict):
|
||||
for info_field, expected in expected_dict.items():
|
||||
if isinstance(expected, compat_str) and expected.startswith('re:'):
|
||||
got = got_dict.get(info_field)
|
||||
match_str = expected[len('re:'):]
|
||||
match_rex = re.compile(match_str)
|
||||
|
||||
self.assertTrue(
|
||||
isinstance(got, compat_str),
|
||||
'Expected a %s object, but got %s for field %s' % (
|
||||
compat_str.__name__, type(got).__name__, info_field))
|
||||
self.assertTrue(
|
||||
match_rex.match(got),
|
||||
'field %s (value: %r) should match %r' % (info_field, got, match_str))
|
||||
elif isinstance(expected, type):
|
||||
got = got_dict.get(info_field)
|
||||
self.assertTrue(isinstance(got, expected),
|
||||
'Expected type %r for field %s, but got value %r of type %r' % (expected, info_field, got, type(got)))
|
||||
else:
|
||||
if isinstance(expected, compat_str) and expected.startswith('md5:'):
|
||||
got = 'md5:' + md5(got_dict.get(info_field))
|
||||
else:
|
||||
got = got_dict.get(info_field)
|
||||
self.assertEqual(expected, got,
|
||||
'invalid value for field %s, expected %r, got %r' % (info_field, expected, got))
|
||||
|
||||
# Check for the presence of mandatory fields
|
||||
if got_dict.get('_type') != 'playlist':
|
||||
for key in ('id', 'url', 'title', 'ext'):
|
||||
self.assertTrue(got_dict.get(key), 'Missing mandatory field %s' % key)
|
||||
# Check for mandatory fields that are automatically set by YoutubeDL
|
||||
for key in ['webpage_url', 'extractor', 'extractor_key']:
|
||||
self.assertTrue(got_dict.get(key), 'Missing field: %s' % key)
|
||||
|
||||
# Are checkable fields missing from the test case definition?
|
||||
test_info_dict = dict((key, value if not isinstance(value, compat_str) or len(value) < 250 else 'md5:' + md5(value))
|
||||
for key, value in got_dict.items()
|
||||
if value and key in ('title', 'description', 'uploader', 'upload_date', 'timestamp', 'uploader_id', 'location'))
|
||||
missing_keys = set(test_info_dict.keys()) - set(expected_dict.keys())
|
||||
if missing_keys:
|
||||
def _repr(v):
|
||||
if isinstance(v, compat_str):
|
||||
return "'%s'" % v.replace('\\', '\\\\').replace("'", "\\'").replace('\n', '\\n')
|
||||
else:
|
||||
return repr(v)
|
||||
info_dict_str = ''.join(
|
||||
' %s: %s,\n' % (_repr(k), _repr(v))
|
||||
for k, v in test_info_dict.items())
|
||||
write_string(
|
||||
'\n\'info_dict\': {\n' + info_dict_str + '}\n', out=sys.stderr)
|
||||
self.assertFalse(
|
||||
missing_keys,
|
||||
'Missing keys in test definition: %s' % (
|
||||
', '.join(sorted(missing_keys))))
|
||||
|
||||
|
||||
def assertRegexpMatches(self, text, regexp, msg=None):
|
||||
if hasattr(self, 'assertRegexp'):
|
||||
return self.assertRegexp(text, regexp, msg)
|
||||
else:
|
||||
m = re.match(regexp, text)
|
||||
if not m:
|
||||
note = 'Regexp didn\'t match: %r not found in %r' % (regexp, text)
|
||||
if msg is None:
|
||||
msg = note
|
||||
else:
|
||||
msg = note + ', ' + msg
|
||||
self.assertTrue(m, msg)
|
||||
|
||||
|
||||
def assertGreaterEqual(self, got, expected, msg=None):
|
||||
if not (got >= expected):
|
||||
if msg is None:
|
||||
msg = '%r not greater than or equal to %r' % (got, expected)
|
||||
self.assertTrue(got >= expected, msg)
|
||||
|
||||
|
||||
def expect_warnings(ydl, warnings_re):
|
||||
real_warning = ydl.report_warning
|
||||
|
||||
def _report_warning(w):
|
||||
if not any(re.search(w_re, w) for w_re in warnings_re):
|
||||
real_warning(w)
|
||||
|
||||
ydl.report_warning = _report_warning
|
||||
43
test/parameters.json
Normal file
43
test/parameters.json
Normal file
@@ -0,0 +1,43 @@
|
||||
{
|
||||
"consoletitle": false,
|
||||
"continuedl": true,
|
||||
"forcedescription": false,
|
||||
"forcefilename": false,
|
||||
"forceformat": false,
|
||||
"forcethumbnail": false,
|
||||
"forcetitle": false,
|
||||
"forceurl": false,
|
||||
"format": null,
|
||||
"format_limit": null,
|
||||
"ignoreerrors": false,
|
||||
"listformats": null,
|
||||
"logtostderr": false,
|
||||
"matchtitle": null,
|
||||
"max_downloads": null,
|
||||
"nooverwrites": false,
|
||||
"nopart": false,
|
||||
"noprogress": false,
|
||||
"outtmpl": "%(id)s.%(ext)s",
|
||||
"password": null,
|
||||
"playlistend": -1,
|
||||
"playliststart": 1,
|
||||
"prefer_free_formats": false,
|
||||
"quiet": false,
|
||||
"ratelimit": null,
|
||||
"rejecttitle": null,
|
||||
"retries": 10,
|
||||
"simulate": false,
|
||||
"subtitleslang": null,
|
||||
"subtitlesformat": "srt",
|
||||
"test": true,
|
||||
"updatetime": true,
|
||||
"usenetrc": false,
|
||||
"username": null,
|
||||
"verbose": true,
|
||||
"writedescription": false,
|
||||
"writeinfojson": true,
|
||||
"writesubtitles": false,
|
||||
"allsubtitles": false,
|
||||
"listssubtitles": false,
|
||||
"socket_timeout": 20
|
||||
}
|
||||
1
test/swftests/.gitignore
vendored
Normal file
1
test/swftests/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
*.swf
|
||||
19
test/swftests/ArrayAccess.as
Normal file
19
test/swftests/ArrayAccess.as
Normal file
@@ -0,0 +1,19 @@
|
||||
// input: [["a", "b", "c", "d"]]
|
||||
// output: ["c", "b", "a", "d"]
|
||||
|
||||
package {
|
||||
public class ArrayAccess {
|
||||
public static function main(ar:Array):Array {
|
||||
var aa:ArrayAccess = new ArrayAccess();
|
||||
return aa.f(ar, 2);
|
||||
}
|
||||
|
||||
private function f(ar:Array, num:Number):Array{
|
||||
var x:String = ar[0];
|
||||
var y:String = ar[num % ar.length];
|
||||
ar[0] = y;
|
||||
ar[num] = x;
|
||||
return ar;
|
||||
}
|
||||
}
|
||||
}
|
||||
17
test/swftests/ClassCall.as
Normal file
17
test/swftests/ClassCall.as
Normal file
@@ -0,0 +1,17 @@
|
||||
// input: []
|
||||
// output: 121
|
||||
|
||||
package {
|
||||
public class ClassCall {
|
||||
public static function main():int{
|
||||
var f:OtherClass = new OtherClass();
|
||||
return f.func(100,20);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class OtherClass {
|
||||
public function func(x: int, y: int):int {
|
||||
return x+y+1;
|
||||
}
|
||||
}
|
||||
15
test/swftests/ClassConstruction.as
Normal file
15
test/swftests/ClassConstruction.as
Normal file
@@ -0,0 +1,15 @@
|
||||
// input: []
|
||||
// output: 0
|
||||
|
||||
package {
|
||||
public class ClassConstruction {
|
||||
public static function main():int{
|
||||
var f:Foo = new Foo();
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class Foo {
|
||||
|
||||
}
|
||||
18
test/swftests/ConstArrayAccess.as
Normal file
18
test/swftests/ConstArrayAccess.as
Normal file
@@ -0,0 +1,18 @@
|
||||
// input: []
|
||||
// output: 4
|
||||
|
||||
package {
|
||||
public class ConstArrayAccess {
|
||||
private static const x:int = 2;
|
||||
private static const ar:Array = ["42", "3411"];
|
||||
|
||||
public static function main():int{
|
||||
var c:ConstArrayAccess = new ConstArrayAccess();
|
||||
return c.f();
|
||||
}
|
||||
|
||||
public function f(): int {
|
||||
return ar[1].length;
|
||||
}
|
||||
}
|
||||
}
|
||||
12
test/swftests/ConstantInt.as
Normal file
12
test/swftests/ConstantInt.as
Normal file
@@ -0,0 +1,12 @@
|
||||
// input: []
|
||||
// output: 2
|
||||
|
||||
package {
|
||||
public class ConstantInt {
|
||||
private static const x:int = 2;
|
||||
|
||||
public static function main():int{
|
||||
return x;
|
||||
}
|
||||
}
|
||||
}
|
||||
10
test/swftests/DictCall.as
Normal file
10
test/swftests/DictCall.as
Normal file
@@ -0,0 +1,10 @@
|
||||
// input: [{"x": 1, "y": 2}]
|
||||
// output: 3
|
||||
|
||||
package {
|
||||
public class DictCall {
|
||||
public static function main(d:Object):int{
|
||||
return d.x + d.y;
|
||||
}
|
||||
}
|
||||
}
|
||||
10
test/swftests/EqualsOperator.as
Normal file
10
test/swftests/EqualsOperator.as
Normal file
@@ -0,0 +1,10 @@
|
||||
// input: []
|
||||
// output: false
|
||||
|
||||
package {
|
||||
public class EqualsOperator {
|
||||
public static function main():Boolean{
|
||||
return 1 == 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
13
test/swftests/LocalVars.as
Normal file
13
test/swftests/LocalVars.as
Normal file
@@ -0,0 +1,13 @@
|
||||
// input: [1, 2]
|
||||
// output: 3
|
||||
|
||||
package {
|
||||
public class LocalVars {
|
||||
public static function main(a:int, b:int):int{
|
||||
var c:int = a + b + b;
|
||||
var d:int = c - b;
|
||||
var e:int = d;
|
||||
return e;
|
||||
}
|
||||
}
|
||||
}
|
||||
22
test/swftests/MemberAssignment.as
Normal file
22
test/swftests/MemberAssignment.as
Normal file
@@ -0,0 +1,22 @@
|
||||
// input: [1]
|
||||
// output: 2
|
||||
|
||||
package {
|
||||
public class MemberAssignment {
|
||||
public var v:int;
|
||||
|
||||
public function g():int {
|
||||
return this.v;
|
||||
}
|
||||
|
||||
public function f(a:int):int{
|
||||
this.v = a;
|
||||
return this.v + this.g();
|
||||
}
|
||||
|
||||
public static function main(a:int): int {
|
||||
var v:MemberAssignment = new MemberAssignment();
|
||||
return v.f(a);
|
||||
}
|
||||
}
|
||||
}
|
||||
24
test/swftests/NeOperator.as
Normal file
24
test/swftests/NeOperator.as
Normal file
@@ -0,0 +1,24 @@
|
||||
// input: []
|
||||
// output: 123
|
||||
|
||||
package {
|
||||
public class NeOperator {
|
||||
public static function main(): int {
|
||||
var res:int = 0;
|
||||
if (1 != 2) {
|
||||
res += 3;
|
||||
} else {
|
||||
res += 4;
|
||||
}
|
||||
if (2 != 2) {
|
||||
res += 10;
|
||||
} else {
|
||||
res += 20;
|
||||
}
|
||||
if (9 == 9) {
|
||||
res += 100;
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
||||
}
|
||||
21
test/swftests/PrivateCall.as
Normal file
21
test/swftests/PrivateCall.as
Normal file
@@ -0,0 +1,21 @@
|
||||
// input: []
|
||||
// output: 9
|
||||
|
||||
package {
|
||||
public class PrivateCall {
|
||||
public static function main():int{
|
||||
var f:OtherClass = new OtherClass();
|
||||
return f.func();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class OtherClass {
|
||||
private function pf():int {
|
||||
return 9;
|
||||
}
|
||||
|
||||
public function func():int {
|
||||
return this.pf();
|
||||
}
|
||||
}
|
||||
22
test/swftests/PrivateVoidCall.as
Normal file
22
test/swftests/PrivateVoidCall.as
Normal file
@@ -0,0 +1,22 @@
|
||||
// input: []
|
||||
// output: 9
|
||||
|
||||
package {
|
||||
public class PrivateVoidCall {
|
||||
public static function main():int{
|
||||
var f:OtherClass = new OtherClass();
|
||||
f.func();
|
||||
return 9;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class OtherClass {
|
||||
private function pf():void {
|
||||
;
|
||||
}
|
||||
|
||||
public function func():void {
|
||||
this.pf();
|
||||
}
|
||||
}
|
||||
13
test/swftests/StaticAssignment.as
Normal file
13
test/swftests/StaticAssignment.as
Normal file
@@ -0,0 +1,13 @@
|
||||
// input: [1]
|
||||
// output: 1
|
||||
|
||||
package {
|
||||
public class StaticAssignment {
|
||||
public static var v:int;
|
||||
|
||||
public static function main(a:int):int{
|
||||
v = a;
|
||||
return v;
|
||||
}
|
||||
}
|
||||
}
|
||||
16
test/swftests/StaticRetrieval.as
Normal file
16
test/swftests/StaticRetrieval.as
Normal file
@@ -0,0 +1,16 @@
|
||||
// input: []
|
||||
// output: 1
|
||||
|
||||
package {
|
||||
public class StaticRetrieval {
|
||||
public static var v:int;
|
||||
|
||||
public static function main():int{
|
||||
if (v) {
|
||||
return 0;
|
||||
} else {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
11
test/swftests/StringBasics.as
Normal file
11
test/swftests/StringBasics.as
Normal file
@@ -0,0 +1,11 @@
|
||||
// input: []
|
||||
// output: 3
|
||||
|
||||
package {
|
||||
public class StringBasics {
|
||||
public static function main():int{
|
||||
var s:String = "abc";
|
||||
return s.length;
|
||||
}
|
||||
}
|
||||
}
|
||||
11
test/swftests/StringCharCodeAt.as
Normal file
11
test/swftests/StringCharCodeAt.as
Normal file
@@ -0,0 +1,11 @@
|
||||
// input: []
|
||||
// output: 9897
|
||||
|
||||
package {
|
||||
public class StringCharCodeAt {
|
||||
public static function main():int{
|
||||
var s:String = "abc";
|
||||
return s.charCodeAt(1) * 100 + s.charCodeAt();
|
||||
}
|
||||
}
|
||||
}
|
||||
11
test/swftests/StringConversion.as
Normal file
11
test/swftests/StringConversion.as
Normal file
@@ -0,0 +1,11 @@
|
||||
// input: []
|
||||
// output: 2
|
||||
|
||||
package {
|
||||
public class StringConversion {
|
||||
public static function main():int{
|
||||
var s:String = String(99);
|
||||
return s.length;
|
||||
}
|
||||
}
|
||||
}
|
||||
44
test/test_InfoExtractor.py
Normal file
44
test/test_InfoExtractor.py
Normal file
@@ -0,0 +1,44 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from test.helper import FakeYDL
|
||||
from youtube_dl.extractor.common import InfoExtractor
|
||||
from youtube_dl.extractor import YoutubeIE, get_info_extractor
|
||||
|
||||
|
||||
class TestIE(InfoExtractor):
|
||||
pass
|
||||
|
||||
|
||||
class TestInfoExtractor(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.ie = TestIE(FakeYDL())
|
||||
|
||||
def test_ie_key(self):
|
||||
self.assertEqual(get_info_extractor(YoutubeIE.ie_key()), YoutubeIE)
|
||||
|
||||
def test_html_search_regex(self):
|
||||
html = '<p id="foo">Watch this <a href="http://www.youtube.com/watch?v=BaW_jenozKc">video</a></p>'
|
||||
search = lambda re, *args: self.ie._html_search_regex(re, html, *args)
|
||||
self.assertEqual(search(r'<p id="foo">(.+?)</p>', 'foo'), 'Watch this video')
|
||||
|
||||
def test_opengraph(self):
|
||||
ie = self.ie
|
||||
html = '''
|
||||
<meta name="og:title" content='Foo'/>
|
||||
<meta content="Some video's description " name="og:description"/>
|
||||
<meta property='og:image' content='http://domain.com/pic.jpg?key1=val1&key2=val2'/>
|
||||
'''
|
||||
self.assertEqual(ie._og_search_title(html), 'Foo')
|
||||
self.assertEqual(ie._og_search_description(html), 'Some video\'s description ')
|
||||
self.assertEqual(ie._og_search_thumbnail(html), 'http://domain.com/pic.jpg?key1=val1&key2=val2')
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
286
test/test_YoutubeDL.py
Normal file
286
test/test_YoutubeDL.py
Normal file
@@ -0,0 +1,286 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from test.helper import FakeYDL, assertRegexpMatches
|
||||
from youtube_dl import YoutubeDL
|
||||
from youtube_dl.extractor import YoutubeIE
|
||||
|
||||
|
||||
class YDL(FakeYDL):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(YDL, self).__init__(*args, **kwargs)
|
||||
self.downloaded_info_dicts = []
|
||||
self.msgs = []
|
||||
|
||||
def process_info(self, info_dict):
|
||||
self.downloaded_info_dicts.append(info_dict)
|
||||
|
||||
def to_screen(self, msg):
|
||||
self.msgs.append(msg)
|
||||
|
||||
|
||||
def _make_result(formats, **kwargs):
|
||||
res = {
|
||||
'formats': formats,
|
||||
'id': 'testid',
|
||||
'title': 'testttitle',
|
||||
'extractor': 'testex',
|
||||
}
|
||||
res.update(**kwargs)
|
||||
return res
|
||||
|
||||
|
||||
class TestFormatSelection(unittest.TestCase):
|
||||
def test_prefer_free_formats(self):
|
||||
# Same resolution => download webm
|
||||
ydl = YDL()
|
||||
ydl.params['prefer_free_formats'] = True
|
||||
formats = [
|
||||
{'ext': 'webm', 'height': 460, 'url': 'x'},
|
||||
{'ext': 'mp4', 'height': 460, 'url': 'y'},
|
||||
]
|
||||
info_dict = _make_result(formats)
|
||||
yie = YoutubeIE(ydl)
|
||||
yie._sort_formats(info_dict['formats'])
|
||||
ydl.process_ie_result(info_dict)
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['ext'], 'webm')
|
||||
|
||||
# Different resolution => download best quality (mp4)
|
||||
ydl = YDL()
|
||||
ydl.params['prefer_free_formats'] = True
|
||||
formats = [
|
||||
{'ext': 'webm', 'height': 720, 'url': 'a'},
|
||||
{'ext': 'mp4', 'height': 1080, 'url': 'b'},
|
||||
]
|
||||
info_dict['formats'] = formats
|
||||
yie = YoutubeIE(ydl)
|
||||
yie._sort_formats(info_dict['formats'])
|
||||
ydl.process_ie_result(info_dict)
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['ext'], 'mp4')
|
||||
|
||||
# No prefer_free_formats => prefer mp4 and flv for greater compatibility
|
||||
ydl = YDL()
|
||||
ydl.params['prefer_free_formats'] = False
|
||||
formats = [
|
||||
{'ext': 'webm', 'height': 720, 'url': '_'},
|
||||
{'ext': 'mp4', 'height': 720, 'url': '_'},
|
||||
{'ext': 'flv', 'height': 720, 'url': '_'},
|
||||
]
|
||||
info_dict['formats'] = formats
|
||||
yie = YoutubeIE(ydl)
|
||||
yie._sort_formats(info_dict['formats'])
|
||||
ydl.process_ie_result(info_dict)
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['ext'], 'mp4')
|
||||
|
||||
ydl = YDL()
|
||||
ydl.params['prefer_free_formats'] = False
|
||||
formats = [
|
||||
{'ext': 'flv', 'height': 720, 'url': '_'},
|
||||
{'ext': 'webm', 'height': 720, 'url': '_'},
|
||||
]
|
||||
info_dict['formats'] = formats
|
||||
yie = YoutubeIE(ydl)
|
||||
yie._sort_formats(info_dict['formats'])
|
||||
ydl.process_ie_result(info_dict)
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['ext'], 'flv')
|
||||
|
||||
def test_format_limit(self):
|
||||
formats = [
|
||||
{'format_id': 'meh', 'url': 'http://example.com/meh', 'preference': 1},
|
||||
{'format_id': 'good', 'url': 'http://example.com/good', 'preference': 2},
|
||||
{'format_id': 'great', 'url': 'http://example.com/great', 'preference': 3},
|
||||
{'format_id': 'excellent', 'url': 'http://example.com/exc', 'preference': 4},
|
||||
]
|
||||
info_dict = _make_result(formats)
|
||||
|
||||
ydl = YDL()
|
||||
ydl.process_ie_result(info_dict)
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], 'excellent')
|
||||
|
||||
ydl = YDL({'format_limit': 'good'})
|
||||
assert ydl.params['format_limit'] == 'good'
|
||||
ydl.process_ie_result(info_dict.copy())
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], 'good')
|
||||
|
||||
ydl = YDL({'format_limit': 'great', 'format': 'all'})
|
||||
ydl.process_ie_result(info_dict.copy())
|
||||
self.assertEqual(ydl.downloaded_info_dicts[0]['format_id'], 'meh')
|
||||
self.assertEqual(ydl.downloaded_info_dicts[1]['format_id'], 'good')
|
||||
self.assertEqual(ydl.downloaded_info_dicts[2]['format_id'], 'great')
|
||||
self.assertTrue('3' in ydl.msgs[0])
|
||||
|
||||
ydl = YDL()
|
||||
ydl.params['format_limit'] = 'excellent'
|
||||
ydl.process_ie_result(info_dict.copy())
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], 'excellent')
|
||||
|
||||
def test_format_selection(self):
|
||||
formats = [
|
||||
{'format_id': '35', 'ext': 'mp4', 'preference': 1, 'url': '_'},
|
||||
{'format_id': '45', 'ext': 'webm', 'preference': 2, 'url': '_'},
|
||||
{'format_id': '47', 'ext': 'webm', 'preference': 3, 'url': '_'},
|
||||
{'format_id': '2', 'ext': 'flv', 'preference': 4, 'url': '_'},
|
||||
]
|
||||
info_dict = _make_result(formats)
|
||||
|
||||
ydl = YDL({'format': '20/47'})
|
||||
ydl.process_ie_result(info_dict.copy())
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], '47')
|
||||
|
||||
ydl = YDL({'format': '20/71/worst'})
|
||||
ydl.process_ie_result(info_dict.copy())
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], '35')
|
||||
|
||||
ydl = YDL()
|
||||
ydl.process_ie_result(info_dict.copy())
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], '2')
|
||||
|
||||
ydl = YDL({'format': 'webm/mp4'})
|
||||
ydl.process_ie_result(info_dict.copy())
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], '47')
|
||||
|
||||
ydl = YDL({'format': '3gp/40/mp4'})
|
||||
ydl.process_ie_result(info_dict.copy())
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], '35')
|
||||
|
||||
def test_format_selection_audio(self):
|
||||
formats = [
|
||||
{'format_id': 'audio-low', 'ext': 'webm', 'preference': 1, 'vcodec': 'none', 'url': '_'},
|
||||
{'format_id': 'audio-mid', 'ext': 'webm', 'preference': 2, 'vcodec': 'none', 'url': '_'},
|
||||
{'format_id': 'audio-high', 'ext': 'flv', 'preference': 3, 'vcodec': 'none', 'url': '_'},
|
||||
{'format_id': 'vid', 'ext': 'mp4', 'preference': 4, 'url': '_'},
|
||||
]
|
||||
info_dict = _make_result(formats)
|
||||
|
||||
ydl = YDL({'format': 'bestaudio'})
|
||||
ydl.process_ie_result(info_dict.copy())
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], 'audio-high')
|
||||
|
||||
ydl = YDL({'format': 'worstaudio'})
|
||||
ydl.process_ie_result(info_dict.copy())
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], 'audio-low')
|
||||
|
||||
formats = [
|
||||
{'format_id': 'vid-low', 'ext': 'mp4', 'preference': 1, 'url': '_'},
|
||||
{'format_id': 'vid-high', 'ext': 'mp4', 'preference': 2, 'url': '_'},
|
||||
]
|
||||
info_dict = _make_result(formats)
|
||||
|
||||
ydl = YDL({'format': 'bestaudio/worstaudio/best'})
|
||||
ydl.process_ie_result(info_dict.copy())
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], 'vid-high')
|
||||
|
||||
def test_format_selection_video(self):
|
||||
formats = [
|
||||
{'format_id': 'dash-video-low', 'ext': 'mp4', 'preference': 1, 'acodec': 'none', 'url': '_'},
|
||||
{'format_id': 'dash-video-high', 'ext': 'mp4', 'preference': 2, 'acodec': 'none', 'url': '_'},
|
||||
{'format_id': 'vid', 'ext': 'mp4', 'preference': 3, 'url': '_'},
|
||||
]
|
||||
info_dict = _make_result(formats)
|
||||
|
||||
ydl = YDL({'format': 'bestvideo'})
|
||||
ydl.process_ie_result(info_dict.copy())
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], 'dash-video-high')
|
||||
|
||||
ydl = YDL({'format': 'worstvideo'})
|
||||
ydl.process_ie_result(info_dict.copy())
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], 'dash-video-low')
|
||||
|
||||
def test_youtube_format_selection(self):
|
||||
order = [
|
||||
'38', '37', '46', '22', '45', '35', '44', '18', '34', '43', '6', '5', '36', '17', '13',
|
||||
# Apple HTTP Live Streaming
|
||||
'96', '95', '94', '93', '92', '132', '151',
|
||||
# 3D
|
||||
'85', '84', '102', '83', '101', '82', '100',
|
||||
# Dash video
|
||||
'138', '137', '248', '136', '247', '135', '246',
|
||||
'245', '244', '134', '243', '133', '242', '160',
|
||||
# Dash audio
|
||||
'141', '172', '140', '171', '139',
|
||||
]
|
||||
|
||||
for f1id, f2id in zip(order, order[1:]):
|
||||
f1 = YoutubeIE._formats[f1id].copy()
|
||||
f1['format_id'] = f1id
|
||||
f1['url'] = 'url:' + f1id
|
||||
f2 = YoutubeIE._formats[f2id].copy()
|
||||
f2['format_id'] = f2id
|
||||
f2['url'] = 'url:' + f2id
|
||||
|
||||
info_dict = _make_result([f1, f2], extractor='youtube')
|
||||
ydl = YDL()
|
||||
yie = YoutubeIE(ydl)
|
||||
yie._sort_formats(info_dict['formats'])
|
||||
ydl.process_ie_result(info_dict)
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], f1id)
|
||||
|
||||
info_dict = _make_result([f2, f1], extractor='youtube')
|
||||
ydl = YDL()
|
||||
yie = YoutubeIE(ydl)
|
||||
yie._sort_formats(info_dict['formats'])
|
||||
ydl.process_ie_result(info_dict)
|
||||
downloaded = ydl.downloaded_info_dicts[0]
|
||||
self.assertEqual(downloaded['format_id'], f1id)
|
||||
|
||||
def test_add_extra_info(self):
|
||||
test_dict = {
|
||||
'extractor': 'Foo',
|
||||
}
|
||||
extra_info = {
|
||||
'extractor': 'Bar',
|
||||
'playlist': 'funny videos',
|
||||
}
|
||||
YDL.add_extra_info(test_dict, extra_info)
|
||||
self.assertEqual(test_dict['extractor'], 'Foo')
|
||||
self.assertEqual(test_dict['playlist'], 'funny videos')
|
||||
|
||||
def test_prepare_filename(self):
|
||||
info = {
|
||||
'id': '1234',
|
||||
'ext': 'mp4',
|
||||
'width': None,
|
||||
}
|
||||
|
||||
def fname(templ):
|
||||
ydl = YoutubeDL({'outtmpl': templ})
|
||||
return ydl.prepare_filename(info)
|
||||
self.assertEqual(fname('%(id)s.%(ext)s'), '1234.mp4')
|
||||
self.assertEqual(fname('%(id)s-%(width)s.%(ext)s'), '1234-NA.mp4')
|
||||
# Replace missing fields with 'NA'
|
||||
self.assertEqual(fname('%(uploader_date)s-%(id)s.%(ext)s'), 'NA-1234.mp4')
|
||||
|
||||
def test_format_note(self):
|
||||
ydl = YoutubeDL()
|
||||
self.assertEqual(ydl._format_note({}), '')
|
||||
assertRegexpMatches(self, ydl._format_note({
|
||||
'vbr': 10,
|
||||
}), '^\s*10k$')
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
55
test/test_age_restriction.py
Normal file
55
test/test_age_restriction.py
Normal file
@@ -0,0 +1,55 @@
|
||||
#!/usr/bin/env python
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from test.helper import try_rm
|
||||
|
||||
|
||||
from youtube_dl import YoutubeDL
|
||||
|
||||
|
||||
def _download_restricted(url, filename, age):
|
||||
""" Returns true if the file has been downloaded """
|
||||
|
||||
params = {
|
||||
'age_limit': age,
|
||||
'skip_download': True,
|
||||
'writeinfojson': True,
|
||||
'outtmpl': '%(id)s.%(ext)s',
|
||||
}
|
||||
ydl = YoutubeDL(params)
|
||||
ydl.add_default_info_extractors()
|
||||
json_filename = os.path.splitext(filename)[0] + '.info.json'
|
||||
try_rm(json_filename)
|
||||
ydl.download([url])
|
||||
res = os.path.exists(json_filename)
|
||||
try_rm(json_filename)
|
||||
return res
|
||||
|
||||
|
||||
class TestAgeRestriction(unittest.TestCase):
|
||||
def _assert_restricted(self, url, filename, age, old_age=None):
|
||||
self.assertTrue(_download_restricted(url, filename, old_age))
|
||||
self.assertFalse(_download_restricted(url, filename, age))
|
||||
|
||||
def test_youtube(self):
|
||||
self._assert_restricted('07FYdnEawAQ', '07FYdnEawAQ.mp4', 10)
|
||||
|
||||
def test_youporn(self):
|
||||
self._assert_restricted(
|
||||
'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/',
|
||||
'505835.mp4', 2, old_age=25)
|
||||
|
||||
def test_pornotube(self):
|
||||
self._assert_restricted(
|
||||
'http://pornotube.com/c/173/m/1689755/Marilyn-Monroe-Bathing',
|
||||
'1689755.flv', 13)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
150
test/test_all_urls.py
Normal file
150
test/test_all_urls.py
Normal file
@@ -0,0 +1,150 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
|
||||
from test.helper import gettestcases
|
||||
|
||||
from youtube_dl.extractor import (
|
||||
FacebookIE,
|
||||
gen_extractors,
|
||||
TwitchIE,
|
||||
YoutubeIE,
|
||||
)
|
||||
|
||||
|
||||
class TestAllURLsMatching(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.ies = gen_extractors()
|
||||
|
||||
def matching_ies(self, url):
|
||||
return [ie.IE_NAME for ie in self.ies if ie.suitable(url) and ie.IE_NAME != 'generic']
|
||||
|
||||
def assertMatch(self, url, ie_list):
|
||||
self.assertEqual(self.matching_ies(url), ie_list)
|
||||
|
||||
def test_youtube_playlist_matching(self):
|
||||
assertPlaylist = lambda url: self.assertMatch(url, ['youtube:playlist'])
|
||||
assertPlaylist('ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
|
||||
assertPlaylist('UUBABnxM4Ar9ten8Mdjj1j0Q') # 585
|
||||
assertPlaylist('PL63F0C78739B09958')
|
||||
assertPlaylist('https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q')
|
||||
assertPlaylist('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
|
||||
assertPlaylist('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC')
|
||||
assertPlaylist('https://www.youtube.com/watch?v=AV6J6_AeFEQ&playnext=1&list=PL4023E734DA416012') # 668
|
||||
self.assertFalse('youtube:playlist' in self.matching_ies('PLtS2H6bU1M'))
|
||||
# Top tracks
|
||||
assertPlaylist('https://www.youtube.com/playlist?list=MCUS.20142101')
|
||||
|
||||
def test_youtube_matching(self):
|
||||
self.assertTrue(YoutubeIE.suitable('PLtS2H6bU1M'))
|
||||
self.assertFalse(YoutubeIE.suitable('https://www.youtube.com/watch?v=AV6J6_AeFEQ&playnext=1&list=PL4023E734DA416012')) # 668
|
||||
self.assertMatch('http://youtu.be/BaW_jenozKc', ['youtube'])
|
||||
self.assertMatch('http://www.youtube.com/v/BaW_jenozKc', ['youtube'])
|
||||
self.assertMatch('https://youtube.googleapis.com/v/BaW_jenozKc', ['youtube'])
|
||||
self.assertMatch('http://www.cleanvideosearch.com/media/action/yt/watch?videoId=8v_4O44sfjM', ['youtube'])
|
||||
|
||||
def test_youtube_channel_matching(self):
|
||||
assertChannel = lambda url: self.assertMatch(url, ['youtube:channel'])
|
||||
assertChannel('https://www.youtube.com/channel/HCtnHdj3df7iM')
|
||||
assertChannel('https://www.youtube.com/channel/HCtnHdj3df7iM?feature=gb_ch_rec')
|
||||
assertChannel('https://www.youtube.com/channel/HCtnHdj3df7iM/videos')
|
||||
|
||||
def test_youtube_user_matching(self):
|
||||
self.assertMatch('www.youtube.com/NASAgovVideo/videos', ['youtube:user'])
|
||||
|
||||
def test_youtube_feeds(self):
|
||||
self.assertMatch('https://www.youtube.com/feed/watch_later', ['youtube:watch_later'])
|
||||
self.assertMatch('https://www.youtube.com/feed/subscriptions', ['youtube:subscriptions'])
|
||||
self.assertMatch('https://www.youtube.com/feed/recommended', ['youtube:recommended'])
|
||||
self.assertMatch('https://www.youtube.com/my_favorites', ['youtube:favorites'])
|
||||
|
||||
def test_youtube_show_matching(self):
|
||||
self.assertMatch('http://www.youtube.com/show/airdisasters', ['youtube:show'])
|
||||
|
||||
def test_youtube_search_matching(self):
|
||||
self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
|
||||
self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
|
||||
|
||||
def test_twitch_channelid_matching(self):
|
||||
self.assertTrue(TwitchIE.suitable('twitch.tv/vanillatv'))
|
||||
self.assertTrue(TwitchIE.suitable('www.twitch.tv/vanillatv'))
|
||||
self.assertTrue(TwitchIE.suitable('http://www.twitch.tv/vanillatv'))
|
||||
self.assertTrue(TwitchIE.suitable('http://www.twitch.tv/vanillatv/'))
|
||||
|
||||
def test_twitch_videoid_matching(self):
|
||||
self.assertTrue(TwitchIE.suitable('http://www.twitch.tv/vanillatv/b/328087483'))
|
||||
|
||||
def test_twitch_chapterid_matching(self):
|
||||
self.assertTrue(TwitchIE.suitable('http://www.twitch.tv/tsm_theoddone/c/2349361'))
|
||||
|
||||
def test_youtube_extract(self):
|
||||
assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
|
||||
assertExtractId('http://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
|
||||
assertExtractId('https://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
|
||||
assertExtractId('https://www.youtube.com/watch?feature=player_embedded&v=BaW_jenozKc', 'BaW_jenozKc')
|
||||
assertExtractId('https://www.youtube.com/watch_popup?v=BaW_jenozKc', 'BaW_jenozKc')
|
||||
assertExtractId('http://www.youtube.com/watch?v=BaW_jenozKcsharePLED17F32AD9753930', 'BaW_jenozKc')
|
||||
assertExtractId('BaW_jenozKc', 'BaW_jenozKc')
|
||||
|
||||
def test_facebook_matching(self):
|
||||
self.assertTrue(FacebookIE.suitable('https://www.facebook.com/Shiniknoh#!/photo.php?v=10153317450565268'))
|
||||
self.assertTrue(FacebookIE.suitable('https://www.facebook.com/cindyweather?fref=ts#!/photo.php?v=10152183998945793'))
|
||||
|
||||
def test_no_duplicates(self):
|
||||
ies = gen_extractors()
|
||||
for tc in gettestcases(include_onlymatching=True):
|
||||
url = tc['url']
|
||||
for ie in ies:
|
||||
if type(ie).__name__ in ('GenericIE', tc['name'] + 'IE'):
|
||||
self.assertTrue(ie.suitable(url), '%s should match URL %r' % (type(ie).__name__, url))
|
||||
else:
|
||||
self.assertFalse(
|
||||
ie.suitable(url),
|
||||
'%s should not match URL %r . That URL belongs to %s.' % (type(ie).__name__, url, tc['name']))
|
||||
|
||||
def test_keywords(self):
|
||||
self.assertMatch(':ytsubs', ['youtube:subscriptions'])
|
||||
self.assertMatch(':ytsubscriptions', ['youtube:subscriptions'])
|
||||
self.assertMatch(':ythistory', ['youtube:history'])
|
||||
self.assertMatch(':thedailyshow', ['ComedyCentralShows'])
|
||||
self.assertMatch(':tds', ['ComedyCentralShows'])
|
||||
self.assertMatch(':colbertreport', ['ComedyCentralShows'])
|
||||
self.assertMatch(':cr', ['ComedyCentralShows'])
|
||||
|
||||
def test_vimeo_matching(self):
|
||||
self.assertMatch('http://vimeo.com/channels/tributes', ['vimeo:channel'])
|
||||
self.assertMatch('http://vimeo.com/channels/31259', ['vimeo:channel'])
|
||||
self.assertMatch('http://vimeo.com/channels/31259/53576664', ['vimeo'])
|
||||
self.assertMatch('http://vimeo.com/user7108434', ['vimeo:user'])
|
||||
self.assertMatch('http://vimeo.com/user7108434/videos', ['vimeo:user'])
|
||||
self.assertMatch('https://vimeo.com/user21297594/review/75524534/3c257a1b5d', ['vimeo:review'])
|
||||
|
||||
# https://github.com/rg3/youtube-dl/issues/1930
|
||||
def test_soundcloud_not_matching_sets(self):
|
||||
self.assertMatch('http://soundcloud.com/floex/sets/gone-ep', ['soundcloud:set'])
|
||||
|
||||
def test_tumblr(self):
|
||||
self.assertMatch('http://tatianamaslanydaily.tumblr.com/post/54196191430/orphan-black-dvd-extra-behind-the-scenes', ['Tumblr'])
|
||||
self.assertMatch('http://tatianamaslanydaily.tumblr.com/post/54196191430', ['Tumblr'])
|
||||
|
||||
def test_pbs(self):
|
||||
# https://github.com/rg3/youtube-dl/issues/2350
|
||||
self.assertMatch('http://video.pbs.org/viralplayer/2365173446/', ['PBS'])
|
||||
self.assertMatch('http://video.pbs.org/widget/partnerplayer/980042464/', ['PBS'])
|
||||
|
||||
def test_yahoo_https(self):
|
||||
# https://github.com/rg3/youtube-dl/issues/2701
|
||||
self.assertMatch(
|
||||
'https://screen.yahoo.com/smartwatches-latest-wearable-gadgets-163745379-cbs.html',
|
||||
['Yahoo'])
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
59
test/test_cache.py
Normal file
59
test/test_cache.py
Normal file
@@ -0,0 +1,59 @@
|
||||
#!/usr/bin/env python
|
||||
# coding: utf-8
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import shutil
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
|
||||
from test.helper import FakeYDL
|
||||
from youtube_dl.cache import Cache
|
||||
|
||||
|
||||
def _is_empty(d):
|
||||
return not bool(os.listdir(d))
|
||||
|
||||
|
||||
def _mkdir(d):
|
||||
if not os.path.exists(d):
|
||||
os.mkdir(d)
|
||||
|
||||
|
||||
class TestCache(unittest.TestCase):
|
||||
def setUp(self):
|
||||
TEST_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
TESTDATA_DIR = os.path.join(TEST_DIR, 'testdata')
|
||||
_mkdir(TESTDATA_DIR)
|
||||
self.test_dir = os.path.join(TESTDATA_DIR, 'cache_test')
|
||||
self.tearDown()
|
||||
|
||||
def tearDown(self):
|
||||
if os.path.exists(self.test_dir):
|
||||
shutil.rmtree(self.test_dir)
|
||||
|
||||
def test_cache(self):
|
||||
ydl = FakeYDL({
|
||||
'cachedir': self.test_dir,
|
||||
})
|
||||
c = Cache(ydl)
|
||||
obj = {'x': 1, 'y': ['ä', '\\a', True]}
|
||||
self.assertEqual(c.load('test_cache', 'k.'), None)
|
||||
c.store('test_cache', 'k.', obj)
|
||||
self.assertEqual(c.load('test_cache', 'k2'), None)
|
||||
self.assertFalse(_is_empty(self.test_dir))
|
||||
self.assertEqual(c.load('test_cache', 'k.'), obj)
|
||||
self.assertEqual(c.load('test_cache', 'y'), None)
|
||||
self.assertEqual(c.load('test_cache2', 'k.'), None)
|
||||
c.remove()
|
||||
self.assertFalse(os.path.exists(self.test_dir))
|
||||
self.assertEqual(c.load('test_cache', 'k.'), None)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
46
test/test_compat.py
Normal file
46
test/test_compat.py
Normal file
@@ -0,0 +1,46 @@
|
||||
#!/usr/bin/env python
|
||||
# coding: utf-8
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
|
||||
from youtube_dl.utils import get_filesystem_encoding
|
||||
from youtube_dl.compat import (
|
||||
compat_getenv,
|
||||
compat_expanduser,
|
||||
)
|
||||
|
||||
|
||||
class TestCompat(unittest.TestCase):
|
||||
def test_compat_getenv(self):
|
||||
test_str = 'тест'
|
||||
os.environ['YOUTUBE-DL-TEST'] = (
|
||||
test_str if sys.version_info >= (3, 0)
|
||||
else test_str.encode(get_filesystem_encoding()))
|
||||
self.assertEqual(compat_getenv('YOUTUBE-DL-TEST'), test_str)
|
||||
|
||||
def test_compat_expanduser(self):
|
||||
old_home = os.environ.get('HOME')
|
||||
test_str = 'C:\Documents and Settings\тест\Application Data'
|
||||
os.environ['HOME'] = (
|
||||
test_str if sys.version_info >= (3, 0)
|
||||
else test_str.encode(get_filesystem_encoding()))
|
||||
self.assertEqual(compat_expanduser('~'), test_str)
|
||||
os.environ['HOME'] = old_home
|
||||
|
||||
def test_all_present(self):
|
||||
import youtube_dl.compat
|
||||
all_names = youtube_dl.compat.__all__
|
||||
present_names = set(filter(
|
||||
lambda c: '_' in c and not c.startswith('_'),
|
||||
dir(youtube_dl.compat))) - set(['unicode_literals'])
|
||||
self.assertEqual(all_names, sorted(present_names))
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
232
test/test_download.py
Normal file
232
test/test_download.py
Normal file
@@ -0,0 +1,232 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from test.helper import (
|
||||
assertGreaterEqual,
|
||||
expect_warnings,
|
||||
get_params,
|
||||
gettestcases,
|
||||
expect_info_dict,
|
||||
try_rm,
|
||||
report_warning,
|
||||
)
|
||||
|
||||
|
||||
import hashlib
|
||||
import io
|
||||
import json
|
||||
import socket
|
||||
|
||||
import youtube_dl.YoutubeDL
|
||||
from youtube_dl.compat import (
|
||||
compat_http_client,
|
||||
compat_urllib_error,
|
||||
compat_HTTPError,
|
||||
)
|
||||
from youtube_dl.utils import (
|
||||
DownloadError,
|
||||
ExtractorError,
|
||||
format_bytes,
|
||||
UnavailableVideoError,
|
||||
)
|
||||
from youtube_dl.extractor import get_info_extractor
|
||||
|
||||
RETRIES = 3
|
||||
|
||||
|
||||
class YoutubeDL(youtube_dl.YoutubeDL):
|
||||
def __init__(self, *args, **kwargs):
|
||||
self.to_stderr = self.to_screen
|
||||
self.processed_info_dicts = []
|
||||
super(YoutubeDL, self).__init__(*args, **kwargs)
|
||||
|
||||
def report_warning(self, message):
|
||||
# Don't accept warnings during tests
|
||||
raise ExtractorError(message)
|
||||
|
||||
def process_info(self, info_dict):
|
||||
self.processed_info_dicts.append(info_dict)
|
||||
return super(YoutubeDL, self).process_info(info_dict)
|
||||
|
||||
|
||||
def _file_md5(fn):
|
||||
with open(fn, 'rb') as f:
|
||||
return hashlib.md5(f.read()).hexdigest()
|
||||
|
||||
defs = gettestcases()
|
||||
|
||||
|
||||
class TestDownload(unittest.TestCase):
|
||||
maxDiff = None
|
||||
|
||||
def setUp(self):
|
||||
self.defs = defs
|
||||
|
||||
# Dynamically generate tests
|
||||
|
||||
|
||||
def generator(test_case):
|
||||
|
||||
def test_template(self):
|
||||
ie = youtube_dl.extractor.get_info_extractor(test_case['name'])
|
||||
other_ies = [get_info_extractor(ie_key) for ie_key in test_case.get('add_ie', [])]
|
||||
is_playlist = any(k.startswith('playlist') for k in test_case)
|
||||
test_cases = test_case.get(
|
||||
'playlist', [] if is_playlist else [test_case])
|
||||
|
||||
def print_skipping(reason):
|
||||
print('Skipping %s: %s' % (test_case['name'], reason))
|
||||
if not ie.working():
|
||||
print_skipping('IE marked as not _WORKING')
|
||||
return
|
||||
|
||||
for tc in test_cases:
|
||||
info_dict = tc.get('info_dict', {})
|
||||
if not tc.get('file') and not (info_dict.get('id') and info_dict.get('ext')):
|
||||
raise Exception('Test definition incorrect. The output file cannot be known. Are both \'id\' and \'ext\' keys present?')
|
||||
|
||||
if 'skip' in test_case:
|
||||
print_skipping(test_case['skip'])
|
||||
return
|
||||
for other_ie in other_ies:
|
||||
if not other_ie.working():
|
||||
print_skipping('test depends on %sIE, marked as not WORKING' % other_ie.ie_key())
|
||||
return
|
||||
|
||||
params = get_params(test_case.get('params', {}))
|
||||
if is_playlist and 'playlist' not in test_case:
|
||||
params.setdefault('extract_flat', True)
|
||||
params.setdefault('skip_download', True)
|
||||
|
||||
ydl = YoutubeDL(params, auto_init=False)
|
||||
ydl.add_default_info_extractors()
|
||||
finished_hook_called = set()
|
||||
|
||||
def _hook(status):
|
||||
if status['status'] == 'finished':
|
||||
finished_hook_called.add(status['filename'])
|
||||
ydl.add_progress_hook(_hook)
|
||||
expect_warnings(ydl, test_case.get('expected_warnings', []))
|
||||
|
||||
def get_tc_filename(tc):
|
||||
return tc.get('file') or ydl.prepare_filename(tc.get('info_dict', {}))
|
||||
|
||||
res_dict = None
|
||||
|
||||
def try_rm_tcs_files(tcs=None):
|
||||
if tcs is None:
|
||||
tcs = test_cases
|
||||
for tc in tcs:
|
||||
tc_filename = get_tc_filename(tc)
|
||||
try_rm(tc_filename)
|
||||
try_rm(tc_filename + '.part')
|
||||
try_rm(os.path.splitext(tc_filename)[0] + '.info.json')
|
||||
try_rm_tcs_files()
|
||||
try:
|
||||
try_num = 1
|
||||
while True:
|
||||
try:
|
||||
# We're not using .download here sine that is just a shim
|
||||
# for outside error handling, and returns the exit code
|
||||
# instead of the result dict.
|
||||
res_dict = ydl.extract_info(test_case['url'])
|
||||
except (DownloadError, ExtractorError) as err:
|
||||
# Check if the exception is not a network related one
|
||||
if not err.exc_info[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError, compat_http_client.BadStatusLine) or (err.exc_info[0] == compat_HTTPError and err.exc_info[1].code == 503):
|
||||
raise
|
||||
|
||||
if try_num == RETRIES:
|
||||
report_warning('Failed due to network errors, skipping...')
|
||||
return
|
||||
|
||||
print('Retrying: {0} failed tries\n\n##########\n\n'.format(try_num))
|
||||
|
||||
try_num += 1
|
||||
else:
|
||||
break
|
||||
|
||||
if is_playlist:
|
||||
self.assertEqual(res_dict['_type'], 'playlist')
|
||||
self.assertTrue('entries' in res_dict)
|
||||
expect_info_dict(self, test_case.get('info_dict', {}), res_dict)
|
||||
|
||||
if 'playlist_mincount' in test_case:
|
||||
assertGreaterEqual(
|
||||
self,
|
||||
len(res_dict['entries']),
|
||||
test_case['playlist_mincount'],
|
||||
'Expected at least %d in playlist %s, but got only %d' % (
|
||||
test_case['playlist_mincount'], test_case['url'],
|
||||
len(res_dict['entries'])))
|
||||
if 'playlist_count' in test_case:
|
||||
self.assertEqual(
|
||||
len(res_dict['entries']),
|
||||
test_case['playlist_count'],
|
||||
'Expected %d entries in playlist %s, but got %d.' % (
|
||||
test_case['playlist_count'],
|
||||
test_case['url'],
|
||||
len(res_dict['entries']),
|
||||
))
|
||||
if 'playlist_duration_sum' in test_case:
|
||||
got_duration = sum(e['duration'] for e in res_dict['entries'])
|
||||
self.assertEqual(
|
||||
test_case['playlist_duration_sum'], got_duration)
|
||||
|
||||
for tc in test_cases:
|
||||
tc_filename = get_tc_filename(tc)
|
||||
if not test_case.get('params', {}).get('skip_download', False):
|
||||
self.assertTrue(os.path.exists(tc_filename), msg='Missing file ' + tc_filename)
|
||||
self.assertTrue(tc_filename in finished_hook_called)
|
||||
expected_minsize = tc.get('file_minsize', 10000)
|
||||
if expected_minsize is not None:
|
||||
if params.get('test'):
|
||||
expected_minsize = max(expected_minsize, 10000)
|
||||
got_fsize = os.path.getsize(tc_filename)
|
||||
assertGreaterEqual(
|
||||
self, got_fsize, expected_minsize,
|
||||
'Expected %s to be at least %s, but it\'s only %s ' %
|
||||
(tc_filename, format_bytes(expected_minsize),
|
||||
format_bytes(got_fsize)))
|
||||
if 'md5' in tc:
|
||||
md5_for_file = _file_md5(tc_filename)
|
||||
self.assertEqual(md5_for_file, tc['md5'])
|
||||
info_json_fn = os.path.splitext(tc_filename)[0] + '.info.json'
|
||||
self.assertTrue(
|
||||
os.path.exists(info_json_fn),
|
||||
'Missing info file %s' % info_json_fn)
|
||||
with io.open(info_json_fn, encoding='utf-8') as infof:
|
||||
info_dict = json.load(infof)
|
||||
|
||||
expect_info_dict(self, tc.get('info_dict', {}), info_dict)
|
||||
finally:
|
||||
try_rm_tcs_files()
|
||||
if is_playlist and res_dict is not None and res_dict.get('entries'):
|
||||
# Remove all other files that may have been extracted if the
|
||||
# extractor returns full results even with extract_flat
|
||||
res_tcs = [{'info_dict': e} for e in res_dict['entries']]
|
||||
try_rm_tcs_files(res_tcs)
|
||||
|
||||
return test_template
|
||||
|
||||
# And add them to TestDownload
|
||||
for n, test_case in enumerate(defs):
|
||||
test_method = generator(test_case)
|
||||
tname = 'test_' + str(test_case['name'])
|
||||
i = 1
|
||||
while hasattr(TestDownload, tname):
|
||||
tname = 'test_%s_%d' % (test_case['name'], i)
|
||||
i += 1
|
||||
test_method.__name__ = str(tname)
|
||||
setattr(TestDownload, test_method.__name__, test_method)
|
||||
del test_method
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
31
test/test_execution.py
Normal file
31
test/test_execution.py
Normal file
@@ -0,0 +1,31 @@
|
||||
#!/usr/bin/env python
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import unittest
|
||||
|
||||
import sys
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
|
||||
try:
|
||||
_DEV_NULL = subprocess.DEVNULL
|
||||
except AttributeError:
|
||||
_DEV_NULL = open(os.devnull, 'wb')
|
||||
|
||||
|
||||
class TestExecution(unittest.TestCase):
|
||||
def test_import(self):
|
||||
subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir)
|
||||
|
||||
def test_module_exec(self):
|
||||
if sys.version_info >= (2, 7): # Python 2.6 doesn't support package execution
|
||||
subprocess.check_call([sys.executable, '-m', 'youtube_dl', '--version'], cwd=rootDir, stdout=_DEV_NULL)
|
||||
|
||||
def test_main_exec(self):
|
||||
subprocess.check_call([sys.executable, 'youtube_dl/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
313
test/test_subtitles.py
Normal file
313
test/test_subtitles.py
Normal file
@@ -0,0 +1,313 @@
|
||||
#!/usr/bin/env python
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from test.helper import FakeYDL, md5
|
||||
|
||||
|
||||
from youtube_dl.extractor import (
|
||||
BlipTVIE,
|
||||
YoutubeIE,
|
||||
DailymotionIE,
|
||||
TEDIE,
|
||||
VimeoIE,
|
||||
WallaIE,
|
||||
)
|
||||
|
||||
|
||||
class BaseTestSubtitles(unittest.TestCase):
|
||||
url = None
|
||||
IE = None
|
||||
|
||||
def setUp(self):
|
||||
self.DL = FakeYDL()
|
||||
self.ie = self.IE(self.DL)
|
||||
|
||||
def getInfoDict(self):
|
||||
info_dict = self.ie.extract(self.url)
|
||||
return info_dict
|
||||
|
||||
def getSubtitles(self):
|
||||
info_dict = self.getInfoDict()
|
||||
return info_dict['subtitles']
|
||||
|
||||
|
||||
class TestYoutubeSubtitles(BaseTestSubtitles):
|
||||
url = 'QRS8MkLhQmM'
|
||||
IE = YoutubeIE
|
||||
|
||||
def test_youtube_no_writesubtitles(self):
|
||||
self.DL.params['writesubtitles'] = False
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(subtitles, None)
|
||||
|
||||
def test_youtube_subtitles(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(md5(subtitles['en']), '4cd9278a35ba2305f47354ee13472260')
|
||||
|
||||
def test_youtube_subtitles_lang(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['subtitleslangs'] = ['it']
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(md5(subtitles['it']), '164a51f16f260476a05b50fe4c2f161d')
|
||||
|
||||
def test_youtube_allsubtitles(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['allsubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(len(subtitles.keys()), 13)
|
||||
|
||||
def test_youtube_subtitles_sbv_format(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['subtitlesformat'] = 'sbv'
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(md5(subtitles['en']), '13aeaa0c245a8bed9a451cb643e3ad8b')
|
||||
|
||||
def test_youtube_subtitles_vtt_format(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['subtitlesformat'] = 'vtt'
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(md5(subtitles['en']), '3cb210999d3e021bd6c7f0ea751eab06')
|
||||
|
||||
def test_youtube_list_subtitles(self):
|
||||
self.DL.expect_warning('Video doesn\'t have automatic captions')
|
||||
self.DL.params['listsubtitles'] = True
|
||||
info_dict = self.getInfoDict()
|
||||
self.assertEqual(info_dict, None)
|
||||
|
||||
def test_youtube_automatic_captions(self):
|
||||
self.url = '8YoUxe5ncPo'
|
||||
self.DL.params['writeautomaticsub'] = True
|
||||
self.DL.params['subtitleslangs'] = ['it']
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertTrue(subtitles['it'] is not None)
|
||||
|
||||
def test_youtube_nosubtitles(self):
|
||||
self.DL.expect_warning('video doesn\'t have subtitles')
|
||||
self.url = 'n5BB19UTcdA'
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['allsubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(len(subtitles), 0)
|
||||
|
||||
def test_youtube_multiple_langs(self):
|
||||
self.url = 'QRS8MkLhQmM'
|
||||
self.DL.params['writesubtitles'] = True
|
||||
langs = ['it', 'fr', 'de']
|
||||
self.DL.params['subtitleslangs'] = langs
|
||||
subtitles = self.getSubtitles()
|
||||
for lang in langs:
|
||||
self.assertTrue(subtitles.get(lang) is not None, 'Subtitles for \'%s\' not extracted' % lang)
|
||||
|
||||
|
||||
class TestDailymotionSubtitles(BaseTestSubtitles):
|
||||
url = 'http://www.dailymotion.com/video/xczg00'
|
||||
IE = DailymotionIE
|
||||
|
||||
def test_no_writesubtitles(self):
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(subtitles, None)
|
||||
|
||||
def test_subtitles(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(md5(subtitles['en']), '976553874490cba125086bbfea3ff76f')
|
||||
|
||||
def test_subtitles_lang(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['subtitleslangs'] = ['fr']
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(md5(subtitles['fr']), '594564ec7d588942e384e920e5341792')
|
||||
|
||||
def test_allsubtitles(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['allsubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(len(subtitles.keys()), 5)
|
||||
|
||||
def test_list_subtitles(self):
|
||||
self.DL.expect_warning('Automatic Captions not supported by this server')
|
||||
self.DL.params['listsubtitles'] = True
|
||||
info_dict = self.getInfoDict()
|
||||
self.assertEqual(info_dict, None)
|
||||
|
||||
def test_automatic_captions(self):
|
||||
self.DL.expect_warning('Automatic Captions not supported by this server')
|
||||
self.DL.params['writeautomaticsub'] = True
|
||||
self.DL.params['subtitleslang'] = ['en']
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertTrue(len(subtitles.keys()) == 0)
|
||||
|
||||
def test_nosubtitles(self):
|
||||
self.DL.expect_warning('video doesn\'t have subtitles')
|
||||
self.url = 'http://www.dailymotion.com/video/x12u166_le-zapping-tele-star-du-08-aout-2013_tv'
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['allsubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(len(subtitles), 0)
|
||||
|
||||
def test_multiple_langs(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
langs = ['es', 'fr', 'de']
|
||||
self.DL.params['subtitleslangs'] = langs
|
||||
subtitles = self.getSubtitles()
|
||||
for lang in langs:
|
||||
self.assertTrue(subtitles.get(lang) is not None, 'Subtitles for \'%s\' not extracted' % lang)
|
||||
|
||||
|
||||
class TestTedSubtitles(BaseTestSubtitles):
|
||||
url = 'http://www.ted.com/talks/dan_dennett_on_our_consciousness.html'
|
||||
IE = TEDIE
|
||||
|
||||
def test_no_writesubtitles(self):
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(subtitles, None)
|
||||
|
||||
def test_subtitles(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(md5(subtitles['en']), '4262c1665ff928a2dada178f62cb8d14')
|
||||
|
||||
def test_subtitles_lang(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['subtitleslangs'] = ['fr']
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(md5(subtitles['fr']), '66a63f7f42c97a50f8c0e90bc7797bb5')
|
||||
|
||||
def test_allsubtitles(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['allsubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertTrue(len(subtitles.keys()) >= 28)
|
||||
|
||||
def test_list_subtitles(self):
|
||||
self.DL.expect_warning('Automatic Captions not supported by this server')
|
||||
self.DL.params['listsubtitles'] = True
|
||||
info_dict = self.getInfoDict()
|
||||
self.assertEqual(info_dict, None)
|
||||
|
||||
def test_automatic_captions(self):
|
||||
self.DL.expect_warning('Automatic Captions not supported by this server')
|
||||
self.DL.params['writeautomaticsub'] = True
|
||||
self.DL.params['subtitleslang'] = ['en']
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertTrue(len(subtitles.keys()) == 0)
|
||||
|
||||
def test_multiple_langs(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
langs = ['es', 'fr', 'de']
|
||||
self.DL.params['subtitleslangs'] = langs
|
||||
subtitles = self.getSubtitles()
|
||||
for lang in langs:
|
||||
self.assertTrue(subtitles.get(lang) is not None, 'Subtitles for \'%s\' not extracted' % lang)
|
||||
|
||||
|
||||
class TestBlipTVSubtitles(BaseTestSubtitles):
|
||||
url = 'http://blip.tv/a/a-6603250'
|
||||
IE = BlipTVIE
|
||||
|
||||
def test_list_subtitles(self):
|
||||
self.DL.expect_warning('Automatic Captions not supported by this server')
|
||||
self.DL.params['listsubtitles'] = True
|
||||
info_dict = self.getInfoDict()
|
||||
self.assertEqual(info_dict, None)
|
||||
|
||||
def test_allsubtitles(self):
|
||||
self.DL.expect_warning('Automatic Captions not supported by this server')
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['allsubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(set(subtitles.keys()), set(['en']))
|
||||
self.assertEqual(md5(subtitles['en']), '5b75c300af65fe4476dff79478bb93e4')
|
||||
|
||||
|
||||
class TestVimeoSubtitles(BaseTestSubtitles):
|
||||
url = 'http://vimeo.com/76979871'
|
||||
IE = VimeoIE
|
||||
|
||||
def test_no_writesubtitles(self):
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(subtitles, None)
|
||||
|
||||
def test_subtitles(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(md5(subtitles['en']), '26399116d23ae3cf2c087cea94bc43b4')
|
||||
|
||||
def test_subtitles_lang(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['subtitleslangs'] = ['fr']
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(md5(subtitles['fr']), 'b6191146a6c5d3a452244d853fde6dc8')
|
||||
|
||||
def test_allsubtitles(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['allsubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(set(subtitles.keys()), set(['de', 'en', 'es', 'fr']))
|
||||
|
||||
def test_list_subtitles(self):
|
||||
self.DL.expect_warning('Automatic Captions not supported by this server')
|
||||
self.DL.params['listsubtitles'] = True
|
||||
info_dict = self.getInfoDict()
|
||||
self.assertEqual(info_dict, None)
|
||||
|
||||
def test_automatic_captions(self):
|
||||
self.DL.expect_warning('Automatic Captions not supported by this server')
|
||||
self.DL.params['writeautomaticsub'] = True
|
||||
self.DL.params['subtitleslang'] = ['en']
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertTrue(len(subtitles.keys()) == 0)
|
||||
|
||||
def test_nosubtitles(self):
|
||||
self.DL.expect_warning('video doesn\'t have subtitles')
|
||||
self.url = 'http://vimeo.com/56015672'
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['allsubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(len(subtitles), 0)
|
||||
|
||||
def test_multiple_langs(self):
|
||||
self.DL.params['writesubtitles'] = True
|
||||
langs = ['es', 'fr', 'de']
|
||||
self.DL.params['subtitleslangs'] = langs
|
||||
subtitles = self.getSubtitles()
|
||||
for lang in langs:
|
||||
self.assertTrue(subtitles.get(lang) is not None, 'Subtitles for \'%s\' not extracted' % lang)
|
||||
|
||||
|
||||
class TestWallaSubtitles(BaseTestSubtitles):
|
||||
url = 'http://vod.walla.co.il/movie/2705958/the-yes-men'
|
||||
IE = WallaIE
|
||||
|
||||
def test_list_subtitles(self):
|
||||
self.DL.expect_warning('Automatic Captions not supported by this server')
|
||||
self.DL.params['listsubtitles'] = True
|
||||
info_dict = self.getInfoDict()
|
||||
self.assertEqual(info_dict, None)
|
||||
|
||||
def test_allsubtitles(self):
|
||||
self.DL.expect_warning('Automatic Captions not supported by this server')
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['allsubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(set(subtitles.keys()), set(['heb']))
|
||||
self.assertEqual(md5(subtitles['heb']), 'e758c5d7cb982f6bef14f377ec7a3920')
|
||||
|
||||
def test_nosubtitles(self):
|
||||
self.DL.expect_warning('video doesn\'t have subtitles')
|
||||
self.url = 'http://vod.walla.co.il/movie/2642630/one-direction-all-for-one'
|
||||
self.DL.params['writesubtitles'] = True
|
||||
self.DL.params['allsubtitles'] = True
|
||||
subtitles = self.getSubtitles()
|
||||
self.assertEqual(len(subtitles), 0)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
80
test/test_swfinterp.py
Normal file
80
test/test_swfinterp.py
Normal file
@@ -0,0 +1,80 @@
|
||||
#!/usr/bin/env python
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
|
||||
import errno
|
||||
import io
|
||||
import json
|
||||
import re
|
||||
import subprocess
|
||||
|
||||
from youtube_dl.swfinterp import SWFInterpreter
|
||||
|
||||
|
||||
TEST_DIR = os.path.join(
|
||||
os.path.dirname(os.path.abspath(__file__)), 'swftests')
|
||||
|
||||
|
||||
class TestSWFInterpreter(unittest.TestCase):
|
||||
pass
|
||||
|
||||
|
||||
def _make_testfunc(testfile):
|
||||
m = re.match(r'^(.*)\.(as)$', testfile)
|
||||
if not m:
|
||||
return
|
||||
test_id = m.group(1)
|
||||
|
||||
def test_func(self):
|
||||
as_file = os.path.join(TEST_DIR, testfile)
|
||||
swf_file = os.path.join(TEST_DIR, test_id + '.swf')
|
||||
if ((not os.path.exists(swf_file))
|
||||
or os.path.getmtime(swf_file) < os.path.getmtime(as_file)):
|
||||
# Recompile
|
||||
try:
|
||||
subprocess.check_call([
|
||||
'mxmlc', '-output', swf_file,
|
||||
'-static-link-runtime-shared-libraries', as_file])
|
||||
except OSError as ose:
|
||||
if ose.errno == errno.ENOENT:
|
||||
print('mxmlc not found! Skipping test.')
|
||||
return
|
||||
raise
|
||||
|
||||
with open(swf_file, 'rb') as swf_f:
|
||||
swf_content = swf_f.read()
|
||||
swfi = SWFInterpreter(swf_content)
|
||||
|
||||
with io.open(as_file, 'r', encoding='utf-8') as as_f:
|
||||
as_content = as_f.read()
|
||||
|
||||
def _find_spec(key):
|
||||
m = re.search(
|
||||
r'(?m)^//\s*%s:\s*(.*?)\n' % re.escape(key), as_content)
|
||||
if not m:
|
||||
raise ValueError('Cannot find %s in %s' % (key, testfile))
|
||||
return json.loads(m.group(1))
|
||||
|
||||
input_args = _find_spec('input')
|
||||
output = _find_spec('output')
|
||||
|
||||
swf_class = swfi.extract_class(test_id)
|
||||
func = swfi.extract_function(swf_class, 'main')
|
||||
res = func(input_args)
|
||||
self.assertEqual(res, output)
|
||||
|
||||
test_func.__name__ = str('test_swf_' + test_id)
|
||||
setattr(TestSWFInterpreter, test_func.__name__, test_func)
|
||||
|
||||
|
||||
for testfile in os.listdir(TEST_DIR):
|
||||
_make_testfunc(testfile)
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
46
test/test_unicode_literals.py
Normal file
46
test/test_unicode_literals.py
Normal file
@@ -0,0 +1,46 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import io
|
||||
import os
|
||||
import re
|
||||
import unittest
|
||||
|
||||
rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
IGNORED_FILES = [
|
||||
'setup.py', # http://bugs.python.org/issue13943
|
||||
'conf.py',
|
||||
'buildserver.py',
|
||||
]
|
||||
|
||||
|
||||
class TestUnicodeLiterals(unittest.TestCase):
|
||||
def test_all_files(self):
|
||||
for dirpath, _, filenames in os.walk(rootDir):
|
||||
for basename in filenames:
|
||||
if not basename.endswith('.py'):
|
||||
continue
|
||||
if basename in IGNORED_FILES:
|
||||
continue
|
||||
|
||||
fn = os.path.join(dirpath, basename)
|
||||
with io.open(fn, encoding='utf-8') as inf:
|
||||
code = inf.read()
|
||||
|
||||
if "'" not in code and '"' not in code:
|
||||
continue
|
||||
self.assertRegexpMatches(
|
||||
code,
|
||||
r'(?:#.*\n*)?from __future__ import (?:[a-z_]+,\s*)*unicode_literals',
|
||||
'unicode_literals import missing in %s' % fn)
|
||||
|
||||
m = re.search(r'(?<=\s)u[\'"](?!\)|,|$)', code)
|
||||
if m is not None:
|
||||
self.assertTrue(
|
||||
m is None,
|
||||
'u present in %s, around %s' % (
|
||||
fn, code[m.start() - 10:m.end() + 10]))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
391
test/test_utils.py
Normal file
391
test/test_utils.py
Normal file
@@ -0,0 +1,391 @@
|
||||
#!/usr/bin/env python
|
||||
# coding: utf-8
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
|
||||
# Various small unit tests
|
||||
import io
|
||||
import json
|
||||
import xml.etree.ElementTree
|
||||
|
||||
from youtube_dl.utils import (
|
||||
clean_html,
|
||||
DateRange,
|
||||
encodeFilename,
|
||||
find_xpath_attr,
|
||||
fix_xml_ampersands,
|
||||
orderedSet,
|
||||
OnDemandPagedList,
|
||||
InAdvancePagedList,
|
||||
parse_duration,
|
||||
read_batch_urls,
|
||||
sanitize_filename,
|
||||
shell_quote,
|
||||
smuggle_url,
|
||||
str_to_int,
|
||||
struct_unpack,
|
||||
timeconvert,
|
||||
unescapeHTML,
|
||||
unified_strdate,
|
||||
unsmuggle_url,
|
||||
url_basename,
|
||||
urlencode_postdata,
|
||||
xpath_with_ns,
|
||||
parse_iso8601,
|
||||
strip_jsonp,
|
||||
uppercase_escape,
|
||||
limit_length,
|
||||
escape_rfc3986,
|
||||
escape_url,
|
||||
js_to_json,
|
||||
intlist_to_bytes,
|
||||
args_to_str,
|
||||
parse_filesize,
|
||||
version_tuple,
|
||||
)
|
||||
|
||||
|
||||
class TestUtil(unittest.TestCase):
|
||||
def test_timeconvert(self):
|
||||
self.assertTrue(timeconvert('') is None)
|
||||
self.assertTrue(timeconvert('bougrg') is None)
|
||||
|
||||
def test_sanitize_filename(self):
|
||||
self.assertEqual(sanitize_filename('abc'), 'abc')
|
||||
self.assertEqual(sanitize_filename('abc_d-e'), 'abc_d-e')
|
||||
|
||||
self.assertEqual(sanitize_filename('123'), '123')
|
||||
|
||||
self.assertEqual('abc_de', sanitize_filename('abc/de'))
|
||||
self.assertFalse('/' in sanitize_filename('abc/de///'))
|
||||
|
||||
self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de'))
|
||||
self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|'))
|
||||
self.assertEqual('yes no', sanitize_filename('yes? no'))
|
||||
self.assertEqual('this - that', sanitize_filename('this: that'))
|
||||
|
||||
self.assertEqual(sanitize_filename('AT&T'), 'AT&T')
|
||||
aumlaut = 'ä'
|
||||
self.assertEqual(sanitize_filename(aumlaut), aumlaut)
|
||||
tests = '\u043a\u0438\u0440\u0438\u043b\u043b\u0438\u0446\u0430'
|
||||
self.assertEqual(sanitize_filename(tests), tests)
|
||||
|
||||
forbidden = '"\0\\/'
|
||||
for fc in forbidden:
|
||||
for fbc in forbidden:
|
||||
self.assertTrue(fbc not in sanitize_filename(fc))
|
||||
|
||||
def test_sanitize_filename_restricted(self):
|
||||
self.assertEqual(sanitize_filename('abc', restricted=True), 'abc')
|
||||
self.assertEqual(sanitize_filename('abc_d-e', restricted=True), 'abc_d-e')
|
||||
|
||||
self.assertEqual(sanitize_filename('123', restricted=True), '123')
|
||||
|
||||
self.assertEqual('abc_de', sanitize_filename('abc/de', restricted=True))
|
||||
self.assertFalse('/' in sanitize_filename('abc/de///', restricted=True))
|
||||
|
||||
self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de', restricted=True))
|
||||
self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|', restricted=True))
|
||||
self.assertEqual('yes_no', sanitize_filename('yes? no', restricted=True))
|
||||
self.assertEqual('this_-_that', sanitize_filename('this: that', restricted=True))
|
||||
|
||||
tests = 'a\xe4b\u4e2d\u56fd\u7684c'
|
||||
self.assertEqual(sanitize_filename(tests, restricted=True), 'a_b_c')
|
||||
self.assertTrue(sanitize_filename('\xf6', restricted=True) != '') # No empty filename
|
||||
|
||||
forbidden = '"\0\\/&!: \'\t\n()[]{}$;`^,#'
|
||||
for fc in forbidden:
|
||||
for fbc in forbidden:
|
||||
self.assertTrue(fbc not in sanitize_filename(fc, restricted=True))
|
||||
|
||||
# Handle a common case more neatly
|
||||
self.assertEqual(sanitize_filename('\u5927\u58f0\u5e26 - Song', restricted=True), 'Song')
|
||||
self.assertEqual(sanitize_filename('\u603b\u7edf: Speech', restricted=True), 'Speech')
|
||||
# .. but make sure the file name is never empty
|
||||
self.assertTrue(sanitize_filename('-', restricted=True) != '')
|
||||
self.assertTrue(sanitize_filename(':', restricted=True) != '')
|
||||
|
||||
def test_sanitize_ids(self):
|
||||
self.assertEqual(sanitize_filename('_n_cd26wFpw', is_id=True), '_n_cd26wFpw')
|
||||
self.assertEqual(sanitize_filename('_BD_eEpuzXw', is_id=True), '_BD_eEpuzXw')
|
||||
self.assertEqual(sanitize_filename('N0Y__7-UOdI', is_id=True), 'N0Y__7-UOdI')
|
||||
|
||||
def test_ordered_set(self):
|
||||
self.assertEqual(orderedSet([1, 1, 2, 3, 4, 4, 5, 6, 7, 3, 5]), [1, 2, 3, 4, 5, 6, 7])
|
||||
self.assertEqual(orderedSet([]), [])
|
||||
self.assertEqual(orderedSet([1]), [1])
|
||||
# keep the list ordered
|
||||
self.assertEqual(orderedSet([135, 1, 1, 1]), [135, 1])
|
||||
|
||||
def test_unescape_html(self):
|
||||
self.assertEqual(unescapeHTML('%20;'), '%20;')
|
||||
self.assertEqual(
|
||||
unescapeHTML('é'), 'é')
|
||||
|
||||
def test_daterange(self):
|
||||
_20century = DateRange("19000101", "20000101")
|
||||
self.assertFalse("17890714" in _20century)
|
||||
_ac = DateRange("00010101")
|
||||
self.assertTrue("19690721" in _ac)
|
||||
_firstmilenium = DateRange(end="10000101")
|
||||
self.assertTrue("07110427" in _firstmilenium)
|
||||
|
||||
def test_unified_dates(self):
|
||||
self.assertEqual(unified_strdate('December 21, 2010'), '20101221')
|
||||
self.assertEqual(unified_strdate('8/7/2009'), '20090708')
|
||||
self.assertEqual(unified_strdate('Dec 14, 2012'), '20121214')
|
||||
self.assertEqual(unified_strdate('2012/10/11 01:56:38 +0000'), '20121011')
|
||||
self.assertEqual(unified_strdate('1968-12-10'), '19681210')
|
||||
self.assertEqual(unified_strdate('28/01/2014 21:00:00 +0100'), '20140128')
|
||||
|
||||
def test_find_xpath_attr(self):
|
||||
testxml = '''<root>
|
||||
<node/>
|
||||
<node x="a"/>
|
||||
<node x="a" y="c" />
|
||||
<node x="b" y="d" />
|
||||
</root>'''
|
||||
doc = xml.etree.ElementTree.fromstring(testxml)
|
||||
|
||||
self.assertEqual(find_xpath_attr(doc, './/fourohfour', 'n', 'v'), None)
|
||||
self.assertEqual(find_xpath_attr(doc, './/node', 'x', 'a'), doc[1])
|
||||
self.assertEqual(find_xpath_attr(doc, './/node', 'y', 'c'), doc[2])
|
||||
|
||||
def test_xpath_with_ns(self):
|
||||
testxml = '''<root xmlns:media="http://example.com/">
|
||||
<media:song>
|
||||
<media:author>The Author</media:author>
|
||||
<url>http://server.com/download.mp3</url>
|
||||
</media:song>
|
||||
</root>'''
|
||||
doc = xml.etree.ElementTree.fromstring(testxml)
|
||||
find = lambda p: doc.find(xpath_with_ns(p, {'media': 'http://example.com/'}))
|
||||
self.assertTrue(find('media:song') is not None)
|
||||
self.assertEqual(find('media:song/media:author').text, 'The Author')
|
||||
self.assertEqual(find('media:song/url').text, 'http://server.com/download.mp3')
|
||||
|
||||
def test_smuggle_url(self):
|
||||
data = {"ö": "ö", "abc": [3]}
|
||||
url = 'https://foo.bar/baz?x=y#a'
|
||||
smug_url = smuggle_url(url, data)
|
||||
unsmug_url, unsmug_data = unsmuggle_url(smug_url)
|
||||
self.assertEqual(url, unsmug_url)
|
||||
self.assertEqual(data, unsmug_data)
|
||||
|
||||
res_url, res_data = unsmuggle_url(url)
|
||||
self.assertEqual(res_url, url)
|
||||
self.assertEqual(res_data, None)
|
||||
|
||||
def test_shell_quote(self):
|
||||
args = ['ffmpeg', '-i', encodeFilename('ñ€ß\'.mp4')]
|
||||
self.assertEqual(shell_quote(args), """ffmpeg -i 'ñ€ß'"'"'.mp4'""")
|
||||
|
||||
def test_str_to_int(self):
|
||||
self.assertEqual(str_to_int('123,456'), 123456)
|
||||
self.assertEqual(str_to_int('123.456'), 123456)
|
||||
|
||||
def test_url_basename(self):
|
||||
self.assertEqual(url_basename('http://foo.de/'), '')
|
||||
self.assertEqual(url_basename('http://foo.de/bar/baz'), 'baz')
|
||||
self.assertEqual(url_basename('http://foo.de/bar/baz?x=y'), 'baz')
|
||||
self.assertEqual(url_basename('http://foo.de/bar/baz#x=y'), 'baz')
|
||||
self.assertEqual(url_basename('http://foo.de/bar/baz/'), 'baz')
|
||||
self.assertEqual(
|
||||
url_basename('http://media.w3.org/2010/05/sintel/trailer.mp4'),
|
||||
'trailer.mp4')
|
||||
|
||||
def test_parse_duration(self):
|
||||
self.assertEqual(parse_duration(None), None)
|
||||
self.assertEqual(parse_duration('1'), 1)
|
||||
self.assertEqual(parse_duration('1337:12'), 80232)
|
||||
self.assertEqual(parse_duration('9:12:43'), 33163)
|
||||
self.assertEqual(parse_duration('12:00'), 720)
|
||||
self.assertEqual(parse_duration('00:01:01'), 61)
|
||||
self.assertEqual(parse_duration('x:y'), None)
|
||||
self.assertEqual(parse_duration('3h11m53s'), 11513)
|
||||
self.assertEqual(parse_duration('3h 11m 53s'), 11513)
|
||||
self.assertEqual(parse_duration('3 hours 11 minutes 53 seconds'), 11513)
|
||||
self.assertEqual(parse_duration('3 hours 11 mins 53 secs'), 11513)
|
||||
self.assertEqual(parse_duration('62m45s'), 3765)
|
||||
self.assertEqual(parse_duration('6m59s'), 419)
|
||||
self.assertEqual(parse_duration('49s'), 49)
|
||||
self.assertEqual(parse_duration('0h0m0s'), 0)
|
||||
self.assertEqual(parse_duration('0m0s'), 0)
|
||||
self.assertEqual(parse_duration('0s'), 0)
|
||||
self.assertEqual(parse_duration('01:02:03.05'), 3723.05)
|
||||
self.assertEqual(parse_duration('T30M38S'), 1838)
|
||||
self.assertEqual(parse_duration('5 s'), 5)
|
||||
self.assertEqual(parse_duration('3 min'), 180)
|
||||
self.assertEqual(parse_duration('2.5 hours'), 9000)
|
||||
|
||||
def test_fix_xml_ampersands(self):
|
||||
self.assertEqual(
|
||||
fix_xml_ampersands('"&x=y&z=a'), '"&x=y&z=a')
|
||||
self.assertEqual(
|
||||
fix_xml_ampersands('"&x=y&wrong;&z=a'),
|
||||
'"&x=y&wrong;&z=a')
|
||||
self.assertEqual(
|
||||
fix_xml_ampersands('&'><"'),
|
||||
'&'><"')
|
||||
self.assertEqual(
|
||||
fix_xml_ampersands('Ӓ᪼'), 'Ӓ᪼')
|
||||
self.assertEqual(fix_xml_ampersands('&#&#'), '&#&#')
|
||||
|
||||
def test_paged_list(self):
|
||||
def testPL(size, pagesize, sliceargs, expected):
|
||||
def get_page(pagenum):
|
||||
firstid = pagenum * pagesize
|
||||
upto = min(size, pagenum * pagesize + pagesize)
|
||||
for i in range(firstid, upto):
|
||||
yield i
|
||||
|
||||
pl = OnDemandPagedList(get_page, pagesize)
|
||||
got = pl.getslice(*sliceargs)
|
||||
self.assertEqual(got, expected)
|
||||
|
||||
iapl = InAdvancePagedList(get_page, size // pagesize + 1, pagesize)
|
||||
got = iapl.getslice(*sliceargs)
|
||||
self.assertEqual(got, expected)
|
||||
|
||||
testPL(5, 2, (), [0, 1, 2, 3, 4])
|
||||
testPL(5, 2, (1,), [1, 2, 3, 4])
|
||||
testPL(5, 2, (2,), [2, 3, 4])
|
||||
testPL(5, 2, (4,), [4])
|
||||
testPL(5, 2, (0, 3), [0, 1, 2])
|
||||
testPL(5, 2, (1, 4), [1, 2, 3])
|
||||
testPL(5, 2, (2, 99), [2, 3, 4])
|
||||
testPL(5, 2, (20, 99), [])
|
||||
|
||||
def test_struct_unpack(self):
|
||||
self.assertEqual(struct_unpack('!B', b'\x00'), (0,))
|
||||
|
||||
def test_read_batch_urls(self):
|
||||
f = io.StringIO('''\xef\xbb\xbf foo
|
||||
bar\r
|
||||
baz
|
||||
# More after this line\r
|
||||
; or after this
|
||||
bam''')
|
||||
self.assertEqual(read_batch_urls(f), ['foo', 'bar', 'baz', 'bam'])
|
||||
|
||||
def test_urlencode_postdata(self):
|
||||
data = urlencode_postdata({'username': 'foo@bar.com', 'password': '1234'})
|
||||
self.assertTrue(isinstance(data, bytes))
|
||||
|
||||
def test_parse_iso8601(self):
|
||||
self.assertEqual(parse_iso8601('2014-03-23T23:04:26+0100'), 1395612266)
|
||||
self.assertEqual(parse_iso8601('2014-03-23T22:04:26+0000'), 1395612266)
|
||||
self.assertEqual(parse_iso8601('2014-03-23T22:04:26Z'), 1395612266)
|
||||
self.assertEqual(parse_iso8601('2014-03-23T22:04:26.1234Z'), 1395612266)
|
||||
|
||||
def test_strip_jsonp(self):
|
||||
stripped = strip_jsonp('cb ([ {"id":"532cb",\n\n\n"x":\n3}\n]\n);')
|
||||
d = json.loads(stripped)
|
||||
self.assertEqual(d, [{"id": "532cb", "x": 3}])
|
||||
|
||||
stripped = strip_jsonp('parseMetadata({"STATUS":"OK"})\n\n\n//epc')
|
||||
d = json.loads(stripped)
|
||||
self.assertEqual(d, {'STATUS': 'OK'})
|
||||
|
||||
def test_uppercase_escape(self):
|
||||
self.assertEqual(uppercase_escape('aä'), 'aä')
|
||||
self.assertEqual(uppercase_escape('\\U0001d550'), '𝕐')
|
||||
|
||||
def test_limit_length(self):
|
||||
self.assertEqual(limit_length(None, 12), None)
|
||||
self.assertEqual(limit_length('foo', 12), 'foo')
|
||||
self.assertTrue(
|
||||
limit_length('foo bar baz asd', 12).startswith('foo bar'))
|
||||
self.assertTrue('...' in limit_length('foo bar baz asd', 12))
|
||||
|
||||
def test_escape_rfc3986(self):
|
||||
reserved = "!*'();:@&=+$,/?#[]"
|
||||
unreserved = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.~'
|
||||
self.assertEqual(escape_rfc3986(reserved), reserved)
|
||||
self.assertEqual(escape_rfc3986(unreserved), unreserved)
|
||||
self.assertEqual(escape_rfc3986('тест'), '%D1%82%D0%B5%D1%81%D1%82')
|
||||
self.assertEqual(escape_rfc3986('%D1%82%D0%B5%D1%81%D1%82'), '%D1%82%D0%B5%D1%81%D1%82')
|
||||
self.assertEqual(escape_rfc3986('foo bar'), 'foo%20bar')
|
||||
self.assertEqual(escape_rfc3986('foo%20bar'), 'foo%20bar')
|
||||
|
||||
def test_escape_url(self):
|
||||
self.assertEqual(
|
||||
escape_url('http://wowza.imust.org/srv/vod/telemb/new/UPLOAD/UPLOAD/20224_IncendieHavré_FD.mp4'),
|
||||
'http://wowza.imust.org/srv/vod/telemb/new/UPLOAD/UPLOAD/20224_IncendieHavre%CC%81_FD.mp4'
|
||||
)
|
||||
self.assertEqual(
|
||||
escape_url('http://www.ardmediathek.de/tv/Sturm-der-Liebe/Folge-2036-Zu-Mann-und-Frau-erklärt/Das-Erste/Video?documentId=22673108&bcastId=5290'),
|
||||
'http://www.ardmediathek.de/tv/Sturm-der-Liebe/Folge-2036-Zu-Mann-und-Frau-erkl%C3%A4rt/Das-Erste/Video?documentId=22673108&bcastId=5290'
|
||||
)
|
||||
self.assertEqual(
|
||||
escape_url('http://тест.рф/фрагмент'),
|
||||
'http://тест.рф/%D1%84%D1%80%D0%B0%D0%B3%D0%BC%D0%B5%D0%BD%D1%82'
|
||||
)
|
||||
self.assertEqual(
|
||||
escape_url('http://тест.рф/абв?абв=абв#абв'),
|
||||
'http://тест.рф/%D0%B0%D0%B1%D0%B2?%D0%B0%D0%B1%D0%B2=%D0%B0%D0%B1%D0%B2#%D0%B0%D0%B1%D0%B2'
|
||||
)
|
||||
self.assertEqual(escape_url('http://vimeo.com/56015672#at=0'), 'http://vimeo.com/56015672#at=0')
|
||||
|
||||
def test_js_to_json_realworld(self):
|
||||
inp = '''{
|
||||
'clip':{'provider':'pseudo'}
|
||||
}'''
|
||||
self.assertEqual(js_to_json(inp), '''{
|
||||
"clip":{"provider":"pseudo"}
|
||||
}''')
|
||||
json.loads(js_to_json(inp))
|
||||
|
||||
inp = '''{
|
||||
'playlist':[{'controls':{'all':null}}]
|
||||
}'''
|
||||
self.assertEqual(js_to_json(inp), '''{
|
||||
"playlist":[{"controls":{"all":null}}]
|
||||
}''')
|
||||
|
||||
def test_js_to_json_edgecases(self):
|
||||
on = js_to_json("{abc_def:'1\\'\\\\2\\\\\\'3\"4'}")
|
||||
self.assertEqual(json.loads(on), {"abc_def": "1'\\2\\'3\"4"})
|
||||
|
||||
on = js_to_json('{"abc": true}')
|
||||
self.assertEqual(json.loads(on), {'abc': True})
|
||||
|
||||
def test_clean_html(self):
|
||||
self.assertEqual(clean_html('a:\nb'), 'a: b')
|
||||
self.assertEqual(clean_html('a:\n "b"'), 'a: "b"')
|
||||
|
||||
def test_intlist_to_bytes(self):
|
||||
self.assertEqual(
|
||||
intlist_to_bytes([0, 1, 127, 128, 255]),
|
||||
b'\x00\x01\x7f\x80\xff')
|
||||
|
||||
def test_args_to_str(self):
|
||||
self.assertEqual(
|
||||
args_to_str(['foo', 'ba/r', '-baz', '2 be', '']),
|
||||
'foo ba/r -baz \'2 be\' \'\''
|
||||
)
|
||||
|
||||
def test_parse_filesize(self):
|
||||
self.assertEqual(parse_filesize(None), None)
|
||||
self.assertEqual(parse_filesize(''), None)
|
||||
self.assertEqual(parse_filesize('91 B'), 91)
|
||||
self.assertEqual(parse_filesize('foobar'), None)
|
||||
self.assertEqual(parse_filesize('2 MiB'), 2097152)
|
||||
self.assertEqual(parse_filesize('5 GB'), 5000000000)
|
||||
self.assertEqual(parse_filesize('1.2Tb'), 1200000000000)
|
||||
self.assertEqual(parse_filesize('1,24 KB'), 1240)
|
||||
|
||||
def test_version_tuple(self):
|
||||
self.assertEqual(version_tuple('1'), (1,))
|
||||
self.assertEqual(version_tuple('10.23.344'), (10, 23, 344))
|
||||
self.assertEqual(version_tuple('10.1-6'), (10, 1, 6)) # avconv style
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
78
test/test_write_annotations.py
Normal file
78
test/test_write_annotations.py
Normal file
@@ -0,0 +1,78 @@
|
||||
#!/usr/bin/env python
|
||||
# coding: utf-8
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from test.helper import get_params, try_rm
|
||||
|
||||
|
||||
import io
|
||||
|
||||
import xml.etree.ElementTree
|
||||
|
||||
import youtube_dl.YoutubeDL
|
||||
import youtube_dl.extractor
|
||||
|
||||
|
||||
class YoutubeDL(youtube_dl.YoutubeDL):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(YoutubeDL, self).__init__(*args, **kwargs)
|
||||
self.to_stderr = self.to_screen
|
||||
|
||||
params = get_params({
|
||||
'writeannotations': True,
|
||||
'skip_download': True,
|
||||
'writeinfojson': False,
|
||||
'format': 'flv',
|
||||
})
|
||||
|
||||
|
||||
TEST_ID = 'gr51aVj-mLg'
|
||||
ANNOTATIONS_FILE = TEST_ID + '.flv.annotations.xml'
|
||||
EXPECTED_ANNOTATIONS = ['Speech bubble', 'Note', 'Title', 'Spotlight', 'Label']
|
||||
|
||||
|
||||
class TestAnnotations(unittest.TestCase):
|
||||
def setUp(self):
|
||||
# Clear old files
|
||||
self.tearDown()
|
||||
|
||||
def test_info_json(self):
|
||||
expected = list(EXPECTED_ANNOTATIONS) # Two annotations could have the same text.
|
||||
ie = youtube_dl.extractor.YoutubeIE()
|
||||
ydl = YoutubeDL(params)
|
||||
ydl.add_info_extractor(ie)
|
||||
ydl.download([TEST_ID])
|
||||
self.assertTrue(os.path.exists(ANNOTATIONS_FILE))
|
||||
annoxml = None
|
||||
with io.open(ANNOTATIONS_FILE, 'r', encoding='utf-8') as annof:
|
||||
annoxml = xml.etree.ElementTree.parse(annof)
|
||||
self.assertTrue(annoxml is not None, 'Failed to parse annotations XML')
|
||||
root = annoxml.getroot()
|
||||
self.assertEqual(root.tag, 'document')
|
||||
annotationsTag = root.find('annotations')
|
||||
self.assertEqual(annotationsTag.tag, 'annotations')
|
||||
annotations = annotationsTag.findall('annotation')
|
||||
|
||||
# Not all the annotations have TEXT children and the annotations are returned unsorted.
|
||||
for a in annotations:
|
||||
self.assertEqual(a.tag, 'annotation')
|
||||
if a.get('type') == 'text':
|
||||
textTag = a.find('TEXT')
|
||||
text = textTag.text
|
||||
self.assertTrue(text in expected) # assertIn only added in python 2.7
|
||||
# remove the first occurance, there could be more than one annotation with the same text
|
||||
expected.remove(text)
|
||||
# We should have seen (and removed) all the expected annotation texts.
|
||||
self.assertEqual(len(expected), 0, 'Not all expected annotations were found.')
|
||||
|
||||
def tearDown(self):
|
||||
try_rm(ANNOTATIONS_FILE)
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
76
test/test_write_info_json.py
Normal file
76
test/test_write_info_json.py
Normal file
@@ -0,0 +1,76 @@
|
||||
#!/usr/bin/env python
|
||||
# coding: utf-8
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from test.helper import get_params
|
||||
|
||||
|
||||
import io
|
||||
import json
|
||||
|
||||
import youtube_dl.YoutubeDL
|
||||
import youtube_dl.extractor
|
||||
|
||||
|
||||
class YoutubeDL(youtube_dl.YoutubeDL):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(YoutubeDL, self).__init__(*args, **kwargs)
|
||||
self.to_stderr = self.to_screen
|
||||
|
||||
params = get_params({
|
||||
'writeinfojson': True,
|
||||
'skip_download': True,
|
||||
'writedescription': True,
|
||||
})
|
||||
|
||||
|
||||
TEST_ID = 'BaW_jenozKc'
|
||||
INFO_JSON_FILE = TEST_ID + '.info.json'
|
||||
DESCRIPTION_FILE = TEST_ID + '.mp4.description'
|
||||
EXPECTED_DESCRIPTION = '''test chars: "'/\ä↭𝕐
|
||||
test URL: https://github.com/rg3/youtube-dl/issues/1892
|
||||
|
||||
This is a test video for youtube-dl.
|
||||
|
||||
For more information, contact phihag@phihag.de .'''
|
||||
|
||||
|
||||
class TestInfoJSON(unittest.TestCase):
|
||||
def setUp(self):
|
||||
# Clear old files
|
||||
self.tearDown()
|
||||
|
||||
def test_info_json(self):
|
||||
ie = youtube_dl.extractor.YoutubeIE()
|
||||
ydl = YoutubeDL(params)
|
||||
ydl.add_info_extractor(ie)
|
||||
ydl.download([TEST_ID])
|
||||
self.assertTrue(os.path.exists(INFO_JSON_FILE))
|
||||
with io.open(INFO_JSON_FILE, 'r', encoding='utf-8') as jsonf:
|
||||
jd = json.load(jsonf)
|
||||
self.assertEqual(jd['upload_date'], '20121002')
|
||||
self.assertEqual(jd['description'], EXPECTED_DESCRIPTION)
|
||||
self.assertEqual(jd['id'], TEST_ID)
|
||||
self.assertEqual(jd['extractor'], 'youtube')
|
||||
self.assertEqual(jd['title'], '''youtube-dl test video "'/\ä↭𝕐''')
|
||||
self.assertEqual(jd['uploader'], 'Philipp Hagemeister')
|
||||
|
||||
self.assertTrue(os.path.exists(DESCRIPTION_FILE))
|
||||
with io.open(DESCRIPTION_FILE, 'r', encoding='utf-8') as descf:
|
||||
descr = descf.read()
|
||||
self.assertEqual(descr, EXPECTED_DESCRIPTION)
|
||||
|
||||
def tearDown(self):
|
||||
if os.path.exists(INFO_JSON_FILE):
|
||||
os.remove(INFO_JSON_FILE)
|
||||
if os.path.exists(DESCRIPTION_FILE):
|
||||
os.remove(DESCRIPTION_FILE)
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
61
test/test_youtube_lists.py
Normal file
61
test/test_youtube_lists.py
Normal file
@@ -0,0 +1,61 @@
|
||||
#!/usr/bin/env python
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from test.helper import FakeYDL
|
||||
|
||||
|
||||
from youtube_dl.extractor import (
|
||||
YoutubePlaylistIE,
|
||||
YoutubeIE,
|
||||
)
|
||||
|
||||
|
||||
class TestYoutubeLists(unittest.TestCase):
|
||||
def assertIsPlaylist(self, info):
|
||||
"""Make sure the info has '_type' set to 'playlist'"""
|
||||
self.assertEqual(info['_type'], 'playlist')
|
||||
|
||||
def test_youtube_playlist_noplaylist(self):
|
||||
dl = FakeYDL()
|
||||
dl.params['noplaylist'] = True
|
||||
ie = YoutubePlaylistIE(dl)
|
||||
result = ie.extract('https://www.youtube.com/watch?v=FXxLjLQi3Fg&list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re')
|
||||
self.assertEqual(result['_type'], 'url')
|
||||
self.assertEqual(YoutubeIE().extract_id(result['url']), 'FXxLjLQi3Fg')
|
||||
|
||||
def test_youtube_course(self):
|
||||
dl = FakeYDL()
|
||||
ie = YoutubePlaylistIE(dl)
|
||||
# TODO find a > 100 (paginating?) videos course
|
||||
result = ie.extract('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
|
||||
entries = result['entries']
|
||||
self.assertEqual(YoutubeIE().extract_id(entries[0]['url']), 'j9WZyLZCBzs')
|
||||
self.assertEqual(len(entries), 25)
|
||||
self.assertEqual(YoutubeIE().extract_id(entries[-1]['url']), 'rYefUsYuEp0')
|
||||
|
||||
def test_youtube_mix(self):
|
||||
dl = FakeYDL()
|
||||
ie = YoutubePlaylistIE(dl)
|
||||
result = ie.extract('https://www.youtube.com/watch?v=W01L70IGBgE&index=2&list=RDOQpdSVF_k_w')
|
||||
entries = result['entries']
|
||||
self.assertTrue(len(entries) >= 20)
|
||||
original_video = entries[0]
|
||||
self.assertEqual(original_video['id'], 'OQpdSVF_k_w')
|
||||
|
||||
def test_youtube_toptracks(self):
|
||||
print('Skipping: The playlist page gives error 500')
|
||||
return
|
||||
dl = FakeYDL()
|
||||
ie = YoutubePlaylistIE(dl)
|
||||
result = ie.extract('https://www.youtube.com/playlist?list=MCUS')
|
||||
entries = result['entries']
|
||||
self.assertEqual(len(entries), 100)
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
115
test/test_youtube_signature.py
Normal file
115
test/test_youtube_signature.py
Normal file
@@ -0,0 +1,115 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Allow direct execution
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
|
||||
import io
|
||||
import re
|
||||
import string
|
||||
|
||||
from youtube_dl.extractor import YoutubeIE
|
||||
from youtube_dl.compat import compat_str, compat_urlretrieve
|
||||
|
||||
_TESTS = [
|
||||
(
|
||||
'https://s.ytimg.com/yts/jsbin/html5player-vflHOr_nV.js',
|
||||
'js',
|
||||
86,
|
||||
'>=<;:/.-[+*)(\'&%$#"!ZYX0VUTSRQPONMLKJIHGFEDCBA\\yxwvutsrqponmlkjihgfedcba987654321',
|
||||
),
|
||||
(
|
||||
'https://s.ytimg.com/yts/jsbin/html5player-vfldJ8xgI.js',
|
||||
'js',
|
||||
85,
|
||||
'3456789a0cdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS[UVWXYZ!"#$%&\'()*+,-./:;<=>?@',
|
||||
),
|
||||
(
|
||||
'https://s.ytimg.com/yts/jsbin/html5player-vfle-mVwz.js',
|
||||
'js',
|
||||
90,
|
||||
']\\[@?>=<;:/.-,+*)(\'&%$#"hZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjiagfedcb39876',
|
||||
),
|
||||
(
|
||||
'https://s.ytimg.com/yts/jsbin/html5player-en_US-vfl0Cbn9e.js',
|
||||
'js',
|
||||
84,
|
||||
'O1I3456789abcde0ghijklmnopqrstuvwxyzABCDEFGHfJKLMN2PQRSTUVW@YZ!"#$%&\'()*+,-./:;<=',
|
||||
),
|
||||
(
|
||||
'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflXGBaUN.js',
|
||||
'js',
|
||||
'2ACFC7A61CA478CD21425E5A57EBD73DDC78E22A.2094302436B2D377D14A3BBA23022D023B8BC25AA',
|
||||
'A52CB8B320D22032ABB3A41D773D2B6342034902.A22E87CDD37DBE75A5E52412DC874AC16A7CFCA2',
|
||||
),
|
||||
(
|
||||
'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflBb0OQx.js',
|
||||
'js',
|
||||
84,
|
||||
'123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQ0STUVWXYZ!"#$%&\'()*+,@./:;<=>'
|
||||
),
|
||||
(
|
||||
'https://s.ytimg.com/yts/jsbin/html5player-en_US-vfl9FYC6l.js',
|
||||
'js',
|
||||
83,
|
||||
'123456789abcdefghijklmnopqr0tuvwxyzABCDETGHIJKLMNOPQRS>UVWXYZ!"#$%&\'()*+,-./:;<=F'
|
||||
),
|
||||
(
|
||||
'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflCGk6yw/html5player.js',
|
||||
'js',
|
||||
'4646B5181C6C3020DF1D9C7FCFEA.AD80ABF70C39BD369CCCAE780AFBB98FA6B6CB42766249D9488C288',
|
||||
'82C8849D94266724DC6B6AF89BBFA087EACCD963.B93C07FBA084ACAEFCF7C9D1FD0203C6C1815B6B'
|
||||
)
|
||||
]
|
||||
|
||||
|
||||
class TestSignature(unittest.TestCase):
|
||||
def setUp(self):
|
||||
TEST_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
self.TESTDATA_DIR = os.path.join(TEST_DIR, 'testdata')
|
||||
if not os.path.exists(self.TESTDATA_DIR):
|
||||
os.mkdir(self.TESTDATA_DIR)
|
||||
|
||||
|
||||
def make_tfunc(url, stype, sig_input, expected_sig):
|
||||
m = re.match(r'.*-([a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?\.[a-z]+$', url)
|
||||
assert m, '%r should follow URL format' % url
|
||||
test_id = m.group(1)
|
||||
|
||||
def test_func(self):
|
||||
basename = 'player-%s.%s' % (test_id, stype)
|
||||
fn = os.path.join(self.TESTDATA_DIR, basename)
|
||||
|
||||
if not os.path.exists(fn):
|
||||
compat_urlretrieve(url, fn)
|
||||
|
||||
ie = YoutubeIE()
|
||||
if stype == 'js':
|
||||
with io.open(fn, encoding='utf-8') as testf:
|
||||
jscode = testf.read()
|
||||
func = ie._parse_sig_js(jscode)
|
||||
else:
|
||||
assert stype == 'swf'
|
||||
with open(fn, 'rb') as testf:
|
||||
swfcode = testf.read()
|
||||
func = ie._parse_sig_swf(swfcode)
|
||||
src_sig = (
|
||||
compat_str(string.printable[:sig_input])
|
||||
if isinstance(sig_input, int) else sig_input)
|
||||
got_sig = func(src_sig)
|
||||
self.assertEqual(got_sig, expected_sig)
|
||||
|
||||
test_func.__name__ = str('test_signature_' + stype + '_' + test_id)
|
||||
setattr(TestSignature, test_func.__name__, test_func)
|
||||
|
||||
for test_spec in _TESTS:
|
||||
make_tfunc(*test_spec)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
8
tox.ini
Normal file
8
tox.ini
Normal file
@@ -0,0 +1,8 @@
|
||||
[tox]
|
||||
envlist = py26,py27,py33
|
||||
[testenv]
|
||||
deps =
|
||||
nose
|
||||
coverage
|
||||
commands = nosetests --verbose {posargs:test} # --with-coverage --cover-package=youtube_dl --cover-html
|
||||
# test.test_download:TestDownload.test_NowVideo
|
||||
2299
youtube-dl
2299
youtube-dl
File diff suppressed because it is too large
Load Diff
24
youtube-dl.plugin.zsh
Normal file
24
youtube-dl.plugin.zsh
Normal file
@@ -0,0 +1,24 @@
|
||||
# This allows the youtube-dl command to be installed in ZSH using antigen.
|
||||
# Antigen is a bundle manager. It allows you to enhance the functionality of
|
||||
# your zsh session by installing bundles and themes easily.
|
||||
|
||||
# Antigen documentation:
|
||||
# http://antigen.sharats.me/
|
||||
# https://github.com/zsh-users/antigen
|
||||
|
||||
# Install youtube-dl:
|
||||
# antigen bundle rg3/youtube-dl
|
||||
# Bundles installed by antigen are available for use immediately.
|
||||
|
||||
# Update youtube-dl (and all other antigen bundles):
|
||||
# antigen update
|
||||
|
||||
# The antigen command will download the git repository to a folder and then
|
||||
# execute an enabling script (this file). The complete process for loading the
|
||||
# code is documented here:
|
||||
# https://github.com/zsh-users/antigen#notes-on-writing-plugins
|
||||
|
||||
# This specific script just aliases youtube-dl to the python script that this
|
||||
# library provides. This requires updating the PYTHONPATH to ensure that the
|
||||
# full set of code can be located.
|
||||
alias youtube-dl="PYTHONPATH=$(dirname $0) $(dirname $0)/bin/youtube-dl"
|
||||
1448
youtube_dl/YoutubeDL.py
Executable file
1448
youtube_dl/YoutubeDL.py
Executable file
File diff suppressed because it is too large
Load Diff
361
youtube_dl/__init__.py
Normal file
361
youtube_dl/__init__.py
Normal file
@@ -0,0 +1,361 @@
|
||||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
__license__ = 'Public Domain'
|
||||
|
||||
import codecs
|
||||
import io
|
||||
import os
|
||||
import random
|
||||
import sys
|
||||
|
||||
|
||||
from .options import (
|
||||
parseOpts,
|
||||
)
|
||||
from .compat import (
|
||||
compat_expanduser,
|
||||
compat_getpass,
|
||||
compat_print,
|
||||
workaround_optparse_bug9161,
|
||||
)
|
||||
from .utils import (
|
||||
DateRange,
|
||||
DEFAULT_OUTTMPL,
|
||||
decodeOption,
|
||||
DownloadError,
|
||||
MaxDownloadsReached,
|
||||
preferredencoding,
|
||||
read_batch_urls,
|
||||
SameFileError,
|
||||
setproctitle,
|
||||
std_headers,
|
||||
write_string,
|
||||
)
|
||||
from .update import update_self
|
||||
from .downloader import (
|
||||
FileDownloader,
|
||||
)
|
||||
from .extractor import gen_extractors
|
||||
from .YoutubeDL import YoutubeDL
|
||||
from .postprocessor import (
|
||||
AtomicParsleyPP,
|
||||
FFmpegAudioFixPP,
|
||||
FFmpegMetadataPP,
|
||||
FFmpegVideoConvertor,
|
||||
FFmpegExtractAudioPP,
|
||||
FFmpegEmbedSubtitlePP,
|
||||
XAttrMetadataPP,
|
||||
ExecAfterDownloadPP,
|
||||
)
|
||||
|
||||
|
||||
def _real_main(argv=None):
|
||||
# Compatibility fixes for Windows
|
||||
if sys.platform == 'win32':
|
||||
# https://github.com/rg3/youtube-dl/issues/820
|
||||
codecs.register(lambda name: codecs.lookup('utf-8') if name == 'cp65001' else None)
|
||||
|
||||
workaround_optparse_bug9161()
|
||||
|
||||
setproctitle('youtube-dl')
|
||||
|
||||
parser, opts, args = parseOpts(argv)
|
||||
|
||||
# Set user agent
|
||||
if opts.user_agent is not None:
|
||||
std_headers['User-Agent'] = opts.user_agent
|
||||
|
||||
# Set referer
|
||||
if opts.referer is not None:
|
||||
std_headers['Referer'] = opts.referer
|
||||
|
||||
# Custom HTTP headers
|
||||
if opts.headers is not None:
|
||||
for h in opts.headers:
|
||||
if h.find(':', 1) < 0:
|
||||
parser.error('wrong header formatting, it should be key:value, not "%s"' % h)
|
||||
key, value = h.split(':', 2)
|
||||
if opts.verbose:
|
||||
write_string('[debug] Adding header from command line option %s:%s\n' % (key, value))
|
||||
std_headers[key] = value
|
||||
|
||||
# Dump user agent
|
||||
if opts.dump_user_agent:
|
||||
compat_print(std_headers['User-Agent'])
|
||||
sys.exit(0)
|
||||
|
||||
# Batch file verification
|
||||
batch_urls = []
|
||||
if opts.batchfile is not None:
|
||||
try:
|
||||
if opts.batchfile == '-':
|
||||
batchfd = sys.stdin
|
||||
else:
|
||||
batchfd = io.open(opts.batchfile, 'r', encoding='utf-8', errors='ignore')
|
||||
batch_urls = read_batch_urls(batchfd)
|
||||
if opts.verbose:
|
||||
write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n')
|
||||
except IOError:
|
||||
sys.exit('ERROR: batch file could not be read')
|
||||
all_urls = batch_urls + args
|
||||
all_urls = [url.strip() for url in all_urls]
|
||||
_enc = preferredencoding()
|
||||
all_urls = [url.decode(_enc, 'ignore') if isinstance(url, bytes) else url for url in all_urls]
|
||||
|
||||
extractors = gen_extractors()
|
||||
|
||||
if opts.list_extractors:
|
||||
for ie in sorted(extractors, key=lambda ie: ie.IE_NAME.lower()):
|
||||
compat_print(ie.IE_NAME + (' (CURRENTLY BROKEN)' if not ie._WORKING else ''))
|
||||
matchedUrls = [url for url in all_urls if ie.suitable(url)]
|
||||
for mu in matchedUrls:
|
||||
compat_print(' ' + mu)
|
||||
sys.exit(0)
|
||||
if opts.list_extractor_descriptions:
|
||||
for ie in sorted(extractors, key=lambda ie: ie.IE_NAME.lower()):
|
||||
if not ie._WORKING:
|
||||
continue
|
||||
desc = getattr(ie, 'IE_DESC', ie.IE_NAME)
|
||||
if desc is False:
|
||||
continue
|
||||
if hasattr(ie, 'SEARCH_KEY'):
|
||||
_SEARCHES = ('cute kittens', 'slithering pythons', 'falling cat', 'angry poodle', 'purple fish', 'running tortoise', 'sleeping bunny')
|
||||
_COUNTS = ('', '5', '10', 'all')
|
||||
desc += ' (Example: "%s%s:%s" )' % (ie.SEARCH_KEY, random.choice(_COUNTS), random.choice(_SEARCHES))
|
||||
compat_print(desc)
|
||||
sys.exit(0)
|
||||
|
||||
# Conflicting, missing and erroneous options
|
||||
if opts.usenetrc and (opts.username is not None or opts.password is not None):
|
||||
parser.error('using .netrc conflicts with giving username/password')
|
||||
if opts.password is not None and opts.username is None:
|
||||
parser.error('account username missing\n')
|
||||
if opts.outtmpl is not None and (opts.usetitle or opts.autonumber or opts.useid):
|
||||
parser.error('using output template conflicts with using title, video ID or auto number')
|
||||
if opts.usetitle and opts.useid:
|
||||
parser.error('using title conflicts with using video ID')
|
||||
if opts.username is not None and opts.password is None:
|
||||
opts.password = compat_getpass('Type account password and press [Return]: ')
|
||||
if opts.ratelimit is not None:
|
||||
numeric_limit = FileDownloader.parse_bytes(opts.ratelimit)
|
||||
if numeric_limit is None:
|
||||
parser.error('invalid rate limit specified')
|
||||
opts.ratelimit = numeric_limit
|
||||
if opts.min_filesize is not None:
|
||||
numeric_limit = FileDownloader.parse_bytes(opts.min_filesize)
|
||||
if numeric_limit is None:
|
||||
parser.error('invalid min_filesize specified')
|
||||
opts.min_filesize = numeric_limit
|
||||
if opts.max_filesize is not None:
|
||||
numeric_limit = FileDownloader.parse_bytes(opts.max_filesize)
|
||||
if numeric_limit is None:
|
||||
parser.error('invalid max_filesize specified')
|
||||
opts.max_filesize = numeric_limit
|
||||
if opts.retries is not None:
|
||||
try:
|
||||
opts.retries = int(opts.retries)
|
||||
except (TypeError, ValueError):
|
||||
parser.error('invalid retry count specified')
|
||||
if opts.buffersize is not None:
|
||||
numeric_buffersize = FileDownloader.parse_bytes(opts.buffersize)
|
||||
if numeric_buffersize is None:
|
||||
parser.error('invalid buffer size specified')
|
||||
opts.buffersize = numeric_buffersize
|
||||
if opts.playliststart <= 0:
|
||||
raise ValueError('Playlist start must be positive')
|
||||
if opts.playlistend not in (-1, None) and opts.playlistend < opts.playliststart:
|
||||
raise ValueError('Playlist end must be greater than playlist start')
|
||||
if opts.extractaudio:
|
||||
if opts.audioformat not in ['best', 'aac', 'mp3', 'm4a', 'opus', 'vorbis', 'wav']:
|
||||
parser.error('invalid audio format specified')
|
||||
if opts.audioquality:
|
||||
opts.audioquality = opts.audioquality.strip('k').strip('K')
|
||||
if not opts.audioquality.isdigit():
|
||||
parser.error('invalid audio quality specified')
|
||||
if opts.recodevideo is not None:
|
||||
if opts.recodevideo not in ['mp4', 'flv', 'webm', 'ogg', 'mkv']:
|
||||
parser.error('invalid video recode format specified')
|
||||
if opts.date is not None:
|
||||
date = DateRange.day(opts.date)
|
||||
else:
|
||||
date = DateRange(opts.dateafter, opts.datebefore)
|
||||
|
||||
# Do not download videos when there are audio-only formats
|
||||
if opts.extractaudio and not opts.keepvideo and opts.format is None:
|
||||
opts.format = 'bestaudio/best'
|
||||
|
||||
# --all-sub automatically sets --write-sub if --write-auto-sub is not given
|
||||
# this was the old behaviour if only --all-sub was given.
|
||||
if opts.allsubtitles and not opts.writeautomaticsub:
|
||||
opts.writesubtitles = True
|
||||
|
||||
if sys.version_info < (3,):
|
||||
# In Python 2, sys.argv is a bytestring (also note http://bugs.python.org/issue2128 for Windows systems)
|
||||
if opts.outtmpl is not None:
|
||||
opts.outtmpl = opts.outtmpl.decode(preferredencoding())
|
||||
outtmpl = ((opts.outtmpl is not None and opts.outtmpl)
|
||||
or (opts.format == '-1' and opts.usetitle and '%(title)s-%(id)s-%(format)s.%(ext)s')
|
||||
or (opts.format == '-1' and '%(id)s-%(format)s.%(ext)s')
|
||||
or (opts.usetitle and opts.autonumber and '%(autonumber)s-%(title)s-%(id)s.%(ext)s')
|
||||
or (opts.usetitle and '%(title)s-%(id)s.%(ext)s')
|
||||
or (opts.useid and '%(id)s.%(ext)s')
|
||||
or (opts.autonumber and '%(autonumber)s-%(id)s.%(ext)s')
|
||||
or DEFAULT_OUTTMPL)
|
||||
if not os.path.splitext(outtmpl)[1] and opts.extractaudio:
|
||||
parser.error('Cannot download a video and extract audio into the same'
|
||||
' file! Use "{0}.%(ext)s" instead of "{0}" as the output'
|
||||
' template'.format(outtmpl))
|
||||
|
||||
any_printing = opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat or opts.getduration or opts.dumpjson or opts.dump_single_json
|
||||
download_archive_fn = compat_expanduser(opts.download_archive) if opts.download_archive is not None else opts.download_archive
|
||||
|
||||
ydl_opts = {
|
||||
'usenetrc': opts.usenetrc,
|
||||
'username': opts.username,
|
||||
'password': opts.password,
|
||||
'twofactor': opts.twofactor,
|
||||
'videopassword': opts.videopassword,
|
||||
'quiet': (opts.quiet or any_printing),
|
||||
'no_warnings': opts.no_warnings,
|
||||
'forceurl': opts.geturl,
|
||||
'forcetitle': opts.gettitle,
|
||||
'forceid': opts.getid,
|
||||
'forcethumbnail': opts.getthumbnail,
|
||||
'forcedescription': opts.getdescription,
|
||||
'forceduration': opts.getduration,
|
||||
'forcefilename': opts.getfilename,
|
||||
'forceformat': opts.getformat,
|
||||
'forcejson': opts.dumpjson,
|
||||
'dump_single_json': opts.dump_single_json,
|
||||
'simulate': opts.simulate or any_printing,
|
||||
'skip_download': opts.skip_download,
|
||||
'format': opts.format,
|
||||
'format_limit': opts.format_limit,
|
||||
'listformats': opts.listformats,
|
||||
'outtmpl': outtmpl,
|
||||
'autonumber_size': opts.autonumber_size,
|
||||
'restrictfilenames': opts.restrictfilenames,
|
||||
'ignoreerrors': opts.ignoreerrors,
|
||||
'ratelimit': opts.ratelimit,
|
||||
'nooverwrites': opts.nooverwrites,
|
||||
'retries': opts.retries,
|
||||
'buffersize': opts.buffersize,
|
||||
'noresizebuffer': opts.noresizebuffer,
|
||||
'continuedl': opts.continue_dl,
|
||||
'noprogress': opts.noprogress,
|
||||
'progress_with_newline': opts.progress_with_newline,
|
||||
'playliststart': opts.playliststart,
|
||||
'playlistend': opts.playlistend,
|
||||
'noplaylist': opts.noplaylist,
|
||||
'logtostderr': opts.outtmpl == '-',
|
||||
'consoletitle': opts.consoletitle,
|
||||
'nopart': opts.nopart,
|
||||
'updatetime': opts.updatetime,
|
||||
'writedescription': opts.writedescription,
|
||||
'writeannotations': opts.writeannotations,
|
||||
'writeinfojson': opts.writeinfojson,
|
||||
'writethumbnail': opts.writethumbnail,
|
||||
'writesubtitles': opts.writesubtitles,
|
||||
'writeautomaticsub': opts.writeautomaticsub,
|
||||
'allsubtitles': opts.allsubtitles,
|
||||
'listsubtitles': opts.listsubtitles,
|
||||
'subtitlesformat': opts.subtitlesformat,
|
||||
'subtitleslangs': opts.subtitleslangs,
|
||||
'matchtitle': decodeOption(opts.matchtitle),
|
||||
'rejecttitle': decodeOption(opts.rejecttitle),
|
||||
'max_downloads': opts.max_downloads,
|
||||
'prefer_free_formats': opts.prefer_free_formats,
|
||||
'verbose': opts.verbose,
|
||||
'dump_intermediate_pages': opts.dump_intermediate_pages,
|
||||
'write_pages': opts.write_pages,
|
||||
'test': opts.test,
|
||||
'keepvideo': opts.keepvideo,
|
||||
'min_filesize': opts.min_filesize,
|
||||
'max_filesize': opts.max_filesize,
|
||||
'min_views': opts.min_views,
|
||||
'max_views': opts.max_views,
|
||||
'daterange': date,
|
||||
'cachedir': opts.cachedir,
|
||||
'youtube_print_sig_code': opts.youtube_print_sig_code,
|
||||
'age_limit': opts.age_limit,
|
||||
'download_archive': download_archive_fn,
|
||||
'cookiefile': opts.cookiefile,
|
||||
'nocheckcertificate': opts.no_check_certificate,
|
||||
'prefer_insecure': opts.prefer_insecure,
|
||||
'proxy': opts.proxy,
|
||||
'socket_timeout': opts.socket_timeout,
|
||||
'bidi_workaround': opts.bidi_workaround,
|
||||
'debug_printtraffic': opts.debug_printtraffic,
|
||||
'prefer_ffmpeg': opts.prefer_ffmpeg,
|
||||
'include_ads': opts.include_ads,
|
||||
'default_search': opts.default_search,
|
||||
'youtube_include_dash_manifest': opts.youtube_include_dash_manifest,
|
||||
'encoding': opts.encoding,
|
||||
'exec_cmd': opts.exec_cmd,
|
||||
'extract_flat': opts.extract_flat,
|
||||
}
|
||||
|
||||
with YoutubeDL(ydl_opts) as ydl:
|
||||
# PostProcessors
|
||||
# Add the metadata pp first, the other pps will copy it
|
||||
if opts.addmetadata:
|
||||
ydl.add_post_processor(FFmpegMetadataPP())
|
||||
if opts.extractaudio:
|
||||
ydl.add_post_processor(FFmpegExtractAudioPP(preferredcodec=opts.audioformat, preferredquality=opts.audioquality, nopostoverwrites=opts.nopostoverwrites))
|
||||
if opts.recodevideo:
|
||||
ydl.add_post_processor(FFmpegVideoConvertor(preferedformat=opts.recodevideo))
|
||||
if opts.embedsubtitles:
|
||||
ydl.add_post_processor(FFmpegEmbedSubtitlePP(subtitlesformat=opts.subtitlesformat))
|
||||
if opts.xattrs:
|
||||
ydl.add_post_processor(XAttrMetadataPP())
|
||||
if opts.embedthumbnail:
|
||||
if not opts.addmetadata:
|
||||
ydl.add_post_processor(FFmpegAudioFixPP())
|
||||
ydl.add_post_processor(AtomicParsleyPP())
|
||||
|
||||
# Please keep ExecAfterDownload towards the bottom as it allows the user to modify the final file in any way.
|
||||
# So if the user is able to remove the file before your postprocessor runs it might cause a few problems.
|
||||
if opts.exec_cmd:
|
||||
ydl.add_post_processor(ExecAfterDownloadPP(
|
||||
verboseOutput=opts.verbose, exec_cmd=opts.exec_cmd))
|
||||
|
||||
# Update version
|
||||
if opts.update_self:
|
||||
update_self(ydl.to_screen, opts.verbose)
|
||||
|
||||
# Remove cache dir
|
||||
if opts.rm_cachedir:
|
||||
ydl.cache.remove()
|
||||
|
||||
# Maybe do nothing
|
||||
if (len(all_urls) < 1) and (opts.load_info_filename is None):
|
||||
if opts.update_self or opts.rm_cachedir:
|
||||
sys.exit()
|
||||
|
||||
ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv)
|
||||
parser.error('you must provide at least one URL')
|
||||
|
||||
try:
|
||||
if opts.load_info_filename is not None:
|
||||
retcode = ydl.download_with_info_file(opts.load_info_filename)
|
||||
else:
|
||||
retcode = ydl.download(all_urls)
|
||||
except MaxDownloadsReached:
|
||||
ydl.to_screen('--max-download limit reached, aborting.')
|
||||
retcode = 101
|
||||
|
||||
sys.exit(retcode)
|
||||
|
||||
|
||||
def main(argv=None):
|
||||
try:
|
||||
_real_main(argv)
|
||||
except DownloadError:
|
||||
sys.exit(1)
|
||||
except SameFileError:
|
||||
sys.exit('ERROR: fixed output name but more than one file to download')
|
||||
except KeyboardInterrupt:
|
||||
sys.exit('\nERROR: Interrupted by user')
|
||||
19
youtube_dl/__main__.py
Executable file
19
youtube_dl/__main__.py
Executable file
@@ -0,0 +1,19 @@
|
||||
#!/usr/bin/env python
|
||||
from __future__ import unicode_literals
|
||||
|
||||
# Execute with
|
||||
# $ python youtube_dl/__main__.py (2.6+)
|
||||
# $ python -m youtube_dl (2.7+)
|
||||
|
||||
import sys
|
||||
|
||||
if __package__ is None and not hasattr(sys, "frozen"):
|
||||
# direct call of __main__.py
|
||||
import os.path
|
||||
path = os.path.realpath(os.path.abspath(__file__))
|
||||
sys.path.append(os.path.dirname(os.path.dirname(path)))
|
||||
|
||||
import youtube_dl
|
||||
|
||||
if __name__ == '__main__':
|
||||
youtube_dl.main()
|
||||
331
youtube_dl/aes.py
Normal file
331
youtube_dl/aes.py
Normal file
@@ -0,0 +1,331 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
__all__ = ['aes_encrypt', 'key_expansion', 'aes_ctr_decrypt', 'aes_cbc_decrypt', 'aes_decrypt_text']
|
||||
|
||||
import base64
|
||||
from math import ceil
|
||||
|
||||
from .utils import bytes_to_intlist, intlist_to_bytes
|
||||
|
||||
BLOCK_SIZE_BYTES = 16
|
||||
|
||||
|
||||
def aes_ctr_decrypt(data, key, counter):
|
||||
"""
|
||||
Decrypt with aes in counter mode
|
||||
|
||||
@param {int[]} data cipher
|
||||
@param {int[]} key 16/24/32-Byte cipher key
|
||||
@param {instance} counter Instance whose next_value function (@returns {int[]} 16-Byte block)
|
||||
returns the next counter block
|
||||
@returns {int[]} decrypted data
|
||||
"""
|
||||
expanded_key = key_expansion(key)
|
||||
block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
|
||||
|
||||
decrypted_data = []
|
||||
for i in range(block_count):
|
||||
counter_block = counter.next_value()
|
||||
block = data[i * BLOCK_SIZE_BYTES: (i + 1) * BLOCK_SIZE_BYTES]
|
||||
block += [0] * (BLOCK_SIZE_BYTES - len(block))
|
||||
|
||||
cipher_counter_block = aes_encrypt(counter_block, expanded_key)
|
||||
decrypted_data += xor(block, cipher_counter_block)
|
||||
decrypted_data = decrypted_data[:len(data)]
|
||||
|
||||
return decrypted_data
|
||||
|
||||
|
||||
def aes_cbc_decrypt(data, key, iv):
|
||||
"""
|
||||
Decrypt with aes in CBC mode
|
||||
|
||||
@param {int[]} data cipher
|
||||
@param {int[]} key 16/24/32-Byte cipher key
|
||||
@param {int[]} iv 16-Byte IV
|
||||
@returns {int[]} decrypted data
|
||||
"""
|
||||
expanded_key = key_expansion(key)
|
||||
block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
|
||||
|
||||
decrypted_data = []
|
||||
previous_cipher_block = iv
|
||||
for i in range(block_count):
|
||||
block = data[i * BLOCK_SIZE_BYTES: (i + 1) * BLOCK_SIZE_BYTES]
|
||||
block += [0] * (BLOCK_SIZE_BYTES - len(block))
|
||||
|
||||
decrypted_block = aes_decrypt(block, expanded_key)
|
||||
decrypted_data += xor(decrypted_block, previous_cipher_block)
|
||||
previous_cipher_block = block
|
||||
decrypted_data = decrypted_data[:len(data)]
|
||||
|
||||
return decrypted_data
|
||||
|
||||
|
||||
def key_expansion(data):
|
||||
"""
|
||||
Generate key schedule
|
||||
|
||||
@param {int[]} data 16/24/32-Byte cipher key
|
||||
@returns {int[]} 176/208/240-Byte expanded key
|
||||
"""
|
||||
data = data[:] # copy
|
||||
rcon_iteration = 1
|
||||
key_size_bytes = len(data)
|
||||
expanded_key_size_bytes = (key_size_bytes // 4 + 7) * BLOCK_SIZE_BYTES
|
||||
|
||||
while len(data) < expanded_key_size_bytes:
|
||||
temp = data[-4:]
|
||||
temp = key_schedule_core(temp, rcon_iteration)
|
||||
rcon_iteration += 1
|
||||
data += xor(temp, data[-key_size_bytes: 4 - key_size_bytes])
|
||||
|
||||
for _ in range(3):
|
||||
temp = data[-4:]
|
||||
data += xor(temp, data[-key_size_bytes: 4 - key_size_bytes])
|
||||
|
||||
if key_size_bytes == 32:
|
||||
temp = data[-4:]
|
||||
temp = sub_bytes(temp)
|
||||
data += xor(temp, data[-key_size_bytes: 4 - key_size_bytes])
|
||||
|
||||
for _ in range(3 if key_size_bytes == 32 else 2 if key_size_bytes == 24 else 0):
|
||||
temp = data[-4:]
|
||||
data += xor(temp, data[-key_size_bytes: 4 - key_size_bytes])
|
||||
data = data[:expanded_key_size_bytes]
|
||||
|
||||
return data
|
||||
|
||||
|
||||
def aes_encrypt(data, expanded_key):
|
||||
"""
|
||||
Encrypt one block with aes
|
||||
|
||||
@param {int[]} data 16-Byte state
|
||||
@param {int[]} expanded_key 176/208/240-Byte expanded key
|
||||
@returns {int[]} 16-Byte cipher
|
||||
"""
|
||||
rounds = len(expanded_key) // BLOCK_SIZE_BYTES - 1
|
||||
|
||||
data = xor(data, expanded_key[:BLOCK_SIZE_BYTES])
|
||||
for i in range(1, rounds + 1):
|
||||
data = sub_bytes(data)
|
||||
data = shift_rows(data)
|
||||
if i != rounds:
|
||||
data = mix_columns(data)
|
||||
data = xor(data, expanded_key[i * BLOCK_SIZE_BYTES: (i + 1) * BLOCK_SIZE_BYTES])
|
||||
|
||||
return data
|
||||
|
||||
|
||||
def aes_decrypt(data, expanded_key):
|
||||
"""
|
||||
Decrypt one block with aes
|
||||
|
||||
@param {int[]} data 16-Byte cipher
|
||||
@param {int[]} expanded_key 176/208/240-Byte expanded key
|
||||
@returns {int[]} 16-Byte state
|
||||
"""
|
||||
rounds = len(expanded_key) // BLOCK_SIZE_BYTES - 1
|
||||
|
||||
for i in range(rounds, 0, -1):
|
||||
data = xor(data, expanded_key[i * BLOCK_SIZE_BYTES: (i + 1) * BLOCK_SIZE_BYTES])
|
||||
if i != rounds:
|
||||
data = mix_columns_inv(data)
|
||||
data = shift_rows_inv(data)
|
||||
data = sub_bytes_inv(data)
|
||||
data = xor(data, expanded_key[:BLOCK_SIZE_BYTES])
|
||||
|
||||
return data
|
||||
|
||||
|
||||
def aes_decrypt_text(data, password, key_size_bytes):
|
||||
"""
|
||||
Decrypt text
|
||||
- The first 8 Bytes of decoded 'data' are the 8 high Bytes of the counter
|
||||
- The cipher key is retrieved by encrypting the first 16 Byte of 'password'
|
||||
with the first 'key_size_bytes' Bytes from 'password' (if necessary filled with 0's)
|
||||
- Mode of operation is 'counter'
|
||||
|
||||
@param {str} data Base64 encoded string
|
||||
@param {str,unicode} password Password (will be encoded with utf-8)
|
||||
@param {int} key_size_bytes Possible values: 16 for 128-Bit, 24 for 192-Bit or 32 for 256-Bit
|
||||
@returns {str} Decrypted data
|
||||
"""
|
||||
NONCE_LENGTH_BYTES = 8
|
||||
|
||||
data = bytes_to_intlist(base64.b64decode(data))
|
||||
password = bytes_to_intlist(password.encode('utf-8'))
|
||||
|
||||
key = password[:key_size_bytes] + [0] * (key_size_bytes - len(password))
|
||||
key = aes_encrypt(key[:BLOCK_SIZE_BYTES], key_expansion(key)) * (key_size_bytes // BLOCK_SIZE_BYTES)
|
||||
|
||||
nonce = data[:NONCE_LENGTH_BYTES]
|
||||
cipher = data[NONCE_LENGTH_BYTES:]
|
||||
|
||||
class Counter:
|
||||
__value = nonce + [0] * (BLOCK_SIZE_BYTES - NONCE_LENGTH_BYTES)
|
||||
|
||||
def next_value(self):
|
||||
temp = self.__value
|
||||
self.__value = inc(self.__value)
|
||||
return temp
|
||||
|
||||
decrypted_data = aes_ctr_decrypt(cipher, key, Counter())
|
||||
plaintext = intlist_to_bytes(decrypted_data)
|
||||
|
||||
return plaintext
|
||||
|
||||
RCON = (0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36)
|
||||
SBOX = (0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
|
||||
0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
|
||||
0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
|
||||
0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
|
||||
0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
|
||||
0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
|
||||
0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
|
||||
0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
|
||||
0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
|
||||
0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
|
||||
0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
|
||||
0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
|
||||
0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
|
||||
0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
|
||||
0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
|
||||
0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16)
|
||||
SBOX_INV = (0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb,
|
||||
0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb,
|
||||
0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
|
||||
0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25,
|
||||
0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92,
|
||||
0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
|
||||
0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06,
|
||||
0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b,
|
||||
0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
|
||||
0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e,
|
||||
0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b,
|
||||
0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
|
||||
0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f,
|
||||
0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef,
|
||||
0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
|
||||
0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d)
|
||||
MIX_COLUMN_MATRIX = ((0x2, 0x3, 0x1, 0x1),
|
||||
(0x1, 0x2, 0x3, 0x1),
|
||||
(0x1, 0x1, 0x2, 0x3),
|
||||
(0x3, 0x1, 0x1, 0x2))
|
||||
MIX_COLUMN_MATRIX_INV = ((0xE, 0xB, 0xD, 0x9),
|
||||
(0x9, 0xE, 0xB, 0xD),
|
||||
(0xD, 0x9, 0xE, 0xB),
|
||||
(0xB, 0xD, 0x9, 0xE))
|
||||
RIJNDAEL_EXP_TABLE = (0x01, 0x03, 0x05, 0x0F, 0x11, 0x33, 0x55, 0xFF, 0x1A, 0x2E, 0x72, 0x96, 0xA1, 0xF8, 0x13, 0x35,
|
||||
0x5F, 0xE1, 0x38, 0x48, 0xD8, 0x73, 0x95, 0xA4, 0xF7, 0x02, 0x06, 0x0A, 0x1E, 0x22, 0x66, 0xAA,
|
||||
0xE5, 0x34, 0x5C, 0xE4, 0x37, 0x59, 0xEB, 0x26, 0x6A, 0xBE, 0xD9, 0x70, 0x90, 0xAB, 0xE6, 0x31,
|
||||
0x53, 0xF5, 0x04, 0x0C, 0x14, 0x3C, 0x44, 0xCC, 0x4F, 0xD1, 0x68, 0xB8, 0xD3, 0x6E, 0xB2, 0xCD,
|
||||
0x4C, 0xD4, 0x67, 0xA9, 0xE0, 0x3B, 0x4D, 0xD7, 0x62, 0xA6, 0xF1, 0x08, 0x18, 0x28, 0x78, 0x88,
|
||||
0x83, 0x9E, 0xB9, 0xD0, 0x6B, 0xBD, 0xDC, 0x7F, 0x81, 0x98, 0xB3, 0xCE, 0x49, 0xDB, 0x76, 0x9A,
|
||||
0xB5, 0xC4, 0x57, 0xF9, 0x10, 0x30, 0x50, 0xF0, 0x0B, 0x1D, 0x27, 0x69, 0xBB, 0xD6, 0x61, 0xA3,
|
||||
0xFE, 0x19, 0x2B, 0x7D, 0x87, 0x92, 0xAD, 0xEC, 0x2F, 0x71, 0x93, 0xAE, 0xE9, 0x20, 0x60, 0xA0,
|
||||
0xFB, 0x16, 0x3A, 0x4E, 0xD2, 0x6D, 0xB7, 0xC2, 0x5D, 0xE7, 0x32, 0x56, 0xFA, 0x15, 0x3F, 0x41,
|
||||
0xC3, 0x5E, 0xE2, 0x3D, 0x47, 0xC9, 0x40, 0xC0, 0x5B, 0xED, 0x2C, 0x74, 0x9C, 0xBF, 0xDA, 0x75,
|
||||
0x9F, 0xBA, 0xD5, 0x64, 0xAC, 0xEF, 0x2A, 0x7E, 0x82, 0x9D, 0xBC, 0xDF, 0x7A, 0x8E, 0x89, 0x80,
|
||||
0x9B, 0xB6, 0xC1, 0x58, 0xE8, 0x23, 0x65, 0xAF, 0xEA, 0x25, 0x6F, 0xB1, 0xC8, 0x43, 0xC5, 0x54,
|
||||
0xFC, 0x1F, 0x21, 0x63, 0xA5, 0xF4, 0x07, 0x09, 0x1B, 0x2D, 0x77, 0x99, 0xB0, 0xCB, 0x46, 0xCA,
|
||||
0x45, 0xCF, 0x4A, 0xDE, 0x79, 0x8B, 0x86, 0x91, 0xA8, 0xE3, 0x3E, 0x42, 0xC6, 0x51, 0xF3, 0x0E,
|
||||
0x12, 0x36, 0x5A, 0xEE, 0x29, 0x7B, 0x8D, 0x8C, 0x8F, 0x8A, 0x85, 0x94, 0xA7, 0xF2, 0x0D, 0x17,
|
||||
0x39, 0x4B, 0xDD, 0x7C, 0x84, 0x97, 0xA2, 0xFD, 0x1C, 0x24, 0x6C, 0xB4, 0xC7, 0x52, 0xF6, 0x01)
|
||||
RIJNDAEL_LOG_TABLE = (0x00, 0x00, 0x19, 0x01, 0x32, 0x02, 0x1a, 0xc6, 0x4b, 0xc7, 0x1b, 0x68, 0x33, 0xee, 0xdf, 0x03,
|
||||
0x64, 0x04, 0xe0, 0x0e, 0x34, 0x8d, 0x81, 0xef, 0x4c, 0x71, 0x08, 0xc8, 0xf8, 0x69, 0x1c, 0xc1,
|
||||
0x7d, 0xc2, 0x1d, 0xb5, 0xf9, 0xb9, 0x27, 0x6a, 0x4d, 0xe4, 0xa6, 0x72, 0x9a, 0xc9, 0x09, 0x78,
|
||||
0x65, 0x2f, 0x8a, 0x05, 0x21, 0x0f, 0xe1, 0x24, 0x12, 0xf0, 0x82, 0x45, 0x35, 0x93, 0xda, 0x8e,
|
||||
0x96, 0x8f, 0xdb, 0xbd, 0x36, 0xd0, 0xce, 0x94, 0x13, 0x5c, 0xd2, 0xf1, 0x40, 0x46, 0x83, 0x38,
|
||||
0x66, 0xdd, 0xfd, 0x30, 0xbf, 0x06, 0x8b, 0x62, 0xb3, 0x25, 0xe2, 0x98, 0x22, 0x88, 0x91, 0x10,
|
||||
0x7e, 0x6e, 0x48, 0xc3, 0xa3, 0xb6, 0x1e, 0x42, 0x3a, 0x6b, 0x28, 0x54, 0xfa, 0x85, 0x3d, 0xba,
|
||||
0x2b, 0x79, 0x0a, 0x15, 0x9b, 0x9f, 0x5e, 0xca, 0x4e, 0xd4, 0xac, 0xe5, 0xf3, 0x73, 0xa7, 0x57,
|
||||
0xaf, 0x58, 0xa8, 0x50, 0xf4, 0xea, 0xd6, 0x74, 0x4f, 0xae, 0xe9, 0xd5, 0xe7, 0xe6, 0xad, 0xe8,
|
||||
0x2c, 0xd7, 0x75, 0x7a, 0xeb, 0x16, 0x0b, 0xf5, 0x59, 0xcb, 0x5f, 0xb0, 0x9c, 0xa9, 0x51, 0xa0,
|
||||
0x7f, 0x0c, 0xf6, 0x6f, 0x17, 0xc4, 0x49, 0xec, 0xd8, 0x43, 0x1f, 0x2d, 0xa4, 0x76, 0x7b, 0xb7,
|
||||
0xcc, 0xbb, 0x3e, 0x5a, 0xfb, 0x60, 0xb1, 0x86, 0x3b, 0x52, 0xa1, 0x6c, 0xaa, 0x55, 0x29, 0x9d,
|
||||
0x97, 0xb2, 0x87, 0x90, 0x61, 0xbe, 0xdc, 0xfc, 0xbc, 0x95, 0xcf, 0xcd, 0x37, 0x3f, 0x5b, 0xd1,
|
||||
0x53, 0x39, 0x84, 0x3c, 0x41, 0xa2, 0x6d, 0x47, 0x14, 0x2a, 0x9e, 0x5d, 0x56, 0xf2, 0xd3, 0xab,
|
||||
0x44, 0x11, 0x92, 0xd9, 0x23, 0x20, 0x2e, 0x89, 0xb4, 0x7c, 0xb8, 0x26, 0x77, 0x99, 0xe3, 0xa5,
|
||||
0x67, 0x4a, 0xed, 0xde, 0xc5, 0x31, 0xfe, 0x18, 0x0d, 0x63, 0x8c, 0x80, 0xc0, 0xf7, 0x70, 0x07)
|
||||
|
||||
|
||||
def sub_bytes(data):
|
||||
return [SBOX[x] for x in data]
|
||||
|
||||
|
||||
def sub_bytes_inv(data):
|
||||
return [SBOX_INV[x] for x in data]
|
||||
|
||||
|
||||
def rotate(data):
|
||||
return data[1:] + [data[0]]
|
||||
|
||||
|
||||
def key_schedule_core(data, rcon_iteration):
|
||||
data = rotate(data)
|
||||
data = sub_bytes(data)
|
||||
data[0] = data[0] ^ RCON[rcon_iteration]
|
||||
|
||||
return data
|
||||
|
||||
|
||||
def xor(data1, data2):
|
||||
return [x ^ y for x, y in zip(data1, data2)]
|
||||
|
||||
|
||||
def rijndael_mul(a, b):
|
||||
if(a == 0 or b == 0):
|
||||
return 0
|
||||
return RIJNDAEL_EXP_TABLE[(RIJNDAEL_LOG_TABLE[a] + RIJNDAEL_LOG_TABLE[b]) % 0xFF]
|
||||
|
||||
|
||||
def mix_column(data, matrix):
|
||||
data_mixed = []
|
||||
for row in range(4):
|
||||
mixed = 0
|
||||
for column in range(4):
|
||||
# xor is (+) and (-)
|
||||
mixed ^= rijndael_mul(data[column], matrix[row][column])
|
||||
data_mixed.append(mixed)
|
||||
return data_mixed
|
||||
|
||||
|
||||
def mix_columns(data, matrix=MIX_COLUMN_MATRIX):
|
||||
data_mixed = []
|
||||
for i in range(4):
|
||||
column = data[i * 4: (i + 1) * 4]
|
||||
data_mixed += mix_column(column, matrix)
|
||||
return data_mixed
|
||||
|
||||
|
||||
def mix_columns_inv(data):
|
||||
return mix_columns(data, MIX_COLUMN_MATRIX_INV)
|
||||
|
||||
|
||||
def shift_rows(data):
|
||||
data_shifted = []
|
||||
for column in range(4):
|
||||
for row in range(4):
|
||||
data_shifted.append(data[((column + row) & 0b11) * 4 + row])
|
||||
return data_shifted
|
||||
|
||||
|
||||
def shift_rows_inv(data):
|
||||
data_shifted = []
|
||||
for column in range(4):
|
||||
for row in range(4):
|
||||
data_shifted.append(data[((column - row) & 0b11) * 4 + row])
|
||||
return data_shifted
|
||||
|
||||
|
||||
def inc(data):
|
||||
data = data[:] # copy
|
||||
for i in range(len(data) - 1, -1, -1):
|
||||
if data[i] == 255:
|
||||
data[i] = 0
|
||||
else:
|
||||
data[i] = data[i] + 1
|
||||
break
|
||||
return data
|
||||
93
youtube_dl/cache.py
Normal file
93
youtube_dl/cache.py
Normal file
@@ -0,0 +1,93 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import errno
|
||||
import io
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
import traceback
|
||||
|
||||
from .compat import compat_expanduser, compat_getenv
|
||||
from .utils import write_json_file
|
||||
|
||||
|
||||
class Cache(object):
|
||||
def __init__(self, ydl):
|
||||
self._ydl = ydl
|
||||
|
||||
def _get_root_dir(self):
|
||||
res = self._ydl.params.get('cachedir')
|
||||
if res is None:
|
||||
cache_root = compat_getenv('XDG_CACHE_HOME', '~/.cache')
|
||||
res = os.path.join(cache_root, 'youtube-dl')
|
||||
return compat_expanduser(res)
|
||||
|
||||
def _get_cache_fn(self, section, key, dtype):
|
||||
assert re.match(r'^[a-zA-Z0-9_.-]+$', section), \
|
||||
'invalid section %r' % section
|
||||
assert re.match(r'^[a-zA-Z0-9_.-]+$', key), 'invalid key %r' % key
|
||||
return os.path.join(
|
||||
self._get_root_dir(), section, '%s.%s' % (key, dtype))
|
||||
|
||||
@property
|
||||
def enabled(self):
|
||||
return self._ydl.params.get('cachedir') is not False
|
||||
|
||||
def store(self, section, key, data, dtype='json'):
|
||||
assert dtype in ('json',)
|
||||
|
||||
if not self.enabled:
|
||||
return
|
||||
|
||||
fn = self._get_cache_fn(section, key, dtype)
|
||||
try:
|
||||
try:
|
||||
os.makedirs(os.path.dirname(fn))
|
||||
except OSError as ose:
|
||||
if ose.errno != errno.EEXIST:
|
||||
raise
|
||||
write_json_file(data, fn)
|
||||
except Exception:
|
||||
tb = traceback.format_exc()
|
||||
self._ydl.report_warning(
|
||||
'Writing cache to %r failed: %s' % (fn, tb))
|
||||
|
||||
def load(self, section, key, dtype='json', default=None):
|
||||
assert dtype in ('json',)
|
||||
|
||||
if not self.enabled:
|
||||
return default
|
||||
|
||||
cache_fn = self._get_cache_fn(section, key, dtype)
|
||||
try:
|
||||
try:
|
||||
with io.open(cache_fn, 'r', encoding='utf-8') as cachef:
|
||||
return json.load(cachef)
|
||||
except ValueError:
|
||||
try:
|
||||
file_size = os.path.getsize(cache_fn)
|
||||
except (OSError, IOError) as oe:
|
||||
file_size = str(oe)
|
||||
self._ydl.report_warning(
|
||||
'Cache retrieval from %s failed (%s)' % (cache_fn, file_size))
|
||||
except IOError:
|
||||
pass # No cache available
|
||||
|
||||
return default
|
||||
|
||||
def remove(self):
|
||||
if not self.enabled:
|
||||
self._ydl.to_screen('Cache is disabled (Did you combine --no-cache-dir and --rm-cache-dir?)')
|
||||
return
|
||||
|
||||
cachedir = self._get_root_dir()
|
||||
if not any((term in cachedir) for term in ('cache', 'tmp')):
|
||||
raise Exception('Not removing directory %s - this does not look like a cache dir' % cachedir)
|
||||
|
||||
self._ydl.to_screen(
|
||||
'Removing cache dir %s .' % cachedir, skip_eol=True)
|
||||
if os.path.exists(cachedir):
|
||||
self._ydl.to_screen('.', skip_eol=True)
|
||||
shutil.rmtree(cachedir)
|
||||
self._ydl.to_screen('.')
|
||||
356
youtube_dl/compat.py
Normal file
356
youtube_dl/compat.py
Normal file
@@ -0,0 +1,356 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import getpass
|
||||
import optparse
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
|
||||
try:
|
||||
import urllib.request as compat_urllib_request
|
||||
except ImportError: # Python 2
|
||||
import urllib2 as compat_urllib_request
|
||||
|
||||
try:
|
||||
import urllib.error as compat_urllib_error
|
||||
except ImportError: # Python 2
|
||||
import urllib2 as compat_urllib_error
|
||||
|
||||
try:
|
||||
import urllib.parse as compat_urllib_parse
|
||||
except ImportError: # Python 2
|
||||
import urllib as compat_urllib_parse
|
||||
|
||||
try:
|
||||
from urllib.parse import urlparse as compat_urllib_parse_urlparse
|
||||
except ImportError: # Python 2
|
||||
from urlparse import urlparse as compat_urllib_parse_urlparse
|
||||
|
||||
try:
|
||||
import urllib.parse as compat_urlparse
|
||||
except ImportError: # Python 2
|
||||
import urlparse as compat_urlparse
|
||||
|
||||
try:
|
||||
import http.cookiejar as compat_cookiejar
|
||||
except ImportError: # Python 2
|
||||
import cookielib as compat_cookiejar
|
||||
|
||||
try:
|
||||
import html.entities as compat_html_entities
|
||||
except ImportError: # Python 2
|
||||
import htmlentitydefs as compat_html_entities
|
||||
|
||||
try:
|
||||
import html.parser as compat_html_parser
|
||||
except ImportError: # Python 2
|
||||
import HTMLParser as compat_html_parser
|
||||
|
||||
try:
|
||||
import http.client as compat_http_client
|
||||
except ImportError: # Python 2
|
||||
import httplib as compat_http_client
|
||||
|
||||
try:
|
||||
from urllib.error import HTTPError as compat_HTTPError
|
||||
except ImportError: # Python 2
|
||||
from urllib2 import HTTPError as compat_HTTPError
|
||||
|
||||
try:
|
||||
from urllib.request import urlretrieve as compat_urlretrieve
|
||||
except ImportError: # Python 2
|
||||
from urllib import urlretrieve as compat_urlretrieve
|
||||
|
||||
|
||||
try:
|
||||
from subprocess import DEVNULL
|
||||
compat_subprocess_get_DEVNULL = lambda: DEVNULL
|
||||
except ImportError:
|
||||
compat_subprocess_get_DEVNULL = lambda: open(os.path.devnull, 'w')
|
||||
|
||||
try:
|
||||
from urllib.parse import unquote as compat_urllib_parse_unquote
|
||||
except ImportError:
|
||||
def compat_urllib_parse_unquote(string, encoding='utf-8', errors='replace'):
|
||||
if string == '':
|
||||
return string
|
||||
res = string.split('%')
|
||||
if len(res) == 1:
|
||||
return string
|
||||
if encoding is None:
|
||||
encoding = 'utf-8'
|
||||
if errors is None:
|
||||
errors = 'replace'
|
||||
# pct_sequence: contiguous sequence of percent-encoded bytes, decoded
|
||||
pct_sequence = b''
|
||||
string = res[0]
|
||||
for item in res[1:]:
|
||||
try:
|
||||
if not item:
|
||||
raise ValueError
|
||||
pct_sequence += item[:2].decode('hex')
|
||||
rest = item[2:]
|
||||
if not rest:
|
||||
# This segment was just a single percent-encoded character.
|
||||
# May be part of a sequence of code units, so delay decoding.
|
||||
# (Stored in pct_sequence).
|
||||
continue
|
||||
except ValueError:
|
||||
rest = '%' + item
|
||||
# Encountered non-percent-encoded characters. Flush the current
|
||||
# pct_sequence.
|
||||
string += pct_sequence.decode(encoding, errors) + rest
|
||||
pct_sequence = b''
|
||||
if pct_sequence:
|
||||
# Flush the final pct_sequence
|
||||
string += pct_sequence.decode(encoding, errors)
|
||||
return string
|
||||
|
||||
|
||||
try:
|
||||
from urllib.parse import parse_qs as compat_parse_qs
|
||||
except ImportError: # Python 2
|
||||
# HACK: The following is the correct parse_qs implementation from cpython 3's stdlib.
|
||||
# Python 2's version is apparently totally broken
|
||||
|
||||
def _parse_qsl(qs, keep_blank_values=False, strict_parsing=False,
|
||||
encoding='utf-8', errors='replace'):
|
||||
qs, _coerce_result = qs, unicode
|
||||
pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
|
||||
r = []
|
||||
for name_value in pairs:
|
||||
if not name_value and not strict_parsing:
|
||||
continue
|
||||
nv = name_value.split('=', 1)
|
||||
if len(nv) != 2:
|
||||
if strict_parsing:
|
||||
raise ValueError("bad query field: %r" % (name_value,))
|
||||
# Handle case of a control-name with no equal sign
|
||||
if keep_blank_values:
|
||||
nv.append('')
|
||||
else:
|
||||
continue
|
||||
if len(nv[1]) or keep_blank_values:
|
||||
name = nv[0].replace('+', ' ')
|
||||
name = compat_urllib_parse_unquote(
|
||||
name, encoding=encoding, errors=errors)
|
||||
name = _coerce_result(name)
|
||||
value = nv[1].replace('+', ' ')
|
||||
value = compat_urllib_parse_unquote(
|
||||
value, encoding=encoding, errors=errors)
|
||||
value = _coerce_result(value)
|
||||
r.append((name, value))
|
||||
return r
|
||||
|
||||
def compat_parse_qs(qs, keep_blank_values=False, strict_parsing=False,
|
||||
encoding='utf-8', errors='replace'):
|
||||
parsed_result = {}
|
||||
pairs = _parse_qsl(qs, keep_blank_values, strict_parsing,
|
||||
encoding=encoding, errors=errors)
|
||||
for name, value in pairs:
|
||||
if name in parsed_result:
|
||||
parsed_result[name].append(value)
|
||||
else:
|
||||
parsed_result[name] = [value]
|
||||
return parsed_result
|
||||
|
||||
try:
|
||||
compat_str = unicode # Python 2
|
||||
except NameError:
|
||||
compat_str = str
|
||||
|
||||
try:
|
||||
compat_chr = unichr # Python 2
|
||||
except NameError:
|
||||
compat_chr = chr
|
||||
|
||||
try:
|
||||
from xml.etree.ElementTree import ParseError as compat_xml_parse_error
|
||||
except ImportError: # Python 2.6
|
||||
from xml.parsers.expat import ExpatError as compat_xml_parse_error
|
||||
|
||||
try:
|
||||
from shlex import quote as shlex_quote
|
||||
except ImportError: # Python < 3.3
|
||||
def shlex_quote(s):
|
||||
if re.match(r'^[-_\w./]+$', s):
|
||||
return s
|
||||
else:
|
||||
return "'" + s.replace("'", "'\"'\"'") + "'"
|
||||
|
||||
|
||||
def compat_ord(c):
|
||||
if type(c) is int:
|
||||
return c
|
||||
else:
|
||||
return ord(c)
|
||||
|
||||
|
||||
if sys.version_info >= (3, 0):
|
||||
compat_getenv = os.getenv
|
||||
compat_expanduser = os.path.expanduser
|
||||
else:
|
||||
# Environment variables should be decoded with filesystem encoding.
|
||||
# Otherwise it will fail if any non-ASCII characters present (see #3854 #3217 #2918)
|
||||
|
||||
def compat_getenv(key, default=None):
|
||||
from .utils import get_filesystem_encoding
|
||||
env = os.getenv(key, default)
|
||||
if env:
|
||||
env = env.decode(get_filesystem_encoding())
|
||||
return env
|
||||
|
||||
# HACK: The default implementations of os.path.expanduser from cpython do not decode
|
||||
# environment variables with filesystem encoding. We will work around this by
|
||||
# providing adjusted implementations.
|
||||
# The following are os.path.expanduser implementations from cpython 2.7.8 stdlib
|
||||
# for different platforms with correct environment variables decoding.
|
||||
|
||||
if os.name == 'posix':
|
||||
def compat_expanduser(path):
|
||||
"""Expand ~ and ~user constructions. If user or $HOME is unknown,
|
||||
do nothing."""
|
||||
if not path.startswith('~'):
|
||||
return path
|
||||
i = path.find('/', 1)
|
||||
if i < 0:
|
||||
i = len(path)
|
||||
if i == 1:
|
||||
if 'HOME' not in os.environ:
|
||||
import pwd
|
||||
userhome = pwd.getpwuid(os.getuid()).pw_dir
|
||||
else:
|
||||
userhome = compat_getenv('HOME')
|
||||
else:
|
||||
import pwd
|
||||
try:
|
||||
pwent = pwd.getpwnam(path[1:i])
|
||||
except KeyError:
|
||||
return path
|
||||
userhome = pwent.pw_dir
|
||||
userhome = userhome.rstrip('/')
|
||||
return (userhome + path[i:]) or '/'
|
||||
elif os.name == 'nt' or os.name == 'ce':
|
||||
def compat_expanduser(path):
|
||||
"""Expand ~ and ~user constructs.
|
||||
|
||||
If user or $HOME is unknown, do nothing."""
|
||||
if path[:1] != '~':
|
||||
return path
|
||||
i, n = 1, len(path)
|
||||
while i < n and path[i] not in '/\\':
|
||||
i = i + 1
|
||||
|
||||
if 'HOME' in os.environ:
|
||||
userhome = compat_getenv('HOME')
|
||||
elif 'USERPROFILE' in os.environ:
|
||||
userhome = compat_getenv('USERPROFILE')
|
||||
elif 'HOMEPATH' not in os.environ:
|
||||
return path
|
||||
else:
|
||||
try:
|
||||
drive = compat_getenv('HOMEDRIVE')
|
||||
except KeyError:
|
||||
drive = ''
|
||||
userhome = os.path.join(drive, compat_getenv('HOMEPATH'))
|
||||
|
||||
if i != 1: # ~user
|
||||
userhome = os.path.join(os.path.dirname(userhome), path[1:i])
|
||||
|
||||
return userhome + path[i:]
|
||||
else:
|
||||
compat_expanduser = os.path.expanduser
|
||||
|
||||
|
||||
if sys.version_info < (3, 0):
|
||||
def compat_print(s):
|
||||
from .utils import preferredencoding
|
||||
print(s.encode(preferredencoding(), 'xmlcharrefreplace'))
|
||||
else:
|
||||
def compat_print(s):
|
||||
assert isinstance(s, compat_str)
|
||||
print(s)
|
||||
|
||||
|
||||
try:
|
||||
subprocess_check_output = subprocess.check_output
|
||||
except AttributeError:
|
||||
def subprocess_check_output(*args, **kwargs):
|
||||
assert 'input' not in kwargs
|
||||
p = subprocess.Popen(*args, stdout=subprocess.PIPE, **kwargs)
|
||||
output, _ = p.communicate()
|
||||
ret = p.poll()
|
||||
if ret:
|
||||
raise subprocess.CalledProcessError(ret, p.args, output=output)
|
||||
return output
|
||||
|
||||
if sys.version_info < (3, 0) and sys.platform == 'win32':
|
||||
def compat_getpass(prompt, *args, **kwargs):
|
||||
if isinstance(prompt, compat_str):
|
||||
from .utils import preferredencoding
|
||||
prompt = prompt.encode(preferredencoding())
|
||||
return getpass.getpass(prompt, *args, **kwargs)
|
||||
else:
|
||||
compat_getpass = getpass.getpass
|
||||
|
||||
# Old 2.6 and 2.7 releases require kwargs to be bytes
|
||||
try:
|
||||
(lambda x: x)(**{'x': 0})
|
||||
except TypeError:
|
||||
def compat_kwargs(kwargs):
|
||||
return dict((bytes(k), v) for k, v in kwargs.items())
|
||||
else:
|
||||
compat_kwargs = lambda kwargs: kwargs
|
||||
|
||||
|
||||
# Fix https://github.com/rg3/youtube-dl/issues/4223
|
||||
# See http://bugs.python.org/issue9161 for what is broken
|
||||
def workaround_optparse_bug9161():
|
||||
op = optparse.OptionParser()
|
||||
og = optparse.OptionGroup(op, 'foo')
|
||||
try:
|
||||
og.add_option('-t')
|
||||
except TypeError:
|
||||
real_add_option = optparse.OptionGroup.add_option
|
||||
|
||||
def _compat_add_option(self, *args, **kwargs):
|
||||
enc = lambda v: (
|
||||
v.encode('ascii', 'replace') if isinstance(v, compat_str)
|
||||
else v)
|
||||
bargs = [enc(a) for a in args]
|
||||
bkwargs = dict(
|
||||
(k, enc(v)) for k, v in kwargs.items())
|
||||
return real_add_option(self, *bargs, **bkwargs)
|
||||
optparse.OptionGroup.add_option = _compat_add_option
|
||||
|
||||
|
||||
__all__ = [
|
||||
'compat_HTTPError',
|
||||
'compat_chr',
|
||||
'compat_cookiejar',
|
||||
'compat_expanduser',
|
||||
'compat_getenv',
|
||||
'compat_getpass',
|
||||
'compat_html_entities',
|
||||
'compat_html_parser',
|
||||
'compat_http_client',
|
||||
'compat_kwargs',
|
||||
'compat_ord',
|
||||
'compat_parse_qs',
|
||||
'compat_print',
|
||||
'compat_str',
|
||||
'compat_subprocess_get_DEVNULL',
|
||||
'compat_urllib_error',
|
||||
'compat_urllib_parse',
|
||||
'compat_urllib_parse_unquote',
|
||||
'compat_urllib_parse_urlparse',
|
||||
'compat_urllib_request',
|
||||
'compat_urlparse',
|
||||
'compat_urlretrieve',
|
||||
'compat_xml_parse_error',
|
||||
'shlex_quote',
|
||||
'subprocess_check_output',
|
||||
'workaround_optparse_bug9161',
|
||||
]
|
||||
37
youtube_dl/downloader/__init__.py
Normal file
37
youtube_dl/downloader/__init__.py
Normal file
@@ -0,0 +1,37 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from .common import FileDownloader
|
||||
from .hls import HlsFD
|
||||
from .hls import NativeHlsFD
|
||||
from .http import HttpFD
|
||||
from .mplayer import MplayerFD
|
||||
from .rtmp import RtmpFD
|
||||
from .f4m import F4mFD
|
||||
|
||||
from ..utils import (
|
||||
determine_ext,
|
||||
)
|
||||
|
||||
|
||||
def get_suitable_downloader(info_dict):
|
||||
"""Get the downloader class that can handle the info dict."""
|
||||
url = info_dict['url']
|
||||
protocol = info_dict.get('protocol')
|
||||
|
||||
if url.startswith('rtmp'):
|
||||
return RtmpFD
|
||||
if protocol == 'm3u8_native':
|
||||
return NativeHlsFD
|
||||
if (protocol == 'm3u8') or (protocol is None and determine_ext(url) == 'm3u8'):
|
||||
return HlsFD
|
||||
if url.startswith('mms') or url.startswith('rtsp'):
|
||||
return MplayerFD
|
||||
if determine_ext(url) == 'f4m':
|
||||
return F4mFD
|
||||
else:
|
||||
return HttpFD
|
||||
|
||||
__all__ = [
|
||||
'get_suitable_downloader',
|
||||
'FileDownloader',
|
||||
]
|
||||
320
youtube_dl/downloader/common.py
Normal file
320
youtube_dl/downloader/common.py
Normal file
@@ -0,0 +1,320 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import time
|
||||
|
||||
from ..utils import (
|
||||
compat_str,
|
||||
encodeFilename,
|
||||
format_bytes,
|
||||
timeconvert,
|
||||
)
|
||||
|
||||
|
||||
class FileDownloader(object):
|
||||
"""File Downloader class.
|
||||
|
||||
File downloader objects are the ones responsible of downloading the
|
||||
actual video file and writing it to disk.
|
||||
|
||||
File downloaders accept a lot of parameters. In order not to saturate
|
||||
the object constructor with arguments, it receives a dictionary of
|
||||
options instead.
|
||||
|
||||
Available options:
|
||||
|
||||
verbose: Print additional info to stdout.
|
||||
quiet: Do not print messages to stdout.
|
||||
ratelimit: Download speed limit, in bytes/sec.
|
||||
retries: Number of times to retry for HTTP error 5xx
|
||||
buffersize: Size of download buffer in bytes.
|
||||
noresizebuffer: Do not automatically resize the download buffer.
|
||||
continuedl: Try to continue downloads if possible.
|
||||
noprogress: Do not print the progress bar.
|
||||
logtostderr: Log messages to stderr instead of stdout.
|
||||
consoletitle: Display progress in console window's titlebar.
|
||||
nopart: Do not use temporary .part files.
|
||||
updatetime: Use the Last-modified header to set output file timestamps.
|
||||
test: Download only first bytes to test the downloader.
|
||||
min_filesize: Skip files smaller than this size
|
||||
max_filesize: Skip files larger than this size
|
||||
|
||||
Subclasses of this one must re-define the real_download method.
|
||||
"""
|
||||
|
||||
_TEST_FILE_SIZE = 10241
|
||||
params = None
|
||||
|
||||
def __init__(self, ydl, params):
|
||||
"""Create a FileDownloader object with the given options."""
|
||||
self.ydl = ydl
|
||||
self._progress_hooks = []
|
||||
self.params = params
|
||||
|
||||
@staticmethod
|
||||
def format_seconds(seconds):
|
||||
(mins, secs) = divmod(seconds, 60)
|
||||
(hours, mins) = divmod(mins, 60)
|
||||
if hours > 99:
|
||||
return '--:--:--'
|
||||
if hours == 0:
|
||||
return '%02d:%02d' % (mins, secs)
|
||||
else:
|
||||
return '%02d:%02d:%02d' % (hours, mins, secs)
|
||||
|
||||
@staticmethod
|
||||
def calc_percent(byte_counter, data_len):
|
||||
if data_len is None:
|
||||
return None
|
||||
return float(byte_counter) / float(data_len) * 100.0
|
||||
|
||||
@staticmethod
|
||||
def format_percent(percent):
|
||||
if percent is None:
|
||||
return '---.-%'
|
||||
return '%6s' % ('%3.1f%%' % percent)
|
||||
|
||||
@staticmethod
|
||||
def calc_eta(start, now, total, current):
|
||||
if total is None:
|
||||
return None
|
||||
dif = now - start
|
||||
if current == 0 or dif < 0.001: # One millisecond
|
||||
return None
|
||||
rate = float(current) / dif
|
||||
return int((float(total) - float(current)) / rate)
|
||||
|
||||
@staticmethod
|
||||
def format_eta(eta):
|
||||
if eta is None:
|
||||
return '--:--'
|
||||
return FileDownloader.format_seconds(eta)
|
||||
|
||||
@staticmethod
|
||||
def calc_speed(start, now, bytes):
|
||||
dif = now - start
|
||||
if bytes == 0 or dif < 0.001: # One millisecond
|
||||
return None
|
||||
return float(bytes) / dif
|
||||
|
||||
@staticmethod
|
||||
def format_speed(speed):
|
||||
if speed is None:
|
||||
return '%10s' % '---b/s'
|
||||
return '%10s' % ('%s/s' % format_bytes(speed))
|
||||
|
||||
@staticmethod
|
||||
def best_block_size(elapsed_time, bytes):
|
||||
new_min = max(bytes / 2.0, 1.0)
|
||||
new_max = min(max(bytes * 2.0, 1.0), 4194304) # Do not surpass 4 MB
|
||||
if elapsed_time < 0.001:
|
||||
return int(new_max)
|
||||
rate = bytes / elapsed_time
|
||||
if rate > new_max:
|
||||
return int(new_max)
|
||||
if rate < new_min:
|
||||
return int(new_min)
|
||||
return int(rate)
|
||||
|
||||
@staticmethod
|
||||
def parse_bytes(bytestr):
|
||||
"""Parse a string indicating a byte quantity into an integer."""
|
||||
matchobj = re.match(r'(?i)^(\d+(?:\.\d+)?)([kMGTPEZY]?)$', bytestr)
|
||||
if matchobj is None:
|
||||
return None
|
||||
number = float(matchobj.group(1))
|
||||
multiplier = 1024.0 ** 'bkmgtpezy'.index(matchobj.group(2).lower())
|
||||
return int(round(number * multiplier))
|
||||
|
||||
def to_screen(self, *args, **kargs):
|
||||
self.ydl.to_screen(*args, **kargs)
|
||||
|
||||
def to_stderr(self, message):
|
||||
self.ydl.to_screen(message)
|
||||
|
||||
def to_console_title(self, message):
|
||||
self.ydl.to_console_title(message)
|
||||
|
||||
def trouble(self, *args, **kargs):
|
||||
self.ydl.trouble(*args, **kargs)
|
||||
|
||||
def report_warning(self, *args, **kargs):
|
||||
self.ydl.report_warning(*args, **kargs)
|
||||
|
||||
def report_error(self, *args, **kargs):
|
||||
self.ydl.report_error(*args, **kargs)
|
||||
|
||||
def slow_down(self, start_time, byte_counter):
|
||||
"""Sleep if the download speed is over the rate limit."""
|
||||
rate_limit = self.params.get('ratelimit', None)
|
||||
if rate_limit is None or byte_counter == 0:
|
||||
return
|
||||
now = time.time()
|
||||
elapsed = now - start_time
|
||||
if elapsed <= 0.0:
|
||||
return
|
||||
speed = float(byte_counter) / elapsed
|
||||
if speed > rate_limit:
|
||||
time.sleep((byte_counter - rate_limit * (now - start_time)) / rate_limit)
|
||||
|
||||
def temp_name(self, filename):
|
||||
"""Returns a temporary filename for the given filename."""
|
||||
if self.params.get('nopart', False) or filename == '-' or \
|
||||
(os.path.exists(encodeFilename(filename)) and not os.path.isfile(encodeFilename(filename))):
|
||||
return filename
|
||||
return filename + '.part'
|
||||
|
||||
def undo_temp_name(self, filename):
|
||||
if filename.endswith('.part'):
|
||||
return filename[:-len('.part')]
|
||||
return filename
|
||||
|
||||
def try_rename(self, old_filename, new_filename):
|
||||
try:
|
||||
if old_filename == new_filename:
|
||||
return
|
||||
os.rename(encodeFilename(old_filename), encodeFilename(new_filename))
|
||||
except (IOError, OSError) as err:
|
||||
self.report_error('unable to rename file: %s' % compat_str(err))
|
||||
|
||||
def try_utime(self, filename, last_modified_hdr):
|
||||
"""Try to set the last-modified time of the given file."""
|
||||
if last_modified_hdr is None:
|
||||
return
|
||||
if not os.path.isfile(encodeFilename(filename)):
|
||||
return
|
||||
timestr = last_modified_hdr
|
||||
if timestr is None:
|
||||
return
|
||||
filetime = timeconvert(timestr)
|
||||
if filetime is None:
|
||||
return filetime
|
||||
# Ignore obviously invalid dates
|
||||
if filetime == 0:
|
||||
return
|
||||
try:
|
||||
os.utime(filename, (time.time(), filetime))
|
||||
except:
|
||||
pass
|
||||
return filetime
|
||||
|
||||
def report_destination(self, filename):
|
||||
"""Report destination filename."""
|
||||
self.to_screen('[download] Destination: ' + filename)
|
||||
|
||||
def _report_progress_status(self, msg, is_last_line=False):
|
||||
fullmsg = '[download] ' + msg
|
||||
if self.params.get('progress_with_newline', False):
|
||||
self.to_screen(fullmsg)
|
||||
else:
|
||||
if os.name == 'nt':
|
||||
prev_len = getattr(self, '_report_progress_prev_line_length',
|
||||
0)
|
||||
if prev_len > len(fullmsg):
|
||||
fullmsg += ' ' * (prev_len - len(fullmsg))
|
||||
self._report_progress_prev_line_length = len(fullmsg)
|
||||
clear_line = '\r'
|
||||
else:
|
||||
clear_line = ('\r\x1b[K' if sys.stderr.isatty() else '\r')
|
||||
self.to_screen(clear_line + fullmsg, skip_eol=not is_last_line)
|
||||
self.to_console_title('youtube-dl ' + msg)
|
||||
|
||||
def report_progress(self, percent, data_len_str, speed, eta):
|
||||
"""Report download progress."""
|
||||
if self.params.get('noprogress', False):
|
||||
return
|
||||
if eta is not None:
|
||||
eta_str = self.format_eta(eta)
|
||||
else:
|
||||
eta_str = 'Unknown ETA'
|
||||
if percent is not None:
|
||||
percent_str = self.format_percent(percent)
|
||||
else:
|
||||
percent_str = 'Unknown %'
|
||||
speed_str = self.format_speed(speed)
|
||||
|
||||
msg = ('%s of %s at %s ETA %s' %
|
||||
(percent_str, data_len_str, speed_str, eta_str))
|
||||
self._report_progress_status(msg)
|
||||
|
||||
def report_progress_live_stream(self, downloaded_data_len, speed, elapsed):
|
||||
if self.params.get('noprogress', False):
|
||||
return
|
||||
downloaded_str = format_bytes(downloaded_data_len)
|
||||
speed_str = self.format_speed(speed)
|
||||
elapsed_str = FileDownloader.format_seconds(elapsed)
|
||||
msg = '%s at %s (%s)' % (downloaded_str, speed_str, elapsed_str)
|
||||
self._report_progress_status(msg)
|
||||
|
||||
def report_finish(self, data_len_str, tot_time):
|
||||
"""Report download finished."""
|
||||
if self.params.get('noprogress', False):
|
||||
self.to_screen('[download] Download completed')
|
||||
else:
|
||||
self._report_progress_status(
|
||||
('100%% of %s in %s' %
|
||||
(data_len_str, self.format_seconds(tot_time))),
|
||||
is_last_line=True)
|
||||
|
||||
def report_resuming_byte(self, resume_len):
|
||||
"""Report attempt to resume at given byte."""
|
||||
self.to_screen('[download] Resuming download at byte %s' % resume_len)
|
||||
|
||||
def report_retry(self, count, retries):
|
||||
"""Report retry in case of HTTP error 5xx"""
|
||||
self.to_screen('[download] Got server HTTP error. Retrying (attempt %d of %d)...' % (count, retries))
|
||||
|
||||
def report_file_already_downloaded(self, file_name):
|
||||
"""Report file has already been fully downloaded."""
|
||||
try:
|
||||
self.to_screen('[download] %s has already been downloaded' % file_name)
|
||||
except UnicodeEncodeError:
|
||||
self.to_screen('[download] The file has already been downloaded')
|
||||
|
||||
def report_unable_to_resume(self):
|
||||
"""Report it was impossible to resume download."""
|
||||
self.to_screen('[download] Unable to resume')
|
||||
|
||||
def download(self, filename, info_dict):
|
||||
"""Download to a filename using the info from info_dict
|
||||
Return True on success and False otherwise
|
||||
"""
|
||||
# Check file already present
|
||||
if self.params.get('continuedl', False) and os.path.isfile(encodeFilename(filename)) and not self.params.get('nopart', False):
|
||||
self.report_file_already_downloaded(filename)
|
||||
self._hook_progress({
|
||||
'filename': filename,
|
||||
'status': 'finished',
|
||||
'total_bytes': os.path.getsize(encodeFilename(filename)),
|
||||
})
|
||||
return True
|
||||
|
||||
return self.real_download(filename, info_dict)
|
||||
|
||||
def real_download(self, filename, info_dict):
|
||||
"""Real download process. Redefine in subclasses."""
|
||||
raise NotImplementedError('This method must be implemented by subclasses')
|
||||
|
||||
def _hook_progress(self, status):
|
||||
for ph in self._progress_hooks:
|
||||
ph(status)
|
||||
|
||||
def add_progress_hook(self, ph):
|
||||
""" ph gets called on download progress, with a dictionary with the entries
|
||||
* filename: The final filename
|
||||
* status: One of "downloading" and "finished"
|
||||
|
||||
It can also have some of the following entries:
|
||||
|
||||
* downloaded_bytes: Bytes on disks
|
||||
* total_bytes: Total bytes, None if unknown
|
||||
* tmpfilename: The filename we're currently writing to
|
||||
* eta: The estimated time in seconds, None if unknown
|
||||
* speed: The download speed in bytes/second, None if unknown
|
||||
|
||||
Hooks are guaranteed to be called at least once (with status "finished")
|
||||
if the download is successful.
|
||||
"""
|
||||
self._progress_hooks.append(ph)
|
||||
336
youtube_dl/downloader/f4m.py
Normal file
336
youtube_dl/downloader/f4m.py
Normal file
@@ -0,0 +1,336 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import base64
|
||||
import io
|
||||
import itertools
|
||||
import os
|
||||
import time
|
||||
import xml.etree.ElementTree as etree
|
||||
|
||||
from .common import FileDownloader
|
||||
from .http import HttpFD
|
||||
from ..utils import (
|
||||
struct_pack,
|
||||
struct_unpack,
|
||||
compat_urlparse,
|
||||
format_bytes,
|
||||
encodeFilename,
|
||||
sanitize_open,
|
||||
xpath_text,
|
||||
)
|
||||
|
||||
|
||||
class FlvReader(io.BytesIO):
|
||||
"""
|
||||
Reader for Flv files
|
||||
The file format is documented in https://www.adobe.com/devnet/f4v.html
|
||||
"""
|
||||
|
||||
# Utility functions for reading numbers and strings
|
||||
def read_unsigned_long_long(self):
|
||||
return struct_unpack('!Q', self.read(8))[0]
|
||||
|
||||
def read_unsigned_int(self):
|
||||
return struct_unpack('!I', self.read(4))[0]
|
||||
|
||||
def read_unsigned_char(self):
|
||||
return struct_unpack('!B', self.read(1))[0]
|
||||
|
||||
def read_string(self):
|
||||
res = b''
|
||||
while True:
|
||||
char = self.read(1)
|
||||
if char == b'\x00':
|
||||
break
|
||||
res += char
|
||||
return res
|
||||
|
||||
def read_box_info(self):
|
||||
"""
|
||||
Read a box and return the info as a tuple: (box_size, box_type, box_data)
|
||||
"""
|
||||
real_size = size = self.read_unsigned_int()
|
||||
box_type = self.read(4)
|
||||
header_end = 8
|
||||
if size == 1:
|
||||
real_size = self.read_unsigned_long_long()
|
||||
header_end = 16
|
||||
return real_size, box_type, self.read(real_size - header_end)
|
||||
|
||||
def read_asrt(self):
|
||||
# version
|
||||
self.read_unsigned_char()
|
||||
# flags
|
||||
self.read(3)
|
||||
quality_entry_count = self.read_unsigned_char()
|
||||
# QualityEntryCount
|
||||
for i in range(quality_entry_count):
|
||||
self.read_string()
|
||||
|
||||
segment_run_count = self.read_unsigned_int()
|
||||
segments = []
|
||||
for i in range(segment_run_count):
|
||||
first_segment = self.read_unsigned_int()
|
||||
fragments_per_segment = self.read_unsigned_int()
|
||||
segments.append((first_segment, fragments_per_segment))
|
||||
|
||||
return {
|
||||
'segment_run': segments,
|
||||
}
|
||||
|
||||
def read_afrt(self):
|
||||
# version
|
||||
self.read_unsigned_char()
|
||||
# flags
|
||||
self.read(3)
|
||||
# time scale
|
||||
self.read_unsigned_int()
|
||||
|
||||
quality_entry_count = self.read_unsigned_char()
|
||||
# QualitySegmentUrlModifiers
|
||||
for i in range(quality_entry_count):
|
||||
self.read_string()
|
||||
|
||||
fragments_count = self.read_unsigned_int()
|
||||
fragments = []
|
||||
for i in range(fragments_count):
|
||||
first = self.read_unsigned_int()
|
||||
first_ts = self.read_unsigned_long_long()
|
||||
duration = self.read_unsigned_int()
|
||||
if duration == 0:
|
||||
discontinuity_indicator = self.read_unsigned_char()
|
||||
else:
|
||||
discontinuity_indicator = None
|
||||
fragments.append({
|
||||
'first': first,
|
||||
'ts': first_ts,
|
||||
'duration': duration,
|
||||
'discontinuity_indicator': discontinuity_indicator,
|
||||
})
|
||||
|
||||
return {
|
||||
'fragments': fragments,
|
||||
}
|
||||
|
||||
def read_abst(self):
|
||||
# version
|
||||
self.read_unsigned_char()
|
||||
# flags
|
||||
self.read(3)
|
||||
|
||||
self.read_unsigned_int() # BootstrapinfoVersion
|
||||
# Profile,Live,Update,Reserved
|
||||
self.read(1)
|
||||
# time scale
|
||||
self.read_unsigned_int()
|
||||
# CurrentMediaTime
|
||||
self.read_unsigned_long_long()
|
||||
# SmpteTimeCodeOffset
|
||||
self.read_unsigned_long_long()
|
||||
|
||||
self.read_string() # MovieIdentifier
|
||||
server_count = self.read_unsigned_char()
|
||||
# ServerEntryTable
|
||||
for i in range(server_count):
|
||||
self.read_string()
|
||||
quality_count = self.read_unsigned_char()
|
||||
# QualityEntryTable
|
||||
for i in range(quality_count):
|
||||
self.read_string()
|
||||
# DrmData
|
||||
self.read_string()
|
||||
# MetaData
|
||||
self.read_string()
|
||||
|
||||
segments_count = self.read_unsigned_char()
|
||||
segments = []
|
||||
for i in range(segments_count):
|
||||
box_size, box_type, box_data = self.read_box_info()
|
||||
assert box_type == b'asrt'
|
||||
segment = FlvReader(box_data).read_asrt()
|
||||
segments.append(segment)
|
||||
fragments_run_count = self.read_unsigned_char()
|
||||
fragments = []
|
||||
for i in range(fragments_run_count):
|
||||
box_size, box_type, box_data = self.read_box_info()
|
||||
assert box_type == b'afrt'
|
||||
fragments.append(FlvReader(box_data).read_afrt())
|
||||
|
||||
return {
|
||||
'segments': segments,
|
||||
'fragments': fragments,
|
||||
}
|
||||
|
||||
def read_bootstrap_info(self):
|
||||
total_size, box_type, box_data = self.read_box_info()
|
||||
assert box_type == b'abst'
|
||||
return FlvReader(box_data).read_abst()
|
||||
|
||||
|
||||
def read_bootstrap_info(bootstrap_bytes):
|
||||
return FlvReader(bootstrap_bytes).read_bootstrap_info()
|
||||
|
||||
|
||||
def build_fragments_list(boot_info):
|
||||
""" Return a list of (segment, fragment) for each fragment in the video """
|
||||
res = []
|
||||
segment_run_table = boot_info['segments'][0]
|
||||
# I've only found videos with one segment
|
||||
segment_run_entry = segment_run_table['segment_run'][0]
|
||||
n_frags = segment_run_entry[1]
|
||||
fragment_run_entry_table = boot_info['fragments'][0]['fragments']
|
||||
first_frag_number = fragment_run_entry_table[0]['first']
|
||||
for (i, frag_number) in zip(range(1, n_frags + 1), itertools.count(first_frag_number)):
|
||||
res.append((1, frag_number))
|
||||
return res
|
||||
|
||||
|
||||
def write_flv_header(stream, metadata):
|
||||
"""Writes the FLV header and the metadata to stream"""
|
||||
# FLV header
|
||||
stream.write(b'FLV\x01')
|
||||
stream.write(b'\x05')
|
||||
stream.write(b'\x00\x00\x00\x09')
|
||||
# FLV File body
|
||||
stream.write(b'\x00\x00\x00\x00')
|
||||
# FLVTAG
|
||||
# Script data
|
||||
stream.write(b'\x12')
|
||||
# Size of the metadata with 3 bytes
|
||||
stream.write(struct_pack('!L', len(metadata))[1:])
|
||||
stream.write(b'\x00\x00\x00\x00\x00\x00\x00')
|
||||
stream.write(metadata)
|
||||
# Magic numbers extracted from the output files produced by AdobeHDS.php
|
||||
#(https://github.com/K-S-V/Scripts)
|
||||
stream.write(b'\x00\x00\x01\x73')
|
||||
|
||||
|
||||
def _add_ns(prop):
|
||||
return '{http://ns.adobe.com/f4m/1.0}%s' % prop
|
||||
|
||||
|
||||
class HttpQuietDownloader(HttpFD):
|
||||
def to_screen(self, *args, **kargs):
|
||||
pass
|
||||
|
||||
|
||||
class F4mFD(FileDownloader):
|
||||
"""
|
||||
A downloader for f4m manifests or AdobeHDS.
|
||||
"""
|
||||
|
||||
def real_download(self, filename, info_dict):
|
||||
man_url = info_dict['url']
|
||||
requested_bitrate = info_dict.get('tbr')
|
||||
self.to_screen('[download] Downloading f4m manifest')
|
||||
manifest = self.ydl.urlopen(man_url).read()
|
||||
self.report_destination(filename)
|
||||
http_dl = HttpQuietDownloader(
|
||||
self.ydl,
|
||||
{
|
||||
'continuedl': True,
|
||||
'quiet': True,
|
||||
'noprogress': True,
|
||||
'test': self.params.get('test', False),
|
||||
}
|
||||
)
|
||||
|
||||
doc = etree.fromstring(manifest)
|
||||
formats = [(int(f.attrib.get('bitrate', -1)), f) for f in doc.findall(_add_ns('media'))]
|
||||
if requested_bitrate is None:
|
||||
# get the best format
|
||||
formats = sorted(formats, key=lambda f: f[0])
|
||||
rate, media = formats[-1]
|
||||
else:
|
||||
rate, media = list(filter(
|
||||
lambda f: int(f[0]) == requested_bitrate, formats))[0]
|
||||
|
||||
base_url = compat_urlparse.urljoin(man_url, media.attrib['url'])
|
||||
bootstrap_node = doc.find(_add_ns('bootstrapInfo'))
|
||||
if bootstrap_node.text is None:
|
||||
bootstrap_url = compat_urlparse.urljoin(
|
||||
base_url, bootstrap_node.attrib['url'])
|
||||
bootstrap = self.ydl.urlopen(bootstrap_url).read()
|
||||
else:
|
||||
bootstrap = base64.b64decode(bootstrap_node.text)
|
||||
metadata = base64.b64decode(media.find(_add_ns('metadata')).text)
|
||||
boot_info = read_bootstrap_info(bootstrap)
|
||||
|
||||
fragments_list = build_fragments_list(boot_info)
|
||||
if self.params.get('test', False):
|
||||
# We only download the first fragment
|
||||
fragments_list = fragments_list[:1]
|
||||
total_frags = len(fragments_list)
|
||||
# For some akamai manifests we'll need to add a query to the fragment url
|
||||
akamai_pv = xpath_text(doc, _add_ns('pv-2.0'))
|
||||
|
||||
tmpfilename = self.temp_name(filename)
|
||||
(dest_stream, tmpfilename) = sanitize_open(tmpfilename, 'wb')
|
||||
write_flv_header(dest_stream, metadata)
|
||||
|
||||
# This dict stores the download progress, it's updated by the progress
|
||||
# hook
|
||||
state = {
|
||||
'downloaded_bytes': 0,
|
||||
'frag_counter': 0,
|
||||
}
|
||||
start = time.time()
|
||||
|
||||
def frag_progress_hook(status):
|
||||
frag_total_bytes = status.get('total_bytes', 0)
|
||||
estimated_size = (state['downloaded_bytes'] +
|
||||
(total_frags - state['frag_counter']) * frag_total_bytes)
|
||||
if status['status'] == 'finished':
|
||||
state['downloaded_bytes'] += frag_total_bytes
|
||||
state['frag_counter'] += 1
|
||||
progress = self.calc_percent(state['frag_counter'], total_frags)
|
||||
byte_counter = state['downloaded_bytes']
|
||||
else:
|
||||
frag_downloaded_bytes = status['downloaded_bytes']
|
||||
byte_counter = state['downloaded_bytes'] + frag_downloaded_bytes
|
||||
frag_progress = self.calc_percent(frag_downloaded_bytes,
|
||||
frag_total_bytes)
|
||||
progress = self.calc_percent(state['frag_counter'], total_frags)
|
||||
progress += frag_progress / float(total_frags)
|
||||
|
||||
eta = self.calc_eta(start, time.time(), estimated_size, byte_counter)
|
||||
self.report_progress(progress, format_bytes(estimated_size),
|
||||
status.get('speed'), eta)
|
||||
http_dl.add_progress_hook(frag_progress_hook)
|
||||
|
||||
frags_filenames = []
|
||||
for (seg_i, frag_i) in fragments_list:
|
||||
name = 'Seg%d-Frag%d' % (seg_i, frag_i)
|
||||
url = base_url + name
|
||||
if akamai_pv:
|
||||
url += '?' + akamai_pv.strip(';')
|
||||
frag_filename = '%s-%s' % (tmpfilename, name)
|
||||
success = http_dl.download(frag_filename, {'url': url})
|
||||
if not success:
|
||||
return False
|
||||
with open(frag_filename, 'rb') as down:
|
||||
down_data = down.read()
|
||||
reader = FlvReader(down_data)
|
||||
while True:
|
||||
_, box_type, box_data = reader.read_box_info()
|
||||
if box_type == b'mdat':
|
||||
dest_stream.write(box_data)
|
||||
break
|
||||
frags_filenames.append(frag_filename)
|
||||
|
||||
dest_stream.close()
|
||||
self.report_finish(format_bytes(state['downloaded_bytes']), time.time() - start)
|
||||
|
||||
self.try_rename(tmpfilename, filename)
|
||||
for frag_file in frags_filenames:
|
||||
os.remove(frag_file)
|
||||
|
||||
fsize = os.path.getsize(encodeFilename(filename))
|
||||
self._hook_progress({
|
||||
'downloaded_bytes': fsize,
|
||||
'total_bytes': fsize,
|
||||
'filename': filename,
|
||||
'status': 'finished',
|
||||
})
|
||||
|
||||
return True
|
||||
107
youtube_dl/downloader/hls.py
Normal file
107
youtube_dl/downloader/hls.py
Normal file
@@ -0,0 +1,107 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
|
||||
from ..postprocessor.ffmpeg import FFmpegPostProcessor
|
||||
from .common import FileDownloader
|
||||
from ..utils import (
|
||||
compat_urlparse,
|
||||
compat_urllib_request,
|
||||
check_executable,
|
||||
encodeFilename,
|
||||
)
|
||||
|
||||
|
||||
class HlsFD(FileDownloader):
|
||||
def real_download(self, filename, info_dict):
|
||||
url = info_dict['url']
|
||||
self.report_destination(filename)
|
||||
tmpfilename = self.temp_name(filename)
|
||||
|
||||
args = [
|
||||
'-y', '-i', url, '-f', 'mp4', '-c', 'copy',
|
||||
'-bsf:a', 'aac_adtstoasc',
|
||||
encodeFilename(tmpfilename, for_subprocess=True)]
|
||||
|
||||
for program in ['avconv', 'ffmpeg']:
|
||||
if check_executable(program, ['-version']):
|
||||
break
|
||||
else:
|
||||
self.report_error('m3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
|
||||
return False
|
||||
cmd = [program] + args
|
||||
|
||||
ffpp = FFmpegPostProcessor(downloader=self)
|
||||
ffpp.check_version()
|
||||
|
||||
retval = subprocess.call(cmd)
|
||||
if retval == 0:
|
||||
fsize = os.path.getsize(encodeFilename(tmpfilename))
|
||||
self.to_screen('\r[%s] %s bytes' % (cmd[0], fsize))
|
||||
self.try_rename(tmpfilename, filename)
|
||||
self._hook_progress({
|
||||
'downloaded_bytes': fsize,
|
||||
'total_bytes': fsize,
|
||||
'filename': filename,
|
||||
'status': 'finished',
|
||||
})
|
||||
return True
|
||||
else:
|
||||
self.to_stderr('\n')
|
||||
self.report_error('%s exited with code %d' % (program, retval))
|
||||
return False
|
||||
|
||||
|
||||
class NativeHlsFD(FileDownloader):
|
||||
""" A more limited implementation that does not require ffmpeg """
|
||||
|
||||
def real_download(self, filename, info_dict):
|
||||
url = info_dict['url']
|
||||
self.report_destination(filename)
|
||||
tmpfilename = self.temp_name(filename)
|
||||
|
||||
self.to_screen(
|
||||
'[hlsnative] %s: Downloading m3u8 manifest' % info_dict['id'])
|
||||
data = self.ydl.urlopen(url).read()
|
||||
s = data.decode('utf-8', 'ignore')
|
||||
segment_urls = []
|
||||
for line in s.splitlines():
|
||||
line = line.strip()
|
||||
if line and not line.startswith('#'):
|
||||
segment_url = (
|
||||
line
|
||||
if re.match(r'^https?://', line)
|
||||
else compat_urlparse.urljoin(url, line))
|
||||
segment_urls.append(segment_url)
|
||||
|
||||
is_test = self.params.get('test', False)
|
||||
remaining_bytes = self._TEST_FILE_SIZE if is_test else None
|
||||
byte_counter = 0
|
||||
with open(tmpfilename, 'wb') as outf:
|
||||
for i, segurl in enumerate(segment_urls):
|
||||
self.to_screen(
|
||||
'[hlsnative] %s: Downloading segment %d / %d' %
|
||||
(info_dict['id'], i + 1, len(segment_urls)))
|
||||
seg_req = compat_urllib_request.Request(segurl)
|
||||
if remaining_bytes is not None:
|
||||
seg_req.add_header('Range', 'bytes=0-%d' % (remaining_bytes - 1))
|
||||
|
||||
segment = self.ydl.urlopen(seg_req).read()
|
||||
if remaining_bytes is not None:
|
||||
segment = segment[:remaining_bytes]
|
||||
remaining_bytes -= len(segment)
|
||||
outf.write(segment)
|
||||
byte_counter += len(segment)
|
||||
if remaining_bytes is not None and remaining_bytes <= 0:
|
||||
break
|
||||
|
||||
self._hook_progress({
|
||||
'downloaded_bytes': byte_counter,
|
||||
'total_bytes': byte_counter,
|
||||
'filename': filename,
|
||||
'status': 'finished',
|
||||
})
|
||||
self.try_rename(tmpfilename, filename)
|
||||
return True
|
||||
214
youtube_dl/downloader/http.py
Normal file
214
youtube_dl/downloader/http.py
Normal file
@@ -0,0 +1,214 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import os
|
||||
import time
|
||||
|
||||
from .common import FileDownloader
|
||||
from ..utils import (
|
||||
compat_urllib_request,
|
||||
compat_urllib_error,
|
||||
ContentTooShortError,
|
||||
|
||||
encodeFilename,
|
||||
sanitize_open,
|
||||
format_bytes,
|
||||
)
|
||||
|
||||
|
||||
class HttpFD(FileDownloader):
|
||||
def real_download(self, filename, info_dict):
|
||||
url = info_dict['url']
|
||||
tmpfilename = self.temp_name(filename)
|
||||
stream = None
|
||||
|
||||
# Do not include the Accept-Encoding header
|
||||
headers = {'Youtubedl-no-compression': 'True'}
|
||||
if 'user_agent' in info_dict:
|
||||
headers['Youtubedl-user-agent'] = info_dict['user_agent']
|
||||
if 'http_referer' in info_dict:
|
||||
headers['Referer'] = info_dict['http_referer']
|
||||
add_headers = info_dict.get('http_headers')
|
||||
if add_headers:
|
||||
headers.update(add_headers)
|
||||
data = info_dict.get('http_post_data')
|
||||
http_method = info_dict.get('http_method')
|
||||
basic_request = compat_urllib_request.Request(url, data, headers)
|
||||
request = compat_urllib_request.Request(url, data, headers)
|
||||
if http_method is not None:
|
||||
basic_request.get_method = lambda: http_method
|
||||
request.get_method = lambda: http_method
|
||||
|
||||
is_test = self.params.get('test', False)
|
||||
|
||||
if is_test:
|
||||
request.add_header('Range', 'bytes=0-%s' % str(self._TEST_FILE_SIZE - 1))
|
||||
|
||||
# Establish possible resume length
|
||||
if os.path.isfile(encodeFilename(tmpfilename)):
|
||||
resume_len = os.path.getsize(encodeFilename(tmpfilename))
|
||||
else:
|
||||
resume_len = 0
|
||||
|
||||
open_mode = 'wb'
|
||||
if resume_len != 0:
|
||||
if self.params.get('continuedl', False):
|
||||
self.report_resuming_byte(resume_len)
|
||||
request.add_header('Range', 'bytes=%d-' % resume_len)
|
||||
open_mode = 'ab'
|
||||
else:
|
||||
resume_len = 0
|
||||
|
||||
count = 0
|
||||
retries = self.params.get('retries', 0)
|
||||
while count <= retries:
|
||||
# Establish connection
|
||||
try:
|
||||
data = self.ydl.urlopen(request)
|
||||
break
|
||||
except (compat_urllib_error.HTTPError, ) as err:
|
||||
if (err.code < 500 or err.code >= 600) and err.code != 416:
|
||||
# Unexpected HTTP error
|
||||
raise
|
||||
elif err.code == 416:
|
||||
# Unable to resume (requested range not satisfiable)
|
||||
try:
|
||||
# Open the connection again without the range header
|
||||
data = self.ydl.urlopen(basic_request)
|
||||
content_length = data.info()['Content-Length']
|
||||
except (compat_urllib_error.HTTPError, ) as err:
|
||||
if err.code < 500 or err.code >= 600:
|
||||
raise
|
||||
else:
|
||||
# Examine the reported length
|
||||
if (content_length is not None and
|
||||
(resume_len - 100 < int(content_length) < resume_len + 100)):
|
||||
# The file had already been fully downloaded.
|
||||
# Explanation to the above condition: in issue #175 it was revealed that
|
||||
# YouTube sometimes adds or removes a few bytes from the end of the file,
|
||||
# changing the file size slightly and causing problems for some users. So
|
||||
# I decided to implement a suggested change and consider the file
|
||||
# completely downloaded if the file size differs less than 100 bytes from
|
||||
# the one in the hard drive.
|
||||
self.report_file_already_downloaded(filename)
|
||||
self.try_rename(tmpfilename, filename)
|
||||
self._hook_progress({
|
||||
'filename': filename,
|
||||
'status': 'finished',
|
||||
})
|
||||
return True
|
||||
else:
|
||||
# The length does not match, we start the download over
|
||||
self.report_unable_to_resume()
|
||||
resume_len = 0
|
||||
open_mode = 'wb'
|
||||
break
|
||||
# Retry
|
||||
count += 1
|
||||
if count <= retries:
|
||||
self.report_retry(count, retries)
|
||||
|
||||
if count > retries:
|
||||
self.report_error('giving up after %s retries' % retries)
|
||||
return False
|
||||
|
||||
data_len = data.info().get('Content-length', None)
|
||||
|
||||
# Range HTTP header may be ignored/unsupported by a webserver
|
||||
# (e.g. extractor/scivee.py, extractor/bambuser.py).
|
||||
# However, for a test we still would like to download just a piece of a file.
|
||||
# To achieve this we limit data_len to _TEST_FILE_SIZE and manually control
|
||||
# block size when downloading a file.
|
||||
if is_test and (data_len is None or int(data_len) > self._TEST_FILE_SIZE):
|
||||
data_len = self._TEST_FILE_SIZE
|
||||
|
||||
if data_len is not None:
|
||||
data_len = int(data_len) + resume_len
|
||||
min_data_len = self.params.get("min_filesize", None)
|
||||
max_data_len = self.params.get("max_filesize", None)
|
||||
if min_data_len is not None and data_len < min_data_len:
|
||||
self.to_screen('\r[download] File is smaller than min-filesize (%s bytes < %s bytes). Aborting.' % (data_len, min_data_len))
|
||||
return False
|
||||
if max_data_len is not None and data_len > max_data_len:
|
||||
self.to_screen('\r[download] File is larger than max-filesize (%s bytes > %s bytes). Aborting.' % (data_len, max_data_len))
|
||||
return False
|
||||
|
||||
data_len_str = format_bytes(data_len)
|
||||
byte_counter = 0 + resume_len
|
||||
block_size = self.params.get('buffersize', 1024)
|
||||
start = time.time()
|
||||
while True:
|
||||
# Download and write
|
||||
before = time.time()
|
||||
data_block = data.read(block_size if not is_test else min(block_size, data_len - byte_counter))
|
||||
after = time.time()
|
||||
if len(data_block) == 0:
|
||||
break
|
||||
byte_counter += len(data_block)
|
||||
|
||||
# Open file just in time
|
||||
if stream is None:
|
||||
try:
|
||||
(stream, tmpfilename) = sanitize_open(tmpfilename, open_mode)
|
||||
assert stream is not None
|
||||
filename = self.undo_temp_name(tmpfilename)
|
||||
self.report_destination(filename)
|
||||
except (OSError, IOError) as err:
|
||||
self.report_error('unable to open for writing: %s' % str(err))
|
||||
return False
|
||||
try:
|
||||
stream.write(data_block)
|
||||
except (IOError, OSError) as err:
|
||||
self.to_stderr('\n')
|
||||
self.report_error('unable to write data: %s' % str(err))
|
||||
return False
|
||||
if not self.params.get('noresizebuffer', False):
|
||||
block_size = self.best_block_size(after - before, len(data_block))
|
||||
|
||||
# Progress message
|
||||
speed = self.calc_speed(start, time.time(), byte_counter - resume_len)
|
||||
if data_len is None:
|
||||
eta = percent = None
|
||||
else:
|
||||
percent = self.calc_percent(byte_counter, data_len)
|
||||
eta = self.calc_eta(start, time.time(), data_len - resume_len, byte_counter - resume_len)
|
||||
self.report_progress(percent, data_len_str, speed, eta)
|
||||
|
||||
self._hook_progress({
|
||||
'downloaded_bytes': byte_counter,
|
||||
'total_bytes': data_len,
|
||||
'tmpfilename': tmpfilename,
|
||||
'filename': filename,
|
||||
'status': 'downloading',
|
||||
'eta': eta,
|
||||
'speed': speed,
|
||||
})
|
||||
|
||||
if is_test and byte_counter == data_len:
|
||||
break
|
||||
|
||||
# Apply rate limit
|
||||
self.slow_down(start, byte_counter - resume_len)
|
||||
|
||||
if stream is None:
|
||||
self.to_stderr('\n')
|
||||
self.report_error('Did not get any data blocks')
|
||||
return False
|
||||
if tmpfilename != '-':
|
||||
stream.close()
|
||||
self.report_finish(data_len_str, (time.time() - start))
|
||||
if data_len is not None and byte_counter != data_len:
|
||||
raise ContentTooShortError(byte_counter, int(data_len))
|
||||
self.try_rename(tmpfilename, filename)
|
||||
|
||||
# Update file modification time
|
||||
if self.params.get('updatetime', True):
|
||||
info_dict['filetime'] = self.try_utime(filename, data.info().get('last-modified', None))
|
||||
|
||||
self._hook_progress({
|
||||
'downloaded_bytes': byte_counter,
|
||||
'total_bytes': byte_counter,
|
||||
'filename': filename,
|
||||
'status': 'finished',
|
||||
})
|
||||
|
||||
return True
|
||||
47
youtube_dl/downloader/mplayer.py
Normal file
47
youtube_dl/downloader/mplayer.py
Normal file
@@ -0,0 +1,47 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
from .common import FileDownloader
|
||||
from ..compat import compat_subprocess_get_DEVNULL
|
||||
from ..utils import (
|
||||
encodeFilename,
|
||||
)
|
||||
|
||||
|
||||
class MplayerFD(FileDownloader):
|
||||
def real_download(self, filename, info_dict):
|
||||
url = info_dict['url']
|
||||
self.report_destination(filename)
|
||||
tmpfilename = self.temp_name(filename)
|
||||
|
||||
args = [
|
||||
'mplayer', '-really-quiet', '-vo', 'null', '-vc', 'dummy',
|
||||
'-dumpstream', '-dumpfile', tmpfilename, url]
|
||||
# Check for mplayer first
|
||||
try:
|
||||
subprocess.call(
|
||||
['mplayer', '-h'],
|
||||
stdout=compat_subprocess_get_DEVNULL(), stderr=subprocess.STDOUT)
|
||||
except (OSError, IOError):
|
||||
self.report_error('MMS or RTSP download detected but "%s" could not be run' % args[0])
|
||||
return False
|
||||
|
||||
# Download using mplayer.
|
||||
retval = subprocess.call(args)
|
||||
if retval == 0:
|
||||
fsize = os.path.getsize(encodeFilename(tmpfilename))
|
||||
self.to_screen('\r[%s] %s bytes' % (args[0], fsize))
|
||||
self.try_rename(tmpfilename, filename)
|
||||
self._hook_progress({
|
||||
'downloaded_bytes': fsize,
|
||||
'total_bytes': fsize,
|
||||
'filename': filename,
|
||||
'status': 'finished',
|
||||
})
|
||||
return True
|
||||
else:
|
||||
self.to_stderr('\n')
|
||||
self.report_error('mplayer exited with code %d' % retval)
|
||||
return False
|
||||
207
youtube_dl/downloader/rtmp.py
Normal file
207
youtube_dl/downloader/rtmp.py
Normal file
@@ -0,0 +1,207 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
|
||||
from .common import FileDownloader
|
||||
from ..utils import (
|
||||
check_executable,
|
||||
compat_str,
|
||||
encodeFilename,
|
||||
format_bytes,
|
||||
get_exe_version,
|
||||
)
|
||||
|
||||
|
||||
def rtmpdump_version():
|
||||
return get_exe_version(
|
||||
'rtmpdump', ['--help'], r'(?i)RTMPDump\s*v?([0-9a-zA-Z._-]+)')
|
||||
|
||||
|
||||
class RtmpFD(FileDownloader):
|
||||
def real_download(self, filename, info_dict):
|
||||
def run_rtmpdump(args):
|
||||
start = time.time()
|
||||
resume_percent = None
|
||||
resume_downloaded_data_len = None
|
||||
proc = subprocess.Popen(args, stderr=subprocess.PIPE)
|
||||
cursor_in_new_line = True
|
||||
proc_stderr_closed = False
|
||||
while not proc_stderr_closed:
|
||||
# read line from stderr
|
||||
line = ''
|
||||
while True:
|
||||
char = proc.stderr.read(1)
|
||||
if not char:
|
||||
proc_stderr_closed = True
|
||||
break
|
||||
if char in [b'\r', b'\n']:
|
||||
break
|
||||
line += char.decode('ascii', 'replace')
|
||||
if not line:
|
||||
# proc_stderr_closed is True
|
||||
continue
|
||||
mobj = re.search(r'([0-9]+\.[0-9]{3}) kB / [0-9]+\.[0-9]{2} sec \(([0-9]{1,2}\.[0-9])%\)', line)
|
||||
if mobj:
|
||||
downloaded_data_len = int(float(mobj.group(1)) * 1024)
|
||||
percent = float(mobj.group(2))
|
||||
if not resume_percent:
|
||||
resume_percent = percent
|
||||
resume_downloaded_data_len = downloaded_data_len
|
||||
eta = self.calc_eta(start, time.time(), 100 - resume_percent, percent - resume_percent)
|
||||
speed = self.calc_speed(start, time.time(), downloaded_data_len - resume_downloaded_data_len)
|
||||
data_len = None
|
||||
if percent > 0:
|
||||
data_len = int(downloaded_data_len * 100 / percent)
|
||||
data_len_str = '~' + format_bytes(data_len)
|
||||
self.report_progress(percent, data_len_str, speed, eta)
|
||||
cursor_in_new_line = False
|
||||
self._hook_progress({
|
||||
'downloaded_bytes': downloaded_data_len,
|
||||
'total_bytes': data_len,
|
||||
'tmpfilename': tmpfilename,
|
||||
'filename': filename,
|
||||
'status': 'downloading',
|
||||
'eta': eta,
|
||||
'speed': speed,
|
||||
})
|
||||
else:
|
||||
# no percent for live streams
|
||||
mobj = re.search(r'([0-9]+\.[0-9]{3}) kB / [0-9]+\.[0-9]{2} sec', line)
|
||||
if mobj:
|
||||
downloaded_data_len = int(float(mobj.group(1)) * 1024)
|
||||
time_now = time.time()
|
||||
speed = self.calc_speed(start, time_now, downloaded_data_len)
|
||||
self.report_progress_live_stream(downloaded_data_len, speed, time_now - start)
|
||||
cursor_in_new_line = False
|
||||
self._hook_progress({
|
||||
'downloaded_bytes': downloaded_data_len,
|
||||
'tmpfilename': tmpfilename,
|
||||
'filename': filename,
|
||||
'status': 'downloading',
|
||||
'speed': speed,
|
||||
})
|
||||
elif self.params.get('verbose', False):
|
||||
if not cursor_in_new_line:
|
||||
self.to_screen('')
|
||||
cursor_in_new_line = True
|
||||
self.to_screen('[rtmpdump] ' + line)
|
||||
proc.wait()
|
||||
if not cursor_in_new_line:
|
||||
self.to_screen('')
|
||||
return proc.returncode
|
||||
|
||||
url = info_dict['url']
|
||||
player_url = info_dict.get('player_url', None)
|
||||
page_url = info_dict.get('page_url', None)
|
||||
app = info_dict.get('app', None)
|
||||
play_path = info_dict.get('play_path', None)
|
||||
tc_url = info_dict.get('tc_url', None)
|
||||
flash_version = info_dict.get('flash_version', None)
|
||||
live = info_dict.get('rtmp_live', False)
|
||||
conn = info_dict.get('rtmp_conn', None)
|
||||
protocol = info_dict.get('rtmp_protocol', None)
|
||||
|
||||
self.report_destination(filename)
|
||||
tmpfilename = self.temp_name(filename)
|
||||
test = self.params.get('test', False)
|
||||
|
||||
# Check for rtmpdump first
|
||||
if not check_executable('rtmpdump', ['-h']):
|
||||
self.report_error('RTMP download detected but "rtmpdump" could not be run. Please install it.')
|
||||
return False
|
||||
|
||||
# Download using rtmpdump. rtmpdump returns exit code 2 when
|
||||
# the connection was interrumpted and resuming appears to be
|
||||
# possible. This is part of rtmpdump's normal usage, AFAIK.
|
||||
basic_args = ['rtmpdump', '--verbose', '-r', url, '-o', tmpfilename]
|
||||
if player_url is not None:
|
||||
basic_args += ['--swfVfy', player_url]
|
||||
if page_url is not None:
|
||||
basic_args += ['--pageUrl', page_url]
|
||||
if app is not None:
|
||||
basic_args += ['--app', app]
|
||||
if play_path is not None:
|
||||
basic_args += ['--playpath', play_path]
|
||||
if tc_url is not None:
|
||||
basic_args += ['--tcUrl', url]
|
||||
if test:
|
||||
basic_args += ['--stop', '1']
|
||||
if flash_version is not None:
|
||||
basic_args += ['--flashVer', flash_version]
|
||||
if live:
|
||||
basic_args += ['--live']
|
||||
if isinstance(conn, list):
|
||||
for entry in conn:
|
||||
basic_args += ['--conn', entry]
|
||||
elif isinstance(conn, compat_str):
|
||||
basic_args += ['--conn', conn]
|
||||
if protocol is not None:
|
||||
basic_args += ['--protocol', protocol]
|
||||
args = basic_args + [[], ['--resume', '--skip', '1']][not live and self.params.get('continuedl', False)]
|
||||
|
||||
if sys.platform == 'win32' and sys.version_info < (3, 0):
|
||||
# Windows subprocess module does not actually support Unicode
|
||||
# on Python 2.x
|
||||
# See http://stackoverflow.com/a/9951851/35070
|
||||
subprocess_encoding = sys.getfilesystemencoding()
|
||||
args = [a.encode(subprocess_encoding, 'ignore') for a in args]
|
||||
else:
|
||||
subprocess_encoding = None
|
||||
|
||||
if self.params.get('verbose', False):
|
||||
if subprocess_encoding:
|
||||
str_args = [
|
||||
a.decode(subprocess_encoding) if isinstance(a, bytes) else a
|
||||
for a in args]
|
||||
else:
|
||||
str_args = args
|
||||
try:
|
||||
import pipes
|
||||
shell_quote = lambda args: ' '.join(map(pipes.quote, str_args))
|
||||
except ImportError:
|
||||
shell_quote = repr
|
||||
self.to_screen('[debug] rtmpdump command line: ' + shell_quote(str_args))
|
||||
|
||||
RD_SUCCESS = 0
|
||||
RD_FAILED = 1
|
||||
RD_INCOMPLETE = 2
|
||||
RD_NO_CONNECT = 3
|
||||
|
||||
retval = run_rtmpdump(args)
|
||||
|
||||
if retval == RD_NO_CONNECT:
|
||||
self.report_error('[rtmpdump] Could not connect to RTMP server.')
|
||||
return False
|
||||
|
||||
while (retval == RD_INCOMPLETE or retval == RD_FAILED) and not test and not live:
|
||||
prevsize = os.path.getsize(encodeFilename(tmpfilename))
|
||||
self.to_screen('[rtmpdump] %s bytes' % prevsize)
|
||||
time.sleep(5.0) # This seems to be needed
|
||||
retval = run_rtmpdump(basic_args + ['-e'] + [[], ['-k', '1']][retval == RD_FAILED])
|
||||
cursize = os.path.getsize(encodeFilename(tmpfilename))
|
||||
if prevsize == cursize and retval == RD_FAILED:
|
||||
break
|
||||
# Some rtmp streams seem abort after ~ 99.8%. Don't complain for those
|
||||
if prevsize == cursize and retval == RD_INCOMPLETE and cursize > 1024:
|
||||
self.to_screen('[rtmpdump] Could not download the whole video. This can happen for some advertisements.')
|
||||
retval = RD_SUCCESS
|
||||
break
|
||||
if retval == RD_SUCCESS or (test and retval == RD_INCOMPLETE):
|
||||
fsize = os.path.getsize(encodeFilename(tmpfilename))
|
||||
self.to_screen('[rtmpdump] %s bytes' % fsize)
|
||||
self.try_rename(tmpfilename, filename)
|
||||
self._hook_progress({
|
||||
'downloaded_bytes': fsize,
|
||||
'total_bytes': fsize,
|
||||
'filename': filename,
|
||||
'status': 'finished',
|
||||
})
|
||||
return True
|
||||
else:
|
||||
self.to_stderr('\n')
|
||||
self.report_error('rtmpdump exited with code %d' % retval)
|
||||
return False
|
||||
552
youtube_dl/extractor/__init__.py
Normal file
552
youtube_dl/extractor/__init__.py
Normal file
@@ -0,0 +1,552 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from .abc import ABCIE
|
||||
from .academicearth import AcademicEarthCourseIE
|
||||
from .addanime import AddAnimeIE
|
||||
from .adultswim import AdultSwimIE
|
||||
from .aftonbladet import AftonbladetIE
|
||||
from .anitube import AnitubeIE
|
||||
from .anysex import AnySexIE
|
||||
from .aol import AolIE
|
||||
from .allocine import AllocineIE
|
||||
from .aparat import AparatIE
|
||||
from .appletrailers import AppleTrailersIE
|
||||
from .archiveorg import ArchiveOrgIE
|
||||
from .ard import ARDIE, ARDMediathekIE
|
||||
from .arte import (
|
||||
ArteTvIE,
|
||||
ArteTVPlus7IE,
|
||||
ArteTVCreativeIE,
|
||||
ArteTVConcertIE,
|
||||
ArteTVFutureIE,
|
||||
ArteTVDDCIE,
|
||||
ArteTVEmbedIE,
|
||||
)
|
||||
from .audiomack import AudiomackIE
|
||||
from .auengine import AUEngineIE
|
||||
from .azubu import AzubuIE
|
||||
from .bambuser import BambuserIE, BambuserChannelIE
|
||||
from .bandcamp import BandcampIE, BandcampAlbumIE
|
||||
from .bbccouk import BBCCoUkIE
|
||||
from .beeg import BeegIE
|
||||
from .behindkink import BehindKinkIE
|
||||
from .bet import BetIE
|
||||
from .bild import BildIE
|
||||
from .bilibili import BiliBiliIE
|
||||
from .blinkx import BlinkxIE
|
||||
from .bliptv import BlipTVIE, BlipTVUserIE
|
||||
from .bloomberg import BloombergIE
|
||||
from .bpb import BpbIE
|
||||
from .br import BRIE
|
||||
from .breakcom import BreakIE
|
||||
from .brightcove import BrightcoveIE
|
||||
from .buzzfeed import BuzzFeedIE
|
||||
from .byutv import BYUtvIE
|
||||
from .c56 import C56IE
|
||||
from .canal13cl import Canal13clIE
|
||||
from .canalplus import CanalplusIE
|
||||
from .canalc2 import Canalc2IE
|
||||
from .cbs import CBSIE
|
||||
from .cbsnews import CBSNewsIE
|
||||
from .ceskatelevize import CeskaTelevizeIE
|
||||
from .channel9 import Channel9IE
|
||||
from .chilloutzone import ChilloutzoneIE
|
||||
from .cinemassacre import CinemassacreIE
|
||||
from .clipfish import ClipfishIE
|
||||
from .cliphunter import CliphunterIE
|
||||
from .clipsyndicate import ClipsyndicateIE
|
||||
from .cloudy import CloudyIE
|
||||
from .clubic import ClubicIE
|
||||
from .cmt import CMTIE
|
||||
from .cnet import CNETIE
|
||||
from .cnn import (
|
||||
CNNIE,
|
||||
CNNBlogsIE,
|
||||
)
|
||||
from .collegehumor import CollegeHumorIE
|
||||
from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
|
||||
from .condenast import CondeNastIE
|
||||
from .cracked import CrackedIE
|
||||
from .criterion import CriterionIE
|
||||
from .crunchyroll import (
|
||||
CrunchyrollIE,
|
||||
CrunchyrollShowPlaylistIE
|
||||
)
|
||||
from .cspan import CSpanIE
|
||||
from .dailymotion import (
|
||||
DailymotionIE,
|
||||
DailymotionPlaylistIE,
|
||||
DailymotionUserIE,
|
||||
)
|
||||
from .daum import DaumIE
|
||||
from .dbtv import DBTVIE
|
||||
from .deezer import DeezerPlaylistIE
|
||||
from .dfb import DFBIE
|
||||
from .dotsub import DotsubIE
|
||||
from .dreisat import DreiSatIE
|
||||
from .drtuber import DrTuberIE
|
||||
from .drtv import DRTVIE
|
||||
from .dump import DumpIE
|
||||
from .defense import DefenseGouvFrIE
|
||||
from .discovery import DiscoveryIE
|
||||
from .divxstage import DivxStageIE
|
||||
from .dropbox import DropboxIE
|
||||
from .ebaumsworld import EbaumsWorldIE
|
||||
from .ehow import EHowIE
|
||||
from .eighttracks import EightTracksIE
|
||||
from .einthusan import EinthusanIE
|
||||
from .eitb import EitbIE
|
||||
from .ellentv import (
|
||||
EllenTVIE,
|
||||
EllenTVClipsIE,
|
||||
)
|
||||
from .elpais import ElPaisIE
|
||||
from .empflix import EMPFlixIE
|
||||
from .engadget import EngadgetIE
|
||||
from .eporner import EpornerIE
|
||||
from .escapist import EscapistIE
|
||||
from .everyonesmixtape import EveryonesMixtapeIE
|
||||
from .exfm import ExfmIE
|
||||
from .expotv import ExpoTVIE
|
||||
from .extremetube import ExtremeTubeIE
|
||||
from .facebook import FacebookIE
|
||||
from .faz import FazIE
|
||||
from .fc2 import FC2IE
|
||||
from .firedrive import FiredriveIE
|
||||
from .firstpost import FirstpostIE
|
||||
from .firsttv import FirstTVIE
|
||||
from .fivemin import FiveMinIE
|
||||
from .fktv import (
|
||||
FKTVIE,
|
||||
FKTVPosteckeIE,
|
||||
)
|
||||
from .flickr import FlickrIE
|
||||
from .folketinget import FolketingetIE
|
||||
from .fourtube import FourTubeIE
|
||||
from .foxgay import FoxgayIE
|
||||
from .foxnews import FoxNewsIE
|
||||
from .franceculture import FranceCultureIE
|
||||
from .franceinter import FranceInterIE
|
||||
from .francetv import (
|
||||
PluzzIE,
|
||||
FranceTvInfoIE,
|
||||
FranceTVIE,
|
||||
GenerationQuoiIE,
|
||||
CultureboxIE,
|
||||
)
|
||||
from .freesound import FreesoundIE
|
||||
from .freespeech import FreespeechIE
|
||||
from .freevideo import FreeVideoIE
|
||||
from .funnyordie import FunnyOrDieIE
|
||||
from .gamekings import GamekingsIE
|
||||
from .gameone import (
|
||||
GameOneIE,
|
||||
GameOnePlaylistIE,
|
||||
)
|
||||
from .gamespot import GameSpotIE
|
||||
from .gamestar import GameStarIE
|
||||
from .gametrailers import GametrailersIE
|
||||
from .gdcvault import GDCVaultIE
|
||||
from .generic import GenericIE
|
||||
from .glide import GlideIE
|
||||
from .globo import GloboIE
|
||||
from .godtube import GodTubeIE
|
||||
from .goldenmoustache import GoldenMoustacheIE
|
||||
from .golem import GolemIE
|
||||
from .googleplus import GooglePlusIE
|
||||
from .googlesearch import GoogleSearchIE
|
||||
from .gorillavid import GorillaVidIE
|
||||
from .goshgay import GoshgayIE
|
||||
from .grooveshark import GroovesharkIE
|
||||
from .hark import HarkIE
|
||||
from .heise import HeiseIE
|
||||
from .helsinki import HelsinkiIE
|
||||
from .hentaistigma import HentaiStigmaIE
|
||||
from .hornbunny import HornBunnyIE
|
||||
from .hostingbulk import HostingBulkIE
|
||||
from .hotnewhiphop import HotNewHipHopIE
|
||||
from .howcast import HowcastIE
|
||||
from .howstuffworks import HowStuffWorksIE
|
||||
from .huffpost import HuffPostIE
|
||||
from .hypem import HypemIE
|
||||
from .iconosquare import IconosquareIE
|
||||
from .ign import IGNIE, OneUPIE
|
||||
from .imdb import (
|
||||
ImdbIE,
|
||||
ImdbListIE
|
||||
)
|
||||
from .ina import InaIE
|
||||
from .infoq import InfoQIE
|
||||
from .instagram import InstagramIE, InstagramUserIE
|
||||
from .internetvideoarchive import InternetVideoArchiveIE
|
||||
from .iprima import IPrimaIE
|
||||
from .ivi import (
|
||||
IviIE,
|
||||
IviCompilationIE
|
||||
)
|
||||
from .izlesene import IzleseneIE
|
||||
from .jadorecettepub import JadoreCettePubIE
|
||||
from .jeuxvideo import JeuxVideoIE
|
||||
from .jove import JoveIE
|
||||
from .jukebox import JukeboxIE
|
||||
from .jpopsukitv import JpopsukiIE
|
||||
from .kankan import KankanIE
|
||||
from .keezmovies import KeezMoviesIE
|
||||
from .khanacademy import KhanAcademyIE
|
||||
from .kickstarter import KickStarterIE
|
||||
from .keek import KeekIE
|
||||
from .kontrtube import KontrTubeIE
|
||||
from .krasview import KrasViewIE
|
||||
from .ku6 import Ku6IE
|
||||
from .la7 import LA7IE
|
||||
from .laola1tv import Laola1TvIE
|
||||
from .lifenews import LifeNewsIE
|
||||
from .liveleak import LiveLeakIE
|
||||
from .livestream import (
|
||||
LivestreamIE,
|
||||
LivestreamOriginalIE,
|
||||
LivestreamShortenerIE,
|
||||
)
|
||||
from .lrt import LRTIE
|
||||
from .lynda import (
|
||||
LyndaIE,
|
||||
LyndaCourseIE
|
||||
)
|
||||
from .m6 import M6IE
|
||||
from .macgamestore import MacGameStoreIE
|
||||
from .mailru import MailRuIE
|
||||
from .malemotion import MalemotionIE
|
||||
from .mdr import MDRIE
|
||||
from .metacafe import MetacafeIE
|
||||
from .metacritic import MetacriticIE
|
||||
from .mgoon import MgoonIE
|
||||
from .minhateca import MinhatecaIE
|
||||
from .ministrygrid import MinistryGridIE
|
||||
from .mit import TechTVMITIE, MITIE, OCWMITIE
|
||||
from .mitele import MiTeleIE
|
||||
from .mixcloud import MixcloudIE
|
||||
from .mlb import MLBIE
|
||||
from .mpora import MporaIE
|
||||
from .moevideo import MoeVideoIE
|
||||
from .mofosex import MofosexIE
|
||||
from .mojvideo import MojvideoIE
|
||||
from .moniker import MonikerIE
|
||||
from .mooshare import MooshareIE
|
||||
from .morningstar import MorningstarIE
|
||||
from .motherless import MotherlessIE
|
||||
from .motorsport import MotorsportIE
|
||||
from .movieclips import MovieClipsIE
|
||||
from .moviezine import MoviezineIE
|
||||
from .movshare import MovShareIE
|
||||
from .mtv import (
|
||||
MTVIE,
|
||||
MTVServicesEmbeddedIE,
|
||||
MTVIggyIE,
|
||||
)
|
||||
from .muenchentv import MuenchenTVIE
|
||||
from .musicplayon import MusicPlayOnIE
|
||||
from .musicvault import MusicVaultIE
|
||||
from .muzu import MuzuTVIE
|
||||
from .myspace import MySpaceIE, MySpaceAlbumIE
|
||||
from .myspass import MySpassIE
|
||||
from .myvideo import MyVideoIE
|
||||
from .myvidster import MyVidsterIE
|
||||
from .naver import NaverIE
|
||||
from .nba import NBAIE
|
||||
from .nbc import (
|
||||
NBCIE,
|
||||
NBCNewsIE,
|
||||
)
|
||||
from .ndr import NDRIE
|
||||
from .ndtv import NDTVIE
|
||||
from .newgrounds import NewgroundsIE
|
||||
from .newstube import NewstubeIE
|
||||
from .nfb import NFBIE
|
||||
from .nfl import NFLIE
|
||||
from .nhl import NHLIE, NHLVideocenterIE
|
||||
from .niconico import NiconicoIE, NiconicoPlaylistIE
|
||||
from .ninegag import NineGagIE
|
||||
from .noco import NocoIE
|
||||
from .normalboots import NormalbootsIE
|
||||
from .nosvideo import NosVideoIE
|
||||
from .novamov import NovaMovIE
|
||||
from .nowness import NownessIE
|
||||
from .nowvideo import NowVideoIE
|
||||
from .npo import (
|
||||
NPOIE,
|
||||
TegenlichtVproIE,
|
||||
)
|
||||
from .nrk import (
|
||||
NRKIE,
|
||||
NRKTVIE,
|
||||
)
|
||||
from .ntv import NTVIE
|
||||
from .nytimes import NYTimesIE
|
||||
from .nuvid import NuvidIE
|
||||
from .oktoberfesttv import OktoberfestTVIE
|
||||
from .ooyala import OoyalaIE
|
||||
from .orf import (
|
||||
ORFTVthekIE,
|
||||
ORFOE1IE,
|
||||
ORFFM4IE,
|
||||
)
|
||||
from .parliamentliveuk import ParliamentLiveUKIE
|
||||
from .patreon import PatreonIE
|
||||
from .pbs import PBSIE
|
||||
from .phoenix import PhoenixIE
|
||||
from .photobucket import PhotobucketIE
|
||||
from .planetaplay import PlanetaPlayIE
|
||||
from .played import PlayedIE
|
||||
from .playfm import PlayFMIE
|
||||
from .playvid import PlayvidIE
|
||||
from .podomatic import PodomaticIE
|
||||
from .pornhd import PornHdIE
|
||||
from .pornhub import PornHubIE
|
||||
from .pornotube import PornotubeIE
|
||||
from .pornoxo import PornoXOIE
|
||||
from .promptfile import PromptFileIE
|
||||
from .prosiebensat1 import ProSiebenSat1IE
|
||||
from .pyvideo import PyvideoIE
|
||||
from .quickvid import QuickVidIE
|
||||
from .radiode import RadioDeIE
|
||||
from .radiofrance import RadioFranceIE
|
||||
from .rai import RaiIE
|
||||
from .rbmaradio import RBMARadioIE
|
||||
from .redtube import RedTubeIE
|
||||
from .reverbnation import ReverbNationIE
|
||||
from .ringtv import RingTVIE
|
||||
from .ro220 import Ro220IE
|
||||
from .rottentomatoes import RottenTomatoesIE
|
||||
from .roxwel import RoxwelIE
|
||||
from .rtbf import RTBFIE
|
||||
from .rtlnl import RtlXlIE
|
||||
from .rtlnow import RTLnowIE
|
||||
from .rts import RTSIE
|
||||
from .rtve import RTVEALaCartaIE, RTVELiveIE
|
||||
from .ruhd import RUHDIE
|
||||
from .rutube import (
|
||||
RutubeIE,
|
||||
RutubeChannelIE,
|
||||
RutubeMovieIE,
|
||||
RutubePersonIE,
|
||||
)
|
||||
from .rutv import RUTVIE
|
||||
from .sapo import SapoIE
|
||||
from .savefrom import SaveFromIE
|
||||
from .sbs import SBSIE
|
||||
from .scivee import SciVeeIE
|
||||
from .screencast import ScreencastIE
|
||||
from .servingsys import ServingSysIE
|
||||
from .sexu import SexuIE
|
||||
from .sexykarma import SexyKarmaIE
|
||||
from .shared import SharedIE
|
||||
from .sharesix import ShareSixIE
|
||||
from .sina import SinaIE
|
||||
from .slideshare import SlideshareIE
|
||||
from .slutload import SlutloadIE
|
||||
from .smotri import (
|
||||
SmotriIE,
|
||||
SmotriCommunityIE,
|
||||
SmotriUserIE,
|
||||
SmotriBroadcastIE,
|
||||
)
|
||||
from .snotr import SnotrIE
|
||||
from .sockshare import SockshareIE
|
||||
from .sohu import SohuIE
|
||||
from .soundcloud import (
|
||||
SoundcloudIE,
|
||||
SoundcloudSetIE,
|
||||
SoundcloudUserIE,
|
||||
SoundcloudPlaylistIE
|
||||
)
|
||||
from .soundgasm import SoundgasmIE
|
||||
from .southpark import (
|
||||
SouthParkIE,
|
||||
SouthparkDeIE,
|
||||
)
|
||||
from .space import SpaceIE
|
||||
from .spankwire import SpankwireIE
|
||||
from .spiegel import SpiegelIE, SpiegelArticleIE
|
||||
from .spiegeltv import SpiegeltvIE
|
||||
from .spike import SpikeIE
|
||||
from .sport5 import Sport5IE
|
||||
from .sportbox import SportBoxIE
|
||||
from .sportdeutschland import SportDeutschlandIE
|
||||
from .srmediathek import SRMediathekIE
|
||||
from .stanfordoc import StanfordOpenClassroomIE
|
||||
from .steam import SteamIE
|
||||
from .streamcloud import StreamcloudIE
|
||||
from .streamcz import StreamCZIE
|
||||
from .sunporno import SunPornoIE
|
||||
from .swrmediathek import SWRMediathekIE
|
||||
from .syfy import SyfyIE
|
||||
from .sztvhu import SztvHuIE
|
||||
from .tagesschau import TagesschauIE
|
||||
from .tapely import TapelyIE
|
||||
from .tass import TassIE
|
||||
from .teachertube import (
|
||||
TeacherTubeIE,
|
||||
TeacherTubeUserIE,
|
||||
)
|
||||
from .teachingchannel import TeachingChannelIE
|
||||
from .teamcoco import TeamcocoIE
|
||||
from .techtalks import TechTalksIE
|
||||
from .ted import TEDIE
|
||||
from .telebruxelles import TeleBruxellesIE
|
||||
from .telecinco import TelecincoIE
|
||||
from .telemb import TeleMBIE
|
||||
from .tenplay import TenPlayIE
|
||||
from .testurl import TestURLIE
|
||||
from .tf1 import TF1IE
|
||||
from .theonion import TheOnionIE
|
||||
from .theplatform import ThePlatformIE
|
||||
from .thesixtyone import TheSixtyOneIE
|
||||
from .thisav import ThisAVIE
|
||||
from .tinypic import TinyPicIE
|
||||
from .tlc import TlcIE, TlcDeIE
|
||||
from .tmz import TMZIE
|
||||
from .tnaflix import TNAFlixIE
|
||||
from .thvideo import (
|
||||
THVideoIE,
|
||||
THVideoPlaylistIE
|
||||
)
|
||||
from .toutv import TouTvIE
|
||||
from .toypics import ToypicsUserIE, ToypicsIE
|
||||
from .traileraddict import TrailerAddictIE
|
||||
from .trilulilu import TriluliluIE
|
||||
from .trutube import TruTubeIE
|
||||
from .tube8 import Tube8IE
|
||||
from .tudou import TudouIE
|
||||
from .tumblr import TumblrIE
|
||||
from .tunein import TuneInIE
|
||||
from .turbo import TurboIE
|
||||
from .tutv import TutvIE
|
||||
from .tvigle import TvigleIE
|
||||
from .tvp import TvpIE
|
||||
from .tvplay import TVPlayIE
|
||||
from .twentyfourvideo import TwentyFourVideoIE
|
||||
from .twitch import TwitchIE
|
||||
from .ubu import UbuIE
|
||||
from .udemy import (
|
||||
UdemyIE,
|
||||
UdemyCourseIE
|
||||
)
|
||||
from .unistra import UnistraIE
|
||||
from .urort import UrortIE
|
||||
from .ustream import UstreamIE, UstreamChannelIE
|
||||
from .vbox7 import Vbox7IE
|
||||
from .veehd import VeeHDIE
|
||||
from .veoh import VeohIE
|
||||
from .vesti import VestiIE
|
||||
from .vevo import VevoIE
|
||||
from .vgtv import VGTVIE
|
||||
from .vh1 import VH1IE
|
||||
from .vice import ViceIE
|
||||
from .viddler import ViddlerIE
|
||||
from .videobam import VideoBamIE
|
||||
from .videodetective import VideoDetectiveIE
|
||||
from .videolecturesnet import VideoLecturesNetIE
|
||||
from .videofyme import VideofyMeIE
|
||||
from .videomega import VideoMegaIE
|
||||
from .videopremium import VideoPremiumIE
|
||||
from .videott import VideoTtIE
|
||||
from .videoweed import VideoWeedIE
|
||||
from .vidme import VidmeIE
|
||||
from .vidzi import VidziIE
|
||||
from .vimeo import (
|
||||
VimeoIE,
|
||||
VimeoAlbumIE,
|
||||
VimeoChannelIE,
|
||||
VimeoGroupsIE,
|
||||
VimeoLikesIE,
|
||||
VimeoReviewIE,
|
||||
VimeoUserIE,
|
||||
VimeoWatchLaterIE,
|
||||
)
|
||||
from .vimple import VimpleIE
|
||||
from .vine import (
|
||||
VineIE,
|
||||
VineUserIE,
|
||||
)
|
||||
from .viki import VikiIE
|
||||
from .vk import (
|
||||
VKIE,
|
||||
VKUserVideosIE,
|
||||
)
|
||||
from .vodlocker import VodlockerIE
|
||||
from .vporn import VpornIE
|
||||
from .vrt import VRTIE
|
||||
from .vube import VubeIE
|
||||
from .vuclip import VuClipIE
|
||||
from .vulture import VultureIE
|
||||
from .walla import WallaIE
|
||||
from .washingtonpost import WashingtonPostIE
|
||||
from .wat import WatIE
|
||||
from .wayofthemaster import WayOfTheMasterIE
|
||||
from .wdr import (
|
||||
WDRIE,
|
||||
WDRMobileIE,
|
||||
WDRMausIE,
|
||||
)
|
||||
from .weibo import WeiboIE
|
||||
from .wimp import WimpIE
|
||||
from .wistia import WistiaIE
|
||||
from .worldstarhiphop import WorldStarHipHopIE
|
||||
from .wrzuta import WrzutaIE
|
||||
from .xbef import XBefIE
|
||||
from .xboxclips import XboxClipsIE
|
||||
from .xhamster import XHamsterIE
|
||||
from .xminus import XMinusIE
|
||||
from .xnxx import XNXXIE
|
||||
from .xvideos import XVideosIE
|
||||
from .xtube import XTubeUserIE, XTubeIE
|
||||
from .yahoo import (
|
||||
YahooIE,
|
||||
YahooSearchIE,
|
||||
)
|
||||
from .ynet import YnetIE
|
||||
from .youjizz import YouJizzIE
|
||||
from .youku import YoukuIE
|
||||
from .youporn import YouPornIE
|
||||
from .yourupload import YourUploadIE
|
||||
from .youtube import (
|
||||
YoutubeIE,
|
||||
YoutubeChannelIE,
|
||||
YoutubeFavouritesIE,
|
||||
YoutubeHistoryIE,
|
||||
YoutubePlaylistIE,
|
||||
YoutubeRecommendedIE,
|
||||
YoutubeSearchDateIE,
|
||||
YoutubeSearchIE,
|
||||
YoutubeSearchURLIE,
|
||||
YoutubeShowIE,
|
||||
YoutubeSubscriptionsIE,
|
||||
YoutubeTopListIE,
|
||||
YoutubeTruncatedURLIE,
|
||||
YoutubeUserIE,
|
||||
YoutubeWatchLaterIE,
|
||||
)
|
||||
from .zdf import ZDFIE
|
||||
from .zingmp3 import (
|
||||
ZingMp3SongIE,
|
||||
ZingMp3AlbumIE,
|
||||
)
|
||||
|
||||
_ALL_CLASSES = [
|
||||
klass
|
||||
for name, klass in globals().items()
|
||||
if name.endswith('IE') and name != 'GenericIE'
|
||||
]
|
||||
_ALL_CLASSES.append(GenericIE)
|
||||
|
||||
|
||||
def gen_extractors():
|
||||
""" Return a list of an instance of every supported extractor.
|
||||
The order does matter; the first extractor matched is the one handling the URL.
|
||||
"""
|
||||
return [klass() for klass in _ALL_CLASSES]
|
||||
|
||||
|
||||
def get_info_extractor(ie_name):
|
||||
"""Returns the info extractor class with the given ie_name"""
|
||||
return globals()[ie_name + 'IE']
|
||||
47
youtube_dl/extractor/abc.py
Normal file
47
youtube_dl/extractor/abc.py
Normal file
@@ -0,0 +1,47 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import re
|
||||
import json
|
||||
|
||||
from .common import InfoExtractor
|
||||
|
||||
|
||||
class ABCIE(InfoExtractor):
|
||||
IE_NAME = 'abc.net.au'
|
||||
_VALID_URL = r'http://www\.abc\.net\.au/news/[^/]+/[^/]+/(?P<id>\d+)'
|
||||
|
||||
_TEST = {
|
||||
'url': 'http://www.abc.net.au/news/2014-11-05/australia-to-staff-ebola-treatment-centre-in-sierra-leone/5868334',
|
||||
'md5': 'cb3dd03b18455a661071ee1e28344d9f',
|
||||
'info_dict': {
|
||||
'id': '5868334',
|
||||
'ext': 'mp4',
|
||||
'title': 'Australia to help staff Ebola treatment centre in Sierra Leone',
|
||||
'description': 'md5:809ad29c67a05f54eb41f2a105693a67',
|
||||
},
|
||||
}
|
||||
|
||||
def _real_extract(self, url):
|
||||
video_id = self._match_id(url)
|
||||
webpage = self._download_webpage(url, video_id)
|
||||
|
||||
urls_info_json = self._search_regex(
|
||||
r'inlineVideoData\.push\((.*?)\);', webpage, 'video urls',
|
||||
flags=re.DOTALL)
|
||||
urls_info = json.loads(urls_info_json.replace('\'', '"'))
|
||||
formats = [{
|
||||
'url': url_info['url'],
|
||||
'width': int(url_info['width']),
|
||||
'height': int(url_info['height']),
|
||||
'tbr': int(url_info['bitrate']),
|
||||
'filesize': int(url_info['filesize']),
|
||||
} for url_info in urls_info]
|
||||
self._sort_formats(formats)
|
||||
|
||||
return {
|
||||
'id': video_id,
|
||||
'title': self._og_search_title(webpage),
|
||||
'formats': formats,
|
||||
'description': self._og_search_description(webpage),
|
||||
'thumbnail': self._og_search_thumbnail(webpage),
|
||||
}
|
||||
41
youtube_dl/extractor/academicearth.py
Normal file
41
youtube_dl/extractor/academicearth.py
Normal file
@@ -0,0 +1,41 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import re
|
||||
|
||||
from .common import InfoExtractor
|
||||
|
||||
|
||||
class AcademicEarthCourseIE(InfoExtractor):
|
||||
_VALID_URL = r'^https?://(?:www\.)?academicearth\.org/playlists/(?P<id>[^?#/]+)'
|
||||
IE_NAME = 'AcademicEarth:Course'
|
||||
_TEST = {
|
||||
'url': 'http://academicearth.org/playlists/laws-of-nature/',
|
||||
'info_dict': {
|
||||
'id': 'laws-of-nature',
|
||||
'title': 'Laws of Nature',
|
||||
'description': 'Introduce yourself to the laws of nature with these free online college lectures from Yale, Harvard, and MIT.',
|
||||
},
|
||||
'playlist_count': 4,
|
||||
}
|
||||
|
||||
def _real_extract(self, url):
|
||||
playlist_id = self._match_id(url)
|
||||
|
||||
webpage = self._download_webpage(url, playlist_id)
|
||||
title = self._html_search_regex(
|
||||
r'<h1 class="playlist-name"[^>]*?>(.*?)</h1>', webpage, 'title')
|
||||
description = self._html_search_regex(
|
||||
r'<p class="excerpt"[^>]*?>(.*?)</p>',
|
||||
webpage, 'description', fatal=False)
|
||||
urls = re.findall(
|
||||
r'<li class="lecture-preview">\s*?<a target="_blank" href="([^"]+)">',
|
||||
webpage)
|
||||
entries = [self.url_result(u) for u in urls]
|
||||
|
||||
return {
|
||||
'_type': 'playlist',
|
||||
'id': playlist_id,
|
||||
'title': title,
|
||||
'description': description,
|
||||
'entries': entries,
|
||||
}
|
||||
87
youtube_dl/extractor/addanime.py
Normal file
87
youtube_dl/extractor/addanime.py
Normal file
@@ -0,0 +1,87 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import re
|
||||
|
||||
from .common import InfoExtractor
|
||||
from ..compat import (
|
||||
compat_HTTPError,
|
||||
compat_str,
|
||||
compat_urllib_parse,
|
||||
compat_urllib_parse_urlparse,
|
||||
)
|
||||
from ..utils import (
|
||||
ExtractorError,
|
||||
)
|
||||
|
||||
|
||||
class AddAnimeIE(InfoExtractor):
|
||||
_VALID_URL = r'^http://(?:\w+\.)?add-anime\.net/watch_video\.php\?(?:.*?)v=(?P<id>[\w_]+)(?:.*)'
|
||||
_TEST = {
|
||||
'url': 'http://www.add-anime.net/watch_video.php?v=24MR3YO5SAS9',
|
||||
'md5': '72954ea10bc979ab5e2eb288b21425a0',
|
||||
'info_dict': {
|
||||
'id': '24MR3YO5SAS9',
|
||||
'ext': 'mp4',
|
||||
'description': 'One Piece 606',
|
||||
'title': 'One Piece 606',
|
||||
}
|
||||
}
|
||||
|
||||
def _real_extract(self, url):
|
||||
video_id = self._match_id(url)
|
||||
|
||||
try:
|
||||
webpage = self._download_webpage(url, video_id)
|
||||
except ExtractorError as ee:
|
||||
if not isinstance(ee.cause, compat_HTTPError) or \
|
||||
ee.cause.code != 503:
|
||||
raise
|
||||
|
||||
redir_webpage = ee.cause.read().decode('utf-8')
|
||||
action = self._search_regex(
|
||||
r'<form id="challenge-form" action="([^"]+)"',
|
||||
redir_webpage, 'Redirect form')
|
||||
vc = self._search_regex(
|
||||
r'<input type="hidden" name="jschl_vc" value="([^"]+)"/>',
|
||||
redir_webpage, 'redirect vc value')
|
||||
av = re.search(
|
||||
r'a\.value = ([0-9]+)[+]([0-9]+)[*]([0-9]+);',
|
||||
redir_webpage)
|
||||
if av is None:
|
||||
raise ExtractorError('Cannot find redirect math task')
|
||||
av_res = int(av.group(1)) + int(av.group(2)) * int(av.group(3))
|
||||
|
||||
parsed_url = compat_urllib_parse_urlparse(url)
|
||||
av_val = av_res + len(parsed_url.netloc)
|
||||
confirm_url = (
|
||||
parsed_url.scheme + '://' + parsed_url.netloc +
|
||||
action + '?' +
|
||||
compat_urllib_parse.urlencode({
|
||||
'jschl_vc': vc, 'jschl_answer': compat_str(av_val)}))
|
||||
self._download_webpage(
|
||||
confirm_url, video_id,
|
||||
note='Confirming after redirect')
|
||||
webpage = self._download_webpage(url, video_id)
|
||||
|
||||
formats = []
|
||||
for format_id in ('normal', 'hq'):
|
||||
rex = r"var %s_video_file = '(.*?)';" % re.escape(format_id)
|
||||
video_url = self._search_regex(rex, webpage, 'video file URLx',
|
||||
fatal=False)
|
||||
if not video_url:
|
||||
continue
|
||||
formats.append({
|
||||
'format_id': format_id,
|
||||
'url': video_url,
|
||||
})
|
||||
self._sort_formats(formats)
|
||||
video_title = self._og_search_title(webpage)
|
||||
video_description = self._og_search_description(webpage)
|
||||
|
||||
return {
|
||||
'_type': 'video',
|
||||
'id': video_id,
|
||||
'formats': formats,
|
||||
'title': video_title,
|
||||
'description': video_description
|
||||
}
|
||||
166
youtube_dl/extractor/adultswim.py
Normal file
166
youtube_dl/extractor/adultswim.py
Normal file
@@ -0,0 +1,166 @@
|
||||
# coding: utf-8
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import re
|
||||
import json
|
||||
|
||||
from .common import InfoExtractor
|
||||
from ..utils import (
|
||||
ExtractorError,
|
||||
)
|
||||
|
||||
|
||||
class AdultSwimIE(InfoExtractor):
|
||||
_VALID_URL = r'https?://(?:www\.)?adultswim\.com/videos/(?P<is_playlist>playlists/)?(?P<show_path>[^/]+)/(?P<episode_path>[^/?#]+)/?'
|
||||
|
||||
_TESTS = [{
|
||||
'url': 'http://adultswim.com/videos/rick-and-morty/pilot',
|
||||
'playlist': [
|
||||
{
|
||||
'md5': '247572debc75c7652f253c8daa51a14d',
|
||||
'info_dict': {
|
||||
'id': 'rQxZvXQ4ROaSOqq-or2Mow-0',
|
||||
'ext': 'flv',
|
||||
'title': 'Rick and Morty - Pilot Part 1',
|
||||
'description': "Rick moves in with his daughter's family and establishes himself as a bad influence on his grandson, Morty. "
|
||||
},
|
||||
},
|
||||
{
|
||||
'md5': '77b0e037a4b20ec6b98671c4c379f48d',
|
||||
'info_dict': {
|
||||
'id': 'rQxZvXQ4ROaSOqq-or2Mow-3',
|
||||
'ext': 'flv',
|
||||
'title': 'Rick and Morty - Pilot Part 4',
|
||||
'description': "Rick moves in with his daughter's family and establishes himself as a bad influence on his grandson, Morty. "
|
||||
},
|
||||
},
|
||||
],
|
||||
'info_dict': {
|
||||
'title': 'Rick and Morty - Pilot',
|
||||
'description': "Rick moves in with his daughter's family and establishes himself as a bad influence on his grandson, Morty. "
|
||||
}
|
||||
}, {
|
||||
'url': 'http://www.adultswim.com/videos/playlists/american-parenting/putting-francine-out-of-business/',
|
||||
'playlist': [
|
||||
{
|
||||
'md5': '2eb5c06d0f9a1539da3718d897f13ec5',
|
||||
'info_dict': {
|
||||
'id': '-t8CamQlQ2aYZ49ItZCFog-0',
|
||||
'ext': 'flv',
|
||||
'title': 'American Dad - Putting Francine Out of Business',
|
||||
'description': 'Stan hatches a plan to get Francine out of the real estate business.Watch more American Dad on [adult swim].'
|
||||
},
|
||||
}
|
||||
],
|
||||
'info_dict': {
|
||||
'title': 'American Dad - Putting Francine Out of Business',
|
||||
'description': 'Stan hatches a plan to get Francine out of the real estate business.Watch more American Dad on [adult swim].'
|
||||
},
|
||||
}]
|
||||
|
||||
@staticmethod
|
||||
def find_video_info(collection, slug):
|
||||
for video in collection.get('videos'):
|
||||
if video.get('slug') == slug:
|
||||
return video
|
||||
|
||||
@staticmethod
|
||||
def find_collection_by_linkURL(collections, linkURL):
|
||||
for collection in collections:
|
||||
if collection.get('linkURL') == linkURL:
|
||||
return collection
|
||||
|
||||
@staticmethod
|
||||
def find_collection_containing_video(collections, slug):
|
||||
for collection in collections:
|
||||
for video in collection.get('videos'):
|
||||
if video.get('slug') == slug:
|
||||
return collection, video
|
||||
|
||||
def _real_extract(self, url):
|
||||
mobj = re.match(self._VALID_URL, url)
|
||||
show_path = mobj.group('show_path')
|
||||
episode_path = mobj.group('episode_path')
|
||||
is_playlist = True if mobj.group('is_playlist') else False
|
||||
|
||||
webpage = self._download_webpage(url, episode_path)
|
||||
|
||||
# Extract the value of `bootstrappedData` from the Javascript in the page.
|
||||
bootstrappedDataJS = self._search_regex(r'var bootstrappedData = ({.*});', webpage, episode_path)
|
||||
|
||||
try:
|
||||
bootstrappedData = json.loads(bootstrappedDataJS)
|
||||
except ValueError as ve:
|
||||
errmsg = '%s: Failed to parse JSON ' % episode_path
|
||||
raise ExtractorError(errmsg, cause=ve)
|
||||
|
||||
# Downloading videos from a /videos/playlist/ URL needs to be handled differently.
|
||||
# NOTE: We are only downloading one video (the current one) not the playlist
|
||||
if is_playlist:
|
||||
collections = bootstrappedData['playlists']['collections']
|
||||
collection = self.find_collection_by_linkURL(collections, show_path)
|
||||
video_info = self.find_video_info(collection, episode_path)
|
||||
|
||||
show_title = video_info['showTitle']
|
||||
segment_ids = [video_info['videoPlaybackID']]
|
||||
else:
|
||||
collections = bootstrappedData['show']['collections']
|
||||
collection, video_info = self.find_collection_containing_video(collections, episode_path)
|
||||
|
||||
show = bootstrappedData['show']
|
||||
show_title = show['title']
|
||||
segment_ids = [clip['videoPlaybackID'] for clip in video_info['clips']]
|
||||
|
||||
episode_id = video_info['id']
|
||||
episode_title = video_info['title']
|
||||
episode_description = video_info['description']
|
||||
episode_duration = video_info.get('duration')
|
||||
|
||||
entries = []
|
||||
for part_num, segment_id in enumerate(segment_ids):
|
||||
segment_url = 'http://www.adultswim.com/videos/api/v0/assets?id=%s&platform=mobile' % segment_id
|
||||
|
||||
segment_title = '%s - %s' % (show_title, episode_title)
|
||||
if len(segment_ids) > 1:
|
||||
segment_title += ' Part %d' % (part_num + 1)
|
||||
|
||||
idoc = self._download_xml(
|
||||
segment_url, segment_title,
|
||||
'Downloading segment information', 'Unable to download segment information')
|
||||
|
||||
segment_duration = idoc.find('.//trt').text.strip()
|
||||
|
||||
formats = []
|
||||
file_els = idoc.findall('.//files/file')
|
||||
|
||||
for file_el in file_els:
|
||||
bitrate = file_el.attrib.get('bitrate')
|
||||
ftype = file_el.attrib.get('type')
|
||||
|
||||
formats.append({
|
||||
'format_id': '%s_%s' % (bitrate, ftype),
|
||||
'url': file_el.text.strip(),
|
||||
# The bitrate may not be a number (for example: 'iphone')
|
||||
'tbr': int(bitrate) if bitrate.isdigit() else None,
|
||||
'quality': 1 if ftype == 'hd' else -1
|
||||
})
|
||||
|
||||
self._sort_formats(formats)
|
||||
|
||||
entries.append({
|
||||
'id': segment_id,
|
||||
'title': segment_title,
|
||||
'formats': formats,
|
||||
'duration': segment_duration,
|
||||
'description': episode_description
|
||||
})
|
||||
|
||||
return {
|
||||
'_type': 'playlist',
|
||||
'id': episode_id,
|
||||
'display_id': episode_path,
|
||||
'entries': entries,
|
||||
'title': '%s - %s' % (show_title, episode_title),
|
||||
'description': episode_description,
|
||||
'duration': episode_duration
|
||||
}
|
||||
66
youtube_dl/extractor/aftonbladet.py
Normal file
66
youtube_dl/extractor/aftonbladet.py
Normal file
@@ -0,0 +1,66 @@
|
||||
# encoding: utf-8
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import re
|
||||
|
||||
from .common import InfoExtractor
|
||||
|
||||
|
||||
class AftonbladetIE(InfoExtractor):
|
||||
_VALID_URL = r'^http://tv\.aftonbladet\.se/webbtv.+?(?P<video_id>article[0-9]+)\.ab(?:$|[?#])'
|
||||
_TEST = {
|
||||
'url': 'http://tv.aftonbladet.se/webbtv/nyheter/vetenskap/rymden/article36015.ab',
|
||||
'info_dict': {
|
||||
'id': 'article36015',
|
||||
'ext': 'mp4',
|
||||
'title': 'Vulkanutbrott i rymden - nu släpper NASA bilderna',
|
||||
'description': 'Jupiters måne mest aktiv av alla himlakroppar',
|
||||
'timestamp': 1394142732,
|
||||
'upload_date': '20140306',
|
||||
},
|
||||
}
|
||||
|
||||
def _real_extract(self, url):
|
||||
mobj = re.search(self._VALID_URL, url)
|
||||
|
||||
video_id = mobj.group('video_id')
|
||||
webpage = self._download_webpage(url, video_id)
|
||||
|
||||
# find internal video meta data
|
||||
meta_url = 'http://aftonbladet-play.drlib.aptoma.no/video/%s.json'
|
||||
internal_meta_id = self._html_search_regex(
|
||||
r'data-aptomaId="([\w\d]+)"', webpage, 'internal_meta_id')
|
||||
internal_meta_url = meta_url % internal_meta_id
|
||||
internal_meta_json = self._download_json(
|
||||
internal_meta_url, video_id, 'Downloading video meta data')
|
||||
|
||||
# find internal video formats
|
||||
format_url = 'http://aftonbladet-play.videodata.drvideo.aptoma.no/actions/video/?id=%s'
|
||||
internal_video_id = internal_meta_json['videoId']
|
||||
internal_formats_url = format_url % internal_video_id
|
||||
internal_formats_json = self._download_json(
|
||||
internal_formats_url, video_id, 'Downloading video formats')
|
||||
|
||||
formats = []
|
||||
for fmt in internal_formats_json['formats']['http']['pseudostreaming']['mp4']:
|
||||
p = fmt['paths'][0]
|
||||
formats.append({
|
||||
'url': 'http://%s:%d/%s/%s' % (p['address'], p['port'], p['path'], p['filename']),
|
||||
'ext': 'mp4',
|
||||
'width': fmt['width'],
|
||||
'height': fmt['height'],
|
||||
'tbr': fmt['bitrate'],
|
||||
'protocol': 'http',
|
||||
})
|
||||
self._sort_formats(formats)
|
||||
|
||||
return {
|
||||
'id': video_id,
|
||||
'title': internal_meta_json['title'],
|
||||
'formats': formats,
|
||||
'thumbnail': internal_meta_json['imageUrl'],
|
||||
'description': internal_meta_json['shortPreamble'],
|
||||
'timestamp': internal_meta_json['timePublished'],
|
||||
'duration': internal_meta_json['duration'],
|
||||
'view_count': internal_meta_json['views'],
|
||||
}
|
||||
89
youtube_dl/extractor/allocine.py
Normal file
89
youtube_dl/extractor/allocine.py
Normal file
@@ -0,0 +1,89 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import re
|
||||
import json
|
||||
|
||||
from .common import InfoExtractor
|
||||
from ..utils import (
|
||||
compat_str,
|
||||
qualities,
|
||||
determine_ext,
|
||||
)
|
||||
|
||||
|
||||
class AllocineIE(InfoExtractor):
|
||||
_VALID_URL = r'https?://(?:www\.)?allocine\.fr/(?P<typ>article|video|film)/(fichearticle_gen_carticle=|player_gen_cmedia=|fichefilm_gen_cfilm=)(?P<id>[0-9]+)(?:\.html)?'
|
||||
|
||||
_TESTS = [{
|
||||
'url': 'http://www.allocine.fr/article/fichearticle_gen_carticle=18635087.html',
|
||||
'md5': '0c9fcf59a841f65635fa300ac43d8269',
|
||||
'info_dict': {
|
||||
'id': '19546517',
|
||||
'ext': 'mp4',
|
||||
'title': 'Astérix - Le Domaine des Dieux Teaser VF',
|
||||
'description': 'md5:abcd09ce503c6560512c14ebfdb720d2',
|
||||
'thumbnail': 're:http://.*\.jpg',
|
||||
},
|
||||
}, {
|
||||
'url': 'http://www.allocine.fr/video/player_gen_cmedia=19540403&cfilm=222257.html',
|
||||
'md5': 'd0cdce5d2b9522ce279fdfec07ff16e0',
|
||||
'info_dict': {
|
||||
'id': '19540403',
|
||||
'ext': 'mp4',
|
||||
'title': 'Planes 2 Bande-annonce VF',
|
||||
'description': 'md5:eeaffe7c2d634525e21159b93acf3b1e',
|
||||
'thumbnail': 're:http://.*\.jpg',
|
||||
},
|
||||
}, {
|
||||
'url': 'http://www.allocine.fr/film/fichefilm_gen_cfilm=181290.html',
|
||||
'md5': '101250fb127ef9ca3d73186ff22a47ce',
|
||||
'info_dict': {
|
||||
'id': '19544709',
|
||||
'ext': 'mp4',
|
||||
'title': 'Dragons 2 - Bande annonce finale VF',
|
||||
'description': 'md5:71742e3a74b0d692c7fce0dd2017a4ac',
|
||||
'thumbnail': 're:http://.*\.jpg',
|
||||
},
|
||||
}]
|
||||
|
||||
def _real_extract(self, url):
|
||||
mobj = re.match(self._VALID_URL, url)
|
||||
typ = mobj.group('typ')
|
||||
display_id = mobj.group('id')
|
||||
|
||||
webpage = self._download_webpage(url, display_id)
|
||||
|
||||
if typ == 'film':
|
||||
video_id = self._search_regex(r'href="/video/player_gen_cmedia=([0-9]+).+"', webpage, 'video id')
|
||||
else:
|
||||
player = self._search_regex(r'data-player=\'([^\']+)\'>', webpage, 'data player')
|
||||
|
||||
player_data = json.loads(player)
|
||||
video_id = compat_str(player_data['refMedia'])
|
||||
|
||||
xml = self._download_xml('http://www.allocine.fr/ws/AcVisiondataV4.ashx?media=%s' % video_id, display_id)
|
||||
|
||||
video = xml.find('.//AcVisionVideo').attrib
|
||||
quality = qualities(['ld', 'md', 'hd'])
|
||||
|
||||
formats = []
|
||||
for k, v in video.items():
|
||||
if re.match(r'.+_path', k):
|
||||
format_id = k.split('_')[0]
|
||||
formats.append({
|
||||
'format_id': format_id,
|
||||
'quality': quality(format_id),
|
||||
'url': v,
|
||||
'ext': determine_ext(v),
|
||||
})
|
||||
|
||||
self._sort_formats(formats)
|
||||
|
||||
return {
|
||||
'id': video_id,
|
||||
'title': video['videoTitle'],
|
||||
'thumbnail': self._og_search_thumbnail(webpage),
|
||||
'formats': formats,
|
||||
'description': self._og_search_description(webpage),
|
||||
}
|
||||
59
youtube_dl/extractor/anitube.py
Normal file
59
youtube_dl/extractor/anitube.py
Normal file
@@ -0,0 +1,59 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import re
|
||||
|
||||
from .common import InfoExtractor
|
||||
|
||||
|
||||
class AnitubeIE(InfoExtractor):
|
||||
IE_NAME = 'anitube.se'
|
||||
_VALID_URL = r'https?://(?:www\.)?anitube\.se/video/(?P<id>\d+)'
|
||||
|
||||
_TEST = {
|
||||
'url': 'http://www.anitube.se/video/36621',
|
||||
'md5': '59d0eeae28ea0bc8c05e7af429998d43',
|
||||
'info_dict': {
|
||||
'id': '36621',
|
||||
'ext': 'mp4',
|
||||
'title': 'Recorder to Randoseru 01',
|
||||
'duration': 180.19,
|
||||
},
|
||||
'skip': 'Blocked in the US',
|
||||
}
|
||||
|
||||
def _real_extract(self, url):
|
||||
mobj = re.match(self._VALID_URL, url)
|
||||
video_id = mobj.group('id')
|
||||
|
||||
webpage = self._download_webpage(url, video_id)
|
||||
key = self._html_search_regex(
|
||||
r'http://www\.anitube\.se/embed/([A-Za-z0-9_-]*)', webpage, 'key')
|
||||
|
||||
config_xml = self._download_xml(
|
||||
'http://www.anitube.se/nuevo/econfig.php?key=%s' % key, key)
|
||||
|
||||
video_title = config_xml.find('title').text
|
||||
thumbnail = config_xml.find('image').text
|
||||
duration = float(config_xml.find('duration').text)
|
||||
|
||||
formats = []
|
||||
video_url = config_xml.find('file')
|
||||
if video_url is not None:
|
||||
formats.append({
|
||||
'format_id': 'sd',
|
||||
'url': video_url.text,
|
||||
})
|
||||
video_url = config_xml.find('filehd')
|
||||
if video_url is not None:
|
||||
formats.append({
|
||||
'format_id': 'hd',
|
||||
'url': video_url.text,
|
||||
})
|
||||
|
||||
return {
|
||||
'id': video_id,
|
||||
'title': video_title,
|
||||
'thumbnail': thumbnail,
|
||||
'duration': duration,
|
||||
'formats': formats
|
||||
}
|
||||
61
youtube_dl/extractor/anysex.py
Normal file
61
youtube_dl/extractor/anysex.py
Normal file
@@ -0,0 +1,61 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import re
|
||||
|
||||
from .common import InfoExtractor
|
||||
from ..utils import (
|
||||
parse_duration,
|
||||
int_or_none,
|
||||
)
|
||||
|
||||
|
||||
class AnySexIE(InfoExtractor):
|
||||
_VALID_URL = r'https?://(?:www\.)?anysex\.com/(?P<id>\d+)'
|
||||
_TEST = {
|
||||
'url': 'http://anysex.com/156592/',
|
||||
'md5': '023e9fbb7f7987f5529a394c34ad3d3d',
|
||||
'info_dict': {
|
||||
'id': '156592',
|
||||
'ext': 'mp4',
|
||||
'title': 'Busty and sexy blondie in her bikini strips for you',
|
||||
'description': 'md5:de9e418178e2931c10b62966474e1383',
|
||||
'categories': ['Erotic'],
|
||||
'duration': 270,
|
||||
'age_limit': 18,
|
||||
}
|
||||
}
|
||||
|
||||
def _real_extract(self, url):
|
||||
mobj = re.match(self._VALID_URL, url)
|
||||
video_id = mobj.group('id')
|
||||
|
||||
webpage = self._download_webpage(url, video_id)
|
||||
|
||||
video_url = self._html_search_regex(r"video_url\s*:\s*'([^']+)'", webpage, 'video URL')
|
||||
|
||||
title = self._html_search_regex(r'<title>(.*?)</title>', webpage, 'title')
|
||||
description = self._html_search_regex(
|
||||
r'<div class="description"[^>]*>([^<]+)</div>', webpage, 'description', fatal=False)
|
||||
thumbnail = self._html_search_regex(
|
||||
r'preview_url\s*:\s*\'(.*?)\'', webpage, 'thumbnail', fatal=False)
|
||||
|
||||
categories = re.findall(
|
||||
r'<a href="http://anysex\.com/categories/[^"]+" title="[^"]*">([^<]+)</a>', webpage)
|
||||
|
||||
duration = parse_duration(self._search_regex(
|
||||
r'<b>Duration:</b> (?:<q itemprop="duration">)?(\d+:\d+)', webpage, 'duration', fatal=False))
|
||||
view_count = int_or_none(self._html_search_regex(
|
||||
r'<b>Views:</b> (\d+)', webpage, 'view count', fatal=False))
|
||||
|
||||
return {
|
||||
'id': video_id,
|
||||
'url': video_url,
|
||||
'ext': 'mp4',
|
||||
'title': title,
|
||||
'description': description,
|
||||
'thumbnail': thumbnail,
|
||||
'categories': categories,
|
||||
'duration': duration,
|
||||
'view_count': view_count,
|
||||
'age_limit': 18,
|
||||
}
|
||||
72
youtube_dl/extractor/aol.py
Normal file
72
youtube_dl/extractor/aol.py
Normal file
@@ -0,0 +1,72 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import re
|
||||
|
||||
from .common import InfoExtractor
|
||||
from .fivemin import FiveMinIE
|
||||
|
||||
|
||||
class AolIE(InfoExtractor):
|
||||
IE_NAME = 'on.aol.com'
|
||||
_VALID_URL = r'''(?x)
|
||||
(?:
|
||||
aol-video:|
|
||||
http://on\.aol\.com/
|
||||
(?:
|
||||
video/.*-|
|
||||
playlist/(?P<playlist_display_id>[^/?#]+?)-(?P<playlist_id>[0-9]+)[?#].*_videoid=
|
||||
)
|
||||
)
|
||||
(?P<id>[0-9]+)
|
||||
(?:$|\?)
|
||||
'''
|
||||
|
||||
_TESTS = [{
|
||||
'url': 'http://on.aol.com/video/u-s--official-warns-of-largest-ever-irs-phone-scam-518167793?icid=OnHomepageC2Wide_MustSee_Img',
|
||||
'md5': '18ef68f48740e86ae94b98da815eec42',
|
||||
'info_dict': {
|
||||
'id': '518167793',
|
||||
'ext': 'mp4',
|
||||
'title': 'U.S. Official Warns Of \'Largest Ever\' IRS Phone Scam',
|
||||
},
|
||||
'add_ie': ['FiveMin'],
|
||||
}, {
|
||||
'url': 'http://on.aol.com/playlist/brace-yourself---todays-weirdest-news-152147?icid=OnHomepageC4_Omg_Img#_videoid=518184316',
|
||||
'info_dict': {
|
||||
'id': '152147',
|
||||
'title': 'Brace Yourself - Today\'s Weirdest News',
|
||||
},
|
||||
'playlist_mincount': 10,
|
||||
}]
|
||||
|
||||
def _real_extract(self, url):
|
||||
mobj = re.match(self._VALID_URL, url)
|
||||
video_id = mobj.group('id')
|
||||
|
||||
playlist_id = mobj.group('playlist_id')
|
||||
if playlist_id and not self._downloader.params.get('noplaylist'):
|
||||
self.to_screen('Downloading playlist %s - add --no-playlist to just download video %s' % (playlist_id, video_id))
|
||||
|
||||
webpage = self._download_webpage(url, playlist_id)
|
||||
title = self._html_search_regex(
|
||||
r'<h1 class="video-title[^"]*">(.+?)</h1>', webpage, 'title')
|
||||
playlist_html = self._search_regex(
|
||||
r"(?s)<ul\s+class='video-related[^']*'>(.*?)</ul>", webpage,
|
||||
'playlist HTML')
|
||||
entries = [{
|
||||
'_type': 'url',
|
||||
'url': 'aol-video:%s' % m.group('id'),
|
||||
'ie_key': 'Aol',
|
||||
} for m in re.finditer(
|
||||
r"<a\s+href='.*videoid=(?P<id>[0-9]+)'\s+class='video-thumb'>",
|
||||
playlist_html)]
|
||||
|
||||
return {
|
||||
'_type': 'playlist',
|
||||
'id': playlist_id,
|
||||
'display_id': mobj.group('playlist_display_id'),
|
||||
'title': title,
|
||||
'entries': entries,
|
||||
}
|
||||
|
||||
return FiveMinIE._build_result(video_id)
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user