Compare commits
1570 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0a2ea1e09d | ||
|
|
be77363515 | ||
|
|
b1a1c5c01b | ||
|
|
6b60360ce1 | ||
|
|
56e92101b0 | ||
|
|
2a5c67f9e3 | ||
|
|
ef39f41e96 | ||
|
|
d317ea3ff8 | ||
|
|
787e4c441b | ||
|
|
ef116d01b7 | ||
|
|
0a5be1f166 | ||
|
|
4a35518da7 | ||
|
|
8f3301cd1e | ||
|
|
97b10558f6 | ||
|
|
e61501f13f | ||
|
|
b1d1778479 | ||
|
|
9cca2d39c3 | ||
|
|
fcee4017d7 | ||
|
|
2890419d6d | ||
|
|
0fe3dd977f | ||
|
|
9ba088f76f | ||
|
|
1a7404ee8a | ||
|
|
f1de7606a5 | ||
|
|
d4b493cebe | ||
|
|
1df3d025bd | ||
|
|
61b7681fd1 | ||
|
|
ac7f16e71c | ||
|
|
b363dca77f | ||
|
|
16cabd19ff | ||
|
|
390b4ad7ec | ||
|
|
b3dc3292b7 | ||
|
|
244a242bdc | ||
|
|
241f3cb9a3 | ||
|
|
aa4fb3d08e | ||
|
|
ebaf9cf848 | ||
|
|
df05db5583 | ||
|
|
1ccfa404d2 | ||
|
|
bc19caf8ee | ||
|
|
36c24a4940 | ||
|
|
1cefcff3da | ||
|
|
1eb61201d6 | ||
|
|
3e514f9cf6 | ||
|
|
b8f1d950f2 | ||
|
|
a85effc8ec | ||
|
|
cf846979b0 | ||
|
|
9f630c9bfb | ||
|
|
1d66b6d069 | ||
|
|
6b83ed34b9 | ||
|
|
a0aeae7e91 | ||
|
|
99e3058676 | ||
|
|
20d1d8a224 | ||
|
|
0b34ff1148 | ||
|
|
4120fcf4af | ||
|
|
7ea277ccf6 | ||
|
|
77a981178b | ||
|
|
ea19545ec6 | ||
|
|
6f6ccb029c | ||
|
|
43b2d28fb5 | ||
|
|
f20d24ac3c | ||
|
|
b1332ee76b | ||
|
|
34b8f3fb64 | ||
|
|
b4f98e91ff | ||
|
|
ebb8d23ef3 | ||
|
|
e5bf6745bf | ||
|
|
686f63b35f | ||
|
|
4ed5f3ff5f | ||
|
|
af8379012a | ||
|
|
1c53102e12 | ||
|
|
1a074b65e6 | ||
|
|
2052adde7d | ||
|
|
eed9eebd45 | ||
|
|
e36eacd05a | ||
|
|
9c7cffa1a3 | ||
|
|
94d2bd7807 | ||
|
|
5efbf7e5c9 | ||
|
|
fce078defe | ||
|
|
10f355ba0f | ||
|
|
9d8293b970 | ||
|
|
73b8b54ae8 | ||
|
|
bc49dbc41d | ||
|
|
69b1ff58d0 | ||
|
|
cf48311fcb | ||
|
|
c919af1fd9 | ||
|
|
cdc5ac6538 | ||
|
|
05881478b5 | ||
|
|
fb279010d0 | ||
|
|
e54f61c480 | ||
|
|
ab9468f84f | ||
|
|
0f20c0acd1 | ||
|
|
a4ef6cb562 | ||
|
|
21c260dc13 | ||
|
|
0df520c5ba | ||
|
|
707461a264 | ||
|
|
a22f94df80 | ||
|
|
a60e817e0c | ||
|
|
f1865dda4f | ||
|
|
8cdc6b1307 | ||
|
|
660facf8c2 | ||
|
|
fee5b42813 | ||
|
|
ddb8500082 | ||
|
|
cc6af9829e | ||
|
|
cfba6b503a | ||
|
|
04c766bb53 | ||
|
|
2389a1aa35 | ||
|
|
430b4c409a | ||
|
|
810952f234 | ||
|
|
ae4a8e40f8 | ||
|
|
ea100dda36 | ||
|
|
46cbce00ca | ||
|
|
00ebbc7e17 | ||
|
|
8109ce5410 | ||
|
|
9200070269 | ||
|
|
16ab96e4ac | ||
|
|
d8632f6386 | ||
|
|
5558bad0de | ||
|
|
0f5b7fd80e | ||
|
|
6a288efb57 | ||
|
|
f07a307b0d | ||
|
|
cb1de722fe | ||
|
|
45036451c7 | ||
|
|
58a4f7a34a | ||
|
|
9082c6f63e | ||
|
|
9fb8a2ae09 | ||
|
|
0e501b498e | ||
|
|
85e0c5709e | ||
|
|
cee88a7e24 | ||
|
|
f503a46447 | ||
|
|
1cdd54e421 | ||
|
|
73be2513ad | ||
|
|
e9eb22a530 | ||
|
|
d17f287ba2 | ||
|
|
06b904b837 | ||
|
|
807c6aebdd | ||
|
|
ab54a7cfb3 | ||
|
|
77d4eed9fc | ||
|
|
9c73638d1b | ||
|
|
3dd7ebb34b | ||
|
|
c943f39f6b | ||
|
|
401698e616 | ||
|
|
c85b3e4fd1 | ||
|
|
be15ee073d | ||
|
|
d838e6276d | ||
|
|
35af086fad | ||
|
|
cf9fbf2b0e | ||
|
|
ef2225c8a5 | ||
|
|
ffacb6085d | ||
|
|
20a84359cd | ||
|
|
a3d123537f | ||
|
|
30fb222fb9 | ||
|
|
4c2a08dd52 | ||
|
|
406c568c1e | ||
|
|
a86424b7df | ||
|
|
f6ffc16964 | ||
|
|
05e8a0d284 | ||
|
|
1dc38afc85 | ||
|
|
ca73b3c286 | ||
|
|
bad30e8f1a | ||
|
|
56036e89af | ||
|
|
bb7a9bb018 | ||
|
|
f9ba0750d6 | ||
|
|
d98299268f | ||
|
|
601d01fe85 | ||
|
|
b24cc29523 | ||
|
|
dd06ac7cc5 | ||
|
|
4097c5ee18 | ||
|
|
240128943c | ||
|
|
6d8a2a0b9e | ||
|
|
6433da4901 | ||
|
|
96b27fa1cb | ||
|
|
9134620fe7 | ||
|
|
1ff1c035b7 | ||
|
|
58e165eb30 | ||
|
|
4fdafc91c1 | ||
|
|
7ef740ebe0 | ||
|
|
138ece60fd | ||
|
|
a2d0cc09eb | ||
|
|
a701d44d25 | ||
|
|
4a67d1c679 | ||
|
|
450ecedad4 | ||
|
|
55ea243862 | ||
|
|
319a27399e | ||
|
|
f532d15222 | ||
|
|
3b4a2da2be | ||
|
|
c464074c92 | ||
|
|
4945ba9073 | ||
|
|
a4b7cfea3f | ||
|
|
d0ed20f10b | ||
|
|
8964d9f349 | ||
|
|
e1525a64fc | ||
|
|
3a0415578a | ||
|
|
3dc023828d | ||
|
|
3d01225b6d | ||
|
|
0feb97275c | ||
|
|
036ac72e3c | ||
|
|
f097a1ed52 | ||
|
|
16485f29c8 | ||
|
|
0b2cb410bd | ||
|
|
330b4adb0e | ||
|
|
32818c60a4 | ||
|
|
a55d7e897d | ||
|
|
bd34106a31 | ||
|
|
85fb83fb67 | ||
|
|
0cfce0ff26 | ||
|
|
65147eb53a | ||
|
|
5b6d29efcb | ||
|
|
c5c53646eb | ||
|
|
0927cedfa0 | ||
|
|
22962e9b7c | ||
|
|
13932b0567 | ||
|
|
ed38a55711 | ||
|
|
e55d9b6d15 | ||
|
|
e15ae42c32 | ||
|
|
a71808445e | ||
|
|
b742b10553 | ||
|
|
e8e9314486 | ||
|
|
0b16be24c1 | ||
|
|
a90df37123 | ||
|
|
fc7608fa87 | ||
|
|
82a61e9da4 | ||
|
|
2d0c1d597f | ||
|
|
4a9566665e | ||
|
|
fad7a21287 | ||
|
|
7893da9426 | ||
|
|
f0ddc79fcc | ||
|
|
f92afd3f10 | ||
|
|
9ce6c3b461 | ||
|
|
b404b44aa1 | ||
|
|
8c38377e38 | ||
|
|
eda83e858d | ||
|
|
a6639aadcf | ||
|
|
2cc62e26b3 | ||
|
|
e42a515199 | ||
|
|
c36e43eaa3 | ||
|
|
0732bd93d2 | ||
|
|
f12027f836 | ||
|
|
d4dfaa6047 | ||
|
|
809d122d98 | ||
|
|
6dbbf8b85b | ||
|
|
3150c04ef4 | ||
|
|
770c641f1b | ||
|
|
9c0ad29db9 | ||
|
|
add6b2e900 | ||
|
|
83c2e7d731 | ||
|
|
29393b1803 | ||
|
|
0ba4d3b831 | ||
|
|
872f60e161 | ||
|
|
65886933ee | ||
|
|
f300d8af21 | ||
|
|
f87068a288 | ||
|
|
1916f4f1a3 | ||
|
|
b0d9b89451 | ||
|
|
0d512db6e2 | ||
|
|
24969c87f3 | ||
|
|
5619f1805b | ||
|
|
e9d72ebb17 | ||
|
|
c7647440ba | ||
|
|
86ba117e04 | ||
|
|
27cf60d5dc | ||
|
|
d06cddd94a | ||
|
|
21ad84daf8 | ||
|
|
c882e13889 | ||
|
|
9a68910e31 | ||
|
|
610abea1c3 | ||
|
|
b132fb73df | ||
|
|
eff52911c2 | ||
|
|
3ff41a965f | ||
|
|
8373fd17b8 | ||
|
|
c531169a37 | ||
|
|
d00b9ba081 | ||
|
|
1d644c82de | ||
|
|
d6308734ea | ||
|
|
534c6719d1 | ||
|
|
4e4315160e | ||
|
|
25398030fa | ||
|
|
b261a24bda | ||
|
|
dcbe5851c2 | ||
|
|
24ef81387e | ||
|
|
6a761c9a10 | ||
|
|
8ac6e9effe | ||
|
|
fec063bd1d | ||
|
|
8b76535ce2 | ||
|
|
7072caf3ce | ||
|
|
2ba8fd20ee | ||
|
|
7f962109e9 | ||
|
|
33e6b6565c | ||
|
|
04cdc64a18 | ||
|
|
452bc0e235 | ||
|
|
607c5b8c11 | ||
|
|
7ef697ed72 | ||
|
|
86182417cc | ||
|
|
200f385d23 | ||
|
|
8a5140d93d | ||
|
|
a5c2fa08a5 | ||
|
|
d0198a4419 | ||
|
|
de1b38e660 | ||
|
|
50bf04c73a | ||
|
|
1cfa101b90 | ||
|
|
14e2775980 | ||
|
|
8e86c855d3 | ||
|
|
01b3772138 | ||
|
|
1f84a81d97 | ||
|
|
12ab547bbc | ||
|
|
ef4fc2d28d | ||
|
|
d12fd7768a | ||
|
|
756480a69f | ||
|
|
19a8e9aa3e | ||
|
|
23f20546f7 | ||
|
|
7a2d1d1807 | ||
|
|
0138a178c3 | ||
|
|
ff6900d8f1 | ||
|
|
7217d45ff9 | ||
|
|
ba86131e4a | ||
|
|
b57278f7f1 | ||
|
|
c9136422b9 | ||
|
|
34692dfd38 | ||
|
|
a990b00b21 | ||
|
|
5f5e4e0ee2 | ||
|
|
e9fa721ca8 | ||
|
|
7ba1510131 | ||
|
|
057c192dc4 | ||
|
|
b78966ae2e | ||
|
|
2c34f7af1c | ||
|
|
6885d23bde | ||
|
|
277010a1b8 | ||
|
|
d0849accbb | ||
|
|
080e8da591 | ||
|
|
bf0b5f8cdb | ||
|
|
6e151cd2a1 | ||
|
|
62273fa6b2 | ||
|
|
00d0c3d828 | ||
|
|
61efbd6823 | ||
|
|
e6a33fb53a | ||
|
|
228d733539 | ||
|
|
83eb584422 | ||
|
|
47e89813a0 | ||
|
|
f0894ced54 | ||
|
|
5372887d46 | ||
|
|
f8d9567422 | ||
|
|
97b54744df | ||
|
|
4a974a1d3d | ||
|
|
192560755c | ||
|
|
d299704f57 | ||
|
|
314e74d1ed | ||
|
|
919af5bf15 | ||
|
|
d819acedd5 | ||
|
|
54fcc5057b | ||
|
|
cd5da2fe9b | ||
|
|
1c79ffc720 | ||
|
|
a1a590fbba | ||
|
|
606c02aef4 | ||
|
|
4f68a8ad0b | ||
|
|
37d962fcf3 | ||
|
|
baf06461df | ||
|
|
464e63fd92 | ||
|
|
2761e9c768 | ||
|
|
0efb5fa7ad | ||
|
|
34947c355d | ||
|
|
958814f2ea | ||
|
|
ec0c0c7870 | ||
|
|
ec0a1d1bb4 | ||
|
|
969d71afec | ||
|
|
c1db01b936 | ||
|
|
90670a4645 | ||
|
|
b5fad54f4a | ||
|
|
50718d3791 | ||
|
|
bd54a8c214 | ||
|
|
0cd0edf4cc | ||
|
|
9e0d91f144 | ||
|
|
38d9c4c504 | ||
|
|
9e1721990d | ||
|
|
a20f82cc61 | ||
|
|
630ed76b8c | ||
|
|
1155cba4dd | ||
|
|
2343181e1b | ||
|
|
9bb7330caa | ||
|
|
3aae1614ea | ||
|
|
cdd308fc4a | ||
|
|
594d18e76e | ||
|
|
50d772eb54 | ||
|
|
57ffb5e0c4 | ||
|
|
49ab4bd201 | ||
|
|
7b06acb972 | ||
|
|
80b86b5693 | ||
|
|
748b996522 | ||
|
|
77877d4201 | ||
|
|
696fa4479c | ||
|
|
e0bb7562be | ||
|
|
8f20d9676b | ||
|
|
b61a4e84f5 | ||
|
|
9c59157a98 | ||
|
|
5def2d3947 | ||
|
|
ce6326a869 | ||
|
|
7e56550887 | ||
|
|
aa42627d45 | ||
|
|
bd6dc1a7c1 | ||
|
|
dfedbcea32 | ||
|
|
d930b97b30 | ||
|
|
de7899c8f8 | ||
|
|
2f53c5e137 | ||
|
|
ff54f48abb | ||
|
|
a7766e8d3f | ||
|
|
844e34e596 | ||
|
|
8515fee681 | ||
|
|
10a1ee3a09 | ||
|
|
a1b2641130 | ||
|
|
bb55b3fab2 | ||
|
|
57d02aa316 | ||
|
|
d3bfccaa6b | ||
|
|
3a92f596ff | ||
|
|
60b4365a76 | ||
|
|
cb0ad73c80 | ||
|
|
9c865050bb | ||
|
|
0edeaa4d58 | ||
|
|
dfd1ca3a8e | ||
|
|
75d9939b98 | ||
|
|
f88d5426c9 | ||
|
|
1b7d4f09a9 | ||
|
|
680376c4a6 | ||
|
|
15cca44bd2 | ||
|
|
29d17870cb | ||
|
|
c150d22c97 | ||
|
|
4e0c1ed393 | ||
|
|
c6240c3253 | ||
|
|
5deb0d7e9a | ||
|
|
803cce808b | ||
|
|
8e89c0962b | ||
|
|
50cc394a27 | ||
|
|
0165d541b8 | ||
|
|
5af36428fa | ||
|
|
48ad571a59 | ||
|
|
57a003d7c5 | ||
|
|
5f5b13d7fe | ||
|
|
ed3f3f11f6 | ||
|
|
0572997a44 | ||
|
|
4ce10859e7 | ||
|
|
eb5a291c8b | ||
|
|
4b6394d0d5 | ||
|
|
6b075ebe83 | ||
|
|
9b4dea29f4 | ||
|
|
a2539b15d5 | ||
|
|
a0da514f33 | ||
|
|
ff5ae7a054 | ||
|
|
27bbdcc465 | ||
|
|
1f19ed9a2d | ||
|
|
06ce97bf6c | ||
|
|
5c67a561c1 | ||
|
|
1ee49318fc | ||
|
|
cc06379ce8 | ||
|
|
66ac79c709 | ||
|
|
ad252c5fc6 | ||
|
|
ab9f86d6c9 | ||
|
|
583cecc661 | ||
|
|
3d66d32597 | ||
|
|
e4962fca52 | ||
|
|
c4b318bd5f | ||
|
|
d55acf9c12 | ||
|
|
24bc40c95e | ||
|
|
0716444be5 | ||
|
|
85c0e99e16 | ||
|
|
0b57961ff7 | ||
|
|
81b3d64f42 | ||
|
|
cf0cf79440 | ||
|
|
a8e6796002 | ||
|
|
f77aff6adf | ||
|
|
7fd028e5fa | ||
|
|
74f1be5452 | ||
|
|
77317aadc4 | ||
|
|
8eb2fb8d5d | ||
|
|
58de27c484 | ||
|
|
185f5ec30b | ||
|
|
351e890db5 | ||
|
|
6f2a00c785 | ||
|
|
6f2aa86229 | ||
|
|
38aef81476 | ||
|
|
9dc3bb4f03 | ||
|
|
9291449737 | ||
|
|
98ee69d696 | ||
|
|
c5d20d56ec | ||
|
|
e341367583 | ||
|
|
f92a4c3e7d | ||
|
|
5b894df71b | ||
|
|
4577670fa8 | ||
|
|
6cac1f84ec | ||
|
|
3c6b189ae6 | ||
|
|
570145b2a4 | ||
|
|
95f2356b4c | ||
|
|
97426621bf | ||
|
|
3b7a9f9830 | ||
|
|
61b92efcda | ||
|
|
b3026dbd87 | ||
|
|
2eea86d8eb | ||
|
|
46fb391d6c | ||
|
|
79b3597637 | ||
|
|
32dc268891 | ||
|
|
02975e6b0e | ||
|
|
83dd5e35a7 | ||
|
|
1d6054f78b | ||
|
|
8a947a2f80 | ||
|
|
6c22f5f595 | ||
|
|
bea86b2a67 | ||
|
|
82f873270e | ||
|
|
2b8fa8b6fe | ||
|
|
38390405dc | ||
|
|
f30343b821 | ||
|
|
d738021285 | ||
|
|
08e32dde7e | ||
|
|
229321c6c5 | ||
|
|
3b65f2a4a7 | ||
|
|
93b0e42609 | ||
|
|
633cdb4a82 | ||
|
|
eda0e0f964 | ||
|
|
a850cf6635 | ||
|
|
af8b9cf1f2 | ||
|
|
cc6cc41ad3 | ||
|
|
8228036936 | ||
|
|
600646b6ce | ||
|
|
fc73d2e6fd | ||
|
|
616cef87cb | ||
|
|
fdc65d6e51 | ||
|
|
be922ef7c1 | ||
|
|
7dd5385f15 | ||
|
|
a5a199b63c | ||
|
|
ab129fa233 | ||
|
|
35717e9dfb | ||
|
|
a881668b38 | ||
|
|
7e92647360 | ||
|
|
0198d7493d | ||
|
|
04d9bc8752 | ||
|
|
3e5fdcf6b9 | ||
|
|
d538a23ad0 | ||
|
|
8de77e3d11 | ||
|
|
985def222e | ||
|
|
9bf4576a50 | ||
|
|
a5c41c8313 | ||
|
|
11d04d52c1 | ||
|
|
cb5af1a396 | ||
|
|
8a487cff9e | ||
|
|
45920e065e | ||
|
|
2d7b6c01d0 | ||
|
|
c33acd0746 | ||
|
|
f2c531baa4 | ||
|
|
287bcfd703 | ||
|
|
e71555e664 | ||
|
|
bc921c889e | ||
|
|
59ebe132db | ||
|
|
b47d335e86 | ||
|
|
f5e186dc67 | ||
|
|
3d85803df9 | ||
|
|
5c64fb5d35 | ||
|
|
5280fc76e9 | ||
|
|
d4a8d9a120 | ||
|
|
3fbf33b8ae | ||
|
|
0d27223f16 | ||
|
|
2c5fcab469 | ||
|
|
8fc7150559 | ||
|
|
89b53ffe96 | ||
|
|
e990bc898d | ||
|
|
cb699b5fec | ||
|
|
8a235c31e0 | ||
|
|
8ee27b8ef4 | ||
|
|
5023651e63 | ||
|
|
f65fc68179 | ||
|
|
b9bcf747de | ||
|
|
88e7167b6c | ||
|
|
f5ab39be8e | ||
|
|
6e69e5d36e | ||
|
|
9c4ca25615 | ||
|
|
d15f40b22d | ||
|
|
1befac8d0e | ||
|
|
cfa1ebbea7 | ||
|
|
2a679dd6e8 | ||
|
|
fce5f00925 | ||
|
|
39d04c4b2a | ||
|
|
5688e4538c | ||
|
|
4e18d4091a | ||
|
|
cfde3ee85d | ||
|
|
1c343cb4c1 | ||
|
|
e3e490daa5 | ||
|
|
d7783749ca | ||
|
|
b07fc8285f | ||
|
|
6379356612 | ||
|
|
ee3768faf8 | ||
|
|
8ff65412a3 | ||
|
|
cb930bef0b | ||
|
|
6a76554563 | ||
|
|
e72005e239 | ||
|
|
54b1832007 | ||
|
|
e714e00223 | ||
|
|
6989484e7c | ||
|
|
53164a058d | ||
|
|
f84078c865 | ||
|
|
7eda218e82 | ||
|
|
54b0c23f11 | ||
|
|
b34417b1fc | ||
|
|
40005351b5 | ||
|
|
6255ccd253 | ||
|
|
4a10a2dfd1 | ||
|
|
992ab0bf10 | ||
|
|
83a2d090ff | ||
|
|
8133ce7b92 | ||
|
|
6a07f705f7 | ||
|
|
9455912d98 | ||
|
|
052e0a4a31 | ||
|
|
b8b1ddc138 | ||
|
|
a92fee3532 | ||
|
|
aff402f6e0 | ||
|
|
a39691fdad | ||
|
|
7eecf709f9 | ||
|
|
dd13de5f65 | ||
|
|
647eaf5af9 | ||
|
|
24394a9028 | ||
|
|
e8835c3054 | ||
|
|
2834cca9fa | ||
|
|
744e720c3b | ||
|
|
a6dfd98717 | ||
|
|
4550f09bf1 | ||
|
|
7289e32bea | ||
|
|
0bdbe66d96 | ||
|
|
e58e701e2c | ||
|
|
ac9b79c8ca | ||
|
|
280fbc1e8d | ||
|
|
a1d4f706f7 | ||
|
|
6e2ff6887d | ||
|
|
fe297d4c56 | ||
|
|
b16971491f | ||
|
|
4b1866d521 | ||
|
|
c539375adc | ||
|
|
ec8beda1ed | ||
|
|
cd96986445 | ||
|
|
975e57d57b | ||
|
|
08ad4f73f1 | ||
|
|
c9f9c868df | ||
|
|
e7f8f4ccfc | ||
|
|
e1b0c85778 | ||
|
|
2148d98f3a | ||
|
|
d06508fda6 | ||
|
|
1f780fc307 | ||
|
|
0178e9dcb8 | ||
|
|
c170c247a9 | ||
|
|
4bb3edbf8d | ||
|
|
9dbae636ae | ||
|
|
b6234f7705 | ||
|
|
101dd356ae | ||
|
|
f8e9db25cd | ||
|
|
8e33507839 | ||
|
|
4c4c3508c2 | ||
|
|
a7ec8ba04e | ||
|
|
b5dce351b0 | ||
|
|
59fa19d7ad | ||
|
|
619e5249ac | ||
|
|
48340010b1 | ||
|
|
4599752d9d | ||
|
|
5eec89cd42 | ||
|
|
dcecab2d9f | ||
|
|
767d31ebd8 | ||
|
|
1ece5de579 | ||
|
|
f34a79df36 | ||
|
|
f231c54886 | ||
|
|
56f0826928 | ||
|
|
caceeee238 | ||
|
|
afd3b84b40 | ||
|
|
4b927832c2 | ||
|
|
c5679d546e | ||
|
|
097fa9cc7c | ||
|
|
6f1a94359f | ||
|
|
44e2f366ce | ||
|
|
cf6b46364c | ||
|
|
b8f7880a78 | ||
|
|
85c6816c23 | ||
|
|
0c1d7d6e0f | ||
|
|
3f073e083e | ||
|
|
6ce7e662c6 | ||
|
|
1e6c067139 | ||
|
|
f53038f6e9 | ||
|
|
c61234dd4c | ||
|
|
6336bbd6e3 | ||
|
|
649ac1900b | ||
|
|
27e3d33f7d | ||
|
|
c29deab728 | ||
|
|
3a4ba6af37 | ||
|
|
e49d80fb17 | ||
|
|
a37f00bc10 | ||
|
|
925d495b62 | ||
|
|
809beb4f81 | ||
|
|
0359451498 | ||
|
|
f6bd2cfcf4 | ||
|
|
9eecc2410c | ||
|
|
6cd8af91be | ||
|
|
7a3c1f0a10 | ||
|
|
f2f3558cc4 | ||
|
|
0dfaf6c1cf | ||
|
|
a6ecba8e13 | ||
|
|
1a2c507d47 | ||
|
|
95b61826e0 | ||
|
|
b1da72fde8 | ||
|
|
b5e64a390a | ||
|
|
da829e0d69 | ||
|
|
fd02908afa | ||
|
|
38092fa055 | ||
|
|
24a7e060f2 | ||
|
|
bd962d4d76 | ||
|
|
a54dbc42e9 | ||
|
|
4c2381db26 | ||
|
|
91400ae31c | ||
|
|
c8f1e23b1a | ||
|
|
188f1cac8f | ||
|
|
b216929dc4 | ||
|
|
08008bb25c | ||
|
|
c96f212726 | ||
|
|
80c1a61c33 | ||
|
|
7925e04834 | ||
|
|
4da9da3d9a | ||
|
|
9916073a98 | ||
|
|
820776427b | ||
|
|
da76ff53ce | ||
|
|
9a657bdc10 | ||
|
|
df73ba2512 | ||
|
|
450237052c | ||
|
|
ffde524c85 | ||
|
|
2618548fbe | ||
|
|
0471d141c4 | ||
|
|
8b31c0376c | ||
|
|
10c23104a1 | ||
|
|
9ed3533225 | ||
|
|
97342951d0 | ||
|
|
46d50ccda2 | ||
|
|
290027b5c5 | ||
|
|
f6129444f7 | ||
|
|
57189c0d06 | ||
|
|
0aaeea4d3c | ||
|
|
f59a54782a | ||
|
|
4156a3f546 | ||
|
|
13edc02440 | ||
|
|
cb4fa201f0 | ||
|
|
1905f8fec9 | ||
|
|
d45e3f3e7b | ||
|
|
a039cbf348 | ||
|
|
c5a21bddfd | ||
|
|
c204b7a82c | ||
|
|
f475975b40 | ||
|
|
d3031ecff2 | ||
|
|
9a0a2111d3 | ||
|
|
d0053dc2f4 | ||
|
|
60e9bf461c | ||
|
|
6add81add8 | ||
|
|
a16b5b5add | ||
|
|
aab918ff1a | ||
|
|
ca97413b76 | ||
|
|
8b0b5f3738 | ||
|
|
07816f7470 | ||
|
|
28bf22a710 | ||
|
|
2466b2e0a6 | ||
|
|
2dc2953831 | ||
|
|
103a5026f9 | ||
|
|
c7ef42a65e | ||
|
|
ccaf73a477 | ||
|
|
dae57b5507 | ||
|
|
5dc1ffb70e | ||
|
|
1dc500d4f3 | ||
|
|
d9bb625534 | ||
|
|
47cb6b9d5b | ||
|
|
b1eed5122a | ||
|
|
97801c4fef | ||
|
|
77d2abe04e | ||
|
|
8b78e29827 | ||
|
|
e6bfc57fc4 | ||
|
|
7facf4f6a2 | ||
|
|
79c25ffb33 | ||
|
|
24dca39177 | ||
|
|
d209c02886 | ||
|
|
c3315ab0fc | ||
|
|
109803e802 | ||
|
|
43ddbc7fd9 | ||
|
|
c8af0d3c1d | ||
|
|
7db9e920de | ||
|
|
c8b726c0d1 | ||
|
|
180acc15cd | ||
|
|
c3d261c74a | ||
|
|
0db89109a5 | ||
|
|
6ee0476799 | ||
|
|
d86da0b0f7 | ||
|
|
eb483ccd48 | ||
|
|
e7d5af5944 | ||
|
|
0e3962e3f6 | ||
|
|
992de4d80e | ||
|
|
85586d2dc5 | ||
|
|
21ee5566a7 | ||
|
|
429a376ccf | ||
|
|
a48c09e688 | ||
|
|
03de09fcaf | ||
|
|
97cf38e501 | ||
|
|
c24c99de36 | ||
|
|
a1ab889fca | ||
|
|
170fd28c55 | ||
|
|
cdf5c5364a | ||
|
|
2e85b4041f | ||
|
|
a56e14f0a0 | ||
|
|
16c3476960 | ||
|
|
982ef3ae97 | ||
|
|
6057751e99 | ||
|
|
4c715111c5 | ||
|
|
0d8e9792ff | ||
|
|
ba5ccdb5cb | ||
|
|
579ca908c6 | ||
|
|
c7d7148132 | ||
|
|
18ad5b0a01 | ||
|
|
cde3298920 | ||
|
|
20e3fb6f5f | ||
|
|
f0b87db248 | ||
|
|
2d90b29612 | ||
|
|
81e6d7f3a7 | ||
|
|
a676a20054 | ||
|
|
aef5669b76 | ||
|
|
ffb809bbca | ||
|
|
60862ec01d | ||
|
|
b7fedb1983 | ||
|
|
fa7d917d0d | ||
|
|
ab20dc42f1 | ||
|
|
02fefd0a81 | ||
|
|
788e907502 | ||
|
|
bb4eb523fe | ||
|
|
11b42e58c1 | ||
|
|
8dba9b93b6 | ||
|
|
d4a564efb5 | ||
|
|
98ce4bb1fb | ||
|
|
0ec8809de1 | ||
|
|
981ac464b5 | ||
|
|
f04017a068 | ||
|
|
1a2b18fcbb | ||
|
|
12d05b96a0 | ||
|
|
4ed4d8287f | ||
|
|
1239f7b871 | ||
|
|
8c2e29eaa2 | ||
|
|
9d060a66ec | ||
|
|
06566d37c2 | ||
|
|
6a50fe7ced | ||
|
|
d40449f2ed | ||
|
|
23e1ab6f21 | ||
|
|
f23e52c699 | ||
|
|
10b4450214 | ||
|
|
4b639ae476 | ||
|
|
77c497e984 | ||
|
|
a4ee465439 | ||
|
|
b6890bc780 | ||
|
|
109accdb54 | ||
|
|
87491351cc | ||
|
|
c2a38bd4e0 | ||
|
|
25282fc44a | ||
|
|
cbbc61d1e1 | ||
|
|
6ed7ec35a4 | ||
|
|
a5d946fe83 | ||
|
|
cf8c1654e8 | ||
|
|
715a7846f7 | ||
|
|
82ea41c1a1 | ||
|
|
934f497118 | ||
|
|
e0de30baff | ||
|
|
a1cfe8730b | ||
|
|
91fc7cab7c | ||
|
|
5cdb3d059c | ||
|
|
b010dc28d2 | ||
|
|
9b51ba443a | ||
|
|
47c08cc8f8 | ||
|
|
c1329938f5 | ||
|
|
2c07b1146c | ||
|
|
fc51b230c4 | ||
|
|
4d5ee7887e | ||
|
|
ad63ec8a7b | ||
|
|
2b0e2ca0fb | ||
|
|
217ca9a053 | ||
|
|
6bf38611e8 | ||
|
|
7251967ef5 | ||
|
|
2c9b305721 | ||
|
|
6eac7405fd | ||
|
|
4b51fb9255 | ||
|
|
a2e5390d30 | ||
|
|
03a6ec3466 | ||
|
|
228d68b488 | ||
|
|
1af4ddb618 | ||
|
|
a30eedbec9 | ||
|
|
2bc3ab6971 | ||
|
|
b1f5e7d7ec | ||
|
|
84d4e0f013 | ||
|
|
61648db0fc | ||
|
|
7b72dfafc2 | ||
|
|
d3da2af8a1 | ||
|
|
55a60018b5 | ||
|
|
6df718aa4a | ||
|
|
a3d62de091 | ||
|
|
eb4007aa87 | ||
|
|
4438c9c85f | ||
|
|
c01380a897 | ||
|
|
ff7c053442 | ||
|
|
4f342bb530 | ||
|
|
99a7c663b3 | ||
|
|
49f2bb2bdf | ||
|
|
9cfce5f72b | ||
|
|
5c8bd3422d | ||
|
|
670d6a0489 | ||
|
|
45d0d94ab4 | ||
|
|
4d864465d7 | ||
|
|
56327ca25e | ||
|
|
0aef294df9 | ||
|
|
7fb471feb1 | ||
|
|
e2d2420aa2 | ||
|
|
bcb3551a0a | ||
|
|
20faf71338 | ||
|
|
63d866a1d2 | ||
|
|
6d9874601a | ||
|
|
3cbf33b482 | ||
|
|
4b2a778708 | ||
|
|
f5102c3558 | ||
|
|
0fdc6b2d8b | ||
|
|
e34c18b751 | ||
|
|
4f41f5968c | ||
|
|
b48d2b1610 | ||
|
|
ceb5c3f11c | ||
|
|
0585c515b3 | ||
|
|
e2074aeb31 | ||
|
|
bc3cec1172 | ||
|
|
83e8bb1bd7 | ||
|
|
88fb6d86bd | ||
|
|
e8c39f2074 | ||
|
|
386b80a66f | ||
|
|
fbb3fa6a27 | ||
|
|
e10debed2f | ||
|
|
437dd3adb1 | ||
|
|
e48191381e | ||
|
|
abb7c72b84 | ||
|
|
20d9ea5a00 | ||
|
|
0da29e4eb2 | ||
|
|
10f92c78eb | ||
|
|
924dbeeebb | ||
|
|
3c363595ce | ||
|
|
695154099d | ||
|
|
8516da8a44 | ||
|
|
21edc05f19 | ||
|
|
cf729b0d31 | ||
|
|
74b806737d | ||
|
|
88cbcc2959 | ||
|
|
eab15876cc | ||
|
|
c6a7b7c1d2 | ||
|
|
d76cd628cf | ||
|
|
7f2c91b230 | ||
|
|
dab0802a88 | ||
|
|
34f06267b8 | ||
|
|
99062175eb | ||
|
|
f47055c51b | ||
|
|
4752c2e689 | ||
|
|
57c1a97ebf | ||
|
|
793ccebf0b | ||
|
|
c688313239 | ||
|
|
afd7f6ef0a | ||
|
|
cc78251846 | ||
|
|
30693d7d16 | ||
|
|
bd2fbe60db | ||
|
|
a114a22770 | ||
|
|
8d657d93e0 | ||
|
|
5802cd3591 | ||
|
|
2d17cfa7e1 | ||
|
|
cf2a3b8948 | ||
|
|
b89a74e6e9 | ||
|
|
9b74602119 | ||
|
|
34463d9084 | ||
|
|
3dcab9e78b | ||
|
|
fce0003912 | ||
|
|
c720f65fee | ||
|
|
a725726e25 | ||
|
|
e5a64d9550 | ||
|
|
0572f8a932 | ||
|
|
23d37d7da1 | ||
|
|
474654fd16 | ||
|
|
c0d70e91b0 | ||
|
|
070d3ff242 | ||
|
|
d5a62cb1a7 | ||
|
|
ba1f82faa0 | ||
|
|
0cce110c52 | ||
|
|
bc91cde244 | ||
|
|
30c9934694 | ||
|
|
f56f3c62e9 | ||
|
|
ac180a7cc5 | ||
|
|
d1f3a16b7f | ||
|
|
e6c495417b | ||
|
|
c301608881 | ||
|
|
7d2290a773 | ||
|
|
ba0d0b755e | ||
|
|
b5e9923469 | ||
|
|
b5bbd9b6a5 | ||
|
|
5bf7618dde | ||
|
|
d02f6c7d18 | ||
|
|
e69a18e548 | ||
|
|
991e2d2024 | ||
|
|
9f31f30925 | ||
|
|
340658c747 | ||
|
|
5bbd9cfabb | ||
|
|
03a8b40ee9 | ||
|
|
386bc950f4 | ||
|
|
d0cc157003 | ||
|
|
c990738c57 | ||
|
|
01971e2a46 | ||
|
|
08cb82e255 | ||
|
|
962c563f2e | ||
|
|
bd6f2c2faf | ||
|
|
ee8fe1e7ff | ||
|
|
424d171656 | ||
|
|
7351133542 | ||
|
|
84deb403eb | ||
|
|
cae40b44e6 | ||
|
|
ab0bbcea94 | ||
|
|
06a7eff0ab | ||
|
|
341333c287 | ||
|
|
0f00985b75 | ||
|
|
c11a86d849 | ||
|
|
52e16c33b4 | ||
|
|
54e15644b6 | ||
|
|
6aa3a6c660 | ||
|
|
83350b3b57 | ||
|
|
8868128d6e | ||
|
|
f7ec537cd5 | ||
|
|
a81156b363 | ||
|
|
4b501ab90b | ||
|
|
90347c72e0 | ||
|
|
ab41d55e4b | ||
|
|
739e7a50f7 | ||
|
|
64ff5ebfd5 | ||
|
|
a51ab3573e | ||
|
|
2aa2f0de19 | ||
|
|
96f5f855a3 | ||
|
|
a82498ba16 | ||
|
|
3b05b52e57 | ||
|
|
b02d6f3cdb | ||
|
|
6e67cae494 | ||
|
|
23eef1a058 | ||
|
|
2ad3f6d6e2 | ||
|
|
996a81ddaa | ||
|
|
4a8ab6e1f6 | ||
|
|
7f817241ed | ||
|
|
a6c53d06d2 | ||
|
|
a70c4d1bf2 | ||
|
|
cdfb907c75 | ||
|
|
c2abb50e9e | ||
|
|
99f4fc96bf | ||
|
|
043f81996e | ||
|
|
213f2f124d | ||
|
|
96e7e83e20 | ||
|
|
e5fccd93a8 | ||
|
|
78e46f5576 | ||
|
|
69ce07fbf7 | ||
|
|
827131e136 | ||
|
|
c764bf4884 | ||
|
|
972203d675 | ||
|
|
2c382e14b5 | ||
|
|
c298950d34 | ||
|
|
00f2e5ccd6 | ||
|
|
8d86cffabd | ||
|
|
95d6ec5fdd | ||
|
|
9fbee6cfeb | ||
|
|
9892f88530 | ||
|
|
10ad990f97 | ||
|
|
0ee7e80fd2 | ||
|
|
7d1520f858 | ||
|
|
77ba258fbf | ||
|
|
06366529cc | ||
|
|
d1c263f1b0 | ||
|
|
d7a031a457 | ||
|
|
b7201f424d | ||
|
|
89f2785244 | ||
|
|
cffe416f50 | ||
|
|
d0eea34e9b | ||
|
|
4e82718788 | ||
|
|
293ca60e72 | ||
|
|
af4a6a5960 | ||
|
|
e01c0b6f43 | ||
|
|
efc984f1dd | ||
|
|
a046db40d2 | ||
|
|
9068909b4d | ||
|
|
4bb2056bc9 | ||
|
|
ed0f05abc4 | ||
|
|
0c44e10ca7 | ||
|
|
d8c9014471 | ||
|
|
7cf1d96a80 | ||
|
|
ffd9fbda57 | ||
|
|
d631ed1cc7 | ||
|
|
d8904aaf6e | ||
|
|
de2db211cc | ||
|
|
e8ab172d1b | ||
|
|
32f96c03dd | ||
|
|
5158606740 | ||
|
|
0de80165ed | ||
|
|
dcaa99d2bf | ||
|
|
1a1a4cd5d0 | ||
|
|
4cbad1fccd | ||
|
|
f818564dd1 | ||
|
|
8be690a26e | ||
|
|
8081d42477 | ||
|
|
b0b6069fe2 | ||
|
|
994aed9af7 | ||
|
|
852fc86cbd | ||
|
|
8801a87a58 | ||
|
|
1e10f0083c | ||
|
|
bb40f0f11a | ||
|
|
78d7243a08 | ||
|
|
09724dddd9 | ||
|
|
59286ff3cb | ||
|
|
3f79c90868 | ||
|
|
33c48d4dfb | ||
|
|
48fbcd7303 | ||
|
|
cdb7b6eb44 | ||
|
|
90b72523b7 | ||
|
|
a1fd30f4f5 | ||
|
|
fcae064dbb | ||
|
|
5815d8efe7 | ||
|
|
0be8a73621 | ||
|
|
76e1d7777c | ||
|
|
e10a84b294 | ||
|
|
5ff2d893b9 | ||
|
|
02f5dbb63f | ||
|
|
d4cfc32c8d | ||
|
|
d5820063a1 | ||
|
|
21de048738 | ||
|
|
06cdac8121 | ||
|
|
f1aa1bdd59 | ||
|
|
44f621b4de | ||
|
|
fd1a1f0f7e | ||
|
|
a38b5220ac | ||
|
|
428a07101a | ||
|
|
f1ef9daa8f | ||
|
|
46d5c9c9e9 | ||
|
|
ecd877551e | ||
|
|
76e071e965 | ||
|
|
5623c1024e | ||
|
|
1a20155f66 | ||
|
|
9a17313a0c | ||
|
|
b3ec61ddd8 | ||
|
|
7dcddf90e9 | ||
|
|
a94fdcae61 | ||
|
|
f9bb83815f | ||
|
|
dccaf16a02 | ||
|
|
f4ee831319 | ||
|
|
5bcf1c6379 | ||
|
|
d2eb87e821 | ||
|
|
be08925eb4 | ||
|
|
5698c22e75 | ||
|
|
2114532f62 | ||
|
|
815ba00a6b | ||
|
|
bcd9f046fb | ||
|
|
bf3b416662 | ||
|
|
736832c4e3 | ||
|
|
f08c0995a2 | ||
|
|
de8a4d1160 | ||
|
|
739c1f705e | ||
|
|
a32889291f | ||
|
|
1e7e4cafd4 | ||
|
|
d5bed6c50a | ||
|
|
8f827c9aae | ||
|
|
24fe033e2f | ||
|
|
85d04f931b | ||
|
|
41b111c8a8 | ||
|
|
72db60bb12 | ||
|
|
076eb009b9 | ||
|
|
789bd0ce82 | ||
|
|
5155fca0e4 | ||
|
|
3b6819f894 | ||
|
|
0dd1683298 | ||
|
|
2788d7433b | ||
|
|
504a2419f6 | ||
|
|
75e5316ba1 | ||
|
|
3be018521a | ||
|
|
6d375d5b5b | ||
|
|
5de39bd7e5 | ||
|
|
a08d576851 | ||
|
|
b8bdf65514 | ||
|
|
1c0c3d07ff | ||
|
|
832980eb9a | ||
|
|
7c158e9f2c | ||
|
|
a98d22ed72 | ||
|
|
63b7d34e29 | ||
|
|
67ae6061aa | ||
|
|
a8a861260e | ||
|
|
fc879d5801 | ||
|
|
2d2645e642 | ||
|
|
8e66f641ce | ||
|
|
82c49b5fc5 | ||
|
|
b57ee73035 | ||
|
|
ed8f493b8b | ||
|
|
9e853027da | ||
|
|
1e05487acd | ||
|
|
167da9dfd5 | ||
|
|
46e138a376 | ||
|
|
853db922f1 | ||
|
|
7bf51b11ee | ||
|
|
3a286ae978 | ||
|
|
82245f0b5c | ||
|
|
802a898394 | ||
|
|
2200fffa1e | ||
|
|
f4b2e78e72 | ||
|
|
ad1162c7de | ||
|
|
ed4daeb560 | ||
|
|
927ae16e4f | ||
|
|
917c89542b | ||
|
|
39570bd4d7 | ||
|
|
f368dfad81 | ||
|
|
205e17cc83 | ||
|
|
4e052c8059 | ||
|
|
0afecd6063 | ||
|
|
41511c5615 | ||
|
|
b9d39e3c64 | ||
|
|
c1f482a950 | ||
|
|
e424031ad9 | ||
|
|
f43dc2fc98 | ||
|
|
9cdc73edce | ||
|
|
3d254fa075 | ||
|
|
ed1e43015e | ||
|
|
e6cbbd73f0 | ||
|
|
67dff7b38c | ||
|
|
ced67176a3 | ||
|
|
00ac8afe64 | ||
|
|
a6964c4495 | ||
|
|
aedbc3c32f | ||
|
|
6541291e0d | ||
|
|
711d274398 | ||
|
|
6c5861b9fc | ||
|
|
f7ab27f9fd | ||
|
|
e4e789cc5b | ||
|
|
09b525fe58 | ||
|
|
9dabfc1367 | ||
|
|
bdb733352a | ||
|
|
75a4655a0f | ||
|
|
051c1516a0 | ||
|
|
62c5b78358 | ||
|
|
290913d07a | ||
|
|
77534d650a | ||
|
|
a4c715e3f6 | ||
|
|
7415d3cee5 | ||
|
|
e1ba9c89fe | ||
|
|
0fcbe7369a | ||
|
|
c8087b5b63 | ||
|
|
065faca8eb | ||
|
|
bcd6a38a05 | ||
|
|
fa67f9b82b | ||
|
|
39acd0bd47 | ||
|
|
c549fcfc27 | ||
|
|
45e838d4c3 | ||
|
|
64f49e4d4f | ||
|
|
61caa90901 | ||
|
|
3e85289318 | ||
|
|
a629f287f0 | ||
|
|
3a4906079b | ||
|
|
3edf21f457 | ||
|
|
785c44cd2a | ||
|
|
1ad8a5313b | ||
|
|
967e161288 | ||
|
|
fe8c3b190c | ||
|
|
993e7d77ad | ||
|
|
e0be052df4 | ||
|
|
d331bae548 | ||
|
|
d88229694a | ||
|
|
8da5b955d6 | ||
|
|
54882679c1 | ||
|
|
f2007be1b0 | ||
|
|
7a757f9e05 | ||
|
|
678f961110 | ||
|
|
f0464c44fd | ||
|
|
b323ee24c4 | ||
|
|
38aad2ee9c | ||
|
|
b69ca93d20 | ||
|
|
e21a039e70 | ||
|
|
11f8e428a0 | ||
|
|
704455c432 | ||
|
|
c25bee755c | ||
|
|
373d598c29 | ||
|
|
b8effffa96 | ||
|
|
ca6a7917ce | ||
|
|
033bdf7908 | ||
|
|
6fe03aa325 | ||
|
|
b93f41f564 | ||
|
|
3f6cc97a02 | ||
|
|
0bda5358bd | ||
|
|
e0af554caa | ||
|
|
b98f8476f5 | ||
|
|
30732305ff | ||
|
|
14102ab3e6 | ||
|
|
df16b14586 | ||
|
|
9dcbc1b1f6 | ||
|
|
d806fd502f | ||
|
|
db650caf18 | ||
|
|
2b6c9ffcdb | ||
|
|
1d4b8ab67d | ||
|
|
6404168bee | ||
|
|
6613366cff | ||
|
|
74349129f4 | ||
|
|
cdc2c1d718 | ||
|
|
f8cc155650 | ||
|
|
b6bdeab50b | ||
|
|
f528f6033f | ||
|
|
ef1bc13c38 | ||
|
|
2f54feac74 | ||
|
|
44a0f760de | ||
|
|
75d30baaa5 | ||
|
|
990fb57839 | ||
|
|
1883341ddb | ||
|
|
5f7cece6d1 | ||
|
|
1e5ac1df9c | ||
|
|
4cdc3085ff | ||
|
|
e483263d70 | ||
|
|
bd41bd4db8 | ||
|
|
89e77d34f4 | ||
|
|
5eeb8fd6fc | ||
|
|
808fca031a | ||
|
|
6b3c1e3802 | ||
|
|
f488ef7597 | ||
|
|
2c179c7465 | ||
|
|
f1cf37200e | ||
|
|
d2da6881d6 | ||
|
|
9c25de58de | ||
|
|
f9aeb676b4 | ||
|
|
396d769bc8 | ||
|
|
83901eecba | ||
|
|
019728cff5 | ||
|
|
a96241d151 | ||
|
|
ebc9771be5 | ||
|
|
0c75bac364 | ||
|
|
3f7e2c1e4a | ||
|
|
10bf38bdf0 | ||
|
|
02508d7d9e | ||
|
|
5cb295f722 | ||
|
|
b08d273996 | ||
|
|
1e27d1803a | ||
|
|
9bc018cc02 | ||
|
|
73cdfc6d45 | ||
|
|
1afd650997 | ||
|
|
9c8eabb46c | ||
|
|
b39884e68f | ||
|
|
451d457426 | ||
|
|
82853aa017 | ||
|
|
157226f75b | ||
|
|
509691a85a | ||
|
|
8b3aee7e2d | ||
|
|
4025e669eb | ||
|
|
1a01d7ed92 | ||
|
|
b4976d27f2 | ||
|
|
173d8444d7 | ||
|
|
aa150b76a5 | ||
|
|
e2b5e28e07 | ||
|
|
1ad07d9977 | ||
|
|
8ba4056894 | ||
|
|
9ad0316dff | ||
|
|
854aae7dc5 | ||
|
|
5b021cd42e | ||
|
|
33417d9b7e | ||
|
|
275184214a | ||
|
|
1f9adbd3cf | ||
|
|
092c207dce | ||
|
|
603c24faed | ||
|
|
f259b32cce | ||
|
|
eba9aa3e17 | ||
|
|
905eb1611e | ||
|
|
6d4b8c3c26 | ||
|
|
6a46609cca | ||
|
|
e872282221 | ||
|
|
24ac5af5b4 | ||
|
|
0ee92fb632 | ||
|
|
7cbc12c6ff | ||
|
|
60c82c73cd | ||
|
|
78790e73c7 | ||
|
|
bf464de16f | ||
|
|
0589963eed | ||
|
|
b79971eea5 | ||
|
|
d1e557f054 | ||
|
|
93ddb8d638 | ||
|
|
06fdd80845 | ||
|
|
b0b26f8300 | ||
|
|
1db890f5e7 | ||
|
|
0f80f96023 | ||
|
|
2d3673ea33 | ||
|
|
c28260611e | ||
|
|
b5dd00007a | ||
|
|
ac39264f3d | ||
|
|
667a04a41d | ||
|
|
51a9b2ea9b | ||
|
|
842ee5ca3c | ||
|
|
2cc67dbda7 | ||
|
|
70bc32614b | ||
|
|
9bf44d7d7e | ||
|
|
f48ecb87b2 | ||
|
|
1765aba681 | ||
|
|
c6063c759e | ||
|
|
bb4db2cede | ||
|
|
7c36898f78 | ||
|
|
23e8cdf216 | ||
|
|
5ffd4123a1 | ||
|
|
27e3c14f10 | ||
|
|
d57bfb825a | ||
|
|
0809e20a6e | ||
|
|
1ec305162e | ||
|
|
45d46d7ae8 | ||
|
|
adb41736d5 | ||
|
|
09d6fa550a | ||
|
|
75cc7383cb | ||
|
|
4d48b9e7c1 | ||
|
|
563e1ca0ba | ||
|
|
0fa3b678b0 | ||
|
|
8420c65d25 | ||
|
|
3232e96f6e | ||
|
|
110e25af73 | ||
|
|
8233faf518 | ||
|
|
11eb603930 | ||
|
|
1d55c51a16 | ||
|
|
447a7e514e | ||
|
|
fd433784bd | ||
|
|
4e2b196b26 | ||
|
|
14fcbfcced | ||
|
|
4126d15821 | ||
|
|
0d1cc72798 | ||
|
|
c42eb789df | ||
|
|
c1dd0b31cf | ||
|
|
9afed7fb1b | ||
|
|
a8239895c6 | ||
|
|
7531ab4623 | ||
|
|
9b36f9cb22 | ||
|
|
29f8ef6b72 | ||
|
|
7752e41416 | ||
|
|
756ccd1921 | ||
|
|
39ae0343fc | ||
|
|
67409214a4 | ||
|
|
b3d0edfec1 | ||
|
|
87b9dba568 | ||
|
|
91a4c0cff5 | ||
|
|
9670dc7a81 | ||
|
|
4f2c5b946d | ||
|
|
fc53c68dd9 | ||
|
|
03bc4cf9b1 | ||
|
|
c637878603 | ||
|
|
91e61f6cd4 | ||
|
|
9f66418073 | ||
|
|
2c3d667675 | ||
|
|
2ab93f2309 | ||
|
|
05ce20303c | ||
|
|
5e997d1bbf | ||
|
|
d95e5b02d6 | ||
|
|
536f04985f | ||
|
|
43a81f725f | ||
|
|
8373e69d09 | ||
|
|
c5ed5fabd8 | ||
|
|
8ba4dadb10 | ||
|
|
112600f5c3 | ||
|
|
c2f869b362 | ||
|
|
2590e0effc | ||
|
|
b417ef5b03 | ||
|
|
1733a506c0 | ||
|
|
ac05cc4387 | ||
|
|
904f337713 | ||
|
|
febad56497 | ||
|
|
cb71de2313 | ||
|
|
6891ef1a0d | ||
|
|
6c68645b0f | ||
|
|
767ca71f7d | ||
|
|
1605d23509 | ||
|
|
90a0201e38 | ||
|
|
80983c2058 | ||
|
|
ad62bbd9d3 | ||
|
|
1b3b6fef10 | ||
|
|
6e1ff18eb9 | ||
|
|
5796ba32a6 | ||
|
|
2eb33e5f0c | ||
|
|
7c14d8c909 | ||
|
|
fe4c1b0ee8 | ||
|
|
d21396c618 | ||
|
|
9df51aec49 | ||
|
|
734b0731a1 | ||
|
|
d20786cd69 | ||
|
|
793ea79cab | ||
|
|
073a86ecbd | ||
|
|
7b4fd57a94 | ||
|
|
f86ca0a168 | ||
|
|
0d3c18d3bc | ||
|
|
a4a31d0860 | ||
|
|
946bba19a9 | ||
|
|
2a1e987d42 | ||
|
|
fbcf718440 | ||
|
|
18aadf9d23 | ||
|
|
cd575d2005 | ||
|
|
3cfdf857cf | ||
|
|
c59abb251b | ||
|
|
2fc1034cc5 | ||
|
|
a8fd60f46e | ||
|
|
0cbae6b4d5 | ||
|
|
dc7ccb3956 | ||
|
|
a420936657 | ||
|
|
dcab7f72d4 | ||
|
|
d0733d3370 | ||
|
|
a695f7c2d7 | ||
|
|
7677bff6d4 | ||
|
|
c7626997de | ||
|
|
7b8751312a | ||
|
|
6d664f2086 | ||
|
|
4ebf7e25b7 | ||
|
|
54e70e7158 | ||
|
|
b950829de3 | ||
|
|
a489397f84 | ||
|
|
897dac354d | ||
|
|
beb4af1311 | ||
|
|
f0aeab0207 | ||
|
|
be1314422d | ||
|
|
c15711aae8 | ||
|
|
1668c4c614 | ||
|
|
7050ee849b | ||
|
|
dfe1e3b631 | ||
|
|
50c47dd657 | ||
|
|
a373141a93 | ||
|
|
24f5856649 | ||
|
|
f85e0a61b1 | ||
|
|
4319ef2853 | ||
|
|
c3a27dbebe | ||
|
|
bac43509d2 | ||
|
|
59b012e527 | ||
|
|
c615e285db | ||
|
|
1aca9fe753 | ||
|
|
349c5ee22e | ||
|
|
c44943cef7 | ||
|
|
91a1ab4a56 | ||
|
|
7a61b52d64 | ||
|
|
e5df96c82e | ||
|
|
770327c3fa | ||
|
|
4bdc6e3d65 | ||
|
|
3e19cdfb0b | ||
|
|
2043dc2161 | ||
|
|
a9e36472c5 | ||
|
|
4df4f9b2ad | ||
|
|
4ad55173a5 | ||
|
|
b9c82dd6b2 | ||
|
|
8333f4893f | ||
|
|
f071965ae8 | ||
|
|
a4fa9ac666 | ||
|
|
939ee555b7 | ||
|
|
4799a032e5 | ||
|
|
b2d2a6a7a5 | ||
|
|
7676106914 | ||
|
|
fe5ea31f2c | ||
|
|
e34223fc94 | ||
|
|
15f733f11c | ||
|
|
7526b18507 | ||
|
|
0af6007632 | ||
|
|
1bc3cd1d51 | ||
|
|
92bafd695d | ||
|
|
78a2ee4e85 | ||
|
|
8b9346d767 | ||
|
|
06d3bd3f93 | ||
|
|
1af7e4ef19 | ||
|
|
8e64e4120b | ||
|
|
b983559763 | ||
|
|
e62527de23 | ||
|
|
1f51f35f8e | ||
|
|
c3686417e3 | ||
|
|
746e10c025 | ||
|
|
98389fc07c | ||
|
|
aaebf93db4 | ||
|
|
8f03ecedaa | ||
|
|
db20bd8eaf | ||
|
|
12500dfb64 | ||
|
|
acc8e7923a | ||
|
|
9aa5775528 | ||
|
|
2a2d71289a | ||
|
|
ae28e34fd5 | ||
|
|
6b175e7d40 | ||
|
|
2c6d74e8ef | ||
|
|
3b832595fe | ||
|
|
bf372029fb | ||
|
|
17ce7e519c | ||
|
|
1f6a112df7 | ||
|
|
0ec6fb5a93 |
9
.github/ISSUE_TEMPLATE.md
vendored
9
.github/ISSUE_TEMPLATE.md
vendored
@@ -1,9 +0,0 @@
|
|||||||
**What version of WebTorrent Desktop?** (See the 'About WebTorrent' menu)
|
|
||||||
|
|
||||||
**What operating system and version?**
|
|
||||||
|
|
||||||
**What did you do?**
|
|
||||||
|
|
||||||
**What did you expect to happen?**
|
|
||||||
|
|
||||||
**What actually happened?**
|
|
||||||
20
.github/ISSUE_TEMPLATE/BUG_REPORT.md
vendored
Normal file
20
.github/ISSUE_TEMPLATE/BUG_REPORT.md
vendored
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
---
|
||||||
|
name: "🐞 Bug report"
|
||||||
|
about: Report an issue with this software
|
||||||
|
title: ''
|
||||||
|
labels: ''
|
||||||
|
assignees: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
<!-- DO NOT POST LINKS OR REFERENCES TO COPYRIGHTED CONTENT IN YOUR ISSUE. -->
|
||||||
|
|
||||||
|
**What version of WebTorrent Desktop are you using?**
|
||||||
|
|
||||||
|
**What operating system and version?**
|
||||||
|
|
||||||
|
**What happened?**
|
||||||
|
|
||||||
|
**What did you expect to happen?**
|
||||||
|
|
||||||
|
**Are you willing to submit a pull request to fix this bug?**
|
||||||
20
.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
vendored
Normal file
20
.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
vendored
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
---
|
||||||
|
name: "⭐️ Feature request"
|
||||||
|
about: Request a new feature to be added
|
||||||
|
title: ''
|
||||||
|
labels: ''
|
||||||
|
assignees: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
<!-- DO NOT POST LINKS OR REFERENCES TO COPYRIGHTED CONTENT IN YOUR ISSUE. -->
|
||||||
|
|
||||||
|
**What version of WebTorrent Desktop are you using?**
|
||||||
|
|
||||||
|
**What operating system and version?**
|
||||||
|
|
||||||
|
**What problem do you want to solve?**
|
||||||
|
|
||||||
|
**What do you think is the correct solution to this problem?**
|
||||||
|
|
||||||
|
**Are you willing to submit a pull request to implement this change?**
|
||||||
21
.github/workflows/ci.yml
vendored
Normal file
21
.github/workflows/ci.yml
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
name: ci
|
||||||
|
on: [push,pull_request]
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
name: Node ${{ matrix.node }} / ${{ matrix.os }}
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
os:
|
||||||
|
- ubuntu-latest
|
||||||
|
node:
|
||||||
|
- '16'
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: ${{ matrix.node }}
|
||||||
|
- run: npm install
|
||||||
|
- run: npm run build --if-present
|
||||||
|
- run: npm test
|
||||||
69
.github/workflows/package.yml
vendored
Normal file
69
.github/workflows/package.yml
vendored
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
name: package
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
jobs:
|
||||||
|
package_linux:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: '16'
|
||||||
|
- uses: actions/cache@v3
|
||||||
|
with:
|
||||||
|
path: ~/.npm
|
||||||
|
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-node-
|
||||||
|
- run: npm install
|
||||||
|
- run: npm run package -- linux
|
||||||
|
- uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: linux
|
||||||
|
path: |
|
||||||
|
dist/*.deb
|
||||||
|
dist/*.rpm
|
||||||
|
dist/*.zip
|
||||||
|
package_macos:
|
||||||
|
runs-on: macos-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: '16'
|
||||||
|
- uses: actions/cache@v3
|
||||||
|
with:
|
||||||
|
path: ~/.npm
|
||||||
|
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-node-
|
||||||
|
- run: npm install
|
||||||
|
- run: npm run package -- darwin
|
||||||
|
- uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: macos
|
||||||
|
path: |
|
||||||
|
dist/*.dmg
|
||||||
|
dist/*.zip
|
||||||
|
package_windows:
|
||||||
|
runs-on: windows-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: '16'
|
||||||
|
- uses: actions/cache@v3
|
||||||
|
with:
|
||||||
|
path: ~/.npm
|
||||||
|
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-node-
|
||||||
|
- run: npm install
|
||||||
|
- run: npm run package -- win32
|
||||||
|
- uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: windows
|
||||||
|
path: |
|
||||||
|
dist/*.exe
|
||||||
|
dist/*.nupkg
|
||||||
|
dist/*.zip
|
||||||
23
.github/workflows/stale.yml
vendored
Normal file
23
.github/workflows/stale.yml
vendored
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
name: Mark stale issues and pull requests
|
||||||
|
|
||||||
|
on:
|
||||||
|
schedule:
|
||||||
|
- cron: '0 12 * * *'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
stale:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
issues: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/stale@v6
|
||||||
|
with:
|
||||||
|
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
stale-issue-message: 'Is this still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?'
|
||||||
|
stale-pr-message: 'Is this still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?'
|
||||||
|
exempt-issue-labels: accepted,blocked,dependency,security,meta
|
||||||
|
exempt-pr-labels: accepted,blocked,bug,dependency,security,meta
|
||||||
|
stale-issue-label: 'stale'
|
||||||
|
stale-pr-label: 'stale'
|
||||||
11
.gitignore
vendored
11
.gitignore
vendored
@@ -1,2 +1,9 @@
|
|||||||
node_modules
|
node_modules/
|
||||||
dist
|
build/
|
||||||
|
dist/
|
||||||
|
npm-debug.log*
|
||||||
|
.vscode/
|
||||||
|
|
||||||
|
# JetBrains IntelliJ IDEA project files
|
||||||
|
.idea
|
||||||
|
*.iml
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
language: node_js
|
|
||||||
node_js:
|
|
||||||
- 'node'
|
|
||||||
install: npm install standard
|
|
||||||
97
AUTHORS.md
97
AUTHORS.md
@@ -2,25 +2,82 @@
|
|||||||
|
|
||||||
#### Ordered by first contribution.
|
#### Ordered by first contribution.
|
||||||
|
|
||||||
- Feross Aboukhadijeh <feross@feross.org>
|
- Feross Aboukhadijeh (feross@feross.org)
|
||||||
- DC <dcposch@dcpos.ch>
|
- DC (dcposch@dcpos.ch)
|
||||||
- Nate Goldman <nate@ngoldman.me>
|
- Nate Goldman (nate@ngoldman.me)
|
||||||
- Chris Morris <chris@chrismorris.org>
|
- Chris Morris (chris@chrismorris.org)
|
||||||
- Giuseppe Crinò <giuscri@gmail.com>
|
- Giuseppe Crinò (giuscri@gmail.com)
|
||||||
- Romain Beaumont <romain.rom1@gmail.com>
|
- Romain Beaumont (romain.rom1@gmail.com)
|
||||||
- Dan Flettre <fletd01@yahoo.com>
|
- Dan Flettre (fletd01@yahoo.com)
|
||||||
- Liam Gray <liam.r.gray@gmail.com>
|
- Liam Gray (liam.r.gray@gmail.com)
|
||||||
- grunjol <grunjol@users.noreply.github.com>
|
- Rémi Jouannet (remijouannet@users.noreply.github.com)
|
||||||
- Rémi Jouannet <remijouannet@users.noreply.github.com>
|
- Evan Miller (miller.evan815@gmail.com)
|
||||||
- Evan Miller <miller.evan815@gmail.com>
|
- Alex (alxmorais8@msn.com)
|
||||||
- Alex <alxmorais8@msn.com>
|
- Diego Rodríguez Baquero (diegorbaquero@gmail.com)
|
||||||
- Diego Rodríguez Baquero <diegorbaquero@gmail.com>
|
- Karlo Luis Martinez Martos (karlo.luis.m@gmail.com)
|
||||||
- Karlo Luis Martinez Martos <karlo.luis.m@gmail.com>
|
- gabriel (furstenheim@gmail.com)
|
||||||
- gabriel <furstenheim@gmail.com>
|
- Rolando Guedes (rolando.guedes@3gnt.net)
|
||||||
- Rolando Guedes <rolando.guedes@3gnt.net>
|
- Benjamin Tan (demoneaux@gmail.com)
|
||||||
- Benjamin Tan <demoneaux@gmail.com>
|
- Mathias Rasmussen (mathiasvr@gmail.com)
|
||||||
- Mathias Rasmussen <mathiasvr@gmail.com>
|
- Sergey Bargamon (sergey@bargamon.ru)
|
||||||
- Sergey Bargamon <sergey@bargamon.ru>
|
- Thomas Watson Steen (w@tson.dk)
|
||||||
- Thomas Watson Steen <w@tson.dk>
|
- anonymlol (anonymlol7@gmail.com)
|
||||||
|
- Gediminas Petrikas (gedas18@gmail.com)
|
||||||
|
- Alberto Miranda (codealchemist@gmail.com)
|
||||||
|
- Adam Gotlib (gotlib.adam+dev@gmail.com)
|
||||||
|
- Rémi Jouannet (remijouannet@gmail.com)
|
||||||
|
- Andrea Tupini (tupini07@gmail.com)
|
||||||
|
- grunjol (grunjol@gmail.com)
|
||||||
|
- Jason Kurian (jasonk92@gmail.com)
|
||||||
|
- Vamsi Krishna Avula (vamsi_ism@outlook.com)
|
||||||
|
- Noam Okman (noamokman@gmail.com)
|
||||||
|
- PurgingPanda (t3ch0wn3r@gmail.com)
|
||||||
|
- Kai Curtis (morecode@kcurtis.com)
|
||||||
|
- Omri Litov (omrilitov@gmail.com)
|
||||||
|
- Alexey Romanov (romanalexey@gmail.com)
|
||||||
|
- Karan Thakkar (karanjthakkar@gmail.com)
|
||||||
|
- Nuno Campos (nuno.campos@me.com)
|
||||||
|
- Ebrahim Byagowi (ebrahim@gnu.org)
|
||||||
|
- Josip Janzic (josip@jjanzic.com)
|
||||||
|
- Egor Yurtaev (yurtaev.egor@gmail.com)
|
||||||
|
- Emil Bay (github@tixz.dk)
|
||||||
|
- Borewit (borewit@users.noreply.github.com)
|
||||||
|
- greenkeeper[bot] (greenkeeper[bot]@users.noreply.github.com)
|
||||||
|
- Auyer (rafa_auyer@icloud.com)
|
||||||
|
- Jon Koops (jonkoops@gmail.com)
|
||||||
|
- Michael George Attard (michaelgeorgeattard@gmail.com)
|
||||||
|
- SimplyAhmazing (ahmad19526@gmail.com)
|
||||||
|
- Cezar Carneiro (cezargcarneiro@gmail.com)
|
||||||
|
- Bilal Elmoussaoui (bil.elmoussaoui@gmail.com)
|
||||||
|
- Terry Hau (terryhau@gmail.com)
|
||||||
|
- Vítor Galvão (info@vitorgalvao.com)
|
||||||
|
- Borewit (Borewit@users.noreply.github.com)
|
||||||
|
- Diego Rodríguez (diegorbaquero@gmail.com)
|
||||||
|
- Dan Flettre (flettre@gmail.com)
|
||||||
|
- Sibiraj (dev.sibiraj@outlook.com)
|
||||||
|
- clujin (clujin@gmail.com)
|
||||||
|
- Sharon Grossman (sharong1337@gmail.com)
|
||||||
|
- Linus Unnebäck (linus@folkdatorn.se)
|
||||||
|
- Adrian Tombu (adrian@otso.fr)
|
||||||
|
- Lucas (5874806+RecoX@users.noreply.github.com)
|
||||||
|
- David Ernst (dsernst@users.noreply.github.com)
|
||||||
|
- David Ernst (git@dsernst.com)
|
||||||
|
- Jimmy Wärting (jimmy@warting.se)
|
||||||
|
- Recox (5874806+RecoX@users.noreply.github.com)
|
||||||
|
- greenkeeper[bot] (23040076+greenkeeper[bot]@users.noreply.github.com)
|
||||||
|
- hicom150 (hicom150@gmail.com)
|
||||||
|
- Дамјан Георгиевски (gdamjan@gmail.com)
|
||||||
|
- Jimmy Wärting (jimmy@warting.se)
|
||||||
|
- Julen Garcia Leunda (hicom150@gmail.com)
|
||||||
|
- Feross (feross@feross.org)
|
||||||
|
- Daniele Debernardi (drebrez@gmail.com)
|
||||||
|
- Chandan Chowdary Bhagam (chandandharana@gmail.com)
|
||||||
|
- Pieter Goetschalckx (3.14.e.ter@gmail.com)
|
||||||
|
- Carey Metcalfe (carey@cmetcalfe.ca)
|
||||||
|
- Ameet Kaustav (akaustav@users.noreply.github.com)
|
||||||
|
- gpatarin (gael.patarin@outlook.com)
|
||||||
|
- Gael Patarin (gael.patarin@outlook.com)
|
||||||
|
- Subin Siby (mail@subinsb.com)
|
||||||
|
- Hinara (hinara.turevel@gmail.com)
|
||||||
|
|
||||||
#### Generated by bin/update-authors.sh.
|
#### Generated by bin/update-authors.sh.
|
||||||
|
|||||||
386
CHANGELOG.md
386
CHANGELOG.md
@@ -1,25 +1,372 @@
|
|||||||
# WebTorrent Desktop Version History
|
# WebTorrent Desktop Version History
|
||||||
|
|
||||||
|
## v0.24.0 - 2020-08-28
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Support the `.m2ts` video container format ([hicom150](https://github.com/hicom150))
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Update to Electron 10.1.0 [\#1864](https://github.com/webtorrent/webtorrent-desktop/pull/1864) ([feross](https://github.com/feross))
|
||||||
|
- Update the Windows installer loading image [\#1841](https://github.com/webtorrent/webtorrent-desktop/pull/1841) ([alxhotel](https://github.com/alxhotel))
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fix music metadata not showing up [\#1847](https://github.com/webtorrent/webtorrent-desktop/pull/1847) ([Borewit](https://github.com/Borewit))
|
||||||
|
- Fix the "Play in VLC" functionality [\#1850](https://github.com/webtorrent/webtorrent-desktop/pull/1850) ([Hinara](https://github.com/Hinara))
|
||||||
|
- Prevent shortcuts from activating when user input elements are focused [\#1840](https://github.com/webtorrent/webtorrent-desktop/pull/1840) ([subins2000](https://github.com/subins2000))
|
||||||
|
|
||||||
|
## v0.23.0 - 2020-07-15
|
||||||
|
|
||||||
|
🔒 This release contains a critical security fix. Please update as soon as possible. [\#1837](https://github.com/webtorrent/webtorrent-desktop/issues/1837#issuecomment-729320901)
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Add macOS Notarization [\#1834](https://github.com/webtorrent/webtorrent-desktop/pull/1834) ([feross](https://github.com/feross))
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Update to Electron 10 beta [\#1834](https://github.com/webtorrent/webtorrent-desktop/pull/1834) ([feross](https://github.com/feross))
|
||||||
|
|
||||||
|
## v0.22.0 - 2020-07-15
|
||||||
|
|
||||||
|
❤️✨ A new version of WebTorrent Desktop is out! ❤️✨
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Linux `.rpm` packages and `arm64` builds are now available! [\#1694](https://github.com/webtorrent/webtorrent-desktop/pull/1694) ([hicom150](https://github.com/hicom150))
|
||||||
|
- Add support for multiple audio tracks [\#1712](https://github.com/webtorrent/webtorrent-desktop/pull/1712) ([hicom150](https://github.com/hicom150))
|
||||||
|
- Improve codec unsupported detection [\#1711](https://github.com/webtorrent/webtorrent-desktop/pull/1711) ([hicom150](https://github.com/hicom150))
|
||||||
|
- Report when files are being verified [\#1717](https://github.com/webtorrent/webtorrent-desktop/pull/1717) ([pR0Ps](https://github.com/pR0Ps))
|
||||||
|
- Support additional audio files: MPEG-Layer-2, Musepack, Matroska audio, WavePack [\#1772](https://github.com/webtorrent/webtorrent-desktop/pull/1772)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Update to Electron 9 [\#1729](https://github.com/webtorrent/webtorrent-desktop/pull/1729) [\#1832](https://github.com/webtorrent/webtorrent-desktop/issues/1832)
|
||||||
|
- Update to music-metadata 4.8.0 [\#1719](https://github.com/webtorrent/webtorrent-desktop/pull/1719) ([Borewit](https://github.com/Borewit))
|
||||||
|
- Update Windows build documentation [\#1715](https://github.com/webtorrent/webtorrent-desktop/pull/1715) ([RecoX](https://github.com/RecoX))
|
||||||
|
- Remove unneeded dependencies ([feross](https://github.com/feross))
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fix a few type errors [\#1720](https://github.com/webtorrent/webtorrent-desktop/pull/1720) ([mathiasvr](https://github.com/mathiasvr))
|
||||||
|
- Fix electron SUID sandbox error [\#1707](https://github.com/webtorrent/webtorrent-desktop/pull/1707) ([hicom150](https://github.com/hicom150))
|
||||||
|
- Fix percentage rounding error [\#1716](https://github.com/webtorrent/webtorrent-desktop/pull/1716) ([pR0Ps](https://github.com/pR0Ps))
|
||||||
|
- Fix path-selector in preferences page [\#1702](https://github.com/webtorrent/webtorrent-desktop/pull/1702) ([314eter](https://github.com/314eter))
|
||||||
|
- Fix path-selector in preferences page [\#1704](https://github.com/webtorrent/webtorrent-desktop/pull/1702) ([mathiasvr](https://github.com/mathiasvr))
|
||||||
|
- Fix: Increase height of 'About' window [\#1737](https://github.com/webtorrent/webtorrent-desktop/pull/1737) ([akaustav](https://github.com/akaustav))
|
||||||
|
- Fix "Save Torrent File As..." [\#1743](https://github.com/webtorrent/webtorrent-desktop/pull/1743) ([gpatarin](https://github.com/gpatarin))
|
||||||
|
|
||||||
|
## v0.21.0 - 2019-09-14
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Add YouTube style hotkeys [\#1579](https://github.com/webtorrent/webtorrent-desktop/pull/1579) ([dsernst](https://github.com/dsernst))
|
||||||
|
- Toggle sound notifications on/off [\#1536](https://github.com/webtorrent/webtorrent-desktop/pull/1536) ([adriantombu](https://github.com/adriantombu))
|
||||||
|
- Ability to play MPEG-4 Audio Book \(.m4b\) [\#1450](https://github.com/webtorrent/webtorrent-desktop/pull/1450) ([Borewit](https://github.com/Borewit))
|
||||||
|
- Add support for subtitles on Chromecast [\#1165](https://github.com/webtorrent/webtorrent-desktop/pull/1165) ([janza](https://github.com/janza))
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Update to Electron 4 [\#1590](https://github.com/webtorrent/webtorrent-desktop/pull/1590) ([Borewit](https://github.com/Borewit))
|
||||||
|
- Remove '\(BETA\)' from app window title [\#1562](https://github.com/webtorrent/webtorrent-desktop/pull/1562) ([dsernst](https://github.com/dsernst))
|
||||||
|
- Update React (v16) and Material-UI (v0.20) [\#1483](https://github.com/webtorrent/webtorrent-desktop/pull/1483) ([mathiasvr](https://github.com/mathiasvr))
|
||||||
|
- Show audio track and disk number [\#1454](https://github.com/webtorrent/webtorrent-desktop/pull/1454) ([Borewit](https://github.com/Borewit))
|
||||||
|
- Asynchronous music metadata updates while streaming [\#1449](https://github.com/webtorrent/webtorrent-desktop/pull/1449) ([Borewit](https://github.com/Borewit))
|
||||||
|
- If torrent is not private, leave private flag unset [\#1411](https://github.com/webtorrent/webtorrent-desktop/pull/1411) ([feross](https://github.com/feross))
|
||||||
|
- Improve audio poster selection: [\#1368](https://github.com/webtorrent/webtorrent-desktop/pull/1368) ([Borewit](https://github.com/Borewit))
|
||||||
|
- Save preferences immediately when changed [\#1042](https://github.com/webtorrent/webtorrent-desktop/pull/1042) ([Flet](https://github.com/Flet))
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Ensure that the minutes field in playback indicator is zero-padded. [\#1506](https://github.com/webtorrent/webtorrent-desktop/pull/1506) ([bnjmnt4n](https://github.com/bnjmnt4n))
|
||||||
|
- Bug Fix: Empty Array Reduce [\#1494](https://github.com/webtorrent/webtorrent-desktop/pull/1494) ([clujin](https://github.com/clujin))
|
||||||
|
- Fix startup problems [\#1419](https://github.com/webtorrent/webtorrent-desktop/pull/1419) ([Borewit](https://github.com/Borewit))
|
||||||
|
- Add back loading spinner for player page. [\#1311](https://github.com/webtorrent/webtorrent-desktop/pull/1311) ([bnjmnt4n](https://github.com/bnjmnt4n))
|
||||||
|
- Fix Linux desktop file [\#1309](https://github.com/webtorrent/webtorrent-desktop/pull/1309) ([bilelmoussaoui](https://github.com/bilelmoussaoui))
|
||||||
|
|
||||||
|
|
||||||
|
## v0.20.0 - 2018-04-26
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Added support for additional audio extensions: 'aiff', 'ape', 'mp2', 'oga', 'opus', 'wma' (#1240)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Displaying filename while music metadata is being downloaded (#1361)
|
||||||
|
- Improved the poster selection for audio/music based torrents (#1334)
|
||||||
|
- Launch VLC player without the `--video-on-top` flag (#1286)
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fix silently failing to open magnets links on Linux (#1367)
|
||||||
|
|
||||||
|
## v0.19.0 - 2018-01-26
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Added watch folder feature: Automatically add new torrent files added to a folder on disk (#1154)
|
||||||
|
- Added highest playback priority feature: pauses other active torrents when playback starts (#840)
|
||||||
|
- Add 'Start Speaking' and 'Stop Speaking' menu item (Mac) (#439)
|
||||||
|
- Add pinch-to-zoom gesture to enter/exit fullscreen (#1148)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- [SECURITY] Mitigate Electron protocol handler issue (Windows)
|
||||||
|
- Moved project from Feross's GitHub account to the WebTorrent GitHub organization
|
||||||
|
- Updated to electron@1.6.16
|
||||||
|
- Updated to material-ui@0.17
|
||||||
|
- Treat .FLAC as playable audio (#1127)
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fix time and duration so it doesn't bounce in the UI (#1233)
|
||||||
|
- Fix 'About WebTorrent' menu location on Windows (#1120)
|
||||||
|
|
||||||
|
## v0.18.0 - 2017-02-03
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Add a new "Transfers" menu for pausing or resuming all torrents (#1027)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Update Electron to 1.4.15
|
||||||
|
- Windows 32-bit: App can use 4GB of memory instead of just 2GB
|
||||||
|
- Fix "Portable App" writing crash reports to "%APPDATA%\Temp" (Windows)
|
||||||
|
- Updated WebTorrent engine to 0.98.5
|
||||||
|
- Fix issue where http web seeds would sometimes stall
|
||||||
|
- Don't send 'completed' event to tracker again if torrent is already complete
|
||||||
|
- Add more peer ID entropy
|
||||||
|
- Set user-agent header for tracker http requests
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fix paste shortcut in tracker list on Create Torrent page (#1112)
|
||||||
|
- Auto-focus the 'OK' button in modal dialogs (#1058)
|
||||||
|
- Fix formatting issue in the speed stats on the Player page (#1039)
|
||||||
|
|
||||||
|
## v0.17.2 - 2016-10-10
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Windows: Fix impossible-to-delete "Wired CD" default torrent
|
||||||
|
- Throttle browser-window 'move' and 'resize' events
|
||||||
|
- Fix crash ("Cannot read property 'files' of null" error)
|
||||||
|
- Fix crash ("TypeError: Cannot read property 'startPiece' of undefined")
|
||||||
|
|
||||||
|
## v0.17.1 - 2016-10-03
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Faster startup (improved by ~25%)
|
||||||
|
- Update Electron to 1.4.2
|
||||||
|
- Remove support for pasting multiple newline-separated magnet links
|
||||||
|
- Reduce UX sound volume
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fix external player (VLC, etc.) opening before HTTP server was ready
|
||||||
|
- Windows (Portable App): Fix "Portable App" mode
|
||||||
|
- Write application support files to the "Portable Settings" folder
|
||||||
|
- Stop writing Electron "single instance" lock file to "%APPDATA%\Roaming\WebTorrent"
|
||||||
|
- Some temp data is still written to "%APPDATA%\Temp" (will be fixed in future version)
|
||||||
|
- Don't show pointer cursor on torrent list checkbox
|
||||||
|
- Trim extra whitespace from magnet links pasted into "Open Torrent Address" dialog
|
||||||
|
- Fix weird outline on 'Create Torrent' button
|
||||||
|
|
||||||
|
## v0.17.0 - 2016-09-23
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Remember window size and position
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Torrent list redesign
|
||||||
|
- Quieter, more subtle sounds
|
||||||
|
- Got rid of the play button spinner, now goes to the player immediately
|
||||||
|
- Faster startup
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fix bug where playback rate could go negative
|
||||||
|
- Don't hide header when moused over player controls
|
||||||
|
- Fix Delete Data File on Windows
|
||||||
|
- Fix a sad, sad bug that resulted in 100+ MB config files
|
||||||
|
- Fix app DMG background image
|
||||||
|
|
||||||
|
## v0.16.0 - 2016-09-18
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- **Windows 64-bit support!** (#931)
|
||||||
|
- Existing 32-bit users will update to 64-bit automatically in next release
|
||||||
|
- 64-bit reduces likelihood of out-of-memory errors by increasing the address space
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Mac: Fix background image on .DMG
|
||||||
|
|
||||||
|
## v0.15.0 - 2016-09-16
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Option to start automatically on login
|
||||||
|
- Add integration tests
|
||||||
|
- Add more detailed telemetry to diagnose "buffer allocation failed"
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Disable playback controls while in external player (#909)
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fix several uncaught errors (#889, #891, #892)
|
||||||
|
- Update to the latest webtorrent.js, fixing some more uncaught errors
|
||||||
|
- Clicking on the "torrent finished" notification works again (#912)
|
||||||
|
|
||||||
|
## v0.14.0 - 2016-09-03
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Autoplay through all files in a torrent (#871)
|
||||||
|
- Torrents now have a progress bar (#844)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Modals now use Material UI
|
||||||
|
- Torrent list style improvements
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fix App.js crash in Linux (#882)
|
||||||
|
- Fix error on Windows caused by `setBadge` (#867)
|
||||||
|
- Don't crash when restarting after adding a magnet link (#869)
|
||||||
|
- Restore playback state when reopening player (#877)
|
||||||
|
|
||||||
|
## v0.13.1 - 2016-08-31
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fixed the Create Torrent page
|
||||||
|
|
||||||
|
## v0.13.0 - 2016-08-31
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Support .m4a audio
|
||||||
|
- Better telemetry: log error versions, report more types of errors
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- New look - Material UI. Rewrote Create Torrent and Preferences pages.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fixed telemetry [object Object] and [object HTMLMediaElement] bugs
|
||||||
|
- Don't render player controls when playing externally, eg in VLC
|
||||||
|
- Don't play notification sounds during media playback
|
||||||
|
|
||||||
|
## v0.12.0 - 2016-08-23
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Custom external media player
|
||||||
|
- Linux: add system-wide launcher and icons for Debian, including Ubuntu
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Telemetry improvements: redact stacktraces, log app version
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fix playback and download of default torrents ("missing path" error) (#804)
|
||||||
|
- Fix Delete Torrent + Data for newly added magnet links
|
||||||
|
- Fix jumpToTime error (#804)
|
||||||
|
|
||||||
|
## v0.11.0 - 2016-08-19
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- New Preference to "Set WebTorrent as default handler for torrents and magnet links" (#771)
|
||||||
|
- New Preference to "Always play in VLC" (#674)
|
||||||
|
- Check for missing default download path and torrent folders on start up (#776)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Do not automatically set WebTorrent as the default handler for torrents (#771)
|
||||||
|
- Torrents can only be created from the home screen (#770)
|
||||||
|
- Update Electron to 1.3.3 (#772)
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Allow modifying the default tracker list on the Create Torrent page (#775)
|
||||||
|
- Prevent opening multiple stacked Preference windows or Create Torrent windows (#770)
|
||||||
|
- Windows: Player window auto-resize does not match video aspect ratio (#565)
|
||||||
|
- Missing page title on Create Torrent page
|
||||||
|
|
||||||
|
## v0.10.0 - 2016-08-05
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Drag-and-drop magnet links (selected text) is now supported (#284)
|
||||||
|
- Windows: Add "User Tasks" shortcuts to app icon in Start Menu (#114)
|
||||||
|
- Linux: Show badge count for completed torrent downloads
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Change WebTorrent Desktop peer ID prefix to 'WD' to distinguish from WebTorrent in the browser, 'WW' (#688)
|
||||||
|
- Switch UI to React to improve UI rendering speed (#729)
|
||||||
|
- The primary bottleneck was actually `hyperx`, not `virtual-dom`.
|
||||||
|
- Update Electron to 1.3.2 (#738) (#739) (#740) (#747) (#756)
|
||||||
|
- Mac 10.9: Fix the fullscreen button showing
|
||||||
|
- Mac 10.9: Fix window having border
|
||||||
|
- Mac 10.9: Fix occasional crash
|
||||||
|
- Mac: Update Squirrel.Mac to 0.2.1 (fixes situations in which updates would not get applied)
|
||||||
|
- Mac: Fix window not showing in Window menu
|
||||||
|
- Mac: Fix context menu always choosing first item by default
|
||||||
|
- Linux: Fix startup crashes (some Linux distros)
|
||||||
|
- Linux: Fix menubar not hiding after entering fullscreen (some Linux distros)
|
||||||
|
- Improved location history (back/forward buttons) to fix rare exceptions (#687) (#748)
|
||||||
|
- Location history abstraction released independently as [`location-history`](https://www.npmjs.com/package/location-history)
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- When streaming to VLC, set VLC window title to torrent file name (#746)
|
||||||
|
- Fix "Cannot read property 'numPiecesPresent' of undefined" exception (#695)
|
||||||
|
- Fix rare case where config file could not be completely written (#733)
|
||||||
|
|
||||||
|
## v0.9.0 - 2016-07-20
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Save selected subtitles
|
||||||
|
- Ask for confirmation before deleting torrents
|
||||||
|
- Support Debian Jessie
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Only send telemetry in production
|
||||||
|
- Clean up the code. Split main.js, refactor lots of things
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fix state.playing.jumpToTime behavior
|
||||||
|
- Remove torrent file and poster image when deleting a torrent
|
||||||
|
|
||||||
|
## v0.8.1 - 2016-06-24
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- New URI handler: stream-magnet
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- DLNA crashing bug
|
||||||
|
|
||||||
|
## v0.8.0 - 2016-06-23
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Cast menu: choose which Chromecast, Airplay, or DLNA device you want to use
|
||||||
|
- Telemetry: send basic data, plus stats on how often the play button works
|
||||||
|
- Make posters from jpeg files, not just jpg
|
||||||
|
- Support .wmv video via Play in VLC
|
||||||
|
- Windows thumbnail bar with a play/pause button
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Nicer modal styles
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Windows tray icon now stays in the right state
|
||||||
|
|
||||||
|
## v0.7.2 - 2016-06-02
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fix exception that affects users upgrading from v0.5.1 or older
|
||||||
|
- Ensure `state.saved.prefs` configuration exists
|
||||||
|
- Fix window title on "About WebTorrent" window
|
||||||
|
|
||||||
## v0.7.1 - 2016-06-02
|
## v0.7.1 - 2016-06-02
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
- Change "Step Forward" keyboard shortcut to `Alt+Left` (Windows)
|
||||||
- Change "Step Forward" keyboard shortcut to `Alt+Left`
|
- Change "Step Backward" keyboard shortcut to to `Alt+Right` (Windows)
|
||||||
- Change "Step Backward" keyboard shortcut to to `Alt+Right`
|
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- First time startup bug -- invalid torrent/poster paths
|
- First time startup bug -- invalid torrent/poster paths
|
||||||
|
|
||||||
## v0.7.0 - 2016-06-02
|
## v0.7.0 - 2016-06-02
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Improved AirPlay support -- using the new [`airplayer`](https://www.npmjs.com/package/airplayer) package
|
- Improved AirPlay support -- using the new [`airplayer`](https://www.npmjs.com/package/airplayer) package
|
||||||
- Remember volume setting in player, for as long as the app is open
|
- Remember volume setting in player, for as long as the app is open
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- Add (+) button now also accepts non .torrent files and creates a torrent from
|
- Add (+) button now also accepts non .torrent files and creates a torrent from
|
||||||
those files
|
those files
|
||||||
- Show prompt text in title bar for open dialogs (OS X)
|
- Show prompt text in title bar for open dialogs (OS X)
|
||||||
@@ -29,7 +376,6 @@
|
|||||||
- Fix crash reporter not working (Windows)
|
- Fix crash reporter not working (Windows)
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Re-enable WebRTC (web peers)! (OS X, Windows)
|
- Re-enable WebRTC (web peers)! (OS X, Windows)
|
||||||
- Windows support was disabled in v0.6.1 to work around a bug in Electron
|
- Windows support was disabled in v0.6.1 to work around a bug in Electron
|
||||||
- OS X support was disabled in v0.4.0 to work around a 100% CPU bug
|
- OS X support was disabled in v0.4.0 to work around a 100% CPU bug
|
||||||
@@ -40,7 +386,6 @@
|
|||||||
- Fix torrent loading message UI misalignment
|
- Fix torrent loading message UI misalignment
|
||||||
|
|
||||||
### Known issues
|
### Known issues
|
||||||
|
|
||||||
- When upgrading to WebTorrent Desktop v0.7.0, some torrent metadata (file list,
|
- When upgrading to WebTorrent Desktop v0.7.0, some torrent metadata (file list,
|
||||||
selected files, whether torrent is streamable) will be cleared. Just start the
|
selected files, whether torrent is streamable) will be cleared. Just start the
|
||||||
torrent to re-populate the metadata.
|
torrent to re-populate the metadata.
|
||||||
@@ -48,7 +393,6 @@
|
|||||||
## v0.6.1 - 2016-05-26
|
## v0.6.1 - 2016-05-26
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Disable WebRTC to work around Electron crash (Windows)
|
- Disable WebRTC to work around Electron crash (Windows)
|
||||||
- Will be re-enabled in the next version of WebTorrent, which will be based on
|
- Will be re-enabled in the next version of WebTorrent, which will be based on
|
||||||
the next version of Electron, where the bug is fixed.
|
the next version of Electron, where the bug is fixed.
|
||||||
@@ -60,7 +404,6 @@
|
|||||||
## v0.6.0 - 2016-05-24
|
## v0.6.0 - 2016-05-24
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Added Preferences page to set Download folder
|
- Added Preferences page to set Download folder
|
||||||
- Save video position, resume playback from saved position
|
- Save video position, resume playback from saved position
|
||||||
- Add additional video player keyboard shortcuts (#275)
|
- Add additional video player keyboard shortcuts (#275)
|
||||||
@@ -70,7 +413,6 @@
|
|||||||
- Add announcement feature
|
- Add announcement feature
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- Nicer player UI
|
- Nicer player UI
|
||||||
- Reduce startup jank, improve startup time (#568)
|
- Reduce startup jank, improve startup time (#568)
|
||||||
- Cleanup unsupported codec detection (#569, #570)
|
- Cleanup unsupported codec detection (#569, #570)
|
||||||
@@ -78,7 +420,6 @@
|
|||||||
- Improve subtitle positioning (#551)
|
- Improve subtitle positioning (#551)
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Fix Uncaught TypeError: Cannot read property 'update' of undefined (#567)
|
- Fix Uncaught TypeError: Cannot read property 'update' of undefined (#567)
|
||||||
- Fix bugs in LocationHistory
|
- Fix bugs in LocationHistory
|
||||||
- When player is active, and magnet link is pasted, go back to list
|
- When player is active, and magnet link is pasted, go back to list
|
||||||
@@ -89,23 +430,19 @@
|
|||||||
## v0.5.1 - 2016-05-18
|
## v0.5.1 - 2016-05-18
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Fix auto-updater (OS X, Windows).
|
- Fix auto-updater (OS X, Windows).
|
||||||
|
|
||||||
## v0.5.0 - 2016-05-17
|
## v0.5.0 - 2016-05-17
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Select/deselect individual files to torrent.
|
- Select/deselect individual files to torrent.
|
||||||
- Automatically include subtitle files (.srt, .vtt) from torrent in the subtitles menu.
|
- Automatically include subtitle files (.srt, .vtt) from torrent in the subtitles menu.
|
||||||
- "Add Subtitle File..." menu item.
|
- "Add Subtitle File..." menu item.
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- When manually adding subtitle track(s), always switch to the new track.
|
- When manually adding subtitle track(s), always switch to the new track.
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Magnet links throw exception on app launch. (OS X)
|
- Magnet links throw exception on app launch. (OS X)
|
||||||
- Multi-file torrents would not seed in-place, were copied to Downloads folder.
|
- Multi-file torrents would not seed in-place, were copied to Downloads folder.
|
||||||
- Missing 'About WebTorrent' menu item. (Windows)
|
- Missing 'About WebTorrent' menu item. (Windows)
|
||||||
@@ -114,7 +451,6 @@
|
|||||||
## v0.4.0 - 2016-05-13
|
## v0.4.0 - 2016-05-13
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Better Windows support!
|
- Better Windows support!
|
||||||
- Windows 32-bit build.
|
- Windows 32-bit build.
|
||||||
- Windows Portable App build.
|
- Windows Portable App build.
|
||||||
@@ -137,7 +473,6 @@
|
|||||||
- New default torrent on first launch: The WIRED CD.
|
- New default torrent on first launch: The WIRED CD.
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- Improve app startup time by 40%.
|
- Improve app startup time by 40%.
|
||||||
- UI tweaks: Reduce font size, reduce torrent list item height.
|
- UI tweaks: Reduce font size, reduce torrent list item height.
|
||||||
- Add Playback menu for playback-related functionality.
|
- Add Playback menu for playback-related functionality.
|
||||||
@@ -148,7 +483,6 @@
|
|||||||
- Remove "Add Fake Airplay/Chromecast" menu items.
|
- Remove "Add Fake Airplay/Chromecast" menu items.
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Disable WebRTC to fix 100% CPU usage/crashes caused by Chromium issue. This is
|
- Disable WebRTC to fix 100% CPU usage/crashes caused by Chromium issue. This is
|
||||||
temporary. (OS X)
|
temporary. (OS X)
|
||||||
- When fullscreen, make controls use the full window. (OS X)
|
- When fullscreen, make controls use the full window. (OS X)
|
||||||
@@ -173,24 +507,20 @@ to this release!
|
|||||||
## v0.3.3 - 2016-04-07
|
## v0.3.3 - 2016-04-07
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- App icon was incorrect (OS X)
|
- App icon was incorrect (OS X)
|
||||||
|
|
||||||
## v0.3.2 - 2016-04-07
|
## v0.3.2 - 2016-04-07
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Register WebTorrent as default handler for magnet links (OS X)
|
- Register WebTorrent as default handler for magnet links (OS X)
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- Faster startup time (50ms)
|
- Faster startup time (50ms)
|
||||||
- Update Electron to 0.37.5
|
- Update Electron to 0.37.5
|
||||||
- Remove the white flash when loading pages and resizing the window
|
- Remove the white flash when loading pages and resizing the window
|
||||||
- Fix crash when sending IPC messages
|
- Fix crash when sending IPC messages
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Fix installation bugs with .deb file (Linux)
|
- Fix installation bugs with .deb file (Linux)
|
||||||
- Pause audio reliably when closing the window
|
- Pause audio reliably when closing the window
|
||||||
- Enforce minimimum window size when resizing player (for audio-only .mov files, which are 0x0)
|
- Enforce minimimum window size when resizing player (for audio-only .mov files, which are 0x0)
|
||||||
@@ -198,17 +528,14 @@ to this release!
|
|||||||
## v0.3.1 - 2016-04-06
|
## v0.3.1 - 2016-04-06
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Add crash reporter to torrent engine process
|
- Add crash reporter to torrent engine process
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Fix cast screen background: cover, don't tile
|
- Fix cast screen background: cover, don't tile
|
||||||
|
|
||||||
## v0.3.0 - 2016-04-06
|
## v0.3.0 - 2016-04-06
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- **Ubuntu/Debian support!** (.deb installer)
|
- **Ubuntu/Debian support!** (.deb installer)
|
||||||
- **DLNA streaming support**
|
- **DLNA streaming support**
|
||||||
- Add "File > Quit" menu item (Linux)
|
- Add "File > Quit" menu item (Linux)
|
||||||
@@ -216,14 +543,12 @@ to this release!
|
|||||||
- Crash reporting
|
- Crash reporting
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- On startup, do not re-verify files when timestamps are unchanged
|
- On startup, do not re-verify files when timestamps are unchanged
|
||||||
- Moved torrent engine to an independent process, for better UI performance
|
- Moved torrent engine to an independent process, for better UI performance
|
||||||
- Removed media queries (UI resizing based on window width)
|
- Removed media queries (UI resizing based on window width)
|
||||||
- Improved Chromecast icon, when connected
|
- Improved Chromecast icon, when connected
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- "Download Complete" notification shows consistently
|
- "Download Complete" notification shows consistently
|
||||||
- Create new torrents and seed them without copying to temporary folder
|
- Create new torrents and seed them without copying to temporary folder
|
||||||
- Clicking the "Download Complete" notification will always activate app
|
- Clicking the "Download Complete" notification will always activate app
|
||||||
@@ -242,7 +567,6 @@ Thanks to @dcposch, @grunjol, and @feross for contributing to this release.
|
|||||||
## v0.2.0 - 2016-03-29
|
## v0.2.0 - 2016-03-29
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Minimise to tray (Windows, Linux)
|
- Minimise to tray (Windows, Linux)
|
||||||
- Show spinner and download speed when player is stalled waiting for data
|
- Show spinner and download speed when player is stalled waiting for data
|
||||||
- Highlight window on drag-and-drop
|
- Highlight window on drag-and-drop
|
||||||
@@ -251,12 +575,10 @@ Thanks to @dcposch, @grunjol, and @feross for contributing to this release.
|
|||||||
Linux users need to download new versions manually.
|
Linux users need to download new versions manually.
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- Renamed WebTorrent.app to WebTorrent Desktop
|
- Renamed WebTorrent.app to WebTorrent Desktop
|
||||||
- Add Cosmos Laundromat as a default torrent
|
- Add Cosmos Laundromat as a default torrent
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Only capture media keys when player is active
|
- Only capture media keys when player is active
|
||||||
- Update WebTorrent to 0.88.1 for performance improvements
|
- Update WebTorrent to 0.88.1 for performance improvements
|
||||||
- When seeding, do not proactively connect to new peers
|
- When seeding, do not proactively connect to new peers
|
||||||
@@ -316,7 +638,7 @@ Windows, and Linux. For now, we're only releasing binaries for OS X.
|
|||||||
|
|
||||||
WebTorrent Desktop is in ALPHA and under very active development – expect lots more polish in
|
WebTorrent Desktop is in ALPHA and under very active development – expect lots more polish in
|
||||||
the coming weeks! If you know JavaScript and want to help us out, there's
|
the coming weeks! If you know JavaScript and want to help us out, there's
|
||||||
[lots to do](https://github.com/feross/webtorrent-desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)!
|
[lots to do](https://github.com/webtorrent/webtorrent-desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)!
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
|
|||||||
@@ -1,75 +0,0 @@
|
|||||||
# Contributing Guidelines
|
|
||||||
|
|
||||||
Contributions welcome!
|
|
||||||
|
|
||||||
**Before spending lots of time on something, ask for feedback on your idea first!**
|
|
||||||
|
|
||||||
Please search issues and pull requests before adding something new to avoid duplicating
|
|
||||||
efforts and conversations.
|
|
||||||
|
|
||||||
This project welcomes non-code contributions, too! The following types of contributions
|
|
||||||
are welcome:
|
|
||||||
|
|
||||||
- **Ideas**: participate in an issue thread or start your own to have your voice heard.
|
|
||||||
- **Writing**: contribute your expertise in an area by helping expand the included docs.
|
|
||||||
- **Copy editing**: fix typos, clarify language, and improve the quality of the docs.
|
|
||||||
- **Formatting**: help keep docs easy to read with consistent formatting.
|
|
||||||
|
|
||||||
## Code Style
|
|
||||||
|
|
||||||
[![standard][standard-image]][standard-url]
|
|
||||||
|
|
||||||
This repository uses [`standard`][standard-url] to maintain code style and consistency,
|
|
||||||
and to avoid style arguments. `npm test` runs `standard` automatically, so you don't have
|
|
||||||
to!
|
|
||||||
|
|
||||||
[standard-image]: https://cdn.rawgit.com/feross/standard/master/badge.svg
|
|
||||||
[standard-url]: https://github.com/feross/standard
|
|
||||||
|
|
||||||
## Project Governance
|
|
||||||
|
|
||||||
Individuals making significant and valuable contributions are given commit-access to the
|
|
||||||
project to contribute as they see fit. This project is more like an open wiki than a
|
|
||||||
standard guarded open source project.
|
|
||||||
|
|
||||||
### Rules
|
|
||||||
|
|
||||||
There are a few basic ground-rules for contributors:
|
|
||||||
|
|
||||||
1. **No `--force` pushes** or modifying the Git history in any way.
|
|
||||||
2. **Non-master branches** should be used for ongoing work.
|
|
||||||
3. **Significant modifications** like API changes should be subject to a **pull request**
|
|
||||||
to solicit feedback from other contributors.
|
|
||||||
4. **Pull requests** are *encouraged* for all contributions to solicit feedback, but left to
|
|
||||||
the discretion of the contributor.
|
|
||||||
|
|
||||||
### Releases
|
|
||||||
|
|
||||||
Declaring formal releases remains the prerogative of the project maintainer.
|
|
||||||
|
|
||||||
### Changes to this arrangement
|
|
||||||
|
|
||||||
This is an experiment and feedback is welcome! This document may also be subject to pull-
|
|
||||||
requests or changes by contributors where you believe you have something valuable to add
|
|
||||||
or change.
|
|
||||||
|
|
||||||
## Developer's Certificate of Origin 1.1
|
|
||||||
|
|
||||||
By making a contribution to this project, I certify that:
|
|
||||||
|
|
||||||
- (a) The contribution was created in whole or in part by me and I have the right to
|
|
||||||
submit it under the open source license indicated in the file; or
|
|
||||||
|
|
||||||
- (b) The contribution is based upon previous work that, to the best of my knowledge, is
|
|
||||||
covered under an appropriate open source license and I have the right under that license
|
|
||||||
to submit that work with modifications, whether created in whole or in part by me, under
|
|
||||||
the same open source license (unless I am permitted to submit under a different
|
|
||||||
license), as indicated in the file; or
|
|
||||||
|
|
||||||
- (c) The contribution was provided directly to me by some other person who certified
|
|
||||||
(a), (b) or (c) and I have not modified it.
|
|
||||||
|
|
||||||
- (d) I understand and agree that this project and the contribution are public and that a
|
|
||||||
record of the contribution (including all personal information I submit with it,
|
|
||||||
including my sign-off) is maintained indefinitely and may be redistributed consistent
|
|
||||||
with this project or the open source license(s) involved.
|
|
||||||
144
README.md
144
README.md
@@ -1,47 +1,112 @@
|
|||||||
<h1 align="center">
|
<h1 align="center">
|
||||||
<br>
|
<br>
|
||||||
<a href="https://webtorrent.io"><img src="https://webtorrent.io/img/WebTorrent.png" alt="WebTorrent" width="200"></a>
|
<a href="https://webtorrent.io">
|
||||||
|
<img src="https://webtorrent.io/img/WebTorrent.png" alt="WebTorrent" width="200">
|
||||||
|
</a>
|
||||||
<br>
|
<br>
|
||||||
WebTorrent Desktop
|
WebTorrent Desktop
|
||||||
<br>
|
<br>
|
||||||
<br>
|
<br>
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<h4 align="center">The streaming torrent client. For OS X, Windows, and Linux.</h4>
|
<h4 align="center">The streaming torrent app. For Mac, Windows, and Linux.</h4>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://gitter.im/feross/webtorrent"><img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg" alt="Gitter"></a>
|
<a href="https://discord.gg/cnXkm4Z"><img src="https://img.shields.io/discord/612575111718895616" alt="discord"></a>
|
||||||
<a href="https://travis-ci.org/feross/webtorrent-desktop"><img src="https://img.shields.io/travis/feross/webtorrent-desktop/master.svg" alt="Travis"></a>
|
<a href="https://github.com/webtorrent/webtorrent-desktop/actions/workflows/ci.yml"><img src="https://github.com/webtorrent/webtorrent-desktop/actions/workflows/ci.yml/badge.svg" alt="GitHub CI action"></a>
|
||||||
<a href="https://github.com/feross/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/feross/webtorrent-desktop.svg" alt="Release"></a>
|
<a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/webtorrent/webtorrent-desktop.svg" alt="github release version"></a>
|
||||||
|
<a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/downloads/webtorrent/webtorrent-desktop/total.svg" alt="github release downloads"></a>
|
||||||
|
<a href="https://standardjs.com"><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="Standard - JavaScript Style Guide"></a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
## Install
|
## Install
|
||||||
|
|
||||||
**WebTorrent Desktop** is still under very active development. You can download the latest version from the [releases](https://github.com/feross/webtorrent-desktop/releases) page.
|
### Recommended Install
|
||||||
|
|
||||||
## Screenshot
|
Download the latest version of WebTorrent Desktop from
|
||||||
|
[the official website](https://webtorrent.io/desktop/):
|
||||||
|
|
||||||
|
### [✨ Download WebTorrent Desktop ✨](https://webtorrent.io/desktop/)
|
||||||
|
|
||||||
|
### Advanced Install
|
||||||
|
|
||||||
|
- Download specific installer files from the [GitHub releases](https://github.com/webtorrent/webtorrent-desktop/releases) page.
|
||||||
|
|
||||||
|
- Use [Homebrew-Cask](https://github.com/caskroom/homebrew-cask) to install from the command line:
|
||||||
|
|
||||||
|
```
|
||||||
|
$ brew install --cask webtorrent
|
||||||
|
```
|
||||||
|
|
||||||
|
- Try the (unstable) development version by cloning the Git repository. See the
|
||||||
|
["How to Contribute"](#how-to-contribute) instructions.
|
||||||
|
|
||||||
|
## Screenshots
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<img src="https://webtorrent.io/img/screenshot-main.png" width="562" height="630" alt="screenshot" align="center">
|
<img src="https://webtorrent.io/img/screenshot-player3.png" alt="screenshot" align="center">
|
||||||
|
<img src="https://webtorrent.io/img/screenshot-main.png" width="612" height="749" alt="screenshot" align="center">
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
## How to Contribute
|
## How to Contribute
|
||||||
|
|
||||||
### Install dependencies
|
### Get the code
|
||||||
|
|
||||||
```
|
```
|
||||||
|
$ git clone https://github.com/webtorrent/webtorrent-desktop.git
|
||||||
|
$ cd webtorrent-desktop
|
||||||
$ npm install
|
$ npm install
|
||||||
```
|
```
|
||||||
|
|
||||||
### Run app
|
### Run the app
|
||||||
|
|
||||||
```
|
```
|
||||||
$ npm start
|
$ npm start
|
||||||
```
|
```
|
||||||
|
|
||||||
### Package app
|
### Watch the code
|
||||||
|
|
||||||
Builds app binaries for OS X, Linux, and Windows.
|
Restart the app automatically every time code changes. Useful during development.
|
||||||
|
|
||||||
|
```
|
||||||
|
$ npm run watch
|
||||||
|
```
|
||||||
|
|
||||||
|
### Run linters
|
||||||
|
|
||||||
|
```
|
||||||
|
$ npm test
|
||||||
|
```
|
||||||
|
|
||||||
|
### Run integration tests
|
||||||
|
|
||||||
|
```
|
||||||
|
$ npm run test-integration
|
||||||
|
```
|
||||||
|
|
||||||
|
The integration tests use Spectron and Tape. They click through the app, taking screenshots and
|
||||||
|
comparing each one to a reference. Why screenshots?
|
||||||
|
|
||||||
|
* Ad-hoc checking makes the tests a lot more work to write
|
||||||
|
* Even diffing the whole HTML is not as thorough as screenshot diffing. For example, it wouldn't
|
||||||
|
catch an bug where hitting ESC from a video doesn't correctly restore window size.
|
||||||
|
* Chrome's own integration tests use screenshot diffing iirc
|
||||||
|
* Small UI changes will break a few tests, but the fix is as easy as deleting the offending
|
||||||
|
screenshots and running the tests, which will recreate them with the new look.
|
||||||
|
* The resulting Github PR will then show, pixel by pixel, the exact UI changes that were made! See
|
||||||
|
https://github.com/blog/817-behold-image-view-modes
|
||||||
|
|
||||||
|
For MacOS, you'll need a Retina screen for the integration tests to pass. Your screen should have
|
||||||
|
the same resolution as a 2018 MacBook Pro 13".
|
||||||
|
|
||||||
|
For Windows, you'll need Windows 10 with a 1366x768 screen.
|
||||||
|
|
||||||
|
When running integration tests, keep the mouse on the edge of the screen and don't touch the mouse
|
||||||
|
or keyboard while the tests are running.
|
||||||
|
|
||||||
|
### Package the app
|
||||||
|
|
||||||
|
Builds app binaries for Mac, Linux, and Windows.
|
||||||
|
|
||||||
```
|
```
|
||||||
$ npm run package
|
$ npm run package
|
||||||
@@ -50,40 +115,75 @@ $ npm run package
|
|||||||
To build for one platform:
|
To build for one platform:
|
||||||
|
|
||||||
```
|
```
|
||||||
$ npm run package -- [platform]
|
$ npm run package -- [platform] [options]
|
||||||
```
|
```
|
||||||
|
|
||||||
Where `[platform]` is `darwin`, `linux`, `win32`, or `all` (default).
|
Where `[platform]` is `darwin`, `linux`, `win32`, or `all` (default).
|
||||||
|
|
||||||
The following optional arguments are available:
|
The following optional arguments are available:
|
||||||
|
|
||||||
- `--sign` - Sign the application (OS X, Windows)
|
- `--sign` - Sign the application (Mac, Windows)
|
||||||
- `--package=[type]` - Package single output type.
|
- `--package=[type]` - Package single output type.
|
||||||
- `deb` - Debian package
|
- `deb` - Debian package
|
||||||
|
- `rpm` - RedHat package
|
||||||
- `zip` - Linux zip file
|
- `zip` - Linux zip file
|
||||||
- `dmg` - OS X disk image
|
- `dmg` - Mac disk image
|
||||||
- `exe` - Windows installer
|
- `exe` - Windows installer
|
||||||
- `portable` - Windows portable app
|
- `portable` - Windows portable app
|
||||||
- `all` - All platforms (default)
|
- `all` - All platforms (default)
|
||||||
|
|
||||||
Note: Even with the `--package` option, the auto-update files (.nupkg for Windows, *-darwin.zip for OS X) will always be produced.
|
Note: Even with the `--package` option, the auto-update files (.nupkg for Windows,
|
||||||
|
-darwin.zip for Mac) will always be produced.
|
||||||
|
|
||||||
#### Windows build notes
|
#### Windows build notes
|
||||||
|
|
||||||
To package the Windows app from non-Windows platforms, [Wine](https://www.winehq.org/) needs
|
The Windows app can be packaged from **any** platform.
|
||||||
to be installed.
|
|
||||||
|
|
||||||
On OS X, first install [XQuartz](http://www.xquartz.org/), then run:
|
Note: Windows code signing only works from **Windows**, for now.
|
||||||
|
|
||||||
|
Note: To package the Windows app from non-Windows platforms,
|
||||||
|
[Wine](https://www.winehq.org/) and [Mono](https://www.mono-project.com/) need
|
||||||
|
to be installed. For example on Mac, first install
|
||||||
|
[XQuartz](http://www.xquartz.org/), then run:
|
||||||
|
|
||||||
```
|
```
|
||||||
brew install wine
|
$ brew install wine mono
|
||||||
```
|
```
|
||||||
|
|
||||||
(Requires the [Homebrew](http://brew.sh/) package manager.)
|
(Requires the [Homebrew](http://brew.sh/) package manager.)
|
||||||
|
|
||||||
### Code Style
|
#### Mac build notes
|
||||||
|
|
||||||
[](https://github.com/feross/standard)
|
The Mac app can only be packaged from **macOS**.
|
||||||
|
|
||||||
|
#### Linux build notes
|
||||||
|
|
||||||
|
The Linux app can be packaged from **any** platform.
|
||||||
|
|
||||||
|
If packaging from Mac, install system dependencies with Homebrew by running:
|
||||||
|
|
||||||
|
```
|
||||||
|
npm run install-system-deps
|
||||||
|
```
|
||||||
|
#### Recommended readings to start working in the app
|
||||||
|
|
||||||
|
Electron (Framework to make native apps for Windows, OSX and Linux in Javascript):
|
||||||
|
https://electronjs.org/docs/tutorial/quick-start
|
||||||
|
|
||||||
|
React.js (Framework to work with Frontend UI):
|
||||||
|
https://reactjs.org/docs/getting-started.html
|
||||||
|
|
||||||
|
Material UI (React components that implement Google's Material Design.):
|
||||||
|
https://material-ui.com/getting-started/installation
|
||||||
|
|
||||||
|
### Privacy
|
||||||
|
|
||||||
|
WebTorrent Desktop collects some basic usage stats to help us make the app better.
|
||||||
|
For example, we track how well the play button works. How often does it succeed?
|
||||||
|
Time out? Show a missing codec error?
|
||||||
|
|
||||||
|
The app never sends any personally identifying information, nor does it track which
|
||||||
|
torrents you add.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|||||||
109
RELEASE_PROCESS.md
Normal file
109
RELEASE_PROCESS.md
Normal file
@@ -0,0 +1,109 @@
|
|||||||
|
## Release Process
|
||||||
|
|
||||||
|
### 1. Create a new version
|
||||||
|
|
||||||
|
- Update `AUTHORS`
|
||||||
|
|
||||||
|
```
|
||||||
|
npm run update-authors
|
||||||
|
```
|
||||||
|
|
||||||
|
Commit if necessary. The commit message should be "authors".
|
||||||
|
|
||||||
|
- Write the changelog
|
||||||
|
|
||||||
|
You can use `git log --oneline <last version tag>..HEAD` to get a list of changes.
|
||||||
|
|
||||||
|
Summarize them concisely in `CHANGELOG.md`. The commit message should be "changelog".
|
||||||
|
|
||||||
|
- Update the version
|
||||||
|
|
||||||
|
```
|
||||||
|
npm version [major|minor|patch]
|
||||||
|
```
|
||||||
|
|
||||||
|
This creates both a commit and a git tag.
|
||||||
|
|
||||||
|
- Make a PR
|
||||||
|
|
||||||
|
Once the PR is reviewed, merge it:
|
||||||
|
|
||||||
|
```
|
||||||
|
git push origin <branch-name>:master
|
||||||
|
```
|
||||||
|
|
||||||
|
This makes it so that the commit hash on master matches the commit hash of the version tag.
|
||||||
|
|
||||||
|
Finally, run:
|
||||||
|
|
||||||
|
```
|
||||||
|
git push --tags
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. Create the release binaries
|
||||||
|
|
||||||
|
- On a Mac:
|
||||||
|
|
||||||
|
```
|
||||||
|
npm run package -- darwin --sign
|
||||||
|
```
|
||||||
|
|
||||||
|
Move the `.zip` and `.dmg` file somewhere because the next step wipes the `dist/` folder away.
|
||||||
|
|
||||||
|
```
|
||||||
|
npm run package -- linux --sign
|
||||||
|
```
|
||||||
|
|
||||||
|
- On Windows, or in a Windows VM:
|
||||||
|
|
||||||
|
```
|
||||||
|
npm run package -- win32 --sign
|
||||||
|
```
|
||||||
|
|
||||||
|
- Then, upload the release binaries to Github:
|
||||||
|
|
||||||
|
```
|
||||||
|
npm run gh-release
|
||||||
|
```
|
||||||
|
|
||||||
|
Follow the URL to a newly created Github release page. Manually upload the binaries from
|
||||||
|
`webtorrent-desktop/dist/`. Open the previous release in another tab, and make sure that you
|
||||||
|
are uploading the same set of files, no more, no less.
|
||||||
|
|
||||||
|
### 3. Test it
|
||||||
|
|
||||||
|
**This is the most important part.**
|
||||||
|
|
||||||
|
- Manually download the binaries for each platform from Github.
|
||||||
|
|
||||||
|
**Do not use your locally built binaries.** Modern OSs treat executables differently if they've
|
||||||
|
been downloaded, even though the files are byte for byte identical. This ensures that the
|
||||||
|
codesigning worked and is valid.
|
||||||
|
|
||||||
|
- Smoke test WebTorrent Desktop on each platform. Before a release, check that the following basic use cases work correctly:
|
||||||
|
|
||||||
|
1. Click "Play" to stream a built-in torrent (e.g. Sintel)
|
||||||
|
- Ensure that seeking to undownloaded region works and plays immediately.
|
||||||
|
- Ensure that sintel.mp4 gets downloaded to `~/Downloads`.
|
||||||
|
|
||||||
|
2. Check that the auto-updater works
|
||||||
|
- Open the console and check for the line "No update available" to indicate that the auto-updater is working. (If the auto updater does not run, users will successfully auto update to this new version, and then be stuck there forever.)
|
||||||
|
|
||||||
|
3. Add a new .torrent file via drag-and-drop.
|
||||||
|
- Ensure that it gets added to the list and starts downloading.
|
||||||
|
|
||||||
|
4. Remove a torrent from the client
|
||||||
|
- Ensure that the file is removed from `~/Downloads`
|
||||||
|
|
||||||
|
5. Create and seed a new a torrent via drag-and-drop.
|
||||||
|
- Ensure that the torrent gets created and seeding begins.
|
||||||
|
|
||||||
|
### 4. Ship it
|
||||||
|
|
||||||
|
- Update the website
|
||||||
|
|
||||||
|
Create a pull request in [webtorrent.io](https://github.com/webtorrent/webtorrent.io). Update
|
||||||
|
`config.js`, updating the desktop app version.
|
||||||
|
|
||||||
|
Once this PR is merged and Feross redeploys the WebTorrent website,
|
||||||
|
hundreds of thousands of users around the world will start auto updating. **Merge with care.**
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
#!/usr/bin/env node
|
|
||||||
|
|
||||||
var fs = require('fs')
|
|
||||||
var cp = require('child_process')
|
|
||||||
|
|
||||||
var BUILT_IN_DEPS = ['child_process', 'electron', 'fs', 'os', 'path']
|
|
||||||
var EXECUTABLE_DEPS = ['gh-release', 'standard']
|
|
||||||
|
|
||||||
main()
|
|
||||||
|
|
||||||
// Scans codebase for missing or unused dependencies. Exits with code 0 on success.
|
|
||||||
function main () {
|
|
||||||
if (process.platform === 'win32') {
|
|
||||||
console.error('Sorry, check-deps only works on Mac and Linux')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var usedDeps = findUsedDeps()
|
|
||||||
var packageDeps = findPackageDeps()
|
|
||||||
|
|
||||||
var missingDeps = usedDeps.filter(
|
|
||||||
(dep) => !packageDeps.includes(dep) && !BUILT_IN_DEPS.includes(dep)
|
|
||||||
)
|
|
||||||
var unusedDeps = packageDeps.filter(
|
|
||||||
(dep) => !usedDeps.includes(dep) && !EXECUTABLE_DEPS.includes(dep)
|
|
||||||
)
|
|
||||||
|
|
||||||
if (missingDeps.length > 0) {
|
|
||||||
console.error('Missing package dependencies: ' + missingDeps)
|
|
||||||
}
|
|
||||||
if (unusedDeps.length > 0) {
|
|
||||||
console.error('Unused package dependencies: ' + unusedDeps)
|
|
||||||
}
|
|
||||||
if (missingDeps.length + unusedDeps.length > 0) {
|
|
||||||
process.exitCode = 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finds all dependencies specified in `package.json`
|
|
||||||
function findPackageDeps () {
|
|
||||||
var pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'))
|
|
||||||
|
|
||||||
var deps = Object.keys(pkg.dependencies)
|
|
||||||
var devDeps = Object.keys(pkg.devDependencies)
|
|
||||||
var optionalDeps = Object.keys(pkg.optionalDependencies)
|
|
||||||
|
|
||||||
return [].concat(deps, devDeps, optionalDeps)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finds all dependencies that used with `require()`
|
|
||||||
function findUsedDeps () {
|
|
||||||
var stdout = cp.execSync('./bin/list-deps.sh')
|
|
||||||
return stdout.toString().trim().split('\n')
|
|
||||||
}
|
|
||||||
22
bin/clean.js
22
bin/clean.js
@@ -5,21 +5,27 @@
|
|||||||
* Useful for developers.
|
* Useful for developers.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var fs = require('fs')
|
const fs = require('fs')
|
||||||
var os = require('os')
|
const os = require('os')
|
||||||
var path = require('path')
|
const path = require('path')
|
||||||
var rimraf = require('rimraf')
|
const rimraf = require('rimraf')
|
||||||
|
|
||||||
var config = require('../config')
|
const config = require('../src/config')
|
||||||
var handlers = require('../main/handlers')
|
const handlers = require('../src/main/handlers')
|
||||||
|
|
||||||
|
// First, remove generated files
|
||||||
|
rimraf.sync('build/')
|
||||||
|
rimraf.sync('dist/')
|
||||||
|
|
||||||
|
// Remove any saved configuration
|
||||||
rimraf.sync(config.CONFIG_PATH)
|
rimraf.sync(config.CONFIG_PATH)
|
||||||
|
|
||||||
var tmpPath
|
// Remove any temporary files
|
||||||
|
let tmpPath
|
||||||
try {
|
try {
|
||||||
tmpPath = path.join(fs.statSync('/tmp') && '/tmp', 'webtorrent')
|
tmpPath = path.join(fs.statSync('/tmp') && '/tmp', 'webtorrent')
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
tmpPath = path.join(os.tmpDir(), 'webtorrent')
|
tmpPath = path.join(os.tmpdir(), 'webtorrent')
|
||||||
}
|
}
|
||||||
rimraf.sync(tmpPath)
|
rimraf.sync(tmpPath)
|
||||||
|
|
||||||
|
|||||||
10
bin/cmd.js
10
bin/cmd.js
@@ -1,10 +0,0 @@
|
|||||||
#!/usr/bin/env node
|
|
||||||
|
|
||||||
var electron = require('electron-prebuilt')
|
|
||||||
var cp = require('child_process')
|
|
||||||
var path = require('path')
|
|
||||||
|
|
||||||
var child = cp.spawn(electron, [path.join(__dirname, '..')], {stdio: 'inherit'})
|
|
||||||
child.on('close', function (code) {
|
|
||||||
process.exitCode = code
|
|
||||||
})
|
|
||||||
12
bin/darwin-entitlements.plist
Normal file
12
bin/darwin-entitlements.plist
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>com.apple.security.cs.allow-jit</key>
|
||||||
|
<true/>
|
||||||
|
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
|
||||||
|
<true/>
|
||||||
|
<key>com.apple.security.cs.debugger</key>
|
||||||
|
<true/>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# This is a truly heinous hack, but it works pretty nicely.
|
|
||||||
# Find all modules we're requiring---even conditional requires.
|
|
||||||
|
|
||||||
grep "require('" *.js bin/ main/ renderer/ -R |
|
|
||||||
grep '.js:' |
|
|
||||||
sed "s/.*require('\([^'\/]*\).*/\1/" |
|
|
||||||
grep -v '^\.' |
|
|
||||||
sort |
|
|
||||||
uniq
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
|
|
||||||
var config = require('../config')
|
const { CONFIG_PATH } = require('../src/config')
|
||||||
var open = require('open')
|
const open = require('open')
|
||||||
|
|
||||||
open(config.CONFIG_PATH)
|
open(CONFIG_PATH)
|
||||||
|
|||||||
403
bin/package.js
403
bin/package.js
@@ -1,27 +1,28 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Builds app binaries for OS X, Linux, and Windows.
|
* Builds app binaries for Mac, Windows, and Linux.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var cp = require('child_process')
|
const cp = require('child_process')
|
||||||
var electronPackager = require('electron-packager')
|
const electronPackager = require('electron-packager')
|
||||||
var fs = require('fs')
|
const fs = require('fs')
|
||||||
var minimist = require('minimist')
|
const minimist = require('minimist')
|
||||||
var mkdirp = require('mkdirp')
|
const os = require('os')
|
||||||
var os = require('os')
|
const path = require('path')
|
||||||
var path = require('path')
|
const rimraf = require('rimraf')
|
||||||
var rimraf = require('rimraf')
|
const series = require('run-series')
|
||||||
var series = require('run-series')
|
const zip = require('cross-zip')
|
||||||
var zip = require('cross-zip')
|
|
||||||
|
|
||||||
var config = require('../config')
|
const config = require('../src/config')
|
||||||
var pkg = require('../package.json')
|
const pkg = require('../package.json')
|
||||||
|
|
||||||
var BUILD_NAME = config.APP_NAME + '-v' + config.APP_VERSION
|
const BUILD_NAME = config.APP_NAME + '-v' + config.APP_VERSION
|
||||||
var DIST_PATH = path.join(config.ROOT_PATH, 'dist')
|
const BUILD_PATH = path.join(config.ROOT_PATH, 'build')
|
||||||
|
const DIST_PATH = path.join(config.ROOT_PATH, 'dist')
|
||||||
|
const NODE_MODULES_PATH = path.join(config.ROOT_PATH, 'node_modules')
|
||||||
|
|
||||||
var argv = minimist(process.argv.slice(2), {
|
const argv = minimist(process.argv.slice(2), {
|
||||||
boolean: [
|
boolean: [
|
||||||
'sign'
|
'sign'
|
||||||
],
|
],
|
||||||
@@ -35,8 +36,19 @@ var argv = minimist(process.argv.slice(2), {
|
|||||||
})
|
})
|
||||||
|
|
||||||
function build () {
|
function build () {
|
||||||
|
console.log('Installing node_modules...')
|
||||||
|
rimraf.sync(NODE_MODULES_PATH)
|
||||||
|
cp.execSync('npm ci', { stdio: 'inherit' })
|
||||||
|
|
||||||
|
console.log('Nuking dist/ and build/...')
|
||||||
rimraf.sync(DIST_PATH)
|
rimraf.sync(DIST_PATH)
|
||||||
var platform = argv._[0]
|
rimraf.sync(BUILD_PATH)
|
||||||
|
|
||||||
|
console.log('Build: Transpiling to ES5...')
|
||||||
|
cp.execSync('npm run build', { NODE_ENV: 'production', stdio: 'inherit' })
|
||||||
|
console.log('Build: Transpiled to ES5.')
|
||||||
|
|
||||||
|
const platform = argv._[0]
|
||||||
if (platform === 'darwin') {
|
if (platform === 'darwin') {
|
||||||
buildDarwin(printDone)
|
buildDarwin(printDone)
|
||||||
} else if (platform === 'win32') {
|
} else if (platform === 'win32') {
|
||||||
@@ -54,35 +66,35 @@ function build () {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var all = {
|
const all = {
|
||||||
// The human-readable copyright line for the app. Maps to the `LegalCopyright` metadata
|
// The human-readable copyright line for the app. Maps to the `LegalCopyright` metadata
|
||||||
// property on Windows, and `NSHumanReadableCopyright` on OS X.
|
// property on Windows, and `NSHumanReadableCopyright` on Mac.
|
||||||
'app-copyright': config.APP_COPYRIGHT,
|
appCopyright: config.APP_COPYRIGHT,
|
||||||
|
|
||||||
// The release version of the application. Maps to the `ProductVersion` metadata
|
// The release version of the application. Maps to the `ProductVersion` metadata
|
||||||
// property on Windows, and `CFBundleShortVersionString` on OS X.
|
// property on Windows, and `CFBundleShortVersionString` on Mac.
|
||||||
'app-version': pkg.version,
|
appVersion: pkg.version,
|
||||||
|
|
||||||
// Package the application's source code into an archive, using Electron's archive
|
// Package the application's source code into an archive, using Electron's archive
|
||||||
// format. Mitigates issues around long path names on Windows and slightly speeds up
|
// format. Mitigates issues around long path names on Windows and slightly speeds up
|
||||||
// require().
|
// require().
|
||||||
asar: true,
|
asar: {
|
||||||
|
// A glob expression, that unpacks the files with matching names to the
|
||||||
// A glob expression, that unpacks the files with matching names to the
|
// "app.asar.unpacked" directory.
|
||||||
// "app.asar.unpacked" directory.
|
unpack: 'WebTorrent*'
|
||||||
'asar-unpack': 'WebTorrent*',
|
},
|
||||||
|
|
||||||
// The build version of the application. Maps to the FileVersion metadata property on
|
// The build version of the application. Maps to the FileVersion metadata property on
|
||||||
// Windows, and CFBundleVersion on OS X. Note: Windows requires the build version to
|
// Windows, and CFBundleVersion on Mac. Note: Windows requires the build version to
|
||||||
// start with a number. We're using the version of the underlying WebTorrent library.
|
// start with a number. We're using the version of the underlying WebTorrent library.
|
||||||
'build-version': require('webtorrent/package.json').version,
|
buildVersion: require('webtorrent/package.json').version,
|
||||||
|
|
||||||
// The application source directory.
|
// The application source directory.
|
||||||
dir: config.ROOT_PATH,
|
dir: config.ROOT_PATH,
|
||||||
|
|
||||||
// Pattern which specifies which files to ignore when copying files to create the
|
// Pattern which specifies which files to ignore when copying files to create the
|
||||||
// package(s).
|
// package(s).
|
||||||
ignore: /^\/dist|\/(appveyor.yml|\.appveyor.yml|\.github|appdmg|AUTHORS|CONTRIBUTORS|bench|benchmark|benchmark\.js|bin|bower\.json|component\.json|coverage|doc|docs|docs\.mli|dragdrop\.min\.js|example|examples|example\.html|example\.js|externs|ipaddr\.min\.js|Makefile|min|minimist|perf|rusha|simplepeer\.min\.js|simplewebsocket\.min\.js|static\/screenshot\.png|test|tests|test\.js|tests\.js|webtorrent\.min\.js|\.[^\/]*|.*\.md|.*\.markdown)$/,
|
ignore: /^\/src|^\/dist|\/(appveyor.yml|\.appveyor.yml|\.github|appdmg|AUTHORS|CONTRIBUTORS|bench|benchmark|benchmark\.js|bin|bower\.json|component\.json|coverage|doc|docs|docs\.mli|dragdrop\.min\.js|example|examples|example\.html|example\.js|externs|ipaddr\.min\.js|Makefile|min|minimist|perf|rusha|simplepeer\.min\.js|simplewebsocket\.min\.js|static\/screenshot\.png|test|tests|test\.js|tests\.js|webtorrent\.min\.js|\.[^/]*|.*\.md|.*\.markdown)$/,
|
||||||
|
|
||||||
// The application name.
|
// The application name.
|
||||||
name: config.APP_NAME,
|
name: config.APP_NAME,
|
||||||
@@ -97,40 +109,40 @@ var all = {
|
|||||||
// "devDependencies" before starting to package the app.
|
// "devDependencies" before starting to package the app.
|
||||||
prune: true,
|
prune: true,
|
||||||
|
|
||||||
// The Electron version with which the app is built (without the leading 'v')
|
// The Electron version that the app is built with (without the leading 'v')
|
||||||
version: require('electron-prebuilt/package.json').version
|
electronVersion: require('electron/package.json').version
|
||||||
}
|
}
|
||||||
|
|
||||||
var darwin = {
|
const darwin = {
|
||||||
// Build for OS X
|
// Build for Mac
|
||||||
platform: 'darwin',
|
platform: 'darwin',
|
||||||
|
|
||||||
// Build 64 bit binaries only.
|
// Build x64 binary only.
|
||||||
arch: 'x64',
|
arch: 'x64',
|
||||||
|
|
||||||
// The bundle identifier to use in the application's plist (OS X only).
|
// The bundle identifier to use in the application's plist (Mac only).
|
||||||
'app-bundle-id': 'io.webtorrent.webtorrent',
|
appBundleId: 'io.webtorrent.webtorrent',
|
||||||
|
|
||||||
// The application category type, as shown in the Finder via "View" -> "Arrange by
|
// The application category type, as shown in the Finder via "View" -> "Arrange by
|
||||||
// Application Category" when viewing the Applications directory (OS X only).
|
// Application Category" when viewing the Applications directory (Mac only).
|
||||||
'app-category-type': 'public.app-category.utilities',
|
appCategoryType: 'public.app-category.utilities',
|
||||||
|
|
||||||
// The bundle identifier to use in the application helper's plist (OS X only).
|
// The bundle identifier to use in the application helper's plist (Mac only).
|
||||||
'helper-bundle-id': 'io.webtorrent.webtorrent-helper',
|
helperBundleId: 'io.webtorrent.webtorrent-helper',
|
||||||
|
|
||||||
// Application icon.
|
// Application icon.
|
||||||
icon: config.APP_ICON + '.icns'
|
icon: config.APP_ICON + '.icns'
|
||||||
}
|
}
|
||||||
|
|
||||||
var win32 = {
|
const win32 = {
|
||||||
// Build for Windows.
|
// Build for Windows.
|
||||||
platform: 'win32',
|
platform: 'win32',
|
||||||
|
|
||||||
// Build 32 bit binaries only.
|
// Build x64 binary only.
|
||||||
arch: 'ia32',
|
arch: 'x64',
|
||||||
|
|
||||||
// Object hash of application metadata to embed into the executable (Windows only)
|
// Object hash of application metadata to embed into the executable (Windows only)
|
||||||
'version-string': {
|
win32metadata: {
|
||||||
|
|
||||||
// Company that produced the file.
|
// Company that produced the file.
|
||||||
CompanyName: config.APP_NAME,
|
CompanyName: config.APP_NAME,
|
||||||
@@ -156,12 +168,12 @@ var win32 = {
|
|||||||
icon: config.APP_ICON + '.ico'
|
icon: config.APP_ICON + '.ico'
|
||||||
}
|
}
|
||||||
|
|
||||||
var linux = {
|
const linux = {
|
||||||
// Build for Linux.
|
// Build for Linux.
|
||||||
platform: 'linux',
|
platform: 'linux',
|
||||||
|
|
||||||
// Build 32 and 64 bit binaries.
|
// Build x64, armv7l, and arm64 binaries.
|
||||||
arch: 'all'
|
arch: ['x64', 'armv7l', 'arm64']
|
||||||
|
|
||||||
// Note: Application icon for Linux is specified via the BrowserWindow `icon` option.
|
// Note: Application icon for Linux is specified via the BrowserWindow `icon` option.
|
||||||
}
|
}
|
||||||
@@ -169,31 +181,30 @@ var linux = {
|
|||||||
build()
|
build()
|
||||||
|
|
||||||
function buildDarwin (cb) {
|
function buildDarwin (cb) {
|
||||||
var plist = require('plist')
|
const plist = require('plist')
|
||||||
|
|
||||||
console.log('OS X: Packaging electron...')
|
console.log('Mac: Packaging electron...')
|
||||||
electronPackager(Object.assign({}, all, darwin), function (err, buildPath) {
|
electronPackager(Object.assign({}, all, darwin)).then(function (buildPath) {
|
||||||
if (err) return cb(err)
|
console.log('Mac: Packaged electron. ' + buildPath)
|
||||||
console.log('OS X: Packaged electron. ' + buildPath)
|
|
||||||
|
|
||||||
var appPath = path.join(buildPath[0], config.APP_NAME + '.app')
|
const appPath = path.join(buildPath[0], config.APP_NAME + '.app')
|
||||||
var contentsPath = path.join(appPath, 'Contents')
|
const contentsPath = path.join(appPath, 'Contents')
|
||||||
var resourcesPath = path.join(contentsPath, 'Resources')
|
const resourcesPath = path.join(contentsPath, 'Resources')
|
||||||
var infoPlistPath = path.join(contentsPath, 'Info.plist')
|
const infoPlistPath = path.join(contentsPath, 'Info.plist')
|
||||||
var infoPlist = plist.parse(fs.readFileSync(infoPlistPath, 'utf8'))
|
const infoPlist = plist.parse(fs.readFileSync(infoPlistPath, 'utf8'))
|
||||||
|
|
||||||
infoPlist.CFBundleDocumentTypes = [
|
infoPlist.CFBundleDocumentTypes = [
|
||||||
{
|
{
|
||||||
CFBundleTypeExtensions: [ 'torrent' ],
|
CFBundleTypeExtensions: ['torrent'],
|
||||||
CFBundleTypeIconFile: path.basename(config.APP_FILE_ICON) + '.icns',
|
CFBundleTypeIconFile: path.basename(config.APP_FILE_ICON) + '.icns',
|
||||||
CFBundleTypeName: 'BitTorrent Document',
|
CFBundleTypeName: 'BitTorrent Document',
|
||||||
CFBundleTypeRole: 'Editor',
|
CFBundleTypeRole: 'Editor',
|
||||||
LSHandlerRank: 'Owner',
|
LSHandlerRank: 'Owner',
|
||||||
LSItemContentTypes: [ 'org.bittorrent.torrent' ]
|
LSItemContentTypes: ['org.bittorrent.torrent']
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
CFBundleTypeName: 'Any',
|
CFBundleTypeName: 'Any',
|
||||||
CFBundleTypeOSTypes: [ '****' ],
|
CFBundleTypeOSTypes: ['****'],
|
||||||
CFBundleTypeRole: 'Editor',
|
CFBundleTypeRole: 'Editor',
|
||||||
LSHandlerRank: 'Owner',
|
LSHandlerRank: 'Owner',
|
||||||
LSTypeIsPackage: false
|
LSTypeIsPackage: false
|
||||||
@@ -205,7 +216,13 @@ function buildDarwin (cb) {
|
|||||||
CFBundleTypeRole: 'Editor',
|
CFBundleTypeRole: 'Editor',
|
||||||
CFBundleURLIconFile: path.basename(config.APP_FILE_ICON) + '.icns',
|
CFBundleURLIconFile: path.basename(config.APP_FILE_ICON) + '.icns',
|
||||||
CFBundleURLName: 'BitTorrent Magnet URL',
|
CFBundleURLName: 'BitTorrent Magnet URL',
|
||||||
CFBundleURLSchemes: [ 'magnet' ]
|
CFBundleURLSchemes: ['magnet']
|
||||||
|
},
|
||||||
|
{
|
||||||
|
CFBundleTypeRole: 'Editor',
|
||||||
|
CFBundleURLIconFile: path.basename(config.APP_FILE_ICON) + '.icns',
|
||||||
|
CFBundleURLName: 'BitTorrent Stream-Magnet URL',
|
||||||
|
CFBundleURLSchemes: ['stream-magnet']
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -222,7 +239,7 @@ function buildDarwin (cb) {
|
|||||||
UTTypeReferenceURL: 'http://www.bittorrent.org/beps/bep_0000.html',
|
UTTypeReferenceURL: 'http://www.bittorrent.org/beps/bep_0000.html',
|
||||||
UTTypeTagSpecification: {
|
UTTypeTagSpecification: {
|
||||||
'com.apple.ostype': 'TORR',
|
'com.apple.ostype': 'TORR',
|
||||||
'public.filename-extension': [ 'torrent' ],
|
'public.filename-extension': ['torrent'],
|
||||||
'public.mime-type': 'application/x-bittorrent'
|
'public.mime-type': 'application/x-bittorrent'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -248,32 +265,54 @@ function buildDarwin (cb) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function signApp (cb) {
|
function signApp (cb) {
|
||||||
var sign = require('electron-osx-sign')
|
const sign = require('electron-osx-sign')
|
||||||
|
const { notarize } = require('electron-notarize')
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Sign the app with Apple Developer ID certificates. We sign the app for 2 reasons:
|
* Sign the app with Apple Developer ID certificates. We sign the app for 2 reasons:
|
||||||
* - So the auto-updater (Squirrrel.Mac) can check that app updates are signed by
|
* - So the auto-updater (Squirrrel.Mac) can check that app updates are signed by
|
||||||
* the same author as the current version.
|
* the same author as the current version.
|
||||||
* - So users will not a see a warning about the app coming from an "Unidentified
|
* - So users will not a see a warning about the app coming from an "Unidentified
|
||||||
* Developer" when they open it for the first time (OS X Gatekeeper).
|
* Developer" when they open it for the first time (Mac Gatekeeper).
|
||||||
*
|
*
|
||||||
* To sign an OS X app for distribution outside the App Store, the following are
|
* To sign an Mac app for distribution outside the App Store, the following are
|
||||||
* required:
|
* required:
|
||||||
* - Xcode
|
* - Xcode
|
||||||
* - Xcode Command Line Tools (xcode-select --install)
|
* - Xcode Command Line Tools (xcode-select --install)
|
||||||
* - Membership in the Apple Developer Program
|
* - Membership in the Apple Developer Program
|
||||||
*/
|
*/
|
||||||
var signOpts = {
|
const signOpts = {
|
||||||
|
verbose: true,
|
||||||
app: appPath,
|
app: appPath,
|
||||||
platform: 'darwin',
|
platform: 'darwin',
|
||||||
verbose: true
|
identity: 'Developer ID Application: WebTorrent, LLC (5MAMC8G3L8)',
|
||||||
|
hardenedRuntime: true,
|
||||||
|
entitlements: path.join(config.ROOT_PATH, 'bin', 'darwin-entitlements.plist'),
|
||||||
|
'entitlements-inherit': path.join(config.ROOT_PATH, 'bin', 'darwin-entitlements.plist'),
|
||||||
|
'signature-flags': 'library'
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('OS X: Signing app...')
|
const notarizeOpts = {
|
||||||
|
appBundleId: darwin.appBundleId,
|
||||||
|
appPath,
|
||||||
|
appleId: 'feross@feross.org',
|
||||||
|
appleIdPassword: '@keychain:AC_PASSWORD'
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('Mac: Signing app...')
|
||||||
sign(signOpts, function (err) {
|
sign(signOpts, function (err) {
|
||||||
if (err) return cb(err)
|
if (err) return cb(err)
|
||||||
console.log('OS X: Signed app.')
|
console.log('Mac: Signed app.')
|
||||||
cb(null)
|
|
||||||
|
console.log('Mac: Notarizing app...')
|
||||||
|
notarize(notarizeOpts).then(
|
||||||
|
function () {
|
||||||
|
console.log('Mac: Notarized app.')
|
||||||
|
cb(null)
|
||||||
|
},
|
||||||
|
function (err) {
|
||||||
|
cb(err)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -287,25 +326,25 @@ function buildDarwin (cb) {
|
|||||||
|
|
||||||
function packageZip () {
|
function packageZip () {
|
||||||
// Create .zip file (used by the auto-updater)
|
// Create .zip file (used by the auto-updater)
|
||||||
console.log('OS X: Creating zip...')
|
console.log('Mac: Creating zip...')
|
||||||
|
|
||||||
var inPath = path.join(buildPath[0], config.APP_NAME + '.app')
|
const inPath = path.join(buildPath[0], config.APP_NAME + '.app')
|
||||||
var outPath = path.join(DIST_PATH, BUILD_NAME + '-darwin.zip')
|
const outPath = path.join(DIST_PATH, BUILD_NAME + '-darwin.zip')
|
||||||
zip.zipSync(inPath, outPath)
|
zip.zipSync(inPath, outPath)
|
||||||
|
|
||||||
console.log('OS X: Created zip.')
|
console.log('Mac: Created zip.')
|
||||||
}
|
}
|
||||||
|
|
||||||
function packageDmg (cb) {
|
function packageDmg (cb) {
|
||||||
console.log('OS X: Creating dmg...')
|
console.log('Mac: Creating dmg...')
|
||||||
|
|
||||||
var appDmg = require('appdmg')
|
const appDmg = require('appdmg')
|
||||||
|
|
||||||
var targetPath = path.join(DIST_PATH, BUILD_NAME + '.dmg')
|
const targetPath = path.join(DIST_PATH, BUILD_NAME + '.dmg')
|
||||||
rimraf.sync(targetPath)
|
rimraf.sync(targetPath)
|
||||||
|
|
||||||
// Create a .dmg (OS X disk image) file, for easy user installation.
|
// Create a .dmg (Mac disk image) file, for easy user installation.
|
||||||
var dmgOpts = {
|
const dmgOpts = {
|
||||||
basepath: config.ROOT_PATH,
|
basepath: config.ROOT_PATH,
|
||||||
target: targetPath,
|
target: targetPath,
|
||||||
specification: {
|
specification: {
|
||||||
@@ -326,21 +365,23 @@ function buildDarwin (cb) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var dmg = appDmg(dmgOpts)
|
const dmg = appDmg(dmgOpts)
|
||||||
dmg.once('error', cb)
|
dmg.once('error', cb)
|
||||||
dmg.on('progress', function (info) {
|
dmg.on('progress', function (info) {
|
||||||
if (info.type === 'step-begin') console.log(info.title + '...')
|
if (info.type === 'step-begin') console.log(info.title + '...')
|
||||||
})
|
})
|
||||||
dmg.once('finish', function (info) {
|
dmg.once('finish', function (info) {
|
||||||
console.log('OS X: Created dmg.')
|
console.log('Mac: Created dmg.')
|
||||||
cb(null)
|
cb(null)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
}).catch(function (err) {
|
||||||
|
cb(err)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildWin32 (cb) {
|
function buildWin32 (cb) {
|
||||||
var installer = require('electron-winstaller')
|
const installer = require('electron-winstaller')
|
||||||
console.log('Windows: Packaging electron...')
|
console.log('Windows: Packaging electron...')
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -348,7 +389,7 @@ function buildWin32 (cb) {
|
|||||||
* - Windows Authenticode private key and cert (authenticode.p12)
|
* - Windows Authenticode private key and cert (authenticode.p12)
|
||||||
* - Windows Authenticode password file (authenticode.txt)
|
* - Windows Authenticode password file (authenticode.txt)
|
||||||
*/
|
*/
|
||||||
var CERT_PATH
|
let CERT_PATH
|
||||||
try {
|
try {
|
||||||
fs.accessSync('D:')
|
fs.accessSync('D:')
|
||||||
CERT_PATH = 'D:'
|
CERT_PATH = 'D:'
|
||||||
@@ -356,16 +397,15 @@ function buildWin32 (cb) {
|
|||||||
CERT_PATH = path.join(os.homedir(), 'Desktop')
|
CERT_PATH = path.join(os.homedir(), 'Desktop')
|
||||||
}
|
}
|
||||||
|
|
||||||
electronPackager(Object.assign({}, all, win32), function (err, buildPath) {
|
electronPackager(Object.assign({}, all, win32)).then(function (buildPath) {
|
||||||
if (err) return cb(err)
|
|
||||||
console.log('Windows: Packaged electron. ' + buildPath)
|
console.log('Windows: Packaged electron. ' + buildPath)
|
||||||
|
|
||||||
var signWithParams
|
let signWithParams
|
||||||
if (process.platform === 'win32') {
|
if (process.platform === 'win32') {
|
||||||
if (argv.sign) {
|
if (argv.sign) {
|
||||||
var certificateFile = path.join(CERT_PATH, 'authenticode.p12')
|
const certificateFile = path.join(CERT_PATH, 'authenticode.p12')
|
||||||
var certificatePassword = fs.readFileSync(path.join(CERT_PATH, 'authenticode.txt'), 'utf8')
|
const certificatePassword = fs.readFileSync(path.join(CERT_PATH, 'authenticode.txt'), 'utf8')
|
||||||
var timestampServer = 'http://timestamp.comodoca.com'
|
const timestampServer = 'http://timestamp.comodoca.com'
|
||||||
signWithParams = `/a /f "${certificateFile}" /p "${certificatePassword}" /tr "${timestampServer}" /td sha256`
|
signWithParams = `/a /f "${certificateFile}" /p "${certificatePassword}" /tr "${timestampServer}" /td sha256`
|
||||||
} else {
|
} else {
|
||||||
printWarning()
|
printWarning()
|
||||||
@@ -374,20 +414,22 @@ function buildWin32 (cb) {
|
|||||||
printWarning()
|
printWarning()
|
||||||
}
|
}
|
||||||
|
|
||||||
var tasks = []
|
const tasks = []
|
||||||
if (argv.package === 'exe' || argv.package === 'all') {
|
buildPath.forEach(function (filesPath) {
|
||||||
tasks.push((cb) => packageInstaller(cb))
|
if (argv.package === 'exe' || argv.package === 'all') {
|
||||||
}
|
tasks.push((cb) => packageInstaller(filesPath, cb))
|
||||||
if (argv.package === 'portable' || argv.package === 'all') {
|
}
|
||||||
tasks.push((cb) => packagePortable(cb))
|
if (argv.package === 'portable' || argv.package === 'all') {
|
||||||
}
|
tasks.push((cb) => packagePortable(filesPath, cb))
|
||||||
|
}
|
||||||
|
})
|
||||||
series(tasks, cb)
|
series(tasks, cb)
|
||||||
|
|
||||||
function packageInstaller (cb) {
|
function packageInstaller (filesPath, cb) {
|
||||||
console.log('Windows: Creating installer...')
|
console.log('Windows: Creating installer...')
|
||||||
|
|
||||||
installer.createWindowsInstaller({
|
installer.createWindowsInstaller({
|
||||||
appDirectory: buildPath[0],
|
appDirectory: filesPath,
|
||||||
authors: config.APP_TEAM,
|
authors: config.APP_TEAM,
|
||||||
description: config.APP_NAME,
|
description: config.APP_NAME,
|
||||||
exe: config.APP_NAME + '.exe',
|
exe: config.APP_NAME + '.exe',
|
||||||
@@ -397,93 +439,174 @@ function buildWin32 (cb) {
|
|||||||
noMsi: true,
|
noMsi: true,
|
||||||
outputDirectory: DIST_PATH,
|
outputDirectory: DIST_PATH,
|
||||||
productName: config.APP_NAME,
|
productName: config.APP_NAME,
|
||||||
remoteReleases: config.GITHUB_URL,
|
// TODO: Re-enable Windows 64-bit delta updates when we confirm that they
|
||||||
|
// work correctly in the presence of the "ia32" .nupkg files. I
|
||||||
|
// (feross) noticed them listed in the 64-bit RELEASES file and
|
||||||
|
// manually edited them out for the v0.17 release. Shipping only
|
||||||
|
// full updates for now will work fine, with no ill-effects.
|
||||||
|
// remoteReleases: config.GITHUB_URL,
|
||||||
|
/**
|
||||||
|
* If you hit a "GitHub API rate limit exceeded" error, set this token!
|
||||||
|
*/
|
||||||
|
// remoteToken: process.env.WEBTORRENT_GITHUB_API_TOKEN,
|
||||||
setupExe: config.APP_NAME + 'Setup-v' + config.APP_VERSION + '.exe',
|
setupExe: config.APP_NAME + 'Setup-v' + config.APP_VERSION + '.exe',
|
||||||
setupIcon: config.APP_ICON + '.ico',
|
setupIcon: config.APP_ICON + '.ico',
|
||||||
signWithParams: signWithParams,
|
signWithParams,
|
||||||
title: config.APP_NAME,
|
title: config.APP_NAME,
|
||||||
usePackageJson: false,
|
usePackageJson: false,
|
||||||
version: pkg.version
|
version: pkg.version
|
||||||
})
|
})
|
||||||
.then(function () {
|
.then(function () {
|
||||||
console.log('Windows: Created installer.')
|
console.log('Windows: Created installer.')
|
||||||
cb(null)
|
|
||||||
})
|
/**
|
||||||
.catch(cb)
|
* Delete extraneous Squirrel files (i.e. *.nupkg delta files for older
|
||||||
|
* versions of the app)
|
||||||
|
*/
|
||||||
|
fs.readdirSync(DIST_PATH)
|
||||||
|
.filter((name) => name.endsWith('.nupkg') && !name.includes(pkg.version))
|
||||||
|
.forEach((filename) => {
|
||||||
|
fs.unlinkSync(path.join(DIST_PATH, filename))
|
||||||
|
})
|
||||||
|
|
||||||
|
cb(null)
|
||||||
|
})
|
||||||
|
.catch(cb)
|
||||||
}
|
}
|
||||||
|
|
||||||
function packagePortable (cb) {
|
function packagePortable (filesPath, cb) {
|
||||||
console.log('Windows: Creating portable app...')
|
console.log('Windows: Creating portable app...')
|
||||||
|
|
||||||
var portablePath = path.join(buildPath[0], 'Portable Settings')
|
const portablePath = path.join(filesPath, 'Portable Settings')
|
||||||
mkdirp.sync(portablePath)
|
fs.mkdirSync(portablePath, { recursive: true })
|
||||||
|
|
||||||
var inPath = path.join(DIST_PATH, path.basename(buildPath[0]))
|
const downloadsPath = path.join(portablePath, 'Downloads')
|
||||||
var outPath = path.join(DIST_PATH, BUILD_NAME + '-win.zip')
|
fs.mkdirSync(downloadsPath, { recursive: true })
|
||||||
|
|
||||||
|
const tempPath = path.join(portablePath, 'Temp')
|
||||||
|
fs.mkdirSync(tempPath, { recursive: true })
|
||||||
|
|
||||||
|
const inPath = path.join(DIST_PATH, path.basename(filesPath))
|
||||||
|
const outPath = path.join(DIST_PATH, BUILD_NAME + '-win.zip')
|
||||||
zip.zipSync(inPath, outPath)
|
zip.zipSync(inPath, outPath)
|
||||||
|
|
||||||
console.log('Windows: Created portable app.')
|
console.log('Windows: Created portable app.')
|
||||||
cb(null)
|
cb(null)
|
||||||
}
|
}
|
||||||
|
}).catch(function (err) {
|
||||||
|
cb(err)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildLinux (cb) {
|
function buildLinux (cb) {
|
||||||
console.log('Linux: Packaging electron...')
|
console.log('Linux: Packaging electron...')
|
||||||
electronPackager(Object.assign({}, all, linux), function (err, buildPath) {
|
|
||||||
if (err) return cb(err)
|
electronPackager(Object.assign({}, all, linux)).then(function (buildPath) {
|
||||||
console.log('Linux: Packaged electron. ' + buildPath)
|
console.log('Linux: Packaged electron. ' + buildPath)
|
||||||
|
|
||||||
var tasks = []
|
const tasks = []
|
||||||
buildPath.forEach(function (filesPath) {
|
buildPath.forEach(function (filesPath) {
|
||||||
var destArch = filesPath.split('-').pop()
|
const destArch = filesPath.split('-').pop()
|
||||||
|
|
||||||
if (argv.package === 'deb' || argv.package === 'all') {
|
if (argv.package === 'deb' || argv.package === 'all') {
|
||||||
tasks.push((cb) => packageDeb(filesPath, destArch, cb))
|
tasks.push((cb) => packageDeb(filesPath, destArch, cb))
|
||||||
}
|
}
|
||||||
|
if (argv.package === 'rpm' || argv.package === 'all') {
|
||||||
|
tasks.push((cb) => packageRpm(filesPath, destArch, cb))
|
||||||
|
}
|
||||||
if (argv.package === 'zip' || argv.package === 'all') {
|
if (argv.package === 'zip' || argv.package === 'all') {
|
||||||
tasks.push((cb) => packageZip(filesPath, destArch, cb))
|
tasks.push((cb) => packageZip(filesPath, destArch, cb))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
series(tasks, cb)
|
series(tasks, cb)
|
||||||
|
}).catch(function (err) {
|
||||||
|
cb(err)
|
||||||
})
|
})
|
||||||
|
|
||||||
function packageDeb (filesPath, destArch, cb) {
|
function packageDeb (filesPath, destArch, cb) {
|
||||||
|
// Linux convention for Debian based 'x64' is 'amd64'
|
||||||
|
if (destArch === 'x64') {
|
||||||
|
destArch = 'amd64'
|
||||||
|
}
|
||||||
|
|
||||||
// Create .deb file for Debian-based platforms
|
// Create .deb file for Debian-based platforms
|
||||||
console.log(`Linux: Creating ${destArch} deb...`)
|
console.log(`Linux: Creating ${destArch} deb...`)
|
||||||
|
|
||||||
var deb = require('nobin-debian-installer')()
|
const installer = require('electron-installer-debian')
|
||||||
var destPath = path.join('/opt', pkg.name)
|
|
||||||
|
|
||||||
deb.pack({
|
const options = {
|
||||||
package: pkg,
|
src: filesPath + '/',
|
||||||
info: {
|
dest: DIST_PATH,
|
||||||
arch: destArch === 'x64' ? 'amd64' : 'i386',
|
arch: destArch,
|
||||||
targetDir: DIST_PATH,
|
bin: 'WebTorrent',
|
||||||
depends: 'libc6 (>= 2.4)',
|
icon: {
|
||||||
scripts: {
|
'48x48': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png'),
|
||||||
postinst: path.join(config.STATIC_PATH, 'linux', 'postinst'),
|
'256x256': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png')
|
||||||
prerm: path.join(config.STATIC_PATH, 'linux', 'prerm')
|
},
|
||||||
}
|
categories: ['Network', 'FileTransfer', 'P2P'],
|
||||||
}
|
mimeType: ['application/x-bittorrent', 'x-scheme-handler/magnet', 'x-scheme-handler/stream-magnet'],
|
||||||
}, [{
|
desktopTemplate: path.join(config.STATIC_PATH, 'linux/webtorrent-desktop.ejs'),
|
||||||
src: ['./**'],
|
lintianOverrides: [
|
||||||
dest: destPath,
|
'unstripped-binary-or-object',
|
||||||
expand: true,
|
'embedded-library',
|
||||||
cwd: filesPath
|
'missing-dependency-on-libc',
|
||||||
}], function (err) {
|
'changelog-file-missing-in-native-package',
|
||||||
if (err) return cb(err)
|
'description-synopsis-is-duplicated',
|
||||||
console.log(`Linux: Created ${destArch} deb.`)
|
'setuid-binary',
|
||||||
cb(null)
|
'binary-without-manpage',
|
||||||
})
|
'shlib-with-executable-bit'
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
installer(options).then(
|
||||||
|
() => {
|
||||||
|
console.log(`Linux: Created ${destArch} deb.`)
|
||||||
|
cb(null)
|
||||||
|
},
|
||||||
|
(err) => cb(err)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function packageRpm (filesPath, destArch, cb) {
|
||||||
|
// Linux convention for RedHat based 'x64' is 'x86_64'
|
||||||
|
if (destArch === 'x64') {
|
||||||
|
destArch = 'x86_64'
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create .rpm file for RedHat-based platforms
|
||||||
|
console.log(`Linux: Creating ${destArch} rpm...`)
|
||||||
|
|
||||||
|
const installer = require('electron-installer-redhat')
|
||||||
|
|
||||||
|
const options = {
|
||||||
|
src: filesPath + '/',
|
||||||
|
dest: DIST_PATH,
|
||||||
|
arch: destArch,
|
||||||
|
bin: 'WebTorrent',
|
||||||
|
icon: {
|
||||||
|
'48x48': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png'),
|
||||||
|
'256x256': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png')
|
||||||
|
},
|
||||||
|
categories: ['Network', 'FileTransfer', 'P2P'],
|
||||||
|
mimeType: ['application/x-bittorrent', 'x-scheme-handler/magnet', 'x-scheme-handler/stream-magnet'],
|
||||||
|
desktopTemplate: path.join(config.STATIC_PATH, 'linux/webtorrent-desktop.ejs')
|
||||||
|
}
|
||||||
|
|
||||||
|
installer(options).then(
|
||||||
|
() => {
|
||||||
|
console.log(`Linux: Created ${destArch} rpm.`)
|
||||||
|
cb(null)
|
||||||
|
},
|
||||||
|
(err) => cb(err)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function packageZip (filesPath, destArch, cb) {
|
function packageZip (filesPath, destArch, cb) {
|
||||||
// Create .zip file for Linux
|
// Create .zip file for Linux
|
||||||
console.log(`Linux: Creating ${destArch} zip...`)
|
console.log(`Linux: Creating ${destArch} zip...`)
|
||||||
|
|
||||||
var inPath = path.join(DIST_PATH, path.basename(filesPath))
|
const inPath = path.join(DIST_PATH, path.basename(filesPath))
|
||||||
var outPath = path.join(DIST_PATH, BUILD_NAME + '-linux-' + destArch + '.zip')
|
const outPath = path.join(DIST_PATH, `${BUILD_NAME}-linux-${destArch}.zip`)
|
||||||
zip.zipSync(inPath, outPath)
|
zip.zipSync(inPath, outPath)
|
||||||
|
|
||||||
console.log(`Linux: Created ${destArch} zip.`)
|
console.log(`Linux: Created ${destArch} zip.`)
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
npm run update-authors
|
|
||||||
git diff --exit-code
|
|
||||||
npm run package -- --sign
|
|
||||||
git push
|
|
||||||
git push --tags
|
|
||||||
npm publish
|
|
||||||
./node_modules/.bin/gh-release
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
git pull
|
|
||||||
rm -rf node_modules/
|
|
||||||
npm install
|
|
||||||
npm dedupe
|
|
||||||
npm test
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
BIN=`dirname $0`
|
|
||||||
|
|
||||||
$BIN/release-_pre.sh
|
|
||||||
npm version major
|
|
||||||
$BIN/release-_post.sh
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
BIN=`dirname $0`
|
|
||||||
|
|
||||||
$BIN/release-_pre.sh
|
|
||||||
npm version minor
|
|
||||||
$BIN/release-_post.sh
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
BIN=`dirname $0`
|
|
||||||
|
|
||||||
$BIN/release-_pre.sh
|
|
||||||
npm version patch
|
|
||||||
$BIN/release-_post.sh
|
|
||||||
@@ -2,16 +2,18 @@
|
|||||||
|
|
||||||
# Update AUTHORS.md based on git history.
|
# Update AUTHORS.md based on git history.
|
||||||
|
|
||||||
git log --reverse --format='%aN <%aE>' | perl -we '
|
git log --reverse --format='%aN (%aE)' | perl -we '
|
||||||
BEGIN {
|
BEGIN {
|
||||||
%seen = (), @authors = ();
|
%seen = (), @authors = ();
|
||||||
}
|
}
|
||||||
while (<>) {
|
while (<>) {
|
||||||
next if $seen{$_};
|
next if $seen{$_};
|
||||||
next if /<support\@greenkeeper.io>/;
|
next if /(support\@greenkeeper.io)/;
|
||||||
next if /<ungoldman\@gmail.com>/;
|
next if /(ungoldman\@gmail.com)/;
|
||||||
next if /<dc\@DCs-MacBook.local>/;
|
next if /(dc\@DCs-MacBook.local)/;
|
||||||
next if /<rolandoguedes\@gmail.com>/;
|
next if /(rolandoguedes\@gmail.com)/;
|
||||||
|
next if /(grunjol\@users.noreply.github.com)/;
|
||||||
|
next if /(dependabot)/;
|
||||||
$seen{$_} = push @authors, "- ", $_;
|
$seen{$_} = push @authors, "- ", $_;
|
||||||
}
|
}
|
||||||
END {
|
END {
|
||||||
|
|||||||
127
config.js
127
config.js
@@ -1,127 +0,0 @@
|
|||||||
var appConfig = require('application-config')('WebTorrent')
|
|
||||||
var fs = require('fs')
|
|
||||||
var path = require('path')
|
|
||||||
|
|
||||||
var APP_NAME = 'WebTorrent'
|
|
||||||
var APP_TEAM = 'WebTorrent, LLC'
|
|
||||||
var APP_VERSION = require('./package.json').version
|
|
||||||
|
|
||||||
var PORTABLE_PATH = path.join(path.dirname(process.execPath), 'Portable Settings')
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
ANNOUNCEMENT_URL: 'https://webtorrent.io/desktop/announcement',
|
|
||||||
|
|
||||||
APP_COPYRIGHT: 'Copyright © 2014-2016 ' + APP_TEAM,
|
|
||||||
APP_FILE_ICON: path.join(__dirname, 'static', 'WebTorrentFile'),
|
|
||||||
APP_ICON: path.join(__dirname, 'static', 'WebTorrent'),
|
|
||||||
APP_NAME: APP_NAME,
|
|
||||||
APP_TEAM: APP_TEAM,
|
|
||||||
APP_VERSION: APP_VERSION,
|
|
||||||
APP_WINDOW_TITLE: APP_NAME + ' (BETA)',
|
|
||||||
|
|
||||||
AUTO_UPDATE_URL: 'https://webtorrent.io/desktop/update',
|
|
||||||
|
|
||||||
CRASH_REPORT_URL: 'https://webtorrent.io/desktop/crash-report',
|
|
||||||
|
|
||||||
CONFIG_PATH: getConfigPath(),
|
|
||||||
|
|
||||||
DEFAULT_TORRENTS: [
|
|
||||||
{
|
|
||||||
name: 'Big Buck Bunny',
|
|
||||||
posterFileName: 'bigBuckBunny.jpg',
|
|
||||||
torrentFileName: 'bigBuckBunny.torrent'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'Cosmos Laundromat (Preview)',
|
|
||||||
posterFileName: 'cosmosLaundromat.jpg',
|
|
||||||
torrentFileName: 'cosmosLaundromat.torrent'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'Sintel',
|
|
||||||
posterFileName: 'sintel.jpg',
|
|
||||||
torrentFileName: 'sintel.torrent'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'Tears of Steel',
|
|
||||||
posterFileName: 'tearsOfSteel.jpg',
|
|
||||||
torrentFileName: 'tearsOfSteel.torrent'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'The WIRED CD - Rip. Sample. Mash. Share.',
|
|
||||||
posterFileName: 'wiredCd.jpg',
|
|
||||||
torrentFileName: 'wiredCd.torrent'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
|
|
||||||
DELAYED_INIT: 3000 /* 3 seconds */,
|
|
||||||
|
|
||||||
DEFAULT_DOWNLOAD_PATH: getDefaultDownloadPath(),
|
|
||||||
|
|
||||||
GITHUB_URL: 'https://github.com/feross/webtorrent-desktop',
|
|
||||||
GITHUB_URL_ISSUES: 'https://github.com/feross/webtorrent-desktop/issues',
|
|
||||||
GITHUB_URL_RAW: 'https://raw.githubusercontent.com/feross/webtorrent-desktop/master',
|
|
||||||
|
|
||||||
HOME_PAGE_URL: 'https://webtorrent.io',
|
|
||||||
|
|
||||||
IS_PORTABLE: isPortable(),
|
|
||||||
IS_PRODUCTION: isProduction(),
|
|
||||||
|
|
||||||
POSTER_PATH: path.join(getConfigPath(), 'Posters'),
|
|
||||||
ROOT_PATH: __dirname,
|
|
||||||
STATIC_PATH: path.join(__dirname, 'static'),
|
|
||||||
TORRENT_PATH: path.join(getConfigPath(), 'Torrents'),
|
|
||||||
|
|
||||||
WINDOW_ABOUT: 'file://' + path.join(__dirname, 'renderer', 'about.html'),
|
|
||||||
WINDOW_MAIN: 'file://' + path.join(__dirname, 'renderer', 'main.html'),
|
|
||||||
WINDOW_WEBTORRENT: 'file://' + path.join(__dirname, 'renderer', 'webtorrent.html'),
|
|
||||||
|
|
||||||
WINDOW_MIN_HEIGHT: 38 + (120 * 2), // header height + 2 torrents
|
|
||||||
WINDOW_MIN_WIDTH: 425
|
|
||||||
}
|
|
||||||
|
|
||||||
function getConfigPath () {
|
|
||||||
if (isPortable()) {
|
|
||||||
return PORTABLE_PATH
|
|
||||||
} else {
|
|
||||||
return path.dirname(appConfig.filePath)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getDefaultDownloadPath () {
|
|
||||||
if (!process || !process.type) {
|
|
||||||
return ''
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isPortable()) {
|
|
||||||
return path.join(getConfigPath(), 'Downloads')
|
|
||||||
}
|
|
||||||
|
|
||||||
var electron = require('electron')
|
|
||||||
|
|
||||||
return process.type === 'renderer'
|
|
||||||
? electron.remote.app.getPath('downloads')
|
|
||||||
: electron.app.getPath('downloads')
|
|
||||||
}
|
|
||||||
|
|
||||||
function isPortable () {
|
|
||||||
try {
|
|
||||||
return process.platform === 'win32' && isProduction() && !!fs.statSync(PORTABLE_PATH)
|
|
||||||
} catch (err) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function isProduction () {
|
|
||||||
if (!process.versions.electron) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if (process.platform === 'darwin') {
|
|
||||||
return !/\/Electron\.app\//.test(process.execPath)
|
|
||||||
}
|
|
||||||
if (process.platform === 'win32') {
|
|
||||||
return !/\\electron\.exe$/.test(process.execPath)
|
|
||||||
}
|
|
||||||
if (process.platform === 'linux') {
|
|
||||||
return !/\/electron$/.test(process.execPath)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
init
|
|
||||||
}
|
|
||||||
|
|
||||||
var config = require('./config')
|
|
||||||
var electron = require('electron')
|
|
||||||
|
|
||||||
function init () {
|
|
||||||
electron.crashReporter.start({
|
|
||||||
companyName: config.APP_NAME,
|
|
||||||
productName: config.APP_NAME,
|
|
||||||
submitURL: config.CRASH_REPORT_URL
|
|
||||||
})
|
|
||||||
}
|
|
||||||
122
main/dialog.js
122
main/dialog.js
@@ -1,122 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
openSeedFile,
|
|
||||||
openSeedDirectory,
|
|
||||||
openTorrentFile,
|
|
||||||
openTorrentAddress,
|
|
||||||
openFiles
|
|
||||||
}
|
|
||||||
|
|
||||||
var electron = require('electron')
|
|
||||||
|
|
||||||
var config = require('../config')
|
|
||||||
var log = require('./log')
|
|
||||||
var windows = require('./windows')
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show open dialog to create a single-file torrent.
|
|
||||||
*/
|
|
||||||
function openSeedFile () {
|
|
||||||
if (!windows.main.win) return
|
|
||||||
log('openSeedFile')
|
|
||||||
var opts = {
|
|
||||||
title: 'Select a file for the torrent.',
|
|
||||||
properties: [ 'openFile' ]
|
|
||||||
}
|
|
||||||
setTitle(opts.title)
|
|
||||||
electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
|
|
||||||
resetTitle()
|
|
||||||
if (!Array.isArray(selectedPaths)) return
|
|
||||||
windows.main.dispatch('showCreateTorrent', selectedPaths)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Show open dialog to create a single-file or single-directory torrent. On
|
|
||||||
* Windows and Linux, open dialogs are for files *or* directories only, not both,
|
|
||||||
* so this function shows a directory dialog on those platforms.
|
|
||||||
*/
|
|
||||||
function openSeedDirectory () {
|
|
||||||
if (!windows.main.win) return
|
|
||||||
log('openSeedDirectory')
|
|
||||||
var opts = process.platform === 'darwin'
|
|
||||||
? {
|
|
||||||
title: 'Select a file or folder for the torrent.',
|
|
||||||
properties: [ 'openFile', 'openDirectory' ]
|
|
||||||
}
|
|
||||||
: {
|
|
||||||
title: 'Select a folder for the torrent.',
|
|
||||||
properties: [ 'openDirectory' ]
|
|
||||||
}
|
|
||||||
setTitle(opts.title)
|
|
||||||
electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
|
|
||||||
resetTitle()
|
|
||||||
if (!Array.isArray(selectedPaths)) return
|
|
||||||
windows.main.dispatch('showCreateTorrent', selectedPaths)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Show flexible open dialog that supports selecting .torrent files to add, or
|
|
||||||
* a file or folder to create a single-file or single-directory torrent.
|
|
||||||
*/
|
|
||||||
function openFiles () {
|
|
||||||
if (!windows.main.win) return
|
|
||||||
log('openFiles')
|
|
||||||
var opts = process.platform === 'darwin'
|
|
||||||
? {
|
|
||||||
title: 'Select a file or folder to add.',
|
|
||||||
properties: [ 'openFile', 'openDirectory' ]
|
|
||||||
}
|
|
||||||
: {
|
|
||||||
title: 'Select a file to add.',
|
|
||||||
properties: [ 'openFile' ]
|
|
||||||
}
|
|
||||||
setTitle(opts.title)
|
|
||||||
electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
|
|
||||||
resetTitle()
|
|
||||||
if (!Array.isArray(selectedPaths)) return
|
|
||||||
windows.main.dispatch('onOpen', selectedPaths)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Show open dialog to open a .torrent file.
|
|
||||||
*/
|
|
||||||
function openTorrentFile () {
|
|
||||||
if (!windows.main.win) return
|
|
||||||
log('openTorrentFile')
|
|
||||||
var opts = {
|
|
||||||
title: 'Select a .torrent file.',
|
|
||||||
filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
|
|
||||||
properties: [ 'openFile', 'multiSelections' ]
|
|
||||||
}
|
|
||||||
setTitle(opts.title)
|
|
||||||
electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
|
|
||||||
resetTitle()
|
|
||||||
if (!Array.isArray(selectedPaths)) return
|
|
||||||
selectedPaths.forEach(function (selectedPath) {
|
|
||||||
windows.main.dispatch('addTorrent', selectedPath)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Show modal dialog to open a torrent URL (magnet uri, http torrent link, etc.)
|
|
||||||
*/
|
|
||||||
function openTorrentAddress () {
|
|
||||||
log('openTorrentAddress')
|
|
||||||
windows.main.dispatch('openTorrentAddress')
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Dialogs on do not show a title on OS X, so the window title is used instead.
|
|
||||||
*/
|
|
||||||
function setTitle (title) {
|
|
||||||
if (process.platform === 'darwin') {
|
|
||||||
windows.main.dispatch('setTitle', title)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function resetTitle () {
|
|
||||||
setTitle(config.APP_WINDOW_TITLE)
|
|
||||||
}
|
|
||||||
354
main/handlers.js
354
main/handlers.js
@@ -1,354 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
install,
|
|
||||||
uninstall
|
|
||||||
}
|
|
||||||
|
|
||||||
var config = require('../config')
|
|
||||||
var path = require('path')
|
|
||||||
|
|
||||||
function install () {
|
|
||||||
if (process.platform === 'darwin') {
|
|
||||||
installDarwin()
|
|
||||||
}
|
|
||||||
if (process.platform === 'win32') {
|
|
||||||
installWin32()
|
|
||||||
}
|
|
||||||
if (process.platform === 'linux') {
|
|
||||||
installLinux()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function uninstall () {
|
|
||||||
if (process.platform === 'darwin') {
|
|
||||||
uninstallDarwin()
|
|
||||||
}
|
|
||||||
if (process.platform === 'win32') {
|
|
||||||
uninstallWin32()
|
|
||||||
}
|
|
||||||
if (process.platform === 'linux') {
|
|
||||||
uninstallLinux()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function installDarwin () {
|
|
||||||
var electron = require('electron')
|
|
||||||
var app = electron.app
|
|
||||||
|
|
||||||
// On OS X, only protocols that are listed in `Info.plist` can be set as the
|
|
||||||
// default handler at runtime.
|
|
||||||
app.setAsDefaultProtocolClient('magnet')
|
|
||||||
|
|
||||||
// File handlers are defined in `Info.plist`.
|
|
||||||
}
|
|
||||||
|
|
||||||
function uninstallDarwin () {}
|
|
||||||
|
|
||||||
var EXEC_COMMAND = [ process.execPath ]
|
|
||||||
|
|
||||||
if (!config.IS_PRODUCTION) {
|
|
||||||
EXEC_COMMAND.push(config.ROOT_PATH)
|
|
||||||
}
|
|
||||||
|
|
||||||
function installWin32 () {
|
|
||||||
var Registry = require('winreg')
|
|
||||||
|
|
||||||
var log = require('./log')
|
|
||||||
|
|
||||||
var iconPath = path.join(
|
|
||||||
process.resourcesPath, 'app.asar.unpacked', 'static', 'WebTorrentFile.ico'
|
|
||||||
)
|
|
||||||
registerProtocolHandlerWin32(
|
|
||||||
'magnet',
|
|
||||||
'URL:BitTorrent Magnet URL',
|
|
||||||
iconPath,
|
|
||||||
EXEC_COMMAND
|
|
||||||
)
|
|
||||||
registerFileHandlerWin32(
|
|
||||||
'.torrent',
|
|
||||||
'io.webtorrent.torrent',
|
|
||||||
'BitTorrent Document',
|
|
||||||
iconPath,
|
|
||||||
EXEC_COMMAND
|
|
||||||
)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* To add a protocol handler, the following keys must be added to the Windows registry:
|
|
||||||
*
|
|
||||||
* HKEY_CLASSES_ROOT
|
|
||||||
* $PROTOCOL
|
|
||||||
* (Default) = "$NAME"
|
|
||||||
* URL Protocol = ""
|
|
||||||
* DefaultIcon
|
|
||||||
* (Default) = "$ICON"
|
|
||||||
* shell
|
|
||||||
* open
|
|
||||||
* command
|
|
||||||
* (Default) = "$COMMAND" "%1"
|
|
||||||
*
|
|
||||||
* Source: https://msdn.microsoft.com/en-us/library/aa767914.aspx
|
|
||||||
*
|
|
||||||
* However, the "HKEY_CLASSES_ROOT" key can only be written by the Administrator user.
|
|
||||||
* So, we instead write to "HKEY_CURRENT_USER\Software\Classes", which is inherited by
|
|
||||||
* "HKEY_CLASSES_ROOT" anyway, and can be written by unprivileged users.
|
|
||||||
*/
|
|
||||||
|
|
||||||
function registerProtocolHandlerWin32 (protocol, name, icon, command) {
|
|
||||||
var protocolKey = new Registry({
|
|
||||||
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
|
||||||
key: '\\Software\\Classes\\' + protocol
|
|
||||||
})
|
|
||||||
|
|
||||||
setProtocol()
|
|
||||||
|
|
||||||
function setProtocol (err) {
|
|
||||||
if (err) log.error(err.message)
|
|
||||||
protocolKey.set('', Registry.REG_SZ, name, setURLProtocol)
|
|
||||||
}
|
|
||||||
|
|
||||||
function setURLProtocol (err) {
|
|
||||||
if (err) log.error(err.message)
|
|
||||||
protocolKey.set('URL Protocol', Registry.REG_SZ, '', setIcon)
|
|
||||||
}
|
|
||||||
|
|
||||||
function setIcon (err) {
|
|
||||||
if (err) log.error(err.message)
|
|
||||||
|
|
||||||
var iconKey = new Registry({
|
|
||||||
hive: Registry.HKCU,
|
|
||||||
key: '\\Software\\Classes\\' + protocol + '\\DefaultIcon'
|
|
||||||
})
|
|
||||||
iconKey.set('', Registry.REG_SZ, icon, setCommand)
|
|
||||||
}
|
|
||||||
|
|
||||||
function setCommand (err) {
|
|
||||||
if (err) log.error(err.message)
|
|
||||||
|
|
||||||
var commandKey = new Registry({
|
|
||||||
hive: Registry.HKCU,
|
|
||||||
key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
|
|
||||||
})
|
|
||||||
commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
|
|
||||||
}
|
|
||||||
|
|
||||||
function done (err) {
|
|
||||||
if (err) log.error(err.message)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* To add a file handler, the following keys must be added to the Windows registry:
|
|
||||||
*
|
|
||||||
* HKEY_CLASSES_ROOT
|
|
||||||
* $EXTENSION
|
|
||||||
* (Default) = "$EXTENSION_ID"
|
|
||||||
* $EXTENSION_ID
|
|
||||||
* (Default) = "$NAME"
|
|
||||||
* DefaultIcon
|
|
||||||
* (Default) = "$ICON"
|
|
||||||
* shell
|
|
||||||
* open
|
|
||||||
* command
|
|
||||||
* (Default) = "$COMMAND" "%1"
|
|
||||||
*/
|
|
||||||
function registerFileHandlerWin32 (ext, id, name, icon, command) {
|
|
||||||
setExt()
|
|
||||||
|
|
||||||
function setExt () {
|
|
||||||
var extKey = new Registry({
|
|
||||||
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
|
||||||
key: '\\Software\\Classes\\' + ext
|
|
||||||
})
|
|
||||||
extKey.set('', Registry.REG_SZ, id, setId)
|
|
||||||
}
|
|
||||||
|
|
||||||
function setId (err) {
|
|
||||||
if (err) log.error(err.message)
|
|
||||||
|
|
||||||
var idKey = new Registry({
|
|
||||||
hive: Registry.HKCU,
|
|
||||||
key: '\\Software\\Classes\\' + id
|
|
||||||
})
|
|
||||||
idKey.set('', Registry.REG_SZ, name, setIcon)
|
|
||||||
}
|
|
||||||
|
|
||||||
function setIcon (err) {
|
|
||||||
if (err) log.error(err.message)
|
|
||||||
|
|
||||||
var iconKey = new Registry({
|
|
||||||
hive: Registry.HKCU,
|
|
||||||
key: '\\Software\\Classes\\' + id + '\\DefaultIcon'
|
|
||||||
})
|
|
||||||
iconKey.set('', Registry.REG_SZ, icon, setCommand)
|
|
||||||
}
|
|
||||||
|
|
||||||
function setCommand (err) {
|
|
||||||
if (err) log.error(err.message)
|
|
||||||
|
|
||||||
var commandKey = new Registry({
|
|
||||||
hive: Registry.HKCU,
|
|
||||||
key: '\\Software\\Classes\\' + id + '\\shell\\open\\command'
|
|
||||||
})
|
|
||||||
commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
|
|
||||||
}
|
|
||||||
|
|
||||||
function done (err) {
|
|
||||||
if (err) log.error(err.message)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function uninstallWin32 () {
|
|
||||||
var Registry = require('winreg')
|
|
||||||
|
|
||||||
unregisterProtocolHandlerWin32('magnet', EXEC_COMMAND)
|
|
||||||
unregisterFileHandlerWin32('.torrent', 'io.webtorrent.torrent', EXEC_COMMAND)
|
|
||||||
|
|
||||||
function unregisterProtocolHandlerWin32 (protocol, command) {
|
|
||||||
getCommand()
|
|
||||||
|
|
||||||
function getCommand () {
|
|
||||||
var commandKey = new Registry({
|
|
||||||
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
|
||||||
key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
|
|
||||||
})
|
|
||||||
commandKey.get('', function (err, item) {
|
|
||||||
if (!err && item.value.indexOf(commandToArgs(command)) >= 0) {
|
|
||||||
destroyProtocol()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function destroyProtocol () {
|
|
||||||
var protocolKey = new Registry({
|
|
||||||
hive: Registry.HKCU,
|
|
||||||
key: '\\Software\\Classes\\' + protocol
|
|
||||||
})
|
|
||||||
protocolKey.destroy(function () {})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function unregisterFileHandlerWin32 (ext, id, command) {
|
|
||||||
eraseId()
|
|
||||||
|
|
||||||
function eraseId () {
|
|
||||||
var idKey = new Registry({
|
|
||||||
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
|
||||||
key: '\\Software\\Classes\\' + id
|
|
||||||
})
|
|
||||||
idKey.destroy(getExt)
|
|
||||||
}
|
|
||||||
|
|
||||||
function getExt () {
|
|
||||||
var extKey = new Registry({
|
|
||||||
hive: Registry.HKCU,
|
|
||||||
key: '\\Software\\Classes\\' + ext
|
|
||||||
})
|
|
||||||
extKey.get('', function (err, item) {
|
|
||||||
if (!err && item.value === id) {
|
|
||||||
destroyExt()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function destroyExt () {
|
|
||||||
var extKey = new Registry({
|
|
||||||
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
|
||||||
key: '\\Software\\Classes\\' + ext
|
|
||||||
})
|
|
||||||
extKey.destroy(function () {})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function commandToArgs (command) {
|
|
||||||
return command.map((arg) => `"${arg}"`).join(' ')
|
|
||||||
}
|
|
||||||
|
|
||||||
function installLinux () {
|
|
||||||
var fs = require('fs-extra')
|
|
||||||
var os = require('os')
|
|
||||||
var path = require('path')
|
|
||||||
|
|
||||||
var config = require('../config')
|
|
||||||
var log = require('./log')
|
|
||||||
|
|
||||||
installDesktopFile()
|
|
||||||
installIconFile()
|
|
||||||
|
|
||||||
function installDesktopFile () {
|
|
||||||
var templatePath = path.join(
|
|
||||||
config.STATIC_PATH, 'linux', 'webtorrent-desktop.desktop'
|
|
||||||
)
|
|
||||||
fs.readFile(templatePath, 'utf8', writeDesktopFile)
|
|
||||||
}
|
|
||||||
|
|
||||||
function writeDesktopFile (err, desktopFile) {
|
|
||||||
if (err) return log.error(err.message)
|
|
||||||
|
|
||||||
var appPath = config.IS_PRODUCTION
|
|
||||||
? path.dirname(process.execPath)
|
|
||||||
: config.ROOT_PATH
|
|
||||||
|
|
||||||
desktopFile = desktopFile.replace(/\$APP_NAME/g, config.APP_NAME)
|
|
||||||
desktopFile = desktopFile.replace(/\$APP_PATH/g, appPath)
|
|
||||||
desktopFile = desktopFile.replace(/\$EXEC_PATH/g, EXEC_COMMAND.join(' '))
|
|
||||||
desktopFile = desktopFile.replace(/\$TRY_EXEC_PATH/g, process.execPath)
|
|
||||||
|
|
||||||
var desktopFilePath = path.join(
|
|
||||||
os.homedir(),
|
|
||||||
'.local',
|
|
||||||
'share',
|
|
||||||
'applications',
|
|
||||||
'webtorrent-desktop.desktop'
|
|
||||||
)
|
|
||||||
fs.mkdirp(path.dirname(desktopFilePath))
|
|
||||||
fs.writeFile(desktopFilePath, desktopFile, function (err) {
|
|
||||||
if (err) return log.error(err.message)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function installIconFile () {
|
|
||||||
var iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
|
|
||||||
fs.readFile(iconStaticPath, writeIconFile)
|
|
||||||
}
|
|
||||||
|
|
||||||
function writeIconFile (err, iconFile) {
|
|
||||||
if (err) return log.error(err.message)
|
|
||||||
|
|
||||||
var iconFilePath = path.join(
|
|
||||||
os.homedir(),
|
|
||||||
'.local',
|
|
||||||
'share',
|
|
||||||
'icons',
|
|
||||||
'webtorrent-desktop.png'
|
|
||||||
)
|
|
||||||
fs.mkdirp(path.dirname(iconFilePath))
|
|
||||||
fs.writeFile(iconFilePath, iconFile, function (err) {
|
|
||||||
if (err) return log.error(err.message)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function uninstallLinux () {
|
|
||||||
var os = require('os')
|
|
||||||
var path = require('path')
|
|
||||||
var fs = require('fs-extra')
|
|
||||||
|
|
||||||
var desktopFilePath = path.join(
|
|
||||||
os.homedir(),
|
|
||||||
'.local',
|
|
||||||
'share',
|
|
||||||
'applications',
|
|
||||||
'webtorrent-desktop.desktop'
|
|
||||||
)
|
|
||||||
fs.removeSync(desktopFilePath)
|
|
||||||
|
|
||||||
var iconFilePath = path.join(
|
|
||||||
os.homedir(),
|
|
||||||
'.local',
|
|
||||||
'share',
|
|
||||||
'icons',
|
|
||||||
'webtorrent-desktop.png'
|
|
||||||
)
|
|
||||||
fs.removeSync(iconFilePath)
|
|
||||||
}
|
|
||||||
153
main/index.js
153
main/index.js
@@ -1,153 +0,0 @@
|
|||||||
console.time('init')
|
|
||||||
|
|
||||||
var electron = require('electron')
|
|
||||||
|
|
||||||
var app = electron.app
|
|
||||||
var ipcMain = electron.ipcMain
|
|
||||||
|
|
||||||
var announcement = require('./announcement')
|
|
||||||
var config = require('../config')
|
|
||||||
var crashReporter = require('../crash-reporter')
|
|
||||||
var dialog = require('./dialog')
|
|
||||||
var dock = require('./dock')
|
|
||||||
var handlers = require('./handlers')
|
|
||||||
var ipc = require('./ipc')
|
|
||||||
var log = require('./log')
|
|
||||||
var menu = require('./menu')
|
|
||||||
var squirrelWin32 = require('./squirrel-win32')
|
|
||||||
var tray = require('./tray')
|
|
||||||
var updater = require('./updater')
|
|
||||||
var windows = require('./windows')
|
|
||||||
|
|
||||||
var shouldQuit = false
|
|
||||||
var argv = sliceArgv(process.argv)
|
|
||||||
|
|
||||||
if (process.platform === 'win32') {
|
|
||||||
shouldQuit = squirrelWin32.handleEvent(argv[0])
|
|
||||||
argv = argv.filter((arg) => arg.indexOf('--squirrel') === -1)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!shouldQuit) {
|
|
||||||
// Prevent multiple instances of app from running at same time. New instances signal
|
|
||||||
// this instance and quit.
|
|
||||||
shouldQuit = app.makeSingleInstance(onAppOpen)
|
|
||||||
if (shouldQuit) {
|
|
||||||
app.quit()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!shouldQuit) {
|
|
||||||
init()
|
|
||||||
}
|
|
||||||
|
|
||||||
function init () {
|
|
||||||
if (config.IS_PORTABLE) {
|
|
||||||
app.setPath('userData', config.CONFIG_PATH)
|
|
||||||
}
|
|
||||||
|
|
||||||
var isReady = false // app ready, windows can be created
|
|
||||||
app.ipcReady = false // main window has finished loading and IPC is ready
|
|
||||||
app.isQuitting = false
|
|
||||||
|
|
||||||
// Open handlers must be added as early as possible
|
|
||||||
app.on('open-file', onOpen)
|
|
||||||
app.on('open-url', onOpen)
|
|
||||||
|
|
||||||
ipc.init()
|
|
||||||
|
|
||||||
app.once('will-finish-launching', function () {
|
|
||||||
crashReporter.init()
|
|
||||||
})
|
|
||||||
|
|
||||||
app.on('ready', function () {
|
|
||||||
isReady = true
|
|
||||||
|
|
||||||
windows.main.init()
|
|
||||||
windows.webtorrent.init()
|
|
||||||
menu.init()
|
|
||||||
|
|
||||||
// To keep app startup fast, some code is delayed.
|
|
||||||
setTimeout(delayedInit, config.DELAYED_INIT)
|
|
||||||
})
|
|
||||||
|
|
||||||
app.once('ipcReady', function () {
|
|
||||||
log('Command line args:', argv)
|
|
||||||
processArgv(argv)
|
|
||||||
console.timeEnd('init')
|
|
||||||
})
|
|
||||||
|
|
||||||
app.on('before-quit', function (e) {
|
|
||||||
if (app.isQuitting) return
|
|
||||||
|
|
||||||
app.isQuitting = true
|
|
||||||
e.preventDefault()
|
|
||||||
windows.main.dispatch('saveState') // try to save state on exit
|
|
||||||
ipcMain.once('savedState', () => app.quit())
|
|
||||||
setTimeout(() => app.quit(), 2000) // quit after 2 secs, at most
|
|
||||||
})
|
|
||||||
|
|
||||||
app.on('activate', function () {
|
|
||||||
if (isReady) windows.main.show()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function delayedInit () {
|
|
||||||
announcement.init()
|
|
||||||
dock.init()
|
|
||||||
handlers.install()
|
|
||||||
tray.init()
|
|
||||||
updater.init()
|
|
||||||
}
|
|
||||||
|
|
||||||
function onOpen (e, torrentId) {
|
|
||||||
e.preventDefault()
|
|
||||||
|
|
||||||
if (app.ipcReady) {
|
|
||||||
// Magnet links opened from Chrome won't focus the app without a setTimeout.
|
|
||||||
// The confirmation dialog Chrome shows causes Chrome to steal back the focus.
|
|
||||||
// Electron issue: https://github.com/atom/electron/issues/4338
|
|
||||||
setTimeout(() => windows.main.show(), 100)
|
|
||||||
|
|
||||||
processArgv([ torrentId ])
|
|
||||||
} else {
|
|
||||||
argv.push(torrentId)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function onAppOpen (newArgv) {
|
|
||||||
newArgv = sliceArgv(newArgv)
|
|
||||||
|
|
||||||
if (app.ipcReady) {
|
|
||||||
log('Second app instance opened, but was prevented:', newArgv)
|
|
||||||
windows.main.show()
|
|
||||||
|
|
||||||
processArgv(newArgv)
|
|
||||||
} else {
|
|
||||||
argv.push(...newArgv)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function sliceArgv (argv) {
|
|
||||||
return argv.slice(config.IS_PRODUCTION ? 1 : 2)
|
|
||||||
}
|
|
||||||
|
|
||||||
function processArgv (argv) {
|
|
||||||
var torrentIds = []
|
|
||||||
argv.forEach(function (arg) {
|
|
||||||
if (arg === '-n') {
|
|
||||||
dialog.openSeedDirectory()
|
|
||||||
} else if (arg === '-o') {
|
|
||||||
dialog.openTorrentFile()
|
|
||||||
} else if (arg === '-u') {
|
|
||||||
dialog.openTorrentAddress()
|
|
||||||
} else if (arg.startsWith('-psn')) {
|
|
||||||
// Ignore OS X launchd "process serial number" argument
|
|
||||||
// Issue: https://github.com/feross/webtorrent-desktop/issues/214
|
|
||||||
} else {
|
|
||||||
torrentIds.push(arg)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
if (torrentIds.length > 0) {
|
|
||||||
windows.main.dispatch('onOpen', torrentIds)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
173
main/ipc.js
173
main/ipc.js
@@ -1,173 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
init
|
|
||||||
}
|
|
||||||
|
|
||||||
var electron = require('electron')
|
|
||||||
|
|
||||||
var app = electron.app
|
|
||||||
|
|
||||||
var dialog = require('./dialog')
|
|
||||||
var dock = require('./dock')
|
|
||||||
var log = require('./log')
|
|
||||||
var menu = require('./menu')
|
|
||||||
var powerSaveBlocker = require('./power-save-blocker')
|
|
||||||
var shell = require('./shell')
|
|
||||||
var shortcuts = require('./shortcuts')
|
|
||||||
var vlc = require('./vlc')
|
|
||||||
var windows = require('./windows')
|
|
||||||
|
|
||||||
// Messages from the main process, to be sent once the WebTorrent process starts
|
|
||||||
var messageQueueMainToWebTorrent = []
|
|
||||||
|
|
||||||
// holds a ChildProcess while we're playing a video in VLC, null otherwise
|
|
||||||
var vlcProcess
|
|
||||||
|
|
||||||
function init () {
|
|
||||||
var ipc = electron.ipcMain
|
|
||||||
|
|
||||||
ipc.once('ipcReady', function (e) {
|
|
||||||
app.ipcReady = true
|
|
||||||
app.emit('ipcReady')
|
|
||||||
})
|
|
||||||
|
|
||||||
ipc.once('ipcReadyWebTorrent', function (e) {
|
|
||||||
app.ipcReadyWebTorrent = true
|
|
||||||
log('sending %d queued messages from the main win to the webtorrent window',
|
|
||||||
messageQueueMainToWebTorrent.length)
|
|
||||||
messageQueueMainToWebTorrent.forEach(function (message) {
|
|
||||||
windows.webtorrent.send(message.name, ...message.args)
|
|
||||||
log('webtorrent: sent queued %s', message.name)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Dialog
|
|
||||||
*/
|
|
||||||
|
|
||||||
ipc.on('openTorrentFile', () => dialog.openTorrentFile())
|
|
||||||
ipc.on('openFiles', () => dialog.openFiles())
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Dock
|
|
||||||
*/
|
|
||||||
|
|
||||||
ipc.on('setBadge', (e, ...args) => dock.setBadge(...args))
|
|
||||||
ipc.on('downloadFinished', (e, ...args) => dock.downloadFinished(...args))
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Events
|
|
||||||
*/
|
|
||||||
|
|
||||||
ipc.on('onPlayerOpen', function () {
|
|
||||||
menu.onPlayerOpen()
|
|
||||||
shortcuts.onPlayerOpen()
|
|
||||||
})
|
|
||||||
|
|
||||||
ipc.on('onPlayerClose', function () {
|
|
||||||
menu.onPlayerClose()
|
|
||||||
shortcuts.onPlayerOpen()
|
|
||||||
})
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Power Save Blocker
|
|
||||||
*/
|
|
||||||
|
|
||||||
ipc.on('blockPowerSave', () => powerSaveBlocker.start())
|
|
||||||
ipc.on('unblockPowerSave', () => powerSaveBlocker.stop())
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Shell
|
|
||||||
*/
|
|
||||||
|
|
||||||
ipc.on('openItem', (e, ...args) => shell.openItem(...args))
|
|
||||||
ipc.on('showItemInFolder', (e, ...args) => shell.showItemInFolder(...args))
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Windows: Main
|
|
||||||
*/
|
|
||||||
|
|
||||||
var main = windows.main
|
|
||||||
|
|
||||||
ipc.on('setAspectRatio', (e, ...args) => main.setAspectRatio(...args))
|
|
||||||
ipc.on('setBounds', (e, ...args) => main.setBounds(...args))
|
|
||||||
ipc.on('setProgress', (e, ...args) => main.setProgress(...args))
|
|
||||||
ipc.on('setTitle', (e, ...args) => main.setTitle(...args))
|
|
||||||
ipc.on('show', () => main.show())
|
|
||||||
ipc.on('toggleFullScreen', (e, ...args) => main.toggleFullScreen(...args))
|
|
||||||
|
|
||||||
/**
|
|
||||||
* VLC
|
|
||||||
* TODO: Move most of this code to vlc.js
|
|
||||||
*/
|
|
||||||
|
|
||||||
ipc.on('checkForVLC', function (e) {
|
|
||||||
vlc.checkForVLC(function (isInstalled) {
|
|
||||||
windows.main.send('checkForVLC', isInstalled)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
ipc.on('vlcPlay', function (e, url) {
|
|
||||||
var args = ['--play-and-exit', '--video-on-top', '--no-video-title-show', '--quiet', url]
|
|
||||||
log('Running vlc ' + args.join(' '))
|
|
||||||
|
|
||||||
vlc.spawn(args, function (err, proc) {
|
|
||||||
if (err) return windows.main.dispatch('vlcNotFound')
|
|
||||||
vlcProcess = proc
|
|
||||||
|
|
||||||
// If it works, close the modal after a second
|
|
||||||
var closeModalTimeout = setTimeout(() =>
|
|
||||||
windows.main.dispatch('exitModal'), 1000)
|
|
||||||
|
|
||||||
vlcProcess.on('close', function (code) {
|
|
||||||
clearTimeout(closeModalTimeout)
|
|
||||||
if (!vlcProcess) return // Killed
|
|
||||||
log('VLC exited with code ', code)
|
|
||||||
if (code === 0) {
|
|
||||||
windows.main.dispatch('backToList')
|
|
||||||
} else {
|
|
||||||
windows.main.dispatch('vlcNotFound')
|
|
||||||
}
|
|
||||||
vlcProcess = null
|
|
||||||
})
|
|
||||||
|
|
||||||
vlcProcess.on('error', function (e) {
|
|
||||||
log('VLC error', e)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
ipc.on('vlcQuit', function () {
|
|
||||||
if (!vlcProcess) return
|
|
||||||
log('Killing VLC, pid ' + vlcProcess.pid)
|
|
||||||
vlcProcess.kill('SIGKILL') // kill -9
|
|
||||||
vlcProcess = null
|
|
||||||
})
|
|
||||||
|
|
||||||
// Capture all events
|
|
||||||
var oldEmit = ipc.emit
|
|
||||||
ipc.emit = function (name, e, ...args) {
|
|
||||||
// Relay messages between the main window and the WebTorrent hidden window
|
|
||||||
if (name.startsWith('wt-') && !app.isQuitting) {
|
|
||||||
if (e.sender.browserWindowOptions.title === 'webtorrent-hidden-window') {
|
|
||||||
// Send message to main window
|
|
||||||
windows.main.send(name, ...args)
|
|
||||||
log('webtorrent: got %s', name)
|
|
||||||
} else if (app.ipcReadyWebTorrent) {
|
|
||||||
// Send message to webtorrent window
|
|
||||||
windows.webtorrent.send(name, ...args)
|
|
||||||
log('webtorrent: sent %s', name)
|
|
||||||
} else {
|
|
||||||
// Queue message for webtorrent window, it hasn't finished loading yet
|
|
||||||
messageQueueMainToWebTorrent.push({
|
|
||||||
name: name,
|
|
||||||
args: args
|
|
||||||
})
|
|
||||||
log('webtorrent: queueing %s', name)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Emit all other events normally
|
|
||||||
oldEmit.call(ipc, name, e, ...args)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
start,
|
|
||||||
stop
|
|
||||||
}
|
|
||||||
|
|
||||||
var electron = require('electron')
|
|
||||||
var log = require('./log')
|
|
||||||
|
|
||||||
var blockId = 0
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Block the system from entering low-power (sleep) mode or turning off the
|
|
||||||
* display.
|
|
||||||
*/
|
|
||||||
function start () {
|
|
||||||
stop() // Stop the previous power saver block, if one exists.
|
|
||||||
blockId = electron.powerSaveBlocker.start('prevent-display-sleep')
|
|
||||||
log(`powerSaveBlocker.start: ${blockId}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stop blocking the system from entering low-power mode.
|
|
||||||
*/
|
|
||||||
function stop () {
|
|
||||||
if (!electron.powerSaveBlocker.isStarted(blockId)) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
electron.powerSaveBlocker.stop(blockId)
|
|
||||||
log(`powerSaveBlocker.stop: ${blockId}`)
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
openExternal,
|
|
||||||
openItem,
|
|
||||||
showItemInFolder
|
|
||||||
}
|
|
||||||
|
|
||||||
var electron = require('electron')
|
|
||||||
var log = require('./log')
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the given external protocol URL in the desktop’s default manner.
|
|
||||||
*/
|
|
||||||
function openExternal (url) {
|
|
||||||
log(`openExternal: ${url}`)
|
|
||||||
electron.shell.openExternal(url)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the given file in the desktop’s default manner.
|
|
||||||
*/
|
|
||||||
function openItem (path) {
|
|
||||||
log(`openItem: ${path}`)
|
|
||||||
electron.shell.openItem(path)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show the given file in a file manager. If possible, select the file.
|
|
||||||
*/
|
|
||||||
function showItemInFolder (path) {
|
|
||||||
log(`showItemInFolder: ${path}`)
|
|
||||||
electron.shell.showItemInFolder(path)
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
onPlayerClose,
|
|
||||||
onPlayerOpen
|
|
||||||
}
|
|
||||||
|
|
||||||
var electron = require('electron')
|
|
||||||
var windows = require('./windows')
|
|
||||||
|
|
||||||
function onPlayerOpen () {
|
|
||||||
// Register play/pause media key, available on some keyboards.
|
|
||||||
electron.globalShortcut.register(
|
|
||||||
'MediaPlayPause',
|
|
||||||
() => windows.main.dispatch('playPause')
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function onPlayerClose () {
|
|
||||||
// Return the media key to the OS, so other apps can use it.
|
|
||||||
electron.globalShortcut.unregister('MediaPlayPause')
|
|
||||||
}
|
|
||||||
@@ -1,151 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
handleEvent
|
|
||||||
}
|
|
||||||
|
|
||||||
var cp = require('child_process')
|
|
||||||
var electron = require('electron')
|
|
||||||
var fs = require('fs')
|
|
||||||
var os = require('os')
|
|
||||||
var path = require('path')
|
|
||||||
|
|
||||||
var app = electron.app
|
|
||||||
|
|
||||||
var handlers = require('./handlers')
|
|
||||||
|
|
||||||
var EXE_NAME = path.basename(process.execPath)
|
|
||||||
var UPDATE_EXE = path.join(process.execPath, '..', '..', 'Update.exe')
|
|
||||||
|
|
||||||
function handleEvent (cmd) {
|
|
||||||
if (cmd === '--squirrel-install') {
|
|
||||||
// App was installed. Install desktop/start menu shortcuts.
|
|
||||||
createShortcuts(function () {
|
|
||||||
// Ensure user sees install splash screen so they realize that Setup.exe actually
|
|
||||||
// installed an application and isn't the application itself.
|
|
||||||
setTimeout(function () {
|
|
||||||
app.quit()
|
|
||||||
}, 3000)
|
|
||||||
})
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cmd === '--squirrel-updated') {
|
|
||||||
// App was updated. (Called on new version of app)
|
|
||||||
updateShortcuts(function () {
|
|
||||||
app.quit()
|
|
||||||
})
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cmd === '--squirrel-uninstall') {
|
|
||||||
// App was just uninstalled. Undo anything we did in the --squirrel-install and
|
|
||||||
// --squirrel-updated handlers
|
|
||||||
|
|
||||||
// Uninstall .torrent file and magnet link handlers
|
|
||||||
handlers.uninstall()
|
|
||||||
|
|
||||||
// Remove desktop/start menu shortcuts.
|
|
||||||
// HACK: add a callback to handlers.uninstall() so we can remove this setTimeout
|
|
||||||
setTimeout(function () {
|
|
||||||
removeShortcuts(function () {
|
|
||||||
app.quit()
|
|
||||||
})
|
|
||||||
}, 1000)
|
|
||||||
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cmd === '--squirrel-obsolete') {
|
|
||||||
// App will be updated. (Called on outgoing version of app)
|
|
||||||
app.quit()
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cmd === '--squirrel-firstrun') {
|
|
||||||
// App is running for the first time. Do not quit, allow startup to continue.
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Spawn a command and invoke the callback when it completes with an error and
|
|
||||||
* the output from standard out.
|
|
||||||
*/
|
|
||||||
function spawn (command, args, cb) {
|
|
||||||
var stdout = ''
|
|
||||||
|
|
||||||
var child
|
|
||||||
try {
|
|
||||||
child = cp.spawn(command, args)
|
|
||||||
} catch (err) {
|
|
||||||
// Spawn can throw an error
|
|
||||||
process.nextTick(function () {
|
|
||||||
cb(error, stdout)
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
child.stdout.on('data', function (data) {
|
|
||||||
stdout += data
|
|
||||||
})
|
|
||||||
|
|
||||||
var error = null
|
|
||||||
child.on('error', function (processError) {
|
|
||||||
error = processError
|
|
||||||
})
|
|
||||||
child.on('close', function (code, signal) {
|
|
||||||
if (code !== 0 && !error) error = new Error('Command failed: #{signal || code}')
|
|
||||||
if (error) error.stdout = stdout
|
|
||||||
cb(error, stdout)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Spawn the Squirrel `Update.exe` command with the given arguments and invoke
|
|
||||||
* the callback when the command completes.
|
|
||||||
*/
|
|
||||||
function spawnUpdate (args, cb) {
|
|
||||||
spawn(UPDATE_EXE, args, cb)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create desktop and start menu shortcuts using the Squirrel `Update.exe`
|
|
||||||
* command.
|
|
||||||
*/
|
|
||||||
function createShortcuts (cb) {
|
|
||||||
spawnUpdate(['--createShortcut', EXE_NAME], cb)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update desktop and start menu shortcuts using the Squirrel `Update.exe`
|
|
||||||
* command.
|
|
||||||
*/
|
|
||||||
function updateShortcuts (cb) {
|
|
||||||
var homeDir = os.homedir()
|
|
||||||
if (homeDir) {
|
|
||||||
var desktopShortcutPath = path.join(homeDir, 'Desktop', 'WebTorrent.lnk')
|
|
||||||
// If the desktop shortcut was deleted by the user, then keep it deleted.
|
|
||||||
fs.access(desktopShortcutPath, function (err) {
|
|
||||||
var desktopShortcutExists = !err
|
|
||||||
createShortcuts(function () {
|
|
||||||
if (desktopShortcutExists) {
|
|
||||||
cb()
|
|
||||||
} else {
|
|
||||||
// Remove the unwanted desktop shortcut that was recreated
|
|
||||||
fs.unlink(desktopShortcutPath, cb)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
createShortcuts(cb)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove desktop and start menu shortcuts using the Squirrel `Update.exe`
|
|
||||||
* command.
|
|
||||||
*/
|
|
||||||
function removeShortcuts (cb) {
|
|
||||||
spawnUpdate(['--removeShortcut', EXE_NAME], cb)
|
|
||||||
}
|
|
||||||
22
main/vlc.js
22
main/vlc.js
@@ -1,22 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
checkForVLC,
|
|
||||||
spawn
|
|
||||||
}
|
|
||||||
|
|
||||||
var cp = require('child_process')
|
|
||||||
var vlcCommand = require('vlc-command')
|
|
||||||
|
|
||||||
// Finds if VLC is installed on Mac, Windows, or Linux.
|
|
||||||
// Calls back with true or false: whether VLC was detected
|
|
||||||
function checkForVLC (cb) {
|
|
||||||
vlcCommand((err) => cb(!err))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Spawns VLC with child_process.spawn() to return a ChildProcess object
|
|
||||||
// Calls back with (err, childProcess)
|
|
||||||
function spawn (args, cb) {
|
|
||||||
vlcCommand(function (err, vlcPath) {
|
|
||||||
if (err) return cb(err)
|
|
||||||
cb(null, cp.spawn(vlcPath, args))
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
var about = module.exports = {
|
|
||||||
init,
|
|
||||||
win: null
|
|
||||||
}
|
|
||||||
|
|
||||||
var config = require('../../config')
|
|
||||||
var electron = require('electron')
|
|
||||||
|
|
||||||
function init () {
|
|
||||||
if (about.win) {
|
|
||||||
return about.win.show()
|
|
||||||
}
|
|
||||||
|
|
||||||
var win = about.win = new electron.BrowserWindow({
|
|
||||||
backgroundColor: '#ECECEC',
|
|
||||||
center: true,
|
|
||||||
fullscreen: false,
|
|
||||||
height: 170,
|
|
||||||
icon: getIconPath(),
|
|
||||||
maximizable: false,
|
|
||||||
minimizable: false,
|
|
||||||
resizable: false,
|
|
||||||
show: false,
|
|
||||||
skipTaskbar: true,
|
|
||||||
title: 'About ' + config.APP_WINDOW_TITLE,
|
|
||||||
useContentSize: true,
|
|
||||||
width: 300
|
|
||||||
})
|
|
||||||
|
|
||||||
win.loadURL(config.WINDOW_ABOUT)
|
|
||||||
|
|
||||||
// No menu on the About window
|
|
||||||
win.setMenu(null)
|
|
||||||
|
|
||||||
win.webContents.once('did-finish-load', function () {
|
|
||||||
win.show()
|
|
||||||
})
|
|
||||||
|
|
||||||
win.once('closed', function () {
|
|
||||||
about.win = null
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function getIconPath () {
|
|
||||||
return process.platform === 'win32'
|
|
||||||
? config.APP_ICON + '.ico'
|
|
||||||
: config.APP_ICON + '.png'
|
|
||||||
}
|
|
||||||
@@ -1,214 +0,0 @@
|
|||||||
var main = module.exports = {
|
|
||||||
dispatch,
|
|
||||||
hide,
|
|
||||||
init,
|
|
||||||
send,
|
|
||||||
setAspectRatio,
|
|
||||||
setBounds,
|
|
||||||
setProgress,
|
|
||||||
setTitle,
|
|
||||||
show,
|
|
||||||
toggleAlwaysOnTop,
|
|
||||||
toggleDevTools,
|
|
||||||
toggleFullScreen,
|
|
||||||
win: null
|
|
||||||
}
|
|
||||||
|
|
||||||
var electron = require('electron')
|
|
||||||
|
|
||||||
var app = electron.app
|
|
||||||
|
|
||||||
var config = require('../../config')
|
|
||||||
var log = require('../log')
|
|
||||||
var menu = require('../menu')
|
|
||||||
var tray = require('../tray')
|
|
||||||
|
|
||||||
var HEADER_HEIGHT = 37
|
|
||||||
var TORRENT_HEIGHT = 100
|
|
||||||
|
|
||||||
function init () {
|
|
||||||
if (main.win) {
|
|
||||||
return main.win.show()
|
|
||||||
}
|
|
||||||
var win = main.win = new electron.BrowserWindow({
|
|
||||||
backgroundColor: '#1E1E1E',
|
|
||||||
darkTheme: true, // Forces dark theme (GTK+3)
|
|
||||||
icon: getIconPath(), // Window icon (Windows, Linux)
|
|
||||||
minWidth: config.WINDOW_MIN_WIDTH,
|
|
||||||
minHeight: config.WINDOW_MIN_HEIGHT,
|
|
||||||
title: config.APP_WINDOW_TITLE,
|
|
||||||
titleBarStyle: 'hidden-inset', // Hide title bar (OS X)
|
|
||||||
useContentSize: true, // Specify web page size without OS chrome
|
|
||||||
width: 500,
|
|
||||||
height: HEADER_HEIGHT + (TORRENT_HEIGHT * 6) // header height + 5 torrents
|
|
||||||
})
|
|
||||||
|
|
||||||
win.loadURL(config.WINDOW_MAIN)
|
|
||||||
|
|
||||||
if (win.setSheetOffset) win.setSheetOffset(HEADER_HEIGHT)
|
|
||||||
|
|
||||||
win.webContents.on('dom-ready', function () {
|
|
||||||
menu.onToggleFullScreen(main.win.isFullScreen())
|
|
||||||
})
|
|
||||||
|
|
||||||
win.on('blur', function () {
|
|
||||||
menu.onWindowBlur()
|
|
||||||
tray.onWindowBlur()
|
|
||||||
})
|
|
||||||
|
|
||||||
win.on('focus', function () {
|
|
||||||
menu.onWindowFocus()
|
|
||||||
tray.onWindowFocus()
|
|
||||||
})
|
|
||||||
|
|
||||||
win.on('enter-full-screen', function () {
|
|
||||||
menu.onToggleFullScreen(true)
|
|
||||||
send('fullscreenChanged', true)
|
|
||||||
win.setMenuBarVisibility(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
win.on('leave-full-screen', function () {
|
|
||||||
menu.onToggleFullScreen(false)
|
|
||||||
send('fullscreenChanged', false)
|
|
||||||
win.setMenuBarVisibility(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
win.on('close', function (e) {
|
|
||||||
if (process.platform !== 'darwin' && !tray.hasTray()) {
|
|
||||||
app.quit()
|
|
||||||
} else if (!app.isQuitting) {
|
|
||||||
e.preventDefault()
|
|
||||||
win.hide()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function dispatch (...args) {
|
|
||||||
send('dispatch', ...args)
|
|
||||||
}
|
|
||||||
|
|
||||||
function hide () {
|
|
||||||
if (!main.win) return
|
|
||||||
main.win.send('dispatch', 'backToList')
|
|
||||||
main.win.hide()
|
|
||||||
}
|
|
||||||
|
|
||||||
function send (...args) {
|
|
||||||
if (!main.win) return
|
|
||||||
main.win.send(...args)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Enforce window aspect ratio. Remove with 0. (OS X)
|
|
||||||
*/
|
|
||||||
function setAspectRatio (aspectRatio) {
|
|
||||||
if (!main.win) return
|
|
||||||
main.win.setAspectRatio(aspectRatio)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Change the size of the window.
|
|
||||||
* TODO: Clean this up? Seems overly complicated.
|
|
||||||
*/
|
|
||||||
function setBounds (bounds, maximize) {
|
|
||||||
// Do nothing in fullscreen
|
|
||||||
if (!main.win || main.win.isFullScreen()) {
|
|
||||||
log('setBounds: not setting bounds because we\'re in full screen')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Maximize or minimize, if the second argument is present
|
|
||||||
var willBeMaximized
|
|
||||||
if (maximize === true) {
|
|
||||||
if (!main.win.isMaximized()) {
|
|
||||||
log('setBounds: maximizing')
|
|
||||||
main.win.maximize()
|
|
||||||
}
|
|
||||||
willBeMaximized = true
|
|
||||||
} else if (maximize === false) {
|
|
||||||
if (main.win.isMaximized()) {
|
|
||||||
log('setBounds: unmaximizing')
|
|
||||||
main.win.unmaximize()
|
|
||||||
}
|
|
||||||
willBeMaximized = false
|
|
||||||
} else {
|
|
||||||
willBeMaximized = main.win.isMaximized()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Assuming we're not maximized or maximizing, set the window size
|
|
||||||
if (!willBeMaximized) {
|
|
||||||
log('setBounds: setting bounds to ' + JSON.stringify(bounds))
|
|
||||||
if (bounds.x === null && bounds.y === null) {
|
|
||||||
// X and Y not specified? By default, center on current screen
|
|
||||||
var scr = electron.screen.getDisplayMatching(main.win.getBounds())
|
|
||||||
bounds.x = Math.round(scr.bounds.x + scr.bounds.width / 2 - bounds.width / 2)
|
|
||||||
bounds.y = Math.round(scr.bounds.y + scr.bounds.height / 2 - bounds.height / 2)
|
|
||||||
log('setBounds: centered to ' + JSON.stringify(bounds))
|
|
||||||
}
|
|
||||||
main.win.setBounds(bounds, true)
|
|
||||||
} else {
|
|
||||||
log('setBounds: not setting bounds because of window maximization')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set progress bar to [0, 1]. Indeterminate when > 1. Remove with < 0.
|
|
||||||
*/
|
|
||||||
function setProgress (progress) {
|
|
||||||
if (!main.win) return
|
|
||||||
main.win.setProgressBar(progress)
|
|
||||||
}
|
|
||||||
|
|
||||||
function setTitle (title) {
|
|
||||||
if (!main.win) return
|
|
||||||
main.win.setTitle(title)
|
|
||||||
}
|
|
||||||
|
|
||||||
function show () {
|
|
||||||
if (!main.win) return
|
|
||||||
main.win.show()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sets whether the window should always show on top of other windows
|
|
||||||
function toggleAlwaysOnTop (flag) {
|
|
||||||
if (!main.win) return
|
|
||||||
if (flag == null) {
|
|
||||||
flag = !main.win.isAlwaysOnTop()
|
|
||||||
}
|
|
||||||
log(`toggleAlwaysOnTop ${flag}`)
|
|
||||||
main.win.setAlwaysOnTop(flag)
|
|
||||||
menu.onToggleAlwaysOnTop(flag)
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggleDevTools () {
|
|
||||||
if (!main.win) return
|
|
||||||
log('toggleDevTools')
|
|
||||||
if (main.win.webContents.isDevToolsOpened()) {
|
|
||||||
main.win.webContents.closeDevTools()
|
|
||||||
} else {
|
|
||||||
main.win.webContents.openDevTools({ detach: true })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggleFullScreen (flag) {
|
|
||||||
if (!main.win || !main.win.isVisible()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flag == null) flag = !main.win.isFullScreen()
|
|
||||||
|
|
||||||
log(`toggleFullScreen ${flag}`)
|
|
||||||
|
|
||||||
if (flag) {
|
|
||||||
// Fullscreen and aspect ratio do not play well together. (OS X)
|
|
||||||
main.win.setAspectRatio(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
main.win.setFullScreen(flag)
|
|
||||||
}
|
|
||||||
|
|
||||||
function getIconPath () {
|
|
||||||
return process.platform === 'win32'
|
|
||||||
? config.APP_ICON + '.ico'
|
|
||||||
: config.APP_ICON + '.png'
|
|
||||||
}
|
|
||||||
27431
package-lock.json
generated
Normal file
27431
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
148
package.json
148
package.json
@@ -1,62 +1,88 @@
|
|||||||
{
|
{
|
||||||
"name": "webtorrent-desktop",
|
"name": "webtorrent-desktop",
|
||||||
"description": "WebTorrent, the streaming torrent client. For OS X, Windows, and Linux.",
|
"description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
|
||||||
"version": "0.7.2",
|
"version": "0.24.0",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "WebTorrent, LLC",
|
"name": "WebTorrent, LLC",
|
||||||
"email": "feross@feross.org",
|
"email": "feross@webtorrent.io",
|
||||||
"url": "https://webtorrent.io"
|
"url": "https://webtorrent.io"
|
||||||
},
|
},
|
||||||
"bin": {
|
"babel": {
|
||||||
"webtorrent-desktop": "./bin/cmd.js"
|
"plugins": [
|
||||||
|
[
|
||||||
|
"@babel/plugin-transform-react-jsx",
|
||||||
|
{
|
||||||
|
"useBuiltIns": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/feross/webtorrent-desktop/issues"
|
"url": "https://github.com/webtorrent/webtorrent-desktop/issues"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"airplayer": "^2.0.0",
|
"@electron/remote": "2.1.3",
|
||||||
"application-config": "^0.2.1",
|
"airplayer": "github:webtorrent/airplayer#fix-security",
|
||||||
"bitfield": "^1.0.2",
|
"application-config": "2.0.0",
|
||||||
"chromecasts": "^1.8.0",
|
"arch": "2.2.0",
|
||||||
"create-torrent": "^3.24.5",
|
"auto-launch": "5.0.5",
|
||||||
"deep-equal": "^1.0.1",
|
"bitfield": "4.1.0",
|
||||||
"dlnacasts": "^0.1.0",
|
"capture-frame": "4.0.0",
|
||||||
"drag-drop": "^2.11.0",
|
"chokidar": "3.5.3",
|
||||||
"electron-prebuilt": "1.2.1",
|
"chromecasts": "1.10.2",
|
||||||
"fs-extra": "^0.27.0",
|
"create-torrent": "5.0.9",
|
||||||
"hyperx": "^2.0.2",
|
"debounce": "1.2.1",
|
||||||
"iso-639-1": "^1.2.1",
|
"dlnacasts": "0.1.0",
|
||||||
"languagedetect": "^1.1.1",
|
"drag-drop": "7.2.0",
|
||||||
"main-loop": "^3.2.0",
|
"es6-error": "4.1.1",
|
||||||
"musicmetadata": "^2.0.2",
|
"fn-getter": "1.0.0",
|
||||||
"network-address": "^1.1.0",
|
"iso-639-1": "2.1.15",
|
||||||
"parse-torrent": "^5.7.3",
|
"languagedetect": "2.0.0",
|
||||||
"prettier-bytes": "^1.0.1",
|
"location-history": "1.1.2",
|
||||||
"run-parallel": "^1.1.6",
|
"material-ui": "0.20.2",
|
||||||
"semver": "^5.1.0",
|
"music-metadata": "7.14.0",
|
||||||
"simple-concat": "^1.0.0",
|
"network-address": "1.1.2",
|
||||||
"simple-get": "^2.0.0",
|
"parse-torrent": "9.1.5",
|
||||||
"srt-to-vtt": "^1.1.1",
|
"prettier-bytes": "1.0.4",
|
||||||
"virtual-dom": "^2.1.1",
|
"prop-types": "15.8.1",
|
||||||
"vlc-command": "^1.0.1",
|
"react": "17.0.2",
|
||||||
"webtorrent": "0.x",
|
"react-dom": "17.0.2",
|
||||||
"winreg": "^1.2.0",
|
"rimraf": "4.4.0",
|
||||||
"zero-fill": "^2.2.3"
|
"run-parallel": "1.2.0",
|
||||||
|
"semver": "7.3.8",
|
||||||
|
"simple-concat": "1.0.1",
|
||||||
|
"simple-get": "4.0.1",
|
||||||
|
"srt-to-vtt": "1.1.3",
|
||||||
|
"vlc-command": "1.2.0",
|
||||||
|
"webtorrent": "1.9.7",
|
||||||
|
"winreg": "1.2.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"cross-zip": "^2.0.1",
|
"@babel/cli": "7.28.6",
|
||||||
"electron-osx-sign": "^0.3.0",
|
"@babel/core": "7.29.0",
|
||||||
"electron-packager": "^7.0.0",
|
"@babel/eslint-parser": "7.28.6",
|
||||||
"electron-winstaller": "^2.3.0",
|
"@babel/plugin-transform-react-jsx": "7.28.6",
|
||||||
"gh-release": "^2.0.3",
|
"cross-zip": "4.0.0",
|
||||||
"minimist": "^1.2.0",
|
"depcheck": "1.4.7",
|
||||||
"mkdirp": "^0.5.1",
|
"electron": "27.3.11",
|
||||||
"nobin-debian-installer": "^0.0.10",
|
"electron-notarize": "1.2.2",
|
||||||
"open": "0.0.5",
|
"electron-osx-sign": "0.6.0",
|
||||||
"plist": "^1.2.0",
|
"electron-packager": "17.1.2",
|
||||||
"rimraf": "^2.5.2",
|
"electron-winstaller": "5.4.0",
|
||||||
"run-series": "^1.1.4",
|
"gh-release": "7.0.2",
|
||||||
"standard": "^7.0.0"
|
"minimist": "1.2.8",
|
||||||
|
"nodemon": "2.0.22",
|
||||||
|
"open": "8.4.2",
|
||||||
|
"plist": "3.1.0",
|
||||||
|
"pngjs": "7.0.0",
|
||||||
|
"run-series": "1.1.9",
|
||||||
|
"spectron": "19.0.0",
|
||||||
|
"standard": "17.0.0",
|
||||||
|
"tape": "5.9.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": "^16.0.0 || ^18.0.0",
|
||||||
|
"npm": "^7.10.0 || ^8.0.0 || ^9.0.0 || ^10.0.0"
|
||||||
},
|
},
|
||||||
"homepage": "https://webtorrent.io",
|
"homepage": "https://webtorrent.io",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
@@ -65,26 +91,42 @@
|
|||||||
"electron-app",
|
"electron-app",
|
||||||
"hybrid webtorrent client",
|
"hybrid webtorrent client",
|
||||||
"mad science",
|
"mad science",
|
||||||
"torrent client",
|
|
||||||
"torrent",
|
"torrent",
|
||||||
|
"torrent client",
|
||||||
"webtorrent"
|
"webtorrent"
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"appdmg": "^0.4.3"
|
"appdmg": "^0.6.0",
|
||||||
|
"electron-installer-debian": "^3.2.0",
|
||||||
|
"electron-installer-redhat": "^3.4.0"
|
||||||
},
|
},
|
||||||
|
"private": true,
|
||||||
"productName": "WebTorrent",
|
"productName": "WebTorrent",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "git://github.com/feross/webtorrent-desktop.git"
|
"url": "git://github.com/webtorrent/webtorrent-desktop.git"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
"build": "babel src --out-dir build",
|
||||||
"clean": "node ./bin/clean.js",
|
"clean": "node ./bin/clean.js",
|
||||||
|
"gh-release": "gh-release",
|
||||||
|
"install-system-deps": "brew install fakeroot dpkg rpm",
|
||||||
"open-config": "node ./bin/open-config.js",
|
"open-config": "node ./bin/open-config.js",
|
||||||
"package": "node ./bin/package.js",
|
"package": "node ./bin/package.js",
|
||||||
"start": "electron .",
|
"start": "npm run build && electron --no-sandbox .",
|
||||||
"test": "standard && node ./bin/check-deps.js",
|
"test": "standard && depcheck --ignores=standard,@babel/eslint-parser --ignore-dirs=build,dist",
|
||||||
"update-authors": "./bin/update-authors.sh"
|
"test-integration": "npm run build && node ./test",
|
||||||
|
"update-authors": "./bin/update-authors.sh",
|
||||||
|
"watch": "nodemon --exec \"npm run start\" --ext js,css --ignore build/ --ignore dist/"
|
||||||
|
},
|
||||||
|
"standard": {
|
||||||
|
"parser": "@babel/eslint-parser"
|
||||||
|
},
|
||||||
|
"renovate": {
|
||||||
|
"extends": [
|
||||||
|
"github>webtorrent/renovate-config"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
module.exports = captureVideoFrame
|
|
||||||
|
|
||||||
function captureVideoFrame (video, format) {
|
|
||||||
if (typeof video === 'string') {
|
|
||||||
video = document.querySelector(video)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (video == null || video.nodeName !== 'VIDEO') {
|
|
||||||
throw new Error('First argument must be a <video> element or selector')
|
|
||||||
}
|
|
||||||
|
|
||||||
if (format == null) {
|
|
||||||
format = 'png'
|
|
||||||
}
|
|
||||||
|
|
||||||
if (format !== 'png' && format !== 'jpg' && format !== 'webp') {
|
|
||||||
throw new Error('Second argument must be one of "png", "jpg", or "webp"')
|
|
||||||
}
|
|
||||||
|
|
||||||
var canvas = document.createElement('canvas')
|
|
||||||
canvas.width = video.videoWidth
|
|
||||||
canvas.height = video.videoHeight
|
|
||||||
|
|
||||||
canvas.getContext('2d').drawImage(video, 0, 0)
|
|
||||||
|
|
||||||
var dataUri = canvas.toDataURL('image/' + format)
|
|
||||||
var data = dataUri.split(',')[1]
|
|
||||||
|
|
||||||
return new Buffer(data, 'base64')
|
|
||||||
}
|
|
||||||
@@ -1,403 +0,0 @@
|
|||||||
// The Cast module talks to Airplay and Chromecast
|
|
||||||
// * Modifies state when things change
|
|
||||||
// * Starts and stops casting, provides remote video controls
|
|
||||||
module.exports = {
|
|
||||||
init,
|
|
||||||
open,
|
|
||||||
close,
|
|
||||||
play,
|
|
||||||
pause,
|
|
||||||
seek,
|
|
||||||
setVolume,
|
|
||||||
setRate
|
|
||||||
}
|
|
||||||
|
|
||||||
var airplayer = require('airplayer')()
|
|
||||||
var chromecasts = require('chromecasts')()
|
|
||||||
var dlnacasts = require('dlnacasts')()
|
|
||||||
|
|
||||||
var config = require('../../config')
|
|
||||||
|
|
||||||
// App state. Cast modifies state.playing and state.errors in response to events
|
|
||||||
var state
|
|
||||||
|
|
||||||
// Callback to notify module users when state has changed
|
|
||||||
var update
|
|
||||||
|
|
||||||
// setInterval() for updating cast status
|
|
||||||
var statusInterval = null
|
|
||||||
|
|
||||||
// Start looking for cast devices on the local network
|
|
||||||
function init (appState, callback) {
|
|
||||||
state = appState
|
|
||||||
update = callback
|
|
||||||
|
|
||||||
// Listen for devices: Chromecast, DLNA and Airplay
|
|
||||||
chromecasts.on('update', function (player) {
|
|
||||||
state.devices.chromecast = chromecastPlayer(player)
|
|
||||||
})
|
|
||||||
|
|
||||||
dlnacasts.on('update', function (player) {
|
|
||||||
state.devices.dlna = dlnaPlayer(player)
|
|
||||||
})
|
|
||||||
|
|
||||||
airplayer.on('update', function (player) {
|
|
||||||
state.devices.airplay = airplayPlayer(player)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// chromecast player implementation
|
|
||||||
function chromecastPlayer (player) {
|
|
||||||
function addEvents () {
|
|
||||||
player.on('error', function (err) {
|
|
||||||
state.playing.location = 'local'
|
|
||||||
state.errors.push({
|
|
||||||
time: new Date().getTime(),
|
|
||||||
message: 'Could not connect to Chromecast. ' + err.message
|
|
||||||
})
|
|
||||||
update()
|
|
||||||
})
|
|
||||||
player.on('disconnect', function () {
|
|
||||||
state.playing.location = 'local'
|
|
||||||
update()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function open () {
|
|
||||||
var torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
|
|
||||||
player.play(state.server.networkURL, {
|
|
||||||
type: 'video/mp4',
|
|
||||||
title: config.APP_NAME + ' - ' + torrentSummary.name
|
|
||||||
}, function (err) {
|
|
||||||
if (err) {
|
|
||||||
state.playing.location = 'local'
|
|
||||||
state.errors.push({
|
|
||||||
time: new Date().getTime(),
|
|
||||||
message: 'Could not connect to Chromecast. ' + err.message
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
state.playing.location = 'chromecast'
|
|
||||||
}
|
|
||||||
update()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function play (callback) {
|
|
||||||
player.play(null, null, callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
function pause (callback) {
|
|
||||||
player.pause(callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
function stop (callback) {
|
|
||||||
player.stop(callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
function status () {
|
|
||||||
player.status(function (err, status) {
|
|
||||||
if (err) return console.log('error getting %s status: %o', state.playing.location, err)
|
|
||||||
state.playing.isPaused = status.playerState === 'PAUSED'
|
|
||||||
state.playing.currentTime = status.currentTime
|
|
||||||
state.playing.volume = status.volume.muted ? 0 : status.volume.level
|
|
||||||
update()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function seek (time, callback) {
|
|
||||||
player.seek(time, callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
function volume (volume, callback) {
|
|
||||||
player.volume(volume, callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
addEvents()
|
|
||||||
|
|
||||||
return {
|
|
||||||
player: player,
|
|
||||||
open: open,
|
|
||||||
play: play,
|
|
||||||
pause: pause,
|
|
||||||
stop: stop,
|
|
||||||
status: status,
|
|
||||||
seek: seek,
|
|
||||||
volume: volume
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// airplay player implementation
|
|
||||||
function airplayPlayer (player) {
|
|
||||||
function addEvents () {
|
|
||||||
player.on('event', function (event) {
|
|
||||||
switch (event.state) {
|
|
||||||
case 'loading':
|
|
||||||
break
|
|
||||||
case 'playing':
|
|
||||||
state.playing.isPaused = false
|
|
||||||
break
|
|
||||||
case 'paused':
|
|
||||||
state.playing.isPaused = true
|
|
||||||
break
|
|
||||||
case 'stopped':
|
|
||||||
break
|
|
||||||
}
|
|
||||||
update()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function open () {
|
|
||||||
player.play(state.server.networkURL, function (err, res) {
|
|
||||||
if (err) {
|
|
||||||
state.playing.location = 'local'
|
|
||||||
state.errors.push({
|
|
||||||
time: new Date().getTime(),
|
|
||||||
message: 'Could not connect to AirPlay. ' + err.message
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
state.playing.location = 'airplay'
|
|
||||||
}
|
|
||||||
update()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function play (callback) {
|
|
||||||
player.resume(callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
function pause (callback) {
|
|
||||||
player.pause(callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
function stop (callback) {
|
|
||||||
player.stop(callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
function status () {
|
|
||||||
player.playbackInfo(function (err, res, status) {
|
|
||||||
if (err) {
|
|
||||||
state.playing.location = 'local'
|
|
||||||
state.errors.push({
|
|
||||||
time: new Date().getTime(),
|
|
||||||
message: 'Could not connect to AirPlay. ' + err.message
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
state.playing.isPaused = status.rate === 0
|
|
||||||
state.playing.currentTime = status.position
|
|
||||||
update()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function seek (time, callback) {
|
|
||||||
player.scrub(time, callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
function volume (volume, callback) {
|
|
||||||
// AirPlay doesn't support volume
|
|
||||||
// TODO: We should just disable the volume slider
|
|
||||||
state.playing.volume = volume
|
|
||||||
}
|
|
||||||
|
|
||||||
addEvents()
|
|
||||||
|
|
||||||
return {
|
|
||||||
player: player,
|
|
||||||
open: open,
|
|
||||||
play: play,
|
|
||||||
pause: pause,
|
|
||||||
stop: stop,
|
|
||||||
status: status,
|
|
||||||
seek: seek,
|
|
||||||
volume: volume
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// DLNA player implementation
|
|
||||||
function dlnaPlayer (player) {
|
|
||||||
function addEvents () {
|
|
||||||
player.on('error', function (err) {
|
|
||||||
state.playing.location = 'local'
|
|
||||||
state.errors.push({
|
|
||||||
time: new Date().getTime(),
|
|
||||||
message: 'Could not connect to DLNA. ' + err.message
|
|
||||||
})
|
|
||||||
update()
|
|
||||||
})
|
|
||||||
player.on('disconnect', function () {
|
|
||||||
state.playing.location = 'local'
|
|
||||||
update()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function open () {
|
|
||||||
var torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
|
|
||||||
player.play(state.server.networkURL, {
|
|
||||||
type: 'video/mp4',
|
|
||||||
title: config.APP_NAME + ' - ' + torrentSummary.name,
|
|
||||||
seek: state.playing.currentTime > 10 ? state.playing.currentTime : 0
|
|
||||||
}, function (err) {
|
|
||||||
if (err) {
|
|
||||||
state.playing.location = 'local'
|
|
||||||
state.errors.push({
|
|
||||||
time: new Date().getTime(),
|
|
||||||
message: 'Could not connect to DLNA. ' + err.message
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
state.playing.location = 'dlna'
|
|
||||||
}
|
|
||||||
update()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function play (callback) {
|
|
||||||
player.play(null, null, callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
function pause (callback) {
|
|
||||||
player.pause(callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
function stop (callback) {
|
|
||||||
player.stop(callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
function status () {
|
|
||||||
player.status(function (err, status) {
|
|
||||||
if (err) return console.log('error getting %s status: %o', state.playing.location, err)
|
|
||||||
state.playing.isPaused = status.playerState === 'PAUSED'
|
|
||||||
state.playing.currentTime = status.currentTime
|
|
||||||
state.playing.volume = status.volume.level
|
|
||||||
update()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function seek (time, callback) {
|
|
||||||
player.seek(time, callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
function volume (volume, callback) {
|
|
||||||
player.volume(volume, function (err) {
|
|
||||||
// quick volume update
|
|
||||||
state.playing.volume = volume
|
|
||||||
callback(err)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
addEvents()
|
|
||||||
|
|
||||||
return {
|
|
||||||
player: player,
|
|
||||||
open: open,
|
|
||||||
play: play,
|
|
||||||
pause: pause,
|
|
||||||
stop: stop,
|
|
||||||
status: status,
|
|
||||||
seek: seek,
|
|
||||||
volume: volume
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Start polling cast device state, whenever we're connected
|
|
||||||
function startStatusInterval () {
|
|
||||||
statusInterval = setInterval(function () {
|
|
||||||
var device = getDevice()
|
|
||||||
if (device) {
|
|
||||||
device.status()
|
|
||||||
}
|
|
||||||
}, 1000)
|
|
||||||
}
|
|
||||||
|
|
||||||
function open (location) {
|
|
||||||
if (state.playing.location !== 'local') {
|
|
||||||
throw new Error('You can\'t connect to ' + location + ' when already connected to another device')
|
|
||||||
}
|
|
||||||
|
|
||||||
state.playing.location = location + '-pending'
|
|
||||||
var device = getDevice(location)
|
|
||||||
if (device) {
|
|
||||||
getDevice(location).open()
|
|
||||||
startStatusInterval()
|
|
||||||
}
|
|
||||||
|
|
||||||
update()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stops casting, move video back to local screen
|
|
||||||
function close () {
|
|
||||||
var device = getDevice()
|
|
||||||
if (device) {
|
|
||||||
device.stop(stoppedCasting)
|
|
||||||
clearInterval(statusInterval)
|
|
||||||
} else {
|
|
||||||
stoppedCasting()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function stoppedCasting () {
|
|
||||||
state.playing.location = 'local'
|
|
||||||
state.playing.jumpToTime = state.playing.currentTime
|
|
||||||
update()
|
|
||||||
}
|
|
||||||
|
|
||||||
function getDevice (location) {
|
|
||||||
if (location && state.devices[location]) {
|
|
||||||
return state.devices[location]
|
|
||||||
} else if (state.playing.location === 'chromecast') {
|
|
||||||
return state.devices.chromecast
|
|
||||||
} else if (state.playing.location === 'airplay') {
|
|
||||||
return state.devices.airplay
|
|
||||||
} else if (state.playing.location === 'dlna') {
|
|
||||||
return state.devices.dlna
|
|
||||||
} else {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function play () {
|
|
||||||
var device = getDevice()
|
|
||||||
if (device) {
|
|
||||||
device.play(castCallback)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function pause () {
|
|
||||||
var device = getDevice()
|
|
||||||
if (device) {
|
|
||||||
device.pause(castCallback)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function setRate (rate) {
|
|
||||||
var device
|
|
||||||
var result = true
|
|
||||||
if (state.playing.location === 'chromecast') {
|
|
||||||
// TODO find how to control playback rate on chromecast
|
|
||||||
castCallback()
|
|
||||||
result = false
|
|
||||||
} else if (state.playing.location === 'airplay') {
|
|
||||||
device = state.devices.airplay
|
|
||||||
device.rate(rate, castCallback)
|
|
||||||
} else {
|
|
||||||
result = false
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
function seek (time) {
|
|
||||||
var device = getDevice()
|
|
||||||
if (device) {
|
|
||||||
device.seek(time, castCallback)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function setVolume (volume) {
|
|
||||||
var device = getDevice()
|
|
||||||
if (device) {
|
|
||||||
device.volume(volume, castCallback)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function castCallback () {
|
|
||||||
console.log('%s callback: %o', state.playing.location, arguments)
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
UnplayableError
|
|
||||||
}
|
|
||||||
|
|
||||||
function UnplayableError () {
|
|
||||||
this.message = 'Can\'t play any files in torrent'
|
|
||||||
}
|
|
||||||
UnplayableError.prototype = Error
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
var h = require('virtual-dom/h')
|
|
||||||
var hyperx = require('hyperx')
|
|
||||||
var hx = hyperx(h)
|
|
||||||
|
|
||||||
module.exports = hx
|
|
||||||
@@ -1,126 +0,0 @@
|
|||||||
module.exports = LocationHistory
|
|
||||||
|
|
||||||
function LocationHistory () {
|
|
||||||
if (!new.target) return new LocationHistory()
|
|
||||||
this._history = []
|
|
||||||
this._forward = []
|
|
||||||
this._pending = false
|
|
||||||
}
|
|
||||||
|
|
||||||
LocationHistory.prototype.url = function () {
|
|
||||||
return this.current() && this.current().url
|
|
||||||
}
|
|
||||||
|
|
||||||
LocationHistory.prototype.current = function () {
|
|
||||||
return this._history[this._history.length - 1]
|
|
||||||
}
|
|
||||||
|
|
||||||
LocationHistory.prototype.go = function (page, cb) {
|
|
||||||
if (!cb) cb = noop
|
|
||||||
if (this._pending) return cb(null)
|
|
||||||
|
|
||||||
console.log('go', page)
|
|
||||||
|
|
||||||
this.clearForward()
|
|
||||||
this._go(page, cb)
|
|
||||||
}
|
|
||||||
|
|
||||||
LocationHistory.prototype.back = function (cb) {
|
|
||||||
var self = this
|
|
||||||
if (!cb) cb = noop
|
|
||||||
if (self._history.length <= 1 || self._pending) return cb(null)
|
|
||||||
|
|
||||||
var page = self._history.pop()
|
|
||||||
self._unload(page, done)
|
|
||||||
|
|
||||||
function done (err) {
|
|
||||||
if (err) return cb(err)
|
|
||||||
self._forward.push(page)
|
|
||||||
self._load(self.current(), cb)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
LocationHistory.prototype.hasBack = function () {
|
|
||||||
return this._history.length > 1
|
|
||||||
}
|
|
||||||
|
|
||||||
LocationHistory.prototype.forward = function (cb) {
|
|
||||||
if (!cb) cb = noop
|
|
||||||
if (this._forward.length === 0 || this._pending) return cb(null)
|
|
||||||
|
|
||||||
var page = this._forward.pop()
|
|
||||||
this._go(page, cb)
|
|
||||||
}
|
|
||||||
|
|
||||||
LocationHistory.prototype.hasForward = function () {
|
|
||||||
return this._forward.length > 0
|
|
||||||
}
|
|
||||||
|
|
||||||
LocationHistory.prototype.clearForward = function (url) {
|
|
||||||
if (url == null) {
|
|
||||||
this._forward = []
|
|
||||||
} else {
|
|
||||||
console.log(this._forward)
|
|
||||||
console.log(url)
|
|
||||||
this._forward = this._forward.filter(function (page) {
|
|
||||||
return page.url !== url
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
LocationHistory.prototype.backToFirst = function (cb) {
|
|
||||||
var self = this
|
|
||||||
if (!cb) cb = noop
|
|
||||||
if (self._history.length <= 1) return cb(null)
|
|
||||||
|
|
||||||
self.back(function (err) {
|
|
||||||
if (err) return cb(err)
|
|
||||||
self.backToFirst(cb)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
LocationHistory.prototype._go = function (page, cb) {
|
|
||||||
var self = this
|
|
||||||
if (!cb) cb = noop
|
|
||||||
|
|
||||||
self._unload(self.current(), done1)
|
|
||||||
|
|
||||||
function done1 (err) {
|
|
||||||
if (err) return cb(err)
|
|
||||||
self._load(page, done2)
|
|
||||||
}
|
|
||||||
|
|
||||||
function done2 (err) {
|
|
||||||
if (err) return cb(err)
|
|
||||||
self._history.push(page)
|
|
||||||
cb(null)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
LocationHistory.prototype._load = function (page, cb) {
|
|
||||||
var self = this
|
|
||||||
self._pending = true
|
|
||||||
|
|
||||||
if (page && page.onbeforeload) page.onbeforeload(done)
|
|
||||||
else done(null)
|
|
||||||
|
|
||||||
function done (err) {
|
|
||||||
self._pending = false
|
|
||||||
cb(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
LocationHistory.prototype._unload = function (page, cb) {
|
|
||||||
var self = this
|
|
||||||
self._pending = true
|
|
||||||
|
|
||||||
if (page && page.onbeforeunload) page.onbeforeunload(done)
|
|
||||||
else done(null)
|
|
||||||
|
|
||||||
function done (err) {
|
|
||||||
self._pending = false
|
|
||||||
cb(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function noop () {}
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
/* eslint-disable camelcase */
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
run
|
|
||||||
}
|
|
||||||
|
|
||||||
var semver = require('semver')
|
|
||||||
var config = require('../../config')
|
|
||||||
|
|
||||||
// Change `state.saved` (which will be saved back to config.json on exit) as
|
|
||||||
// needed, for example to deal with config.json format changes across versions
|
|
||||||
function run (state) {
|
|
||||||
// Replace "{ version: 1 }" with app version (semver)
|
|
||||||
if (!semver.valid(state.saved.version)) {
|
|
||||||
state.saved.version = '0.0.0' // Pre-0.7.0 version, so run all migrations
|
|
||||||
}
|
|
||||||
|
|
||||||
var version = state.saved.version
|
|
||||||
|
|
||||||
if (semver.lt(version, '0.7.0')) {
|
|
||||||
migrate_0_7_0(state.saved)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (semver.lt(version, '0.7.2')) {
|
|
||||||
migrate_0_7_2(state.saved)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Config is now on the new version
|
|
||||||
state.saved.version = config.APP_VERSION
|
|
||||||
}
|
|
||||||
|
|
||||||
function migrate_0_7_0 (saved) {
|
|
||||||
console.log('migrate to 0.7.0')
|
|
||||||
|
|
||||||
var fs = require('fs-extra')
|
|
||||||
var path = require('path')
|
|
||||||
|
|
||||||
saved.torrents.forEach(function (ts) {
|
|
||||||
var infoHash = ts.infoHash
|
|
||||||
|
|
||||||
// Replace torrentPath with torrentFileName
|
|
||||||
// There are a number of cases to handle here:
|
|
||||||
// * Originally we used absolute paths
|
|
||||||
// * Then, relative paths for the default torrents, eg '../static/sintel.torrent'
|
|
||||||
// * Then, paths computed at runtime for default torrents, eg 'sintel.torrent'
|
|
||||||
// * Finally, now we're getting rid of torrentPath altogether
|
|
||||||
var src, dst
|
|
||||||
if (ts.torrentPath) {
|
|
||||||
console.log('replacing torrentPath %s', ts.torrentPath)
|
|
||||||
if (path.isAbsolute(ts.torrentPath) || ts.torrentPath.startsWith('..')) {
|
|
||||||
src = ts.torrentPath
|
|
||||||
} else {
|
|
||||||
src = path.join(config.STATIC_PATH, ts.torrentPath)
|
|
||||||
}
|
|
||||||
dst = path.join(config.TORRENT_PATH, infoHash + '.torrent')
|
|
||||||
// Synchronous FS calls aren't ideal, but probably OK in a migration
|
|
||||||
// that only runs once
|
|
||||||
if (src !== dst) fs.copySync(src, dst)
|
|
||||||
|
|
||||||
delete ts.torrentPath
|
|
||||||
ts.torrentFileName = infoHash + '.torrent'
|
|
||||||
}
|
|
||||||
|
|
||||||
// Replace posterURL with posterFileName
|
|
||||||
if (ts.posterURL) {
|
|
||||||
console.log('replacing posterURL %s', ts.posterURL)
|
|
||||||
var extension = path.extname(ts.posterURL)
|
|
||||||
src = path.isAbsolute(ts.posterURL)
|
|
||||||
? ts.posterURL
|
|
||||||
: path.join(config.STATIC_PATH, ts.posterURL)
|
|
||||||
dst = path.join(config.POSTER_PATH, infoHash + extension)
|
|
||||||
// Synchronous FS calls aren't ideal, but probably OK in a migration
|
|
||||||
// that only runs once
|
|
||||||
if (src !== dst) fs.copySync(src, dst)
|
|
||||||
|
|
||||||
delete ts.posterURL
|
|
||||||
ts.posterFileName = infoHash + extension
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fix exception caused by incorrect file ordering.
|
|
||||||
// https://github.com/feross/webtorrent-desktop/pull/604#issuecomment-222805214
|
|
||||||
delete ts.defaultPlayFileIndex
|
|
||||||
delete ts.files
|
|
||||||
delete ts.selections
|
|
||||||
delete ts.fileModtimes
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function migrate_0_7_2 (saved) {
|
|
||||||
if (!saved.prefs) {
|
|
||||||
saved.prefs = {
|
|
||||||
downloadPath: config.DEFAULT_DOWNLOAD_PATH
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,215 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
getDefaultPlayState,
|
|
||||||
load,
|
|
||||||
save
|
|
||||||
}
|
|
||||||
|
|
||||||
var appConfig = require('application-config')('WebTorrent')
|
|
||||||
var path = require('path')
|
|
||||||
|
|
||||||
var config = require('../../config')
|
|
||||||
var migrations = require('./migrations')
|
|
||||||
|
|
||||||
appConfig.filePath = path.join(config.CONFIG_PATH, 'config.json')
|
|
||||||
|
|
||||||
function getDefaultState () {
|
|
||||||
var LocationHistory = require('./location-history')
|
|
||||||
|
|
||||||
return {
|
|
||||||
/*
|
|
||||||
* Temporary state disappears once the program exits.
|
|
||||||
* It can contain complex objects like open connections, etc.
|
|
||||||
*/
|
|
||||||
client: null, /* the WebTorrent client */
|
|
||||||
server: null, /* local WebTorrent-to-HTTP server */
|
|
||||||
prev: {}, /* used for state diffing in updateElectron() */
|
|
||||||
location: new LocationHistory(),
|
|
||||||
window: {
|
|
||||||
bounds: null, /* {x, y, width, height } */
|
|
||||||
isFocused: true,
|
|
||||||
isFullScreen: false,
|
|
||||||
title: config.APP_WINDOW_TITLE
|
|
||||||
},
|
|
||||||
selectedInfoHash: null, /* the torrent we've selected to view details. see state.torrents */
|
|
||||||
playing: getDefaultPlayState(), /* the media (audio or video) that we're currently playing */
|
|
||||||
devices: { /* playback devices like Chromecast and AppleTV */
|
|
||||||
airplay: null, /* airplay client. finds and manages AppleTVs */
|
|
||||||
chromecast: null /* chromecast client. finds and manages Chromecasts */
|
|
||||||
},
|
|
||||||
dock: {
|
|
||||||
badge: 0,
|
|
||||||
progress: 0
|
|
||||||
},
|
|
||||||
modal: null, /* modal popover */
|
|
||||||
errors: [], /* user-facing errors */
|
|
||||||
nextTorrentKey: 1, /* identify torrents for IPC between the main and webtorrent windows */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Saved state is read from and written to a file every time the app runs.
|
|
||||||
* It should be simple and minimal and must be JSON.
|
|
||||||
* It must never contain absolute paths since we have a portable app.
|
|
||||||
*
|
|
||||||
* Config path:
|
|
||||||
*
|
|
||||||
* OS X ~/Library/Application Support/WebTorrent/config.json
|
|
||||||
* Linux (XDG) $XDG_CONFIG_HOME/WebTorrent/config.json
|
|
||||||
* Linux (Legacy) ~/.config/WebTorrent/config.json
|
|
||||||
* Windows (> Vista) %LOCALAPPDATA%/WebTorrent/config.json
|
|
||||||
* Windows (XP, 2000) %USERPROFILE%/Local Settings/Application Data/WebTorrent/config.json
|
|
||||||
*
|
|
||||||
* Also accessible via `require('application-config')('WebTorrent').filePath`
|
|
||||||
*/
|
|
||||||
saved: {},
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Getters, for convenience
|
|
||||||
*/
|
|
||||||
getPlayingTorrentSummary,
|
|
||||||
getPlayingFileSummary
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Whenever we stop playing video or audio, here's what we reset state.playing to */
|
|
||||||
function getDefaultPlayState () {
|
|
||||||
return {
|
|
||||||
infoHash: null, /* the info hash of the torrent we're playing */
|
|
||||||
fileIndex: null, /* the zero-based index within the torrent */
|
|
||||||
location: 'local', /* 'local', 'chromecast', 'airplay' */
|
|
||||||
type: null, /* 'audio' or 'video', could be 'other' if ever support eg streaming to VLC */
|
|
||||||
currentTime: 0, /* seconds */
|
|
||||||
duration: 1, /* seconds */
|
|
||||||
isPaused: true,
|
|
||||||
isStalled: false,
|
|
||||||
lastTimeUpdate: 0, /* Unix time in ms */
|
|
||||||
mouseStationarySince: 0, /* Unix time in ms */
|
|
||||||
playbackRate: 1,
|
|
||||||
subtitles: {
|
|
||||||
tracks: [], /* subtitle tracks, each {label, language, ...} */
|
|
||||||
selectedIndex: -1, /* current subtitle track */
|
|
||||||
showMenu: false /* popover menu, above the video */
|
|
||||||
},
|
|
||||||
aspectRatio: 0 /* aspect ratio of the video */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If the saved state file doesn't exist yet, here's what we use instead */
|
|
||||||
function setupSavedState (cb) {
|
|
||||||
var fs = require('fs-extra')
|
|
||||||
var parseTorrent = require('parse-torrent')
|
|
||||||
var parallel = require('run-parallel')
|
|
||||||
|
|
||||||
var saved = {
|
|
||||||
prefs: {
|
|
||||||
downloadPath: config.DEFAULT_DOWNLOAD_PATH
|
|
||||||
},
|
|
||||||
torrents: config.DEFAULT_TORRENTS.map(createTorrentObject),
|
|
||||||
version: config.APP_VERSION /* make sure we can upgrade gracefully later */
|
|
||||||
}
|
|
||||||
|
|
||||||
var tasks = []
|
|
||||||
|
|
||||||
config.DEFAULT_TORRENTS.map(function (t, i) {
|
|
||||||
var infoHash = saved.torrents[i].infoHash
|
|
||||||
tasks.push(function (cb) {
|
|
||||||
fs.copy(
|
|
||||||
path.join(config.STATIC_PATH, t.posterFileName),
|
|
||||||
path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName)),
|
|
||||||
cb
|
|
||||||
)
|
|
||||||
})
|
|
||||||
tasks.push(function (cb) {
|
|
||||||
fs.copy(
|
|
||||||
path.join(config.STATIC_PATH, t.torrentFileName),
|
|
||||||
path.join(config.TORRENT_PATH, infoHash + '.torrent'),
|
|
||||||
cb
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
parallel(tasks, function (err) {
|
|
||||||
if (err) return cb(err)
|
|
||||||
cb(null, saved)
|
|
||||||
})
|
|
||||||
|
|
||||||
function createTorrentObject (t) {
|
|
||||||
var torrent = fs.readFileSync(path.join(config.STATIC_PATH, t.torrentFileName))
|
|
||||||
var parsedTorrent = parseTorrent(torrent)
|
|
||||||
|
|
||||||
return {
|
|
||||||
status: 'paused',
|
|
||||||
infoHash: parsedTorrent.infoHash,
|
|
||||||
name: t.name,
|
|
||||||
displayName: t.name,
|
|
||||||
posterFileName: parsedTorrent.infoHash + path.extname(t.posterFileName),
|
|
||||||
torrentFileName: parsedTorrent.infoHash + '.torrent',
|
|
||||||
magnetURI: parseTorrent.toMagnetURI(parsedTorrent),
|
|
||||||
files: parsedTorrent.files,
|
|
||||||
selections: parsedTorrent.files.map((x) => true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getPlayingTorrentSummary () {
|
|
||||||
var infoHash = this.playing.infoHash
|
|
||||||
return this.saved.torrents.find((x) => x.infoHash === infoHash)
|
|
||||||
}
|
|
||||||
|
|
||||||
function getPlayingFileSummary () {
|
|
||||||
var torrentSummary = this.getPlayingTorrentSummary()
|
|
||||||
if (!torrentSummary) return null
|
|
||||||
return torrentSummary.files[this.playing.fileIndex]
|
|
||||||
}
|
|
||||||
|
|
||||||
function load (cb) {
|
|
||||||
var state = getDefaultState()
|
|
||||||
|
|
||||||
appConfig.read(function (err, saved) {
|
|
||||||
if (err || !saved.version) {
|
|
||||||
console.log('Missing config file: Creating new one')
|
|
||||||
setupSavedState(onSaved)
|
|
||||||
} else {
|
|
||||||
onSaved(null, saved)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
function onSaved (err, saved) {
|
|
||||||
if (err) return cb(err)
|
|
||||||
state.saved = saved
|
|
||||||
migrations.run(state)
|
|
||||||
cb(null, state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Write state.saved to the JSON state file
|
|
||||||
function save (state, cb) {
|
|
||||||
console.log('Saving state to ' + appConfig.filePath)
|
|
||||||
|
|
||||||
var electron = require('electron')
|
|
||||||
|
|
||||||
// Clean up, so that we're not saving any pending state
|
|
||||||
var copy = Object.assign({}, state.saved)
|
|
||||||
// Remove torrents pending addition to the list, where we haven't finished
|
|
||||||
// reading the torrent file or file(s) to seed & don't have an infohash
|
|
||||||
copy.torrents = copy.torrents
|
|
||||||
.filter((x) => x.infoHash)
|
|
||||||
.map(function (x) {
|
|
||||||
var torrent = {}
|
|
||||||
for (var key in x) {
|
|
||||||
if (key === 'progress' || key === 'torrentKey') {
|
|
||||||
continue // Don't save progress info or key for the webtorrent process
|
|
||||||
}
|
|
||||||
if (key === 'playStatus') {
|
|
||||||
continue // Don't save whether a torrent is playing / pending
|
|
||||||
}
|
|
||||||
torrent[key] = x[key]
|
|
||||||
}
|
|
||||||
return torrent
|
|
||||||
})
|
|
||||||
|
|
||||||
appConfig.write(copy, function (err) {
|
|
||||||
if (err) console.error(err)
|
|
||||||
|
|
||||||
// TODO: this doesn't belong here
|
|
||||||
electron.ipcRenderer.send('savedState')
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
isPlayable,
|
|
||||||
isVideo,
|
|
||||||
isAudio,
|
|
||||||
isPlayableTorrent
|
|
||||||
}
|
|
||||||
|
|
||||||
var path = require('path')
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determines whether a file in a torrent is audio/video we can play
|
|
||||||
*/
|
|
||||||
function isPlayable (file) {
|
|
||||||
return isVideo(file) || isAudio(file)
|
|
||||||
}
|
|
||||||
|
|
||||||
function isVideo (file) {
|
|
||||||
var ext = path.extname(file.name).toLowerCase()
|
|
||||||
return [
|
|
||||||
'.avi',
|
|
||||||
'.m4v',
|
|
||||||
'.mkv',
|
|
||||||
'.mov',
|
|
||||||
'.mp4',
|
|
||||||
'.mpg',
|
|
||||||
'.ogv',
|
|
||||||
'.webm'
|
|
||||||
].includes(ext)
|
|
||||||
}
|
|
||||||
|
|
||||||
function isAudio (file) {
|
|
||||||
var ext = path.extname(file.name).toLowerCase()
|
|
||||||
return [
|
|
||||||
'.aac',
|
|
||||||
'.ac3',
|
|
||||||
'.mp3',
|
|
||||||
'.ogg',
|
|
||||||
'.wav'
|
|
||||||
].includes(ext)
|
|
||||||
}
|
|
||||||
|
|
||||||
function isPlayableTorrent (torrentSummary) {
|
|
||||||
return torrentSummary.files && torrentSummary.files.some(isPlayable)
|
|
||||||
}
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
module.exports = torrentPoster
|
|
||||||
|
|
||||||
var captureVideoFrame = require('./capture-video-frame')
|
|
||||||
var path = require('path')
|
|
||||||
|
|
||||||
function torrentPoster (torrent, cb) {
|
|
||||||
// First, try to use a poster image if available
|
|
||||||
var posterFile = torrent.files.filter(function (file) {
|
|
||||||
return /^poster\.(jpg|png|gif)$/.test(file.name)
|
|
||||||
})[0]
|
|
||||||
if (posterFile) return torrentPosterFromImage(posterFile, torrent, cb)
|
|
||||||
|
|
||||||
// Second, try to use the largest video file
|
|
||||||
// Filter out file formats that the <video> tag definitely can't play
|
|
||||||
var videoFile = getLargestFileByExtension(torrent, ['.mp4', '.m4v', '.webm', '.mov', '.mkv'])
|
|
||||||
if (videoFile) return torrentPosterFromVideo(videoFile, torrent, cb)
|
|
||||||
|
|
||||||
// Third, try to use the largest image file
|
|
||||||
var imgFile = getLargestFileByExtension(torrent, ['.gif', '.jpg', '.png'])
|
|
||||||
if (imgFile) return torrentPosterFromImage(imgFile, torrent, cb)
|
|
||||||
|
|
||||||
// TODO: generate a waveform from the largest sound file
|
|
||||||
// Finally, admit defeat
|
|
||||||
return cb(new Error('Cannot generate a poster from any files in the torrent'))
|
|
||||||
}
|
|
||||||
|
|
||||||
function getLargestFileByExtension (torrent, extensions) {
|
|
||||||
var files = torrent.files.filter(function (file) {
|
|
||||||
var extname = path.extname(file.name).toLowerCase()
|
|
||||||
return extensions.indexOf(extname) !== -1
|
|
||||||
})
|
|
||||||
if (files.length === 0) return undefined
|
|
||||||
return files.reduce(function (a, b) {
|
|
||||||
return a.length > b.length ? a : b
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function torrentPosterFromVideo (file, torrent, cb) {
|
|
||||||
var index = torrent.files.indexOf(file)
|
|
||||||
|
|
||||||
var server = torrent.createServer(0)
|
|
||||||
server.listen(0, onListening)
|
|
||||||
|
|
||||||
function onListening () {
|
|
||||||
var port = server.address().port
|
|
||||||
var url = 'http://localhost:' + port + '/' + index
|
|
||||||
var video = document.createElement('video')
|
|
||||||
video.addEventListener('canplay', onCanPlay)
|
|
||||||
|
|
||||||
video.volume = 0
|
|
||||||
video.src = url
|
|
||||||
video.play()
|
|
||||||
|
|
||||||
function onCanPlay () {
|
|
||||||
video.removeEventListener('canplay', onCanPlay)
|
|
||||||
video.addEventListener('seeked', onSeeked)
|
|
||||||
|
|
||||||
video.currentTime = Math.min((video.duration || 600) * 0.03, 60)
|
|
||||||
}
|
|
||||||
|
|
||||||
function onSeeked () {
|
|
||||||
video.removeEventListener('seeked', onSeeked)
|
|
||||||
|
|
||||||
var buf = captureVideoFrame(video)
|
|
||||||
|
|
||||||
// unload video element
|
|
||||||
video.pause()
|
|
||||||
video.src = ''
|
|
||||||
video.load()
|
|
||||||
|
|
||||||
server.destroy()
|
|
||||||
|
|
||||||
if (buf.length === 0) return cb(new Error('Generated poster contains no data'))
|
|
||||||
|
|
||||||
cb(null, buf, '.jpg')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function torrentPosterFromImage (file, torrent, cb) {
|
|
||||||
var extname = path.extname(file.name)
|
|
||||||
file.getBuffer((err, buf) => cb(err, buf, extname))
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
getPosterPath,
|
|
||||||
getTorrentPath
|
|
||||||
}
|
|
||||||
|
|
||||||
var path = require('path')
|
|
||||||
var config = require('../../config')
|
|
||||||
|
|
||||||
// Expects a torrentSummary
|
|
||||||
// Returns an absolute path to the torrent file, or null if unavailable
|
|
||||||
function getTorrentPath (torrentSummary) {
|
|
||||||
if (!torrentSummary || !torrentSummary.torrentFileName) return null
|
|
||||||
return path.join(config.TORRENT_PATH, torrentSummary.torrentFileName)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Expects a torrentSummary
|
|
||||||
// Returns an absolute path to the poster image, or null if unavailable
|
|
||||||
function getPosterPath (torrentSummary) {
|
|
||||||
if (!torrentSummary || !torrentSummary.posterFileName) return null
|
|
||||||
var posterPath = path.join(config.POSTER_PATH, torrentSummary.posterFileName)
|
|
||||||
// Work around a Chrome bug (reproduced in vanilla Chrome, not just Electron):
|
|
||||||
// Backslashes in URLS in CSS cause bizarre string encoding issues
|
|
||||||
return posterPath.replace(/\\/g, '/')
|
|
||||||
}
|
|
||||||
1298
renderer/main.js
1298
renderer/main.js
File diff suppressed because it is too large
Load Diff
@@ -1,82 +0,0 @@
|
|||||||
module.exports = App
|
|
||||||
|
|
||||||
var hx = require('../lib/hx')
|
|
||||||
var Header = require('./header')
|
|
||||||
|
|
||||||
var Views = {
|
|
||||||
'home': require('./home'),
|
|
||||||
'player': require('./player'),
|
|
||||||
'create-torrent': require('./create-torrent'),
|
|
||||||
'preferences': require('./preferences')
|
|
||||||
}
|
|
||||||
|
|
||||||
var Modals = {
|
|
||||||
'open-torrent-address-modal': require('./open-torrent-address-modal'),
|
|
||||||
'update-available-modal': require('./update-available-modal'),
|
|
||||||
'unsupported-media-modal': require('./unsupported-media-modal')
|
|
||||||
}
|
|
||||||
|
|
||||||
function App (state) {
|
|
||||||
// Hide player controls while playing video, if the mouse stays still for a while
|
|
||||||
// Never hide the controls when:
|
|
||||||
// * The mouse is over the controls or we're scrubbing (see CSS)
|
|
||||||
// * The video is paused
|
|
||||||
// * The video is playing remotely on Chromecast or Airplay
|
|
||||||
var hideControls = state.location.url() === 'player' &&
|
|
||||||
state.playing.mouseStationarySince !== 0 &&
|
|
||||||
new Date().getTime() - state.playing.mouseStationarySince > 2000 &&
|
|
||||||
!state.playing.isPaused &&
|
|
||||||
state.playing.location === 'local' &&
|
|
||||||
state.playing.playbackRate === 1
|
|
||||||
|
|
||||||
var cls = [
|
|
||||||
'view-' + state.location.url(), /* e.g. view-home, view-player */
|
|
||||||
'is-' + process.platform /* e.g. is-darwin, is-win32, is-linux */
|
|
||||||
]
|
|
||||||
if (state.window.isFullScreen) cls.push('is-fullscreen')
|
|
||||||
if (state.window.isFocused) cls.push('is-focused')
|
|
||||||
if (hideControls) cls.push('hide-video-controls')
|
|
||||||
|
|
||||||
return hx`
|
|
||||||
<div class='app ${cls.join(' ')}'>
|
|
||||||
${Header(state)}
|
|
||||||
${getErrorPopover(state)}
|
|
||||||
<div class='content'>${getView(state)}</div>
|
|
||||||
${getModal(state)}
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
function getErrorPopover (state) {
|
|
||||||
var now = new Date().getTime()
|
|
||||||
var recentErrors = state.errors.filter((x) => now - x.time < 5000)
|
|
||||||
var hasErrors = recentErrors.length > 0
|
|
||||||
|
|
||||||
var errorElems = recentErrors.map(function (error) {
|
|
||||||
return hx`<div class='error'>${error.message}</div>`
|
|
||||||
})
|
|
||||||
return hx`
|
|
||||||
<div class='error-popover ${hasErrors ? 'visible' : 'hidden'}'>
|
|
||||||
<div class='title'>Error</div>
|
|
||||||
${errorElems}
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
function getModal (state) {
|
|
||||||
if (!state.modal) return
|
|
||||||
var contents = Modals[state.modal.id](state)
|
|
||||||
return hx`
|
|
||||||
<div class='modal'>
|
|
||||||
<div class='modal-background'></div>
|
|
||||||
<div class='modal-content'>
|
|
||||||
${contents}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
function getView (state) {
|
|
||||||
var url = state.location.url()
|
|
||||||
return Views[url](state)
|
|
||||||
}
|
|
||||||
@@ -1,159 +0,0 @@
|
|||||||
module.exports = CreateTorrentPage
|
|
||||||
|
|
||||||
var createTorrent = require('create-torrent')
|
|
||||||
var path = require('path')
|
|
||||||
var prettyBytes = require('prettier-bytes')
|
|
||||||
|
|
||||||
var {dispatch, dispatcher} = require('../lib/dispatcher')
|
|
||||||
var hx = require('../lib/hx')
|
|
||||||
|
|
||||||
function CreateTorrentPage (state) {
|
|
||||||
var info = state.location.current()
|
|
||||||
|
|
||||||
// Preprocess: exclude .DS_Store and other dotfiles
|
|
||||||
var files = info.files
|
|
||||||
.filter((f) => !f.name.startsWith('.'))
|
|
||||||
.map((f) => ({name: f.name, path: f.path, size: f.size}))
|
|
||||||
if (files.length === 0) return CreateTorrentErrorPage()
|
|
||||||
|
|
||||||
// First, extract the base folder that the files are all in
|
|
||||||
var pathPrefix = info.folderPath
|
|
||||||
if (!pathPrefix) {
|
|
||||||
pathPrefix = files.map((x) => x.path).reduce(findCommonPrefix)
|
|
||||||
if (!pathPrefix.endsWith('/') && !pathPrefix.endsWith('\\')) {
|
|
||||||
pathPrefix = path.dirname(pathPrefix)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sanity check: show the number of files and total size
|
|
||||||
var numFiles = files.length
|
|
||||||
var totalBytes = files
|
|
||||||
.map((f) => f.size)
|
|
||||||
.reduce((a, b) => a + b, 0)
|
|
||||||
var torrentInfo = `${numFiles} files, ${prettyBytes(totalBytes)}`
|
|
||||||
|
|
||||||
// Then, use the name of the base folder (or sole file, for a single file torrent)
|
|
||||||
// as the default name. Show all files relative to the base folder.
|
|
||||||
var defaultName, basePath
|
|
||||||
if (files.length === 1) {
|
|
||||||
// Single file torrent: /a/b/foo.jpg -> torrent name "foo.jpg", path "/a/b"
|
|
||||||
defaultName = files[0].name
|
|
||||||
basePath = pathPrefix
|
|
||||||
} else {
|
|
||||||
// Multi file torrent: /a/b/{foo, bar}.jpg -> torrent name "b", path "/a"
|
|
||||||
defaultName = path.basename(pathPrefix)
|
|
||||||
basePath = path.dirname(pathPrefix)
|
|
||||||
}
|
|
||||||
var maxFileElems = 100
|
|
||||||
var fileElems = files.slice(0, maxFileElems).map(function (file) {
|
|
||||||
var relativePath = files.length === 0 ? file.name : path.relative(pathPrefix, file.path)
|
|
||||||
return hx`<div>${relativePath}</div>`
|
|
||||||
})
|
|
||||||
if (files.length > maxFileElems) {
|
|
||||||
fileElems.push(hx`<div>+ ${maxFileElems - files.length} more</div>`)
|
|
||||||
}
|
|
||||||
var trackers = createTorrent.announceList.join('\n')
|
|
||||||
var collapsedClass = info.showAdvanced ? 'expanded' : 'collapsed'
|
|
||||||
|
|
||||||
return hx`
|
|
||||||
<div class='create-torrent'>
|
|
||||||
<h2>Create torrent ${defaultName}</h2>
|
|
||||||
<p class="torrent-info">
|
|
||||||
${torrentInfo}
|
|
||||||
</p>
|
|
||||||
<p class='torrent-attribute'>
|
|
||||||
<label>Path:</label>
|
|
||||||
<div class='torrent-attribute'>${pathPrefix}</div>
|
|
||||||
</p>
|
|
||||||
<div class='expand-collapse ${collapsedClass}' onclick=${handleToggleShowAdvanced}>
|
|
||||||
${info.showAdvanced ? 'Basic' : 'Advanced'}
|
|
||||||
</div>
|
|
||||||
<div class="create-torrent-advanced ${collapsedClass}">
|
|
||||||
<p class='torrent-attribute'>
|
|
||||||
<label>Comment:</label>
|
|
||||||
<textarea class='torrent-attribute torrent-comment'></textarea>
|
|
||||||
</p>
|
|
||||||
<p class='torrent-attribute'>
|
|
||||||
<label>Trackers:</label>
|
|
||||||
<textarea class='torrent-attribute torrent-trackers'>${trackers}</textarea>
|
|
||||||
</p>
|
|
||||||
<p class='torrent-attribute'>
|
|
||||||
<label>Private:</label>
|
|
||||||
<input type='checkbox' class='torrent-is-private' value='torrent-is-private'>
|
|
||||||
</p>
|
|
||||||
<p class='torrent-attribute'>
|
|
||||||
<label>Files:</label>
|
|
||||||
<div>${fileElems}</div>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<p class="float-right">
|
|
||||||
<button class='button-flat light' onclick=${handleCancel}>Cancel</button>
|
|
||||||
<button class='button-raised' onclick=${handleOK}>Create Torrent</button>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
|
|
||||||
function handleOK () {
|
|
||||||
var announceList = document.querySelector('.torrent-trackers').value
|
|
||||||
.split('\n')
|
|
||||||
.map((s) => s.trim())
|
|
||||||
.filter((s) => s !== '')
|
|
||||||
var isPrivate = document.querySelector('.torrent-is-private').checked
|
|
||||||
var comment = document.querySelector('.torrent-comment').value.trim()
|
|
||||||
var options = {
|
|
||||||
// We can't let the user choose their own name if we want WebTorrent
|
|
||||||
// to use the files in place rather than creating a new folder.
|
|
||||||
// If we ever want to add support for that:
|
|
||||||
// name: document.querySelector('.torrent-name').value
|
|
||||||
name: defaultName,
|
|
||||||
path: basePath,
|
|
||||||
files: files,
|
|
||||||
announce: announceList,
|
|
||||||
private: isPrivate,
|
|
||||||
comment: comment
|
|
||||||
}
|
|
||||||
dispatch('createTorrent', options)
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleCancel () {
|
|
||||||
dispatch('back')
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleToggleShowAdvanced () {
|
|
||||||
// TODO: what's the clean way to handle this?
|
|
||||||
// Should every button on every screen have its own dispatch()?
|
|
||||||
info.showAdvanced = !info.showAdvanced
|
|
||||||
dispatch('update')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function CreateTorrentErrorPage () {
|
|
||||||
return hx`
|
|
||||||
<div class='create-torrent'>
|
|
||||||
<h2>Create torrent</h2>
|
|
||||||
<p class="torrent-info">
|
|
||||||
<p>
|
|
||||||
Sorry, you must select at least one file that is not a hidden file.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
Hidden files, starting with a . character, are not included.
|
|
||||||
</p>
|
|
||||||
</p>
|
|
||||||
<p class="float-right">
|
|
||||||
<button class='button-flat light' onclick=${dispatcher('back')}>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finds the longest common prefix
|
|
||||||
function findCommonPrefix (a, b) {
|
|
||||||
for (var i = 0; i < a.length && i < b.length; i++) {
|
|
||||||
if (a.charCodeAt(i) !== b.charCodeAt(i)) break
|
|
||||||
}
|
|
||||||
if (i === a.length) return a
|
|
||||||
if (i === b.length) return b
|
|
||||||
return a.substring(0, i)
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
module.exports = Header
|
|
||||||
|
|
||||||
var {dispatcher} = require('../lib/dispatcher')
|
|
||||||
var hx = require('../lib/hx')
|
|
||||||
|
|
||||||
function Header (state) {
|
|
||||||
return hx`
|
|
||||||
<div class='header'>
|
|
||||||
${getTitle()}
|
|
||||||
<div class='nav left float-left'>
|
|
||||||
<i.icon.back
|
|
||||||
class=${state.location.hasBack() ? '' : 'disabled'}
|
|
||||||
title='Back'
|
|
||||||
onclick=${dispatcher('back')}>
|
|
||||||
chevron_left
|
|
||||||
</i>
|
|
||||||
<i.icon.forward
|
|
||||||
class=${state.location.hasForward() ? '' : 'disabled'}
|
|
||||||
title='Forward'
|
|
||||||
onclick=${dispatcher('forward')}>
|
|
||||||
chevron_right
|
|
||||||
</i>
|
|
||||||
</div>
|
|
||||||
<div class='nav right float-right'>
|
|
||||||
${getAddButton()}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
|
|
||||||
function getTitle () {
|
|
||||||
if (process.platform === 'darwin') {
|
|
||||||
return hx`<div class='title ellipsis'>${state.window.title}</div>`
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getAddButton () {
|
|
||||||
if (state.location.url() === 'home') {
|
|
||||||
return hx`
|
|
||||||
<i
|
|
||||||
class='icon add'
|
|
||||||
title='Add torrent'
|
|
||||||
onclick=${dispatcher('openFiles')}>
|
|
||||||
add
|
|
||||||
</i>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,296 +0,0 @@
|
|||||||
module.exports = TorrentList
|
|
||||||
|
|
||||||
var prettyBytes = require('prettier-bytes')
|
|
||||||
|
|
||||||
var hx = require('../lib/hx')
|
|
||||||
var TorrentSummary = require('../lib/torrent-summary')
|
|
||||||
var TorrentPlayer = require('../lib/torrent-player')
|
|
||||||
var {dispatcher} = require('../lib/dispatcher')
|
|
||||||
|
|
||||||
function TorrentList (state) {
|
|
||||||
var torrentRows = state.saved.torrents.map(
|
|
||||||
(torrentSummary) => renderTorrent(torrentSummary)
|
|
||||||
)
|
|
||||||
|
|
||||||
return hx`
|
|
||||||
<div class='torrent-list'>
|
|
||||||
${torrentRows}
|
|
||||||
<div class='torrent-placeholder'>
|
|
||||||
<span class='ellipsis'>Drop a torrent file here or paste a magnet link</span>
|
|
||||||
</div>
|
|
||||||
</div>`
|
|
||||||
|
|
||||||
function renderTorrent (torrentSummary) {
|
|
||||||
var infoHash = torrentSummary.infoHash
|
|
||||||
var isSelected = infoHash && state.selectedInfoHash === infoHash
|
|
||||||
|
|
||||||
// Background image: show some nice visuals, like a frame from the movie, if possible
|
|
||||||
var style = {}
|
|
||||||
if (torrentSummary.posterFileName) {
|
|
||||||
var gradient = isSelected
|
|
||||||
? 'linear-gradient(to bottom, rgba(0, 0, 0, 0.8) 0%, rgba(0, 0, 0, 0.4) 100%)'
|
|
||||||
: 'linear-gradient(to bottom, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0) 100%)'
|
|
||||||
var posterPath = TorrentSummary.getPosterPath(torrentSummary)
|
|
||||||
style.backgroundImage = gradient + `, url('${posterPath}')`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Foreground: name of the torrent, basic info like size, play button,
|
|
||||||
// cast buttons if available, and delete
|
|
||||||
var classes = ['torrent']
|
|
||||||
// playStatus turns the play button into a loading spinner or error icon
|
|
||||||
if (torrentSummary.playStatus) classes.push(torrentSummary.playStatus)
|
|
||||||
if (isSelected) classes.push('selected')
|
|
||||||
if (!infoHash) classes.push('disabled')
|
|
||||||
classes = classes.join(' ')
|
|
||||||
return hx`
|
|
||||||
<div style=${style} class=${classes}
|
|
||||||
oncontextmenu=${infoHash && dispatcher('openTorrentContextMenu', infoHash)}
|
|
||||||
onclick=${infoHash && dispatcher('toggleSelectTorrent', infoHash)}>
|
|
||||||
${renderTorrentMetadata(torrentSummary)}
|
|
||||||
${infoHash ? renderTorrentButtons(torrentSummary) : ''}
|
|
||||||
${isSelected ? renderTorrentDetails(torrentSummary) : ''}
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Show name, download status, % complete
|
|
||||||
function renderTorrentMetadata (torrentSummary) {
|
|
||||||
var name = torrentSummary.name || 'Loading torrent...'
|
|
||||||
var elements = [hx`
|
|
||||||
<div class='name ellipsis'>${name}</div>
|
|
||||||
`]
|
|
||||||
|
|
||||||
// If it's downloading/seeding then show progress info
|
|
||||||
var prog = torrentSummary.progress
|
|
||||||
if (torrentSummary.status !== 'paused' && prog) {
|
|
||||||
elements.push(hx`
|
|
||||||
<div class='ellipsis'>
|
|
||||||
${renderPercentProgress()}
|
|
||||||
${renderTotalProgress()}
|
|
||||||
${renderPeers()}
|
|
||||||
${renderDownloadSpeed()}
|
|
||||||
${renderUploadSpeed()}
|
|
||||||
</div>
|
|
||||||
`)
|
|
||||||
}
|
|
||||||
|
|
||||||
return hx`<div class='metadata'>${elements}</div>`
|
|
||||||
|
|
||||||
function renderPercentProgress () {
|
|
||||||
var progress = Math.floor(100 * prog.progress)
|
|
||||||
return hx`<span>${progress}%</span>`
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderTotalProgress () {
|
|
||||||
var downloaded = prettyBytes(prog.downloaded)
|
|
||||||
var total = prettyBytes(prog.length || 0)
|
|
||||||
if (downloaded === total) {
|
|
||||||
return hx`<span>${downloaded}</span>`
|
|
||||||
} else {
|
|
||||||
return hx`<span>${downloaded} / ${total}</span>`
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderPeers () {
|
|
||||||
if (prog.numPeers === 0) return
|
|
||||||
var count = prog.numPeers === 1 ? 'peer' : 'peers'
|
|
||||||
return hx`<span>${prog.numPeers} ${count}</span>`
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderDownloadSpeed () {
|
|
||||||
if (prog.downloadSpeed === 0) return
|
|
||||||
return hx`<span>↓ ${prettyBytes(prog.downloadSpeed)}/s</span>`
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderUploadSpeed () {
|
|
||||||
if (prog.uploadSpeed === 0) return
|
|
||||||
return hx`<span>↑ ${prettyBytes(prog.uploadSpeed)}/s</span>`
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Download button toggles between torrenting (DL/seed) and paused
|
|
||||||
// Play button starts streaming the torrent immediately, unpausing if needed
|
|
||||||
function renderTorrentButtons (torrentSummary) {
|
|
||||||
var infoHash = torrentSummary.infoHash
|
|
||||||
|
|
||||||
var playIcon, playTooltip, playClass
|
|
||||||
if (torrentSummary.playStatus === 'timeout') {
|
|
||||||
playIcon = 'warning'
|
|
||||||
playTooltip = 'Playback timed out. No seeds? No internet? Click to try again.'
|
|
||||||
} else {
|
|
||||||
playIcon = 'play_arrow'
|
|
||||||
playTooltip = 'Start streaming'
|
|
||||||
}
|
|
||||||
|
|
||||||
var downloadIcon, downloadTooltip
|
|
||||||
if (torrentSummary.status === 'seeding') {
|
|
||||||
downloadIcon = 'file_upload'
|
|
||||||
downloadTooltip = 'Seeding. Click to stop.'
|
|
||||||
} else if (torrentSummary.status === 'downloading') {
|
|
||||||
downloadIcon = 'file_download'
|
|
||||||
downloadTooltip = 'Torrenting. Click to stop.'
|
|
||||||
} else {
|
|
||||||
downloadIcon = 'file_download'
|
|
||||||
downloadTooltip = 'Click to start torrenting.'
|
|
||||||
}
|
|
||||||
|
|
||||||
// Do we have a saved position? Show it using a radial progress bar on top
|
|
||||||
// of the play button, unless already showing a spinner there:
|
|
||||||
var positionElem
|
|
||||||
var willShowSpinner = torrentSummary.playStatus === 'requested'
|
|
||||||
var defaultFile = torrentSummary.files &&
|
|
||||||
torrentSummary.files[torrentSummary.defaultPlayFileIndex]
|
|
||||||
if (defaultFile && defaultFile.currentTime && !willShowSpinner) {
|
|
||||||
var fraction = defaultFile.currentTime / defaultFile.duration
|
|
||||||
positionElem = renderRadialProgressBar(fraction, 'radial-progress-large')
|
|
||||||
playClass = 'resume-position'
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only show the play button for torrents that contain playable media
|
|
||||||
var playButton
|
|
||||||
if (TorrentPlayer.isPlayableTorrent(torrentSummary)) {
|
|
||||||
playButton = hx`
|
|
||||||
<i.button-round.icon.play
|
|
||||||
title=${playTooltip}
|
|
||||||
class=${playClass}
|
|
||||||
onclick=${dispatcher('play', infoHash)}>
|
|
||||||
${playIcon}
|
|
||||||
</i>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
return hx`
|
|
||||||
<div class='buttons'>
|
|
||||||
${positionElem}
|
|
||||||
${playButton}
|
|
||||||
<i.button-round.icon.download
|
|
||||||
class=${torrentSummary.status}
|
|
||||||
title=${downloadTooltip}
|
|
||||||
onclick=${dispatcher('toggleTorrent', infoHash)}>
|
|
||||||
${downloadIcon}
|
|
||||||
</i>
|
|
||||||
<i
|
|
||||||
class='icon delete'
|
|
||||||
title='Remove torrent'
|
|
||||||
onclick=${dispatcher('deleteTorrent', infoHash)}>
|
|
||||||
close
|
|
||||||
</i>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Show files, per-file download status and play buttons, and so on
|
|
||||||
function renderTorrentDetails (torrentSummary) {
|
|
||||||
var filesElement
|
|
||||||
if (!torrentSummary.files) {
|
|
||||||
// We don't know what files this torrent contains
|
|
||||||
var message = torrentSummary.status === 'paused'
|
|
||||||
? 'Failed to load torrent info. Click the download button to try again...'
|
|
||||||
: 'Downloading torrent info...'
|
|
||||||
filesElement = hx`<div class='files warning'>${message}</div>`
|
|
||||||
} else {
|
|
||||||
// We do know the files. List them and show download stats for each one
|
|
||||||
var fileRows = torrentSummary.files
|
|
||||||
.map((file, index) => ({ file, index }))
|
|
||||||
.sort(function (a, b) {
|
|
||||||
if (a.file.name < b.file.name) return -1
|
|
||||||
if (b.file.name < a.file.name) return 1
|
|
||||||
return 0
|
|
||||||
})
|
|
||||||
.map((object) => renderFileRow(torrentSummary, object.file, object.index))
|
|
||||||
|
|
||||||
filesElement = hx`
|
|
||||||
<div class='files'>
|
|
||||||
<table>
|
|
||||||
${fileRows}
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
return hx`
|
|
||||||
<div class='torrent-details'>
|
|
||||||
${filesElement}
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Show a single torrentSummary file in the details view for a single torrent
|
|
||||||
function renderFileRow (torrentSummary, file, index) {
|
|
||||||
// First, find out how much of the file we've downloaded
|
|
||||||
// Are we even torrenting it?
|
|
||||||
var isSelected = torrentSummary.selections && torrentSummary.selections[index]
|
|
||||||
var isDone = false // Are we finished torrenting it?
|
|
||||||
var progress = ''
|
|
||||||
if (torrentSummary.progress && torrentSummary.progress.files) {
|
|
||||||
var fileProg = torrentSummary.progress.files[index]
|
|
||||||
isDone = fileProg.numPiecesPresent === fileProg.numPieces
|
|
||||||
progress = Math.round(100 * fileProg.numPiecesPresent / fileProg.numPieces) + '%'
|
|
||||||
}
|
|
||||||
|
|
||||||
// Second, for media files where we saved our position, show how far we got
|
|
||||||
var positionElem
|
|
||||||
if (file.currentTime) {
|
|
||||||
// Radial progress bar. 0% = start from 0:00, 270% = 3/4 of the way thru
|
|
||||||
positionElem = renderRadialProgressBar(file.currentTime / file.duration)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finally, render the file as a table row
|
|
||||||
var isPlayable = TorrentPlayer.isPlayable(file)
|
|
||||||
var infoHash = torrentSummary.infoHash
|
|
||||||
var icon
|
|
||||||
var handleClick
|
|
||||||
if (isPlayable) {
|
|
||||||
icon = 'play_arrow' /* playable? add option to play */
|
|
||||||
handleClick = dispatcher('play', infoHash, index)
|
|
||||||
} else {
|
|
||||||
icon = 'description' /* file icon, opens in OS default app */
|
|
||||||
handleClick = dispatcher('openItem', infoHash, index)
|
|
||||||
}
|
|
||||||
var rowClass = ''
|
|
||||||
if (!isSelected) rowClass = 'disabled' // File deselected, not being torrented
|
|
||||||
if (!isDone && !isPlayable) rowClass = 'disabled' // Can't open yet, can't stream
|
|
||||||
return hx`
|
|
||||||
<tr onclick=${handleClick}>
|
|
||||||
<td class='col-icon ${rowClass}'>
|
|
||||||
${positionElem}
|
|
||||||
<i class='icon'>${icon}</i>
|
|
||||||
</td>
|
|
||||||
<td class='col-name ${rowClass}'>
|
|
||||||
${file.name}
|
|
||||||
</td>
|
|
||||||
<td class='col-progress ${rowClass}'>
|
|
||||||
${isSelected ? progress : ''}
|
|
||||||
</td>
|
|
||||||
<td class='col-size ${rowClass}'>
|
|
||||||
${prettyBytes(file.length)}
|
|
||||||
</td>
|
|
||||||
<td class='col-select'
|
|
||||||
onclick=${dispatcher('toggleTorrentFile', infoHash, index)}>
|
|
||||||
<i class='icon'>${isSelected ? 'close' : 'add'}</i>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderRadialProgressBar (fraction, cssClass) {
|
|
||||||
var rotation = 360 * fraction
|
|
||||||
var transformFill = {transform: 'rotate(' + (rotation / 2) + 'deg)'}
|
|
||||||
var transformFix = {transform: 'rotate(' + rotation + 'deg)'}
|
|
||||||
|
|
||||||
return hx`
|
|
||||||
<div class="radial-progress ${cssClass}">
|
|
||||||
<div class="circle">
|
|
||||||
<div class="mask full" style=${transformFill}>
|
|
||||||
<div class="fill" style=${transformFill}></div>
|
|
||||||
</div>
|
|
||||||
<div class="mask half">
|
|
||||||
<div class="fill" style=${transformFill}></div>
|
|
||||||
<div class="fill fix" style=${transformFix}></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="inset"></div>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
module.exports = OpenTorrentAddressModal
|
|
||||||
|
|
||||||
var {dispatch} = require('../lib/dispatcher')
|
|
||||||
var hx = require('../lib/hx')
|
|
||||||
|
|
||||||
function OpenTorrentAddressModal (state) {
|
|
||||||
return hx`
|
|
||||||
<div class='open-torrent-address-modal'>
|
|
||||||
<p><label>Enter torrent address or magnet link</label></p>
|
|
||||||
<p>
|
|
||||||
<input id='add-torrent-url' type='text' onkeypress=${handleKeyPress} />
|
|
||||||
</p>
|
|
||||||
<p class='float-right'>
|
|
||||||
<button class='button button-flat' onclick=${handleCancel}>CANCEL</button>
|
|
||||||
<button class='button button-raised' onclick=${handleOK}>OK</button>
|
|
||||||
</p>
|
|
||||||
<script>document.querySelector('#add-torrent-url').focus()</script>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleKeyPress (e) {
|
|
||||||
if (e.which === 13) handleOK() /* hit Enter to submit */
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleOK () {
|
|
||||||
dispatch('exitModal')
|
|
||||||
dispatch('addTorrent', document.querySelector('#add-torrent-url').value)
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleCancel () {
|
|
||||||
dispatch('exitModal')
|
|
||||||
}
|
|
||||||
@@ -1,625 +0,0 @@
|
|||||||
module.exports = Player
|
|
||||||
|
|
||||||
var Bitfield = require('bitfield')
|
|
||||||
var prettyBytes = require('prettier-bytes')
|
|
||||||
var zeroFill = require('zero-fill')
|
|
||||||
|
|
||||||
var hx = require('../lib/hx')
|
|
||||||
var TorrentSummary = require('../lib/torrent-summary')
|
|
||||||
var {dispatch, dispatcher} = require('../lib/dispatcher')
|
|
||||||
|
|
||||||
// Shows a streaming video player. Standard features + Chromecast + Airplay
|
|
||||||
function Player (state) {
|
|
||||||
// Show the video as large as will fit in the window, play immediately
|
|
||||||
// If the video is on Chromecast or Airplay, show a title screen instead
|
|
||||||
var showVideo = state.playing.location === 'local'
|
|
||||||
return hx`
|
|
||||||
<div
|
|
||||||
class='player'
|
|
||||||
onwheel=${handleVolumeWheel}
|
|
||||||
onmousemove=${dispatcher('mediaMouseMoved')}>
|
|
||||||
${showVideo ? renderMedia(state) : renderCastScreen(state)}
|
|
||||||
${renderPlayerControls(state)}
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handles volume change by wheel
|
|
||||||
function handleVolumeWheel (e) {
|
|
||||||
dispatch('changeVolume', (-e.deltaY | e.deltaX) / 500)
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderMedia (state) {
|
|
||||||
if (!state.server) return
|
|
||||||
|
|
||||||
// Unfortunately, play/pause can't be done just by modifying HTML.
|
|
||||||
// Instead, grab the DOM node and play/pause it if necessary
|
|
||||||
// Get the <video> or <audio> tag
|
|
||||||
var mediaElement = document.querySelector(state.playing.type)
|
|
||||||
if (mediaElement !== null) {
|
|
||||||
if (state.playing.isPaused && !mediaElement.paused) {
|
|
||||||
mediaElement.pause()
|
|
||||||
} else if (!state.playing.isPaused && mediaElement.paused) {
|
|
||||||
mediaElement.play()
|
|
||||||
}
|
|
||||||
// When the user clicks or drags on the progress bar, jump to that position
|
|
||||||
if (state.playing.jumpToTime) {
|
|
||||||
mediaElement.currentTime = state.playing.jumpToTime
|
|
||||||
state.playing.jumpToTime = null
|
|
||||||
}
|
|
||||||
if (state.playing.playbackRate !== mediaElement.playbackRate) {
|
|
||||||
mediaElement.playbackRate = state.playing.playbackRate
|
|
||||||
}
|
|
||||||
// Recover previous volume
|
|
||||||
if (state.previousVolume !== null && isFinite(state.previousVolume)) {
|
|
||||||
mediaElement.volume = state.previousVolume
|
|
||||||
state.previousVolume = null
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set volume
|
|
||||||
if (state.playing.setVolume !== null && isFinite(state.playing.setVolume)) {
|
|
||||||
mediaElement.volume = state.playing.setVolume
|
|
||||||
state.playing.setVolume = null
|
|
||||||
}
|
|
||||||
|
|
||||||
// Switch to the newly added subtitle track, if available
|
|
||||||
var tracks = mediaElement.textTracks || []
|
|
||||||
for (var j = 0; j < tracks.length; j++) {
|
|
||||||
var isSelectedTrack = j === state.playing.subtitles.selectedIndex
|
|
||||||
tracks[j].mode = isSelectedTrack ? 'showing' : 'hidden'
|
|
||||||
}
|
|
||||||
|
|
||||||
// Save video position
|
|
||||||
var file = state.getPlayingFileSummary()
|
|
||||||
file.currentTime = state.playing.currentTime = mediaElement.currentTime
|
|
||||||
file.duration = state.playing.duration = mediaElement.duration
|
|
||||||
state.playing.volume = mediaElement.volume
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add subtitles to the <video> tag
|
|
||||||
var trackTags = []
|
|
||||||
if (state.playing.subtitles.selectedIndex >= 0) {
|
|
||||||
for (var i = 0; i < state.playing.subtitles.tracks.length; i++) {
|
|
||||||
var track = state.playing.subtitles.tracks[i]
|
|
||||||
var isSelected = state.playing.subtitles.selectedIndex === i
|
|
||||||
trackTags.push(hx`
|
|
||||||
<track
|
|
||||||
${isSelected ? 'default' : ''}
|
|
||||||
label=${track.label}
|
|
||||||
type='subtitles'
|
|
||||||
src=${track.buffer}>
|
|
||||||
`)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create the <audio> or <video> tag
|
|
||||||
var mediaTag = hx`
|
|
||||||
<div
|
|
||||||
src='${state.server.localURL}'
|
|
||||||
ondblclick=${dispatcher('toggleFullScreen')}
|
|
||||||
onloadedmetadata=${onLoadedMetadata}
|
|
||||||
onended=${onEnded}
|
|
||||||
onstalling=${dispatcher('mediaStalled')}
|
|
||||||
onerror=${dispatcher('mediaError')}
|
|
||||||
ontimeupdate=${dispatcher('mediaTimeUpdate')}
|
|
||||||
onencrypted=${dispatcher('mediaEncrypted')}
|
|
||||||
oncanplay=${onCanPlay}>
|
|
||||||
${trackTags}
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
mediaTag.tagName = state.playing.type // conditional tag name
|
|
||||||
|
|
||||||
// Show the media.
|
|
||||||
return hx`
|
|
||||||
<div
|
|
||||||
class='letterbox'
|
|
||||||
onmousemove=${dispatcher('mediaMouseMoved')}>
|
|
||||||
${mediaTag}
|
|
||||||
${renderOverlay(state)}
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
|
|
||||||
// As soon as we know the video dimensions, resize the window
|
|
||||||
function onLoadedMetadata (e) {
|
|
||||||
if (state.playing.type !== 'video') return
|
|
||||||
var video = e.target
|
|
||||||
var dimensions = {
|
|
||||||
width: video.videoWidth,
|
|
||||||
height: video.videoHeight
|
|
||||||
}
|
|
||||||
dispatch('setDimensions', dimensions)
|
|
||||||
}
|
|
||||||
|
|
||||||
// When the video completes, pause the video instead of looping
|
|
||||||
function onEnded (e) {
|
|
||||||
state.playing.isPaused = true
|
|
||||||
}
|
|
||||||
|
|
||||||
function onCanPlay (e) {
|
|
||||||
var elem = e.target
|
|
||||||
if (state.playing.type === 'video' &&
|
|
||||||
elem.webkitVideoDecodedByteCount === 0) {
|
|
||||||
dispatch('mediaError', 'Video codec unsupported')
|
|
||||||
} else if (elem.webkitAudioDecodedByteCount === 0) {
|
|
||||||
dispatch('mediaError', 'Audio codec unsupported')
|
|
||||||
} else {
|
|
||||||
elem.play()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderOverlay (state) {
|
|
||||||
var elems = []
|
|
||||||
var audioMetadataElem = renderAudioMetadata(state)
|
|
||||||
var spinnerElem = renderLoadingSpinner(state)
|
|
||||||
if (audioMetadataElem) elems.push(audioMetadataElem)
|
|
||||||
if (spinnerElem) elems.push(spinnerElem)
|
|
||||||
|
|
||||||
// Video fills the window, centered with black bars if necessary
|
|
||||||
// Audio gets a static poster image and a summary of the file metadata.
|
|
||||||
var style
|
|
||||||
if (state.playing.type === 'audio') {
|
|
||||||
style = { backgroundImage: cssBackgroundImagePoster(state) }
|
|
||||||
} else if (elems.length !== 0) {
|
|
||||||
style = { backgroundImage: cssBackgroundImageDarkGradient() }
|
|
||||||
} else {
|
|
||||||
// Video playing, so no spinner. No overlay needed
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
return hx`
|
|
||||||
<div class='media-overlay-background' style=${style}>
|
|
||||||
<div class='media-overlay'>${elems}</div>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderAudioMetadata (state) {
|
|
||||||
var fileSummary = state.getPlayingFileSummary()
|
|
||||||
if (!fileSummary.audioInfo) return
|
|
||||||
var info = fileSummary.audioInfo
|
|
||||||
|
|
||||||
// Get audio track info
|
|
||||||
var title = info.title
|
|
||||||
if (!title) {
|
|
||||||
title = fileSummary.name
|
|
||||||
}
|
|
||||||
var artist = info.artist && info.artist[0]
|
|
||||||
var album = info.album
|
|
||||||
if (album && info.year && !album.includes(info.year)) {
|
|
||||||
album += ' (' + info.year + ')'
|
|
||||||
}
|
|
||||||
var track
|
|
||||||
if (info.track && info.track.no && info.track.of) {
|
|
||||||
track = info.track.no + ' of ' + info.track.of
|
|
||||||
}
|
|
||||||
|
|
||||||
// Show a small info box in the middle of the screen with title/album/etc
|
|
||||||
var elems = []
|
|
||||||
if (artist) {
|
|
||||||
elems.push(hx`
|
|
||||||
<div class='audio-artist'>
|
|
||||||
<label>Artist</label>${artist}
|
|
||||||
</div>
|
|
||||||
`)
|
|
||||||
}
|
|
||||||
if (album) {
|
|
||||||
elems.push(hx`
|
|
||||||
<div class='audio-album'>
|
|
||||||
<label>Album</label>${album}
|
|
||||||
</div>
|
|
||||||
`)
|
|
||||||
}
|
|
||||||
if (track) {
|
|
||||||
elems.push(hx`
|
|
||||||
<div class='audio-track'>
|
|
||||||
<label>Track</label>${track}
|
|
||||||
</div>
|
|
||||||
`)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Align the title with the other info, if available. Otherwise, center title
|
|
||||||
var emptyLabel = hx`<label></label>`
|
|
||||||
elems.unshift(hx`
|
|
||||||
<div class='audio-title'>
|
|
||||||
${elems.length ? emptyLabel : undefined}${title}
|
|
||||||
</div>
|
|
||||||
`)
|
|
||||||
|
|
||||||
return hx`<div class='audio-metadata'>${elems}</div>`
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderLoadingSpinner (state) {
|
|
||||||
if (state.playing.isPaused) return
|
|
||||||
var isProbablyStalled = state.playing.isStalled ||
|
|
||||||
(new Date().getTime() - state.playing.lastTimeUpdate > 2000)
|
|
||||||
if (!isProbablyStalled) return
|
|
||||||
|
|
||||||
var prog = state.getPlayingTorrentSummary().progress || {}
|
|
||||||
var fileProgress = 0
|
|
||||||
if (prog.files) {
|
|
||||||
var file = prog.files[state.playing.fileIndex]
|
|
||||||
fileProgress = Math.floor(100 * file.numPiecesPresent / file.numPieces)
|
|
||||||
}
|
|
||||||
|
|
||||||
return hx`
|
|
||||||
<div class='media-stalled'>
|
|
||||||
<div class='loading-spinner'> </div>
|
|
||||||
<div class='loading-status ellipsis'>
|
|
||||||
<span class='progress'>${fileProgress}%</span> downloaded,
|
|
||||||
<span>↓ ${prettyBytes(prog.downloadSpeed || 0)}/s</span>
|
|
||||||
<span>↑ ${prettyBytes(prog.uploadSpeed || 0)}/s</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderCastScreen (state) {
|
|
||||||
var castIcon, castType, isCast
|
|
||||||
if (state.playing.location.startsWith('chromecast')) {
|
|
||||||
castIcon = 'cast_connected'
|
|
||||||
castType = 'Chromecast'
|
|
||||||
isCast = true
|
|
||||||
} else if (state.playing.location.startsWith('airplay')) {
|
|
||||||
castIcon = 'airplay'
|
|
||||||
castType = 'AirPlay'
|
|
||||||
isCast = true
|
|
||||||
} else if (state.playing.location.startsWith('dlna')) {
|
|
||||||
castIcon = 'tv'
|
|
||||||
castType = 'DLNA'
|
|
||||||
isCast = true
|
|
||||||
} else if (state.playing.location === 'vlc') {
|
|
||||||
castIcon = 'tv'
|
|
||||||
castType = 'VLC'
|
|
||||||
isCast = false
|
|
||||||
} else if (state.playing.location === 'error') {
|
|
||||||
castIcon = 'error_outline'
|
|
||||||
castType = 'Error'
|
|
||||||
isCast = false
|
|
||||||
}
|
|
||||||
|
|
||||||
var isStarting = state.playing.location.endsWith('-pending')
|
|
||||||
var castStatus
|
|
||||||
if (isCast) castStatus = isStarting ? 'Connecting...' : 'Connected'
|
|
||||||
else castStatus = ''
|
|
||||||
|
|
||||||
// Show a nice title image, if possible
|
|
||||||
var style = {
|
|
||||||
backgroundImage: cssBackgroundImagePoster(state)
|
|
||||||
}
|
|
||||||
|
|
||||||
return hx`
|
|
||||||
<div class='letterbox' style=${style}>
|
|
||||||
<div class='cast-screen'>
|
|
||||||
<i class='icon'>${castIcon}</i>
|
|
||||||
<div class='cast-type'>${castType}</div>
|
|
||||||
<div class='cast-status'>${castStatus}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderSubtitlesOptions (state) {
|
|
||||||
var subtitles = state.playing.subtitles
|
|
||||||
if (!subtitles.tracks.length || !subtitles.showMenu) return
|
|
||||||
|
|
||||||
var items = subtitles.tracks.map(function (track, ix) {
|
|
||||||
var isSelected = state.playing.subtitles.selectedIndex === ix
|
|
||||||
return hx`
|
|
||||||
<li onclick=${dispatcher('selectSubtitle', ix)}>
|
|
||||||
<i.icon>${'radio_button_' + (isSelected ? 'checked' : 'unchecked')}</i>
|
|
||||||
${track.label}
|
|
||||||
</li>
|
|
||||||
`
|
|
||||||
})
|
|
||||||
|
|
||||||
var noneSelected = state.playing.subtitles.selectedIndex === -1
|
|
||||||
var noneClass = 'radio_button_' + (noneSelected ? 'checked' : 'unchecked')
|
|
||||||
return hx`
|
|
||||||
<ul.subtitles-list>
|
|
||||||
${items}
|
|
||||||
<li onclick=${dispatcher('selectSubtitle', -1)}>
|
|
||||||
<i.icon>${noneClass}</i>
|
|
||||||
None
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderPlayerControls (state) {
|
|
||||||
var positionPercent = 100 * state.playing.currentTime / state.playing.duration
|
|
||||||
var playbackCursorStyle = { left: 'calc(' + positionPercent + '% - 3px)' }
|
|
||||||
var captionsClass = state.playing.subtitles.tracks.length === 0
|
|
||||||
? 'disabled'
|
|
||||||
: state.playing.subtitles.selectedIndex >= 0
|
|
||||||
? 'active'
|
|
||||||
: ''
|
|
||||||
|
|
||||||
var elements = [
|
|
||||||
hx`
|
|
||||||
<div class='playback-bar'>
|
|
||||||
${renderLoadingBar(state)}
|
|
||||||
<div
|
|
||||||
class='playback-cursor'
|
|
||||||
style=${playbackCursorStyle}>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class='scrub-bar'
|
|
||||||
draggable='true'
|
|
||||||
ondragstart=${handleDragStart}
|
|
||||||
onclick=${handleScrub},
|
|
||||||
ondrag=${handleScrub}>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
`,
|
|
||||||
hx`
|
|
||||||
<i class='icon play-pause float-left' onclick=${dispatcher('playPause')}>
|
|
||||||
${state.playing.isPaused ? 'play_arrow' : 'pause'}
|
|
||||||
</i>
|
|
||||||
`,
|
|
||||||
hx`
|
|
||||||
<i
|
|
||||||
class='icon fullscreen float-right'
|
|
||||||
onclick=${dispatcher('toggleFullScreen')}>
|
|
||||||
${state.window.isFullScreen ? 'fullscreen_exit' : 'fullscreen'}
|
|
||||||
</i>
|
|
||||||
`
|
|
||||||
]
|
|
||||||
|
|
||||||
if (state.playing.type === 'video') {
|
|
||||||
// show closed captions icon
|
|
||||||
elements.push(hx`
|
|
||||||
<i.icon.closed-caption.float-right
|
|
||||||
class=${captionsClass}
|
|
||||||
onclick=${handleSubtitles}>
|
|
||||||
closed_caption
|
|
||||||
</i>
|
|
||||||
`)
|
|
||||||
}
|
|
||||||
|
|
||||||
// If we've detected a Chromecast or AppleTV, the user can play video there
|
|
||||||
var isOnChromecast = state.playing.location.startsWith('chromecast')
|
|
||||||
var isOnAirplay = state.playing.location.startsWith('airplay')
|
|
||||||
var isOnDlna = state.playing.location.startsWith('dlna')
|
|
||||||
var chromecastClass, chromecastHandler
|
|
||||||
var airplayClass, airplayHandler
|
|
||||||
var dlnaClass, dlnaHandler
|
|
||||||
if (isOnChromecast) {
|
|
||||||
chromecastClass = 'active'
|
|
||||||
dlnaClass = 'disabled'
|
|
||||||
airplayClass = 'disabled'
|
|
||||||
chromecastHandler = dispatcher('closeDevice')
|
|
||||||
airplayHandler = undefined
|
|
||||||
dlnaHandler = undefined
|
|
||||||
} else if (isOnAirplay) {
|
|
||||||
chromecastClass = 'disabled'
|
|
||||||
dlnaClass = 'disabled'
|
|
||||||
airplayClass = 'active'
|
|
||||||
chromecastHandler = undefined
|
|
||||||
airplayHandler = dispatcher('closeDevice')
|
|
||||||
dlnaHandler = undefined
|
|
||||||
} else if (isOnDlna) {
|
|
||||||
chromecastClass = 'disabled'
|
|
||||||
dlnaClass = 'active'
|
|
||||||
airplayClass = 'disabled'
|
|
||||||
chromecastHandler = undefined
|
|
||||||
airplayHandler = undefined
|
|
||||||
dlnaHandler = dispatcher('closeDevice')
|
|
||||||
} else {
|
|
||||||
chromecastClass = ''
|
|
||||||
airplayClass = ''
|
|
||||||
dlnaClass = ''
|
|
||||||
chromecastHandler = dispatcher('openDevice', 'chromecast')
|
|
||||||
airplayHandler = dispatcher('openDevice', 'airplay')
|
|
||||||
dlnaHandler = dispatcher('openDevice', 'dlna')
|
|
||||||
}
|
|
||||||
if (state.devices.chromecast || isOnChromecast) {
|
|
||||||
var castIcon = isOnChromecast ? 'cast_connected' : 'cast'
|
|
||||||
elements.push(hx`
|
|
||||||
<i.icon.device.float-right
|
|
||||||
class=${chromecastClass}
|
|
||||||
onclick=${chromecastHandler}>
|
|
||||||
${castIcon}
|
|
||||||
</i>
|
|
||||||
`)
|
|
||||||
}
|
|
||||||
if (state.devices.airplay || isOnAirplay) {
|
|
||||||
elements.push(hx`
|
|
||||||
<i.icon.device.float-right
|
|
||||||
class=${airplayClass}
|
|
||||||
onclick=${airplayHandler}>
|
|
||||||
airplay
|
|
||||||
</i>
|
|
||||||
`)
|
|
||||||
}
|
|
||||||
if (state.devices.dlna || isOnDlna) {
|
|
||||||
elements.push(hx`
|
|
||||||
<i
|
|
||||||
class='icon device float-right'
|
|
||||||
class=${dlnaClass}
|
|
||||||
onclick=${dlnaHandler}>
|
|
||||||
tv
|
|
||||||
</i>
|
|
||||||
`)
|
|
||||||
}
|
|
||||||
|
|
||||||
// render volume
|
|
||||||
var volume = state.playing.volume
|
|
||||||
var volumeIcon = 'volume_' + (
|
|
||||||
volume === 0 ? 'off'
|
|
||||||
: volume < 0.3 ? 'mute'
|
|
||||||
: volume < 0.6 ? 'down'
|
|
||||||
: 'up')
|
|
||||||
var volumeStyle = {
|
|
||||||
background: '-webkit-gradient(linear, left top, right top, ' +
|
|
||||||
'color-stop(' + (volume * 100) + '%, #eee), ' +
|
|
||||||
'color-stop(' + (volume * 100) + '%, #727272))'
|
|
||||||
}
|
|
||||||
|
|
||||||
elements.push(hx`
|
|
||||||
<div class='volume float-left'>
|
|
||||||
<i
|
|
||||||
class='icon volume-icon float-left'
|
|
||||||
onmousedown=${handleVolumeMute}>
|
|
||||||
${volumeIcon}
|
|
||||||
</i>
|
|
||||||
<input
|
|
||||||
class='volume-slider float-right'
|
|
||||||
type='range' min='0' max='1' step='0.05'
|
|
||||||
value=${volumeChanging !== false ? volumeChanging : volume}
|
|
||||||
onmousedown=${handleVolumeScrub}
|
|
||||||
onmouseup=${handleVolumeScrub}
|
|
||||||
onmousemove=${handleVolumeScrub}
|
|
||||||
style=${volumeStyle}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
`)
|
|
||||||
|
|
||||||
// Show video playback progress
|
|
||||||
var currentTimeStr = formatTime(state.playing.currentTime)
|
|
||||||
var durationStr = formatTime(state.playing.duration)
|
|
||||||
elements.push(hx`
|
|
||||||
<span class='time float-left'>
|
|
||||||
${currentTimeStr} / ${durationStr}
|
|
||||||
</span>
|
|
||||||
`)
|
|
||||||
|
|
||||||
// render playback rate
|
|
||||||
if (state.playing.playbackRate !== 1) {
|
|
||||||
elements.push(hx`
|
|
||||||
<span class='rate float-left'>
|
|
||||||
${state.playing.playbackRate}x
|
|
||||||
</span>
|
|
||||||
`)
|
|
||||||
}
|
|
||||||
|
|
||||||
return hx`
|
|
||||||
<div class='controls'>
|
|
||||||
${elements}
|
|
||||||
${renderSubtitlesOptions(state)}
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
|
|
||||||
function handleDragStart (e) {
|
|
||||||
// Prevent the cursor from changing, eg to a green + icon on Mac
|
|
||||||
if (e.dataTransfer) {
|
|
||||||
var dt = e.dataTransfer
|
|
||||||
dt.effectAllowed = 'none'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handles a click or drag to scrub (jump to another position in the video)
|
|
||||||
function handleScrub (e) {
|
|
||||||
dispatch('mediaMouseMoved')
|
|
||||||
var windowWidth = document.querySelector('body').clientWidth
|
|
||||||
var fraction = e.clientX / windowWidth
|
|
||||||
var position = fraction * state.playing.duration /* seconds */
|
|
||||||
dispatch('playbackJump', position)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handles volume muting and Unmuting
|
|
||||||
function handleVolumeMute (e) {
|
|
||||||
if (state.playing.volume === 0.0) {
|
|
||||||
dispatch('setVolume', 1.0)
|
|
||||||
} else {
|
|
||||||
dispatch('setVolume', 0.0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handles volume slider scrub
|
|
||||||
function handleVolumeScrub (e) {
|
|
||||||
switch (e.type) {
|
|
||||||
case 'mouseup':
|
|
||||||
volumeChanging = false
|
|
||||||
dispatch('setVolume', e.offsetX / 50)
|
|
||||||
break
|
|
||||||
case 'mousedown':
|
|
||||||
volumeChanging = this.value
|
|
||||||
break
|
|
||||||
case 'mousemove':
|
|
||||||
// only change if move was started by click
|
|
||||||
if (volumeChanging !== false) {
|
|
||||||
volumeChanging = this.value
|
|
||||||
}
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleSubtitles (e) {
|
|
||||||
if (!state.playing.subtitles.tracks.length || e.ctrlKey || e.metaKey) {
|
|
||||||
// if no subtitles available select it
|
|
||||||
dispatch('openSubtitles')
|
|
||||||
} else {
|
|
||||||
dispatch('toggleSubtitlesMenu')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// lets scrub without sending to volume backend
|
|
||||||
var volumeChanging = false
|
|
||||||
|
|
||||||
// Renders the loading bar. Shows which parts of the torrent are loaded, which
|
|
||||||
// can be "spongey" / non-contiguous
|
|
||||||
function renderLoadingBar (state) {
|
|
||||||
var torrentSummary = state.getPlayingTorrentSummary()
|
|
||||||
if (!torrentSummary.progress) {
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find all contiguous parts of the torrent which are loaded
|
|
||||||
var prog = torrentSummary.progress
|
|
||||||
var fileProg = prog.files[state.playing.fileIndex]
|
|
||||||
var parts = []
|
|
||||||
var lastPiecePresent = false
|
|
||||||
for (var i = fileProg.startPiece; i <= fileProg.endPiece; i++) {
|
|
||||||
var partPresent = Bitfield.prototype.get.call(prog.bitfield, i)
|
|
||||||
if (partPresent && !lastPiecePresent) {
|
|
||||||
parts.push({start: i - fileProg.startPiece, count: 1})
|
|
||||||
} else if (partPresent) {
|
|
||||||
parts[parts.length - 1].count++
|
|
||||||
}
|
|
||||||
lastPiecePresent = partPresent
|
|
||||||
}
|
|
||||||
|
|
||||||
// Output some bars to show which parts of the file are loaded
|
|
||||||
return hx`
|
|
||||||
<div class='loading-bar'>
|
|
||||||
${parts.map(function (part) {
|
|
||||||
var style = {
|
|
||||||
left: (100 * part.start / fileProg.numPieces) + '%',
|
|
||||||
width: (100 * part.count / fileProg.numPieces) + '%'
|
|
||||||
}
|
|
||||||
|
|
||||||
return hx`<div class='loading-bar-part' style=${style}></div>`
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns the CSS background-image string for a poster image + dark vignette
|
|
||||||
function cssBackgroundImagePoster (state) {
|
|
||||||
var torrentSummary = state.getPlayingTorrentSummary()
|
|
||||||
var posterPath = TorrentSummary.getPosterPath(torrentSummary)
|
|
||||||
if (!posterPath) return ''
|
|
||||||
return cssBackgroundImageDarkGradient() + `, url(${posterPath})`
|
|
||||||
}
|
|
||||||
|
|
||||||
function cssBackgroundImageDarkGradient () {
|
|
||||||
return 'radial-gradient(circle at center, ' +
|
|
||||||
'rgba(0,0,0,0.4) 0%, rgba(0,0,0,1) 100%)'
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatTime (time) {
|
|
||||||
if (typeof time !== 'number' || Number.isNaN(time)) {
|
|
||||||
return '0:00'
|
|
||||||
}
|
|
||||||
|
|
||||||
var hours = Math.floor(time / 3600)
|
|
||||||
var minutes = Math.floor(time % 3600 / 60)
|
|
||||||
if (hours > 0) {
|
|
||||||
minutes = zeroFill(2, minutes)
|
|
||||||
}
|
|
||||||
var seconds = zeroFill(2, Math.floor(time % 60))
|
|
||||||
|
|
||||||
return (hours > 0 ? hours + ':' : '') + minutes + ':' + seconds
|
|
||||||
}
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
module.exports = Preferences
|
|
||||||
|
|
||||||
var hx = require('../lib/hx')
|
|
||||||
var {dispatch} = require('../lib/dispatcher')
|
|
||||||
|
|
||||||
var remote = require('electron').remote
|
|
||||||
var dialog = remote.dialog
|
|
||||||
|
|
||||||
function Preferences (state) {
|
|
||||||
return hx`
|
|
||||||
<div class='preferences'>
|
|
||||||
${renderGeneralSection(state)}
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderGeneralSection (state) {
|
|
||||||
return renderSection({
|
|
||||||
title: 'General',
|
|
||||||
description: '',
|
|
||||||
icon: 'settings'
|
|
||||||
}, [
|
|
||||||
renderDownloadDirSelector(state)
|
|
||||||
])
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderDownloadDirSelector (state) {
|
|
||||||
return renderFileSelector({
|
|
||||||
label: 'Download Path',
|
|
||||||
description: 'Data from torrents will be saved here',
|
|
||||||
property: 'downloadPath',
|
|
||||||
options: {
|
|
||||||
title: 'Select download directory',
|
|
||||||
properties: [ 'openDirectory' ]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
state.unsaved.prefs.downloadPath,
|
|
||||||
function (filePath) {
|
|
||||||
setStateValue('downloadPath', filePath)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Renders a prefs section.
|
|
||||||
// - definition should be {icon, title, description}
|
|
||||||
// - controls should be an array of vdom elements
|
|
||||||
function renderSection (definition, controls) {
|
|
||||||
var helpElem = !definition.description ? null : hx`
|
|
||||||
<div class='help text'>
|
|
||||||
<i.icon>help_outline</i>${definition.description}
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
return hx`
|
|
||||||
<section class='section preferences-panel'>
|
|
||||||
<div class='section-container'>
|
|
||||||
<div class='section-heading'>
|
|
||||||
<i.icon>${definition.icon}</i>${definition.title}
|
|
||||||
</div>
|
|
||||||
${helpElem}
|
|
||||||
<div class='section-body'>
|
|
||||||
${controls}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Creates a file chooser
|
|
||||||
// - defition should be {label, description, options}
|
|
||||||
// options are passed to dialog.showOpenDialog
|
|
||||||
// - value should be the current pref, a file or folder path
|
|
||||||
// - callback takes a new file or folder path
|
|
||||||
function renderFileSelector (definition, value, callback) {
|
|
||||||
return hx`
|
|
||||||
<div class='control-group'>
|
|
||||||
<div class='controls'>
|
|
||||||
<label class='control-label'>
|
|
||||||
<div class='preference-title'>${definition.label}</div>
|
|
||||||
<div class='preference-description'>${definition.description}</div>
|
|
||||||
</label>
|
|
||||||
<div class='controls'>
|
|
||||||
<input type='text' class='file-picker-text'
|
|
||||||
id=${definition.property}
|
|
||||||
disabled='disabled'
|
|
||||||
value=${value} />
|
|
||||||
<button class='btn' onclick=${handleClick}>
|
|
||||||
<i.icon>folder_open</i>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
function handleClick () {
|
|
||||||
dialog.showOpenDialog(remote.getCurrentWindow(), definition.options, function (filenames) {
|
|
||||||
if (!Array.isArray(filenames)) return
|
|
||||||
callback(filenames[0])
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function setStateValue (property, value) {
|
|
||||||
dispatch('updatePreferences', property, value)
|
|
||||||
}
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
module.exports = UnsupportedMediaModal
|
|
||||||
|
|
||||||
var electron = require('electron')
|
|
||||||
|
|
||||||
var {dispatch, dispatcher} = require('../lib/dispatcher')
|
|
||||||
var hx = require('../lib/hx')
|
|
||||||
|
|
||||||
function UnsupportedMediaModal (state) {
|
|
||||||
var err = state.modal.error
|
|
||||||
var message = (err && err.getMessage)
|
|
||||||
? err.getMessage()
|
|
||||||
: err
|
|
||||||
var actionButton = state.modal.vlcInstalled
|
|
||||||
? hx`<button class="button-raised" onclick=${onPlay}>Play in VLC</button>`
|
|
||||||
: hx`<button class="button-raised" onclick=${onInstall}>Install VLC</button>`
|
|
||||||
var vlcMessage = state.modal.vlcNotFound
|
|
||||||
? 'Couldn\'t run VLC. Please make sure it\'s installed.'
|
|
||||||
: ''
|
|
||||||
return hx`
|
|
||||||
<div>
|
|
||||||
<p><strong>Sorry, we can't play that file.</strong></p>
|
|
||||||
<p>${message}</p>
|
|
||||||
<p class='float-right'>
|
|
||||||
<button class="button-flat" onclick=${dispatcher('backToList')}>Cancel</button>
|
|
||||||
${actionButton}
|
|
||||||
</p>
|
|
||||||
<p class='error-text'>${vlcMessage}</p>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
|
|
||||||
function onInstall () {
|
|
||||||
electron.shell.openExternal('http://www.videolan.org/vlc/')
|
|
||||||
state.modal.vlcInstalled = true // Assume they'll install it successfully
|
|
||||||
}
|
|
||||||
|
|
||||||
function onPlay () {
|
|
||||||
dispatch('vlcPlay')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
module.exports = UpdateAvailableModal
|
|
||||||
|
|
||||||
var electron = require('electron')
|
|
||||||
|
|
||||||
var {dispatch} = require('../lib/dispatcher')
|
|
||||||
var hx = require('../lib/hx')
|
|
||||||
|
|
||||||
function UpdateAvailableModal (state) {
|
|
||||||
return hx`
|
|
||||||
<div class='update-available-modal'>
|
|
||||||
<p><strong>A new version of WebTorrent is available: v${state.modal.version}</strong></p>
|
|
||||||
<p>We have an auto-updater for Windows and Mac. We don't have one for Linux yet, so you'll have to download the new version manually.</p>
|
|
||||||
<p>
|
|
||||||
<button class='primary' onclick=${handleOK}>Show Download Page</button>
|
|
||||||
<button class='cancel' onclick=${handleCancel}>Skip This Release</button>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
|
|
||||||
function handleOK () {
|
|
||||||
electron.shell.openExternal('https://github.com/feross/webtorrent-desktop/releases')
|
|
||||||
dispatch('exitModal')
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleCancel () {
|
|
||||||
dispatch('skipVersion', state.modal.version)
|
|
||||||
dispatch('exitModal')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,359 +0,0 @@
|
|||||||
// To keep the UI snappy, we run WebTorrent in its own hidden window, a separate
|
|
||||||
// process from the main window.
|
|
||||||
console.time('init')
|
|
||||||
|
|
||||||
var WebTorrent = require('webtorrent')
|
|
||||||
var defaultAnnounceList = require('create-torrent').announceList
|
|
||||||
var deepEqual = require('deep-equal')
|
|
||||||
var electron = require('electron')
|
|
||||||
var fs = require('fs-extra')
|
|
||||||
var musicmetadata = require('musicmetadata')
|
|
||||||
var networkAddress = require('network-address')
|
|
||||||
var path = require('path')
|
|
||||||
|
|
||||||
var crashReporter = require('../crash-reporter')
|
|
||||||
var config = require('../config')
|
|
||||||
var torrentPoster = require('./lib/torrent-poster')
|
|
||||||
|
|
||||||
// Report when the process crashes
|
|
||||||
crashReporter.init()
|
|
||||||
|
|
||||||
// Send & receive messages from the main window
|
|
||||||
var ipc = electron.ipcRenderer
|
|
||||||
|
|
||||||
// Force use of webtorrent trackers on all torrents
|
|
||||||
global.WEBTORRENT_ANNOUNCE = defaultAnnounceList
|
|
||||||
.map((arr) => arr[0])
|
|
||||||
.filter((url) => url.indexOf('wss://') === 0 || url.indexOf('ws://') === 0)
|
|
||||||
|
|
||||||
// Connect to the WebTorrent and BitTorrent networks. WebTorrent Desktop is a hybrid
|
|
||||||
// client, as explained here: https://webtorrent.io/faq
|
|
||||||
var client = new WebTorrent()
|
|
||||||
|
|
||||||
// WebTorrent-to-HTTP streaming sever
|
|
||||||
var server = null
|
|
||||||
|
|
||||||
// Used for diffing, so we only send progress updates when necessary
|
|
||||||
var prevProgress = null
|
|
||||||
|
|
||||||
init()
|
|
||||||
|
|
||||||
function init () {
|
|
||||||
client.on('warning', (err) => ipc.send('wt-warning', null, err.message))
|
|
||||||
client.on('error', (err) => ipc.send('wt-error', null, err.message))
|
|
||||||
|
|
||||||
ipc.on('wt-start-torrenting', (e, torrentKey, torrentID, path, fileModtimes, selections) =>
|
|
||||||
startTorrenting(torrentKey, torrentID, path, fileModtimes, selections))
|
|
||||||
ipc.on('wt-stop-torrenting', (e, infoHash) =>
|
|
||||||
stopTorrenting(infoHash))
|
|
||||||
ipc.on('wt-create-torrent', (e, torrentKey, options) =>
|
|
||||||
createTorrent(torrentKey, options))
|
|
||||||
ipc.on('wt-save-torrent-file', (e, torrentKey) =>
|
|
||||||
saveTorrentFile(torrentKey))
|
|
||||||
ipc.on('wt-generate-torrent-poster', (e, torrentKey) =>
|
|
||||||
generateTorrentPoster(torrentKey))
|
|
||||||
ipc.on('wt-get-audio-metadata', (e, infoHash, index) =>
|
|
||||||
getAudioMetadata(infoHash, index))
|
|
||||||
ipc.on('wt-start-server', (e, infoHash, index) =>
|
|
||||||
startServer(infoHash, index))
|
|
||||||
ipc.on('wt-stop-server', (e) =>
|
|
||||||
stopServer())
|
|
||||||
ipc.on('wt-select-files', (e, infoHash, selections) =>
|
|
||||||
selectFiles(infoHash, selections))
|
|
||||||
|
|
||||||
ipc.send('ipcReadyWebTorrent')
|
|
||||||
|
|
||||||
setInterval(updateTorrentProgress, 1000)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Starts a given TorrentID, which can be an infohash, magnet URI, etc. Returns WebTorrent object
|
|
||||||
// See https://github.com/feross/webtorrent/blob/master/docs/api.md#clientaddtorrentid-opts-function-ontorrent-torrent-
|
|
||||||
function startTorrenting (torrentKey, torrentID, path, fileModtimes, selections) {
|
|
||||||
console.log('starting torrent %s: %s', torrentKey, torrentID)
|
|
||||||
|
|
||||||
var torrent = client.add(torrentID, {
|
|
||||||
path: path,
|
|
||||||
fileModtimes: fileModtimes
|
|
||||||
})
|
|
||||||
torrent.key = torrentKey
|
|
||||||
|
|
||||||
// Listen for ready event, progress notifications, etc
|
|
||||||
addTorrentEvents(torrent)
|
|
||||||
|
|
||||||
// Only download the files the user wants, not necessarily all files
|
|
||||||
torrent.once('ready', () => selectFiles(torrent, selections))
|
|
||||||
|
|
||||||
return torrent
|
|
||||||
}
|
|
||||||
|
|
||||||
function stopTorrenting (infoHash) {
|
|
||||||
var torrent = client.get(infoHash)
|
|
||||||
if (torrent) torrent.destroy()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a new torrent, start seeding
|
|
||||||
function createTorrent (torrentKey, options) {
|
|
||||||
console.log('creating torrent', torrentKey, options)
|
|
||||||
var paths = options.files.map((f) => f.path)
|
|
||||||
var torrent = client.seed(paths, options)
|
|
||||||
torrent.key = torrentKey
|
|
||||||
addTorrentEvents(torrent)
|
|
||||||
ipc.send('wt-new-torrent')
|
|
||||||
}
|
|
||||||
|
|
||||||
function addTorrentEvents (torrent) {
|
|
||||||
torrent.on('warning', (err) =>
|
|
||||||
ipc.send('wt-warning', torrent.key, err.message))
|
|
||||||
torrent.on('error', (err) =>
|
|
||||||
ipc.send('wt-error', torrent.key, err.message))
|
|
||||||
torrent.on('infoHash', () =>
|
|
||||||
ipc.send('wt-infohash', torrent.key, torrent.infoHash))
|
|
||||||
torrent.on('metadata', torrentMetadata)
|
|
||||||
torrent.on('ready', torrentReady)
|
|
||||||
torrent.on('done', torrentDone)
|
|
||||||
|
|
||||||
function torrentMetadata () {
|
|
||||||
var info = getTorrentInfo(torrent)
|
|
||||||
ipc.send('wt-metadata', torrent.key, info)
|
|
||||||
|
|
||||||
updateTorrentProgress()
|
|
||||||
}
|
|
||||||
|
|
||||||
function torrentReady () {
|
|
||||||
var info = getTorrentInfo(torrent)
|
|
||||||
ipc.send('wt-ready', torrent.key, info)
|
|
||||||
ipc.send('wt-ready-' + torrent.infoHash, torrent.key, info) // TODO: hack
|
|
||||||
|
|
||||||
updateTorrentProgress()
|
|
||||||
}
|
|
||||||
|
|
||||||
function torrentDone () {
|
|
||||||
var info = getTorrentInfo(torrent)
|
|
||||||
ipc.send('wt-done', torrent.key, info)
|
|
||||||
|
|
||||||
updateTorrentProgress()
|
|
||||||
|
|
||||||
torrent.getFileModtimes(function (err, fileModtimes) {
|
|
||||||
if (err) return onError(err)
|
|
||||||
ipc.send('wt-file-modtimes', torrent.key, fileModtimes)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Produces a JSON saveable summary of a torrent
|
|
||||||
function getTorrentInfo (torrent) {
|
|
||||||
return {
|
|
||||||
infoHash: torrent.infoHash,
|
|
||||||
magnetURI: torrent.magnetURI,
|
|
||||||
name: torrent.name,
|
|
||||||
path: torrent.path,
|
|
||||||
files: torrent.files.map(getTorrentFileInfo),
|
|
||||||
bytesReceived: torrent.received
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Produces a JSON saveable summary of a file in a torrent
|
|
||||||
function getTorrentFileInfo (file) {
|
|
||||||
return {
|
|
||||||
name: file.name,
|
|
||||||
length: file.length,
|
|
||||||
path: file.path
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Every time we resolve a magnet URI, save the torrent file so that we never
|
|
||||||
// have to download it again. Never ask the DHT the same question twice.
|
|
||||||
function saveTorrentFile (torrentKey) {
|
|
||||||
var torrent = getTorrent(torrentKey)
|
|
||||||
checkIfTorrentFileExists(torrent.infoHash, function (torrentPath, exists) {
|
|
||||||
var fileName = torrent.infoHash + '.torrent'
|
|
||||||
if (exists) {
|
|
||||||
// We've already saved the file
|
|
||||||
return ipc.send('wt-file-saved', torrentKey, fileName)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Otherwise, save the .torrent file, under the app config folder
|
|
||||||
fs.mkdir(config.TORRENT_PATH, function (_) {
|
|
||||||
fs.writeFile(torrentPath, torrent.torrentFile, function (err) {
|
|
||||||
if (err) return console.log('error saving torrent file %s: %o', torrentPath, err)
|
|
||||||
console.log('saved torrent file %s', torrentPath)
|
|
||||||
return ipc.send('wt-file-saved', torrentKey, fileName)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Checks whether we've already resolved a given infohash to a torrent file
|
|
||||||
// Calls back with (torrentPath, exists). Logs, does not call back on error
|
|
||||||
function checkIfTorrentFileExists (infoHash, cb) {
|
|
||||||
var torrentPath = path.join(config.TORRENT_PATH, infoHash + '.torrent')
|
|
||||||
fs.exists(torrentPath, function (exists) {
|
|
||||||
cb(torrentPath, exists)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Save a JPG that represents a torrent.
|
|
||||||
// Auto chooses either a frame from a video file, an image, etc
|
|
||||||
function generateTorrentPoster (torrentKey) {
|
|
||||||
var torrent = getTorrent(torrentKey)
|
|
||||||
torrentPoster(torrent, function (err, buf, extension) {
|
|
||||||
if (err) return console.log('error generating poster: %o', err)
|
|
||||||
// save it for next time
|
|
||||||
fs.mkdirp(config.POSTER_PATH, function (err) {
|
|
||||||
if (err) return console.log('error creating poster dir: %o', err)
|
|
||||||
var posterFileName = torrent.infoHash + extension
|
|
||||||
var posterFilePath = path.join(config.POSTER_PATH, posterFileName)
|
|
||||||
fs.writeFile(posterFilePath, buf, function (err) {
|
|
||||||
if (err) return console.log('error saving poster: %o', err)
|
|
||||||
// show the poster
|
|
||||||
ipc.send('wt-poster', torrentKey, posterFileName)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function updateTorrentProgress () {
|
|
||||||
var progress = getTorrentProgress()
|
|
||||||
// TODO: diff torrent-by-torrent, not once for the whole update
|
|
||||||
if (prevProgress && deepEqual(progress, prevProgress, {strict: true})) {
|
|
||||||
return /* don't send heavy object if it hasn't changed */
|
|
||||||
}
|
|
||||||
ipc.send('wt-progress', progress)
|
|
||||||
prevProgress = progress
|
|
||||||
}
|
|
||||||
|
|
||||||
function getTorrentProgress () {
|
|
||||||
// First, track overall progress
|
|
||||||
var progress = client.progress
|
|
||||||
var hasActiveTorrents = client.torrents.some(function (torrent) {
|
|
||||||
return torrent.progress !== 1
|
|
||||||
})
|
|
||||||
|
|
||||||
// Track progress for every file in each torrent
|
|
||||||
// TODO: ideally this would be tracked by WebTorrent, which could do it
|
|
||||||
// more efficiently than looping over torrent.bitfield
|
|
||||||
var torrentProg = client.torrents.map(function (torrent) {
|
|
||||||
var fileProg = torrent.files && torrent.files.map(function (file, index) {
|
|
||||||
var numPieces = file._endPiece - file._startPiece + 1
|
|
||||||
var numPiecesPresent = 0
|
|
||||||
for (var piece = file._startPiece; piece <= file._endPiece; piece++) {
|
|
||||||
if (torrent.bitfield.get(piece)) numPiecesPresent++
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
startPiece: file._startPiece,
|
|
||||||
endPiece: file._endPiece,
|
|
||||||
numPieces,
|
|
||||||
numPiecesPresent
|
|
||||||
}
|
|
||||||
})
|
|
||||||
return {
|
|
||||||
torrentKey: torrent.key,
|
|
||||||
ready: torrent.ready,
|
|
||||||
progress: torrent.progress,
|
|
||||||
downloaded: torrent.downloaded,
|
|
||||||
downloadSpeed: torrent.downloadSpeed,
|
|
||||||
uploadSpeed: torrent.uploadSpeed,
|
|
||||||
numPeers: torrent.numPeers,
|
|
||||||
length: torrent.length,
|
|
||||||
bitfield: torrent.bitfield,
|
|
||||||
files: fileProg
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
return {
|
|
||||||
torrents: torrentProg,
|
|
||||||
progress,
|
|
||||||
hasActiveTorrents
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function startServer (infoHash, index) {
|
|
||||||
var torrent = client.get(infoHash)
|
|
||||||
if (torrent.ready) startServerFromReadyTorrent(torrent, index)
|
|
||||||
else torrent.once('ready', () => startServerFromReadyTorrent(torrent, index))
|
|
||||||
}
|
|
||||||
|
|
||||||
function startServerFromReadyTorrent (torrent, index, cb) {
|
|
||||||
if (server) return
|
|
||||||
|
|
||||||
// start the streaming torrent-to-http server
|
|
||||||
server = torrent.createServer()
|
|
||||||
server.listen(0, function () {
|
|
||||||
var port = server.address().port
|
|
||||||
var urlSuffix = ':' + port + '/' + index
|
|
||||||
var info = {
|
|
||||||
torrentKey: torrent.key,
|
|
||||||
localURL: 'http://localhost' + urlSuffix,
|
|
||||||
networkURL: 'http://' + networkAddress() + urlSuffix
|
|
||||||
}
|
|
||||||
|
|
||||||
ipc.send('wt-server-running', info)
|
|
||||||
ipc.send('wt-server-' + torrent.infoHash, info) // TODO: hack
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function stopServer () {
|
|
||||||
if (!server) return
|
|
||||||
server.destroy()
|
|
||||||
server = null
|
|
||||||
}
|
|
||||||
|
|
||||||
function getAudioMetadata (infoHash, index) {
|
|
||||||
var torrent = client.get(infoHash)
|
|
||||||
var file = torrent.files[index]
|
|
||||||
musicmetadata(file.createReadStream(), function (err, info) {
|
|
||||||
if (err) return
|
|
||||||
console.log('got audio metadata for %s: %o', file.name, info)
|
|
||||||
ipc.send('wt-audio-metadata', infoHash, index, info)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function selectFiles (torrentOrInfoHash, selections) {
|
|
||||||
// Get the torrent object
|
|
||||||
var torrent
|
|
||||||
if (typeof torrentOrInfoHash === 'string') {
|
|
||||||
torrent = client.get(torrentOrInfoHash)
|
|
||||||
} else {
|
|
||||||
torrent = torrentOrInfoHash
|
|
||||||
}
|
|
||||||
|
|
||||||
// Selections not specified?
|
|
||||||
// Load all files. We still need to replace the default whole-torrent
|
|
||||||
// selection with individual selections for each file, so we can
|
|
||||||
// select/deselect files later on
|
|
||||||
if (!selections) {
|
|
||||||
selections = torrent.files.map((x) => true)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Selections specified incorrectly?
|
|
||||||
if (selections.length !== torrent.files.length) {
|
|
||||||
throw new Error('got ' + selections.length + ' file selections, ' +
|
|
||||||
'but the torrent contains ' + torrent.files.length + ' files')
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove default selection (whole torrent)
|
|
||||||
torrent.deselect(0, torrent.pieces.length - 1, false)
|
|
||||||
|
|
||||||
// Add selections (individual files)
|
|
||||||
for (var i = 0; i < selections.length; i++) {
|
|
||||||
var file = torrent.files[i]
|
|
||||||
if (selections[i]) {
|
|
||||||
file.select()
|
|
||||||
} else {
|
|
||||||
console.log('deselecting file ' + i + ' of torrent ' + torrent.name)
|
|
||||||
file.deselect()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Gets a WebTorrent handle by torrentKey
|
|
||||||
// Throws an Error if we're not currently torrenting anything w/ that key
|
|
||||||
function getTorrent (torrentKey) {
|
|
||||||
var ret = client.torrents.find((x) => x.key === torrentKey)
|
|
||||||
if (!ret) throw new Error('missing torrent key ' + torrentKey)
|
|
||||||
return ret
|
|
||||||
}
|
|
||||||
|
|
||||||
function onError (err) {
|
|
||||||
console.log(err)
|
|
||||||
}
|
|
||||||
176
src/config.js
Normal file
176
src/config.js
Normal file
@@ -0,0 +1,176 @@
|
|||||||
|
const appConfig = require('application-config')('WebTorrent')
|
||||||
|
const path = require('path')
|
||||||
|
const { app } = require('electron')
|
||||||
|
const arch = require('arch')
|
||||||
|
|
||||||
|
const APP_NAME = 'WebTorrent'
|
||||||
|
const APP_TEAM = 'WebTorrent, LLC'
|
||||||
|
const APP_VERSION = require('../package.json').version
|
||||||
|
|
||||||
|
const IS_TEST = isTest()
|
||||||
|
const PORTABLE_PATH = IS_TEST
|
||||||
|
? path.join(process.platform === 'win32' ? 'C:\\Windows\\Temp' : '/tmp', 'WebTorrentTest')
|
||||||
|
: path.join(path.dirname(process.execPath), 'Portable Settings')
|
||||||
|
const IS_PRODUCTION = isProduction()
|
||||||
|
const IS_PORTABLE = isPortable()
|
||||||
|
|
||||||
|
const UI_HEADER_HEIGHT = 38
|
||||||
|
const UI_TORRENT_HEIGHT = 100
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
ANNOUNCEMENT_URL: 'https://webtorrent.io/desktop/announcement',
|
||||||
|
AUTO_UPDATE_URL: 'https://webtorrent.io/desktop/update',
|
||||||
|
CRASH_REPORT_URL: 'https://webtorrent.io/desktop/crash-report',
|
||||||
|
TELEMETRY_URL: 'https://webtorrent.io/desktop/telemetry',
|
||||||
|
|
||||||
|
APP_COPYRIGHT: `Copyright © 2014-${new Date().getFullYear()} ${APP_TEAM}`,
|
||||||
|
APP_FILE_ICON: path.join(__dirname, '..', 'static', 'WebTorrentFile'),
|
||||||
|
APP_ICON: path.join(__dirname, '..', 'static', 'WebTorrent'),
|
||||||
|
APP_NAME,
|
||||||
|
APP_TEAM,
|
||||||
|
APP_VERSION,
|
||||||
|
APP_WINDOW_TITLE: APP_NAME,
|
||||||
|
|
||||||
|
CONFIG_PATH: getConfigPath(),
|
||||||
|
|
||||||
|
DEFAULT_TORRENTS: [
|
||||||
|
{
|
||||||
|
testID: 'bbb',
|
||||||
|
name: 'Big Buck Bunny',
|
||||||
|
posterFileName: 'bigBuckBunny.jpg',
|
||||||
|
torrentFileName: 'bigBuckBunny.torrent'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
testID: 'cosmos',
|
||||||
|
name: 'Cosmos Laundromat (Preview)',
|
||||||
|
posterFileName: 'cosmosLaundromat.jpg',
|
||||||
|
torrentFileName: 'cosmosLaundromat.torrent'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
testID: 'sintel',
|
||||||
|
name: 'Sintel',
|
||||||
|
posterFileName: 'sintel.jpg',
|
||||||
|
torrentFileName: 'sintel.torrent'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
testID: 'tears',
|
||||||
|
name: 'Tears of Steel',
|
||||||
|
posterFileName: 'tearsOfSteel.jpg',
|
||||||
|
torrentFileName: 'tearsOfSteel.torrent'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
testID: 'wired',
|
||||||
|
name: 'The WIRED CD - Rip. Sample. Mash. Share',
|
||||||
|
posterFileName: 'wiredCd.jpg',
|
||||||
|
torrentFileName: 'wiredCd.torrent'
|
||||||
|
}
|
||||||
|
],
|
||||||
|
|
||||||
|
DELAYED_INIT: 3000 /* 3 seconds */,
|
||||||
|
|
||||||
|
DEFAULT_DOWNLOAD_PATH: getDefaultDownloadPath(),
|
||||||
|
|
||||||
|
GITHUB_URL: 'https://github.com/webtorrent/webtorrent-desktop',
|
||||||
|
GITHUB_URL_ISSUES: 'https://github.com/webtorrent/webtorrent-desktop/issues',
|
||||||
|
GITHUB_URL_RAW: 'https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/master',
|
||||||
|
GITHUB_URL_RELEASES: 'https://github.com/webtorrent/webtorrent-desktop/releases',
|
||||||
|
|
||||||
|
HOME_PAGE_URL: 'https://webtorrent.io',
|
||||||
|
TWITTER_PAGE_URL: 'https://twitter.com/WebTorrentApp',
|
||||||
|
|
||||||
|
IS_PORTABLE,
|
||||||
|
IS_PRODUCTION,
|
||||||
|
IS_TEST,
|
||||||
|
|
||||||
|
OS_SYSARCH: arch() === 'x64' ? 'x64' : 'ia32',
|
||||||
|
|
||||||
|
POSTER_PATH: path.join(getConfigPath(), 'Posters'),
|
||||||
|
ROOT_PATH: path.join(__dirname, '..'),
|
||||||
|
STATIC_PATH: path.join(__dirname, '..', 'static'),
|
||||||
|
TORRENT_PATH: path.join(getConfigPath(), 'Torrents'),
|
||||||
|
|
||||||
|
WINDOW_ABOUT: 'file://' + path.join(__dirname, '..', 'static', 'about.html'),
|
||||||
|
WINDOW_MAIN: 'file://' + path.join(__dirname, '..', 'static', 'main.html'),
|
||||||
|
WINDOW_WEBTORRENT: 'file://' + path.join(__dirname, '..', 'static', 'webtorrent.html'),
|
||||||
|
|
||||||
|
WINDOW_INITIAL_BOUNDS: {
|
||||||
|
width: 500,
|
||||||
|
height: UI_HEADER_HEIGHT + (UI_TORRENT_HEIGHT * 6) // header + 6 torrents
|
||||||
|
},
|
||||||
|
WINDOW_MIN_HEIGHT: UI_HEADER_HEIGHT + (UI_TORRENT_HEIGHT * 2), // header + 2 torrents
|
||||||
|
WINDOW_MIN_WIDTH: 425,
|
||||||
|
|
||||||
|
UI_HEADER_HEIGHT,
|
||||||
|
UI_TORRENT_HEIGHT
|
||||||
|
}
|
||||||
|
|
||||||
|
function getConfigPath () {
|
||||||
|
if (IS_PORTABLE) {
|
||||||
|
return PORTABLE_PATH
|
||||||
|
} else {
|
||||||
|
return path.dirname(appConfig.filePath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getDefaultDownloadPath () {
|
||||||
|
if (IS_PORTABLE) {
|
||||||
|
return path.join(getConfigPath(), 'Downloads')
|
||||||
|
} else {
|
||||||
|
return getPath('downloads')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getPath (key) {
|
||||||
|
if (!process.versions.electron) {
|
||||||
|
// Node.js process
|
||||||
|
return ''
|
||||||
|
} else if (process.type === 'renderer') {
|
||||||
|
// Electron renderer process
|
||||||
|
return require('@electron/remote').app.getPath(key)
|
||||||
|
} else {
|
||||||
|
// Electron main process
|
||||||
|
return app.getPath(key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function isTest () {
|
||||||
|
return process.env.NODE_ENV === 'test'
|
||||||
|
}
|
||||||
|
|
||||||
|
function isPortable () {
|
||||||
|
if (IS_TEST) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
if (process.platform !== 'win32' || !IS_PRODUCTION) {
|
||||||
|
// Fast path: Non-Windows platforms should not check for path on disk
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
const fs = require('fs')
|
||||||
|
|
||||||
|
try {
|
||||||
|
// This line throws if the "Portable Settings" folder does not exist, and does
|
||||||
|
// nothing otherwise.
|
||||||
|
fs.accessSync(PORTABLE_PATH, fs.constants.R_OK | fs.constants.W_OK)
|
||||||
|
return true
|
||||||
|
} catch (err) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function isProduction () {
|
||||||
|
if (!process.versions.electron) {
|
||||||
|
// Node.js process
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if (process.platform === 'darwin') {
|
||||||
|
return !/\/Electron\.app\//.test(process.execPath)
|
||||||
|
}
|
||||||
|
if (process.platform === 'win32') {
|
||||||
|
return !/\\electron\.exe$/.test(process.execPath)
|
||||||
|
}
|
||||||
|
if (process.platform === 'linux') {
|
||||||
|
return !/\/electron$/.test(process.execPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
15
src/crash-reporter.js
Normal file
15
src/crash-reporter.js
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
module.exports = {
|
||||||
|
init
|
||||||
|
}
|
||||||
|
|
||||||
|
function init () {
|
||||||
|
const config = require('./config')
|
||||||
|
const { crashReporter } = require('electron')
|
||||||
|
|
||||||
|
crashReporter.start({
|
||||||
|
productName: config.APP_NAME,
|
||||||
|
submitURL: config.CRASH_REPORT_URL,
|
||||||
|
globalExtra: { _companyName: config.APP_NAME },
|
||||||
|
compress: true
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -2,14 +2,13 @@ module.exports = {
|
|||||||
init
|
init
|
||||||
}
|
}
|
||||||
|
|
||||||
var electron = require('electron')
|
const { dialog } = require('electron')
|
||||||
|
|
||||||
var config = require('../config')
|
const config = require('../config')
|
||||||
var log = require('./log')
|
const log = require('./log')
|
||||||
|
|
||||||
var ANNOUNCEMENT_URL = config.ANNOUNCEMENT_URL +
|
const ANNOUNCEMENT_URL =
|
||||||
'?version=' + config.APP_VERSION +
|
`${config.ANNOUNCEMENT_URL}?version=${config.APP_VERSION}&platform=${process.platform}`
|
||||||
'&platform=' + process.platform
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* In certain situations, the WebTorrent team may need to show an announcement to
|
* In certain situations, the WebTorrent team may need to show an announcement to
|
||||||
@@ -26,13 +25,13 @@ var ANNOUNCEMENT_URL = config.ANNOUNCEMENT_URL +
|
|||||||
* }
|
* }
|
||||||
*/
|
*/
|
||||||
function init () {
|
function init () {
|
||||||
var get = require('simple-get')
|
const get = require('simple-get')
|
||||||
get.concat(ANNOUNCEMENT_URL, onResponse)
|
get.concat(ANNOUNCEMENT_URL, onResponse)
|
||||||
}
|
}
|
||||||
|
|
||||||
function onResponse (err, res, data) {
|
function onResponse (err, res, data) {
|
||||||
if (err) return log(`Failed to retrieve announcement: ${err.message}`)
|
if (err) return log(`Failed to retrieve announcement: ${err.message}`)
|
||||||
if (res.statusCode !== 200) return log('No announcement exists')
|
if (res.statusCode !== 200) return log('No announcement available')
|
||||||
|
|
||||||
try {
|
try {
|
||||||
data = JSON.parse(data.toString())
|
data = JSON.parse(data.toString())
|
||||||
@@ -45,13 +44,11 @@ function onResponse (err, res, data) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
electron.dialog.showMessageBox({
|
dialog.showMessageBox({
|
||||||
type: 'info',
|
type: 'info',
|
||||||
buttons: ['OK'],
|
buttons: ['OK'],
|
||||||
title: data.title,
|
title: data.title,
|
||||||
message: data.message,
|
message: data.message,
|
||||||
detail: data.detail
|
detail: data.detail
|
||||||
}, noop)
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function noop () {}
|
|
||||||
121
src/main/dialog.js
Normal file
121
src/main/dialog.js
Normal file
@@ -0,0 +1,121 @@
|
|||||||
|
module.exports = {
|
||||||
|
openSeedFile,
|
||||||
|
openSeedDirectory,
|
||||||
|
openTorrentFile,
|
||||||
|
openTorrentAddress,
|
||||||
|
openFiles
|
||||||
|
}
|
||||||
|
|
||||||
|
const { dialog } = require('electron')
|
||||||
|
|
||||||
|
const log = require('./log')
|
||||||
|
const windows = require('./windows')
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show open dialog to create a single-file torrent.
|
||||||
|
*/
|
||||||
|
function openSeedFile () {
|
||||||
|
if (!windows.main.win) return
|
||||||
|
log('openSeedFile')
|
||||||
|
const opts = {
|
||||||
|
title: 'Select a file for the torrent.',
|
||||||
|
properties: ['openFile']
|
||||||
|
}
|
||||||
|
showOpenSeed(opts)
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Show open dialog to create a single-file or single-directory torrent. On
|
||||||
|
* Windows and Linux, open dialogs are for files *or* directories only, not both,
|
||||||
|
* so this function shows a directory dialog on those platforms.
|
||||||
|
*/
|
||||||
|
function openSeedDirectory () {
|
||||||
|
if (!windows.main.win) return
|
||||||
|
log('openSeedDirectory')
|
||||||
|
const opts = process.platform === 'darwin'
|
||||||
|
? {
|
||||||
|
title: 'Select a file or folder for the torrent.',
|
||||||
|
properties: ['openFile', 'openDirectory']
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
title: 'Select a folder for the torrent.',
|
||||||
|
properties: ['openDirectory']
|
||||||
|
}
|
||||||
|
showOpenSeed(opts)
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Show flexible open dialog that supports selecting .torrent files to add, or
|
||||||
|
* a file or folder to create a single-file or single-directory torrent.
|
||||||
|
*/
|
||||||
|
function openFiles () {
|
||||||
|
if (!windows.main.win) return
|
||||||
|
log('openFiles')
|
||||||
|
const opts = process.platform === 'darwin'
|
||||||
|
? {
|
||||||
|
title: 'Select a file or folder to add.',
|
||||||
|
properties: ['openFile', 'openDirectory']
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
title: 'Select a file to add.',
|
||||||
|
properties: ['openFile']
|
||||||
|
}
|
||||||
|
setTitle(opts.title)
|
||||||
|
const selectedPaths = dialog.showOpenDialogSync(windows.main.win, opts)
|
||||||
|
resetTitle()
|
||||||
|
if (!Array.isArray(selectedPaths)) return
|
||||||
|
windows.main.dispatch('onOpen', selectedPaths)
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Show open dialog to open a .torrent file.
|
||||||
|
*/
|
||||||
|
function openTorrentFile () {
|
||||||
|
if (!windows.main.win) return
|
||||||
|
log('openTorrentFile')
|
||||||
|
const opts = {
|
||||||
|
title: 'Select a .torrent file.',
|
||||||
|
filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
|
||||||
|
properties: ['openFile', 'multiSelections']
|
||||||
|
}
|
||||||
|
setTitle(opts.title)
|
||||||
|
const selectedPaths = dialog.showOpenDialogSync(windows.main.win, opts)
|
||||||
|
resetTitle()
|
||||||
|
if (!Array.isArray(selectedPaths)) return
|
||||||
|
selectedPaths.forEach(selectedPath => {
|
||||||
|
windows.main.dispatch('addTorrent', selectedPath)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Show modal dialog to open a torrent URL (magnet uri, http torrent link, etc.)
|
||||||
|
*/
|
||||||
|
function openTorrentAddress () {
|
||||||
|
log('openTorrentAddress')
|
||||||
|
windows.main.dispatch('openTorrentAddress')
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Dialogs on do not show a title on Mac, so the window title is used instead.
|
||||||
|
*/
|
||||||
|
function setTitle (title) {
|
||||||
|
if (process.platform === 'darwin') {
|
||||||
|
windows.main.dispatch('setTitle', title)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function resetTitle () {
|
||||||
|
windows.main.dispatch('resetTitle')
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pops up an Open File dialog with the given options.
|
||||||
|
* After the user selects files / folders, shows the Create Torrent page.
|
||||||
|
*/
|
||||||
|
function showOpenSeed (opts) {
|
||||||
|
setTitle(opts.title)
|
||||||
|
const selectedPaths = dialog.showOpenDialogSync(windows.main.win, opts)
|
||||||
|
resetTitle()
|
||||||
|
if (!Array.isArray(selectedPaths)) return
|
||||||
|
windows.main.dispatch('showCreateTorrent', selectedPaths)
|
||||||
|
}
|
||||||
@@ -4,24 +4,22 @@ module.exports = {
|
|||||||
setBadge
|
setBadge
|
||||||
}
|
}
|
||||||
|
|
||||||
var electron = require('electron')
|
const { app, Menu } = require('electron')
|
||||||
|
|
||||||
var app = electron.app
|
const dialog = require('./dialog')
|
||||||
|
const log = require('./log')
|
||||||
var dialog = require('./dialog')
|
|
||||||
var log = require('./log')
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a right-click menu to the dock icon. (OS X)
|
* Add a right-click menu to the dock icon. (Mac)
|
||||||
*/
|
*/
|
||||||
function init () {
|
function init () {
|
||||||
if (!app.dock) return
|
if (!app.dock) return
|
||||||
var menu = electron.Menu.buildFromTemplate(getMenuTemplate())
|
const menu = Menu.buildFromTemplate(getMenuTemplate())
|
||||||
app.dock.setMenu(menu)
|
app.dock.setMenu(menu)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Bounce the Downloads stack if `path` is inside the Downloads folder. (OS X)
|
* Bounce the Downloads stack if `path` is inside the Downloads folder. (Mac)
|
||||||
*/
|
*/
|
||||||
function downloadFinished (path) {
|
function downloadFinished (path) {
|
||||||
if (!app.dock) return
|
if (!app.dock) return
|
||||||
@@ -30,12 +28,14 @@ function downloadFinished (path) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display string in dock badging area. (OS X)
|
* Display a counter badge for the app. (Mac, Linux)
|
||||||
*/
|
*/
|
||||||
function setBadge (text) {
|
function setBadge (count) {
|
||||||
if (!app.dock) return
|
if (process.platform === 'darwin' ||
|
||||||
log(`setBadge: ${text}`)
|
(process.platform === 'linux' && app.isUnityRunning())) {
|
||||||
app.dock.setBadge(String(text))
|
log(`setBadge: ${count}`)
|
||||||
|
app.badgeCount = Number(count)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getMenuTemplate () {
|
function getMenuTemplate () {
|
||||||
76
src/main/external-player.js
Normal file
76
src/main/external-player.js
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
module.exports = {
|
||||||
|
spawn,
|
||||||
|
kill,
|
||||||
|
checkInstall
|
||||||
|
}
|
||||||
|
|
||||||
|
const cp = require('child_process')
|
||||||
|
const path = require('path')
|
||||||
|
const vlcCommand = require('vlc-command')
|
||||||
|
|
||||||
|
const log = require('./log')
|
||||||
|
const windows = require('./windows')
|
||||||
|
|
||||||
|
// holds a ChildProcess while we're playing a video in an external player, null otherwise
|
||||||
|
let proc = null
|
||||||
|
|
||||||
|
function checkInstall (playerPath, cb) {
|
||||||
|
// check for VLC if external player has not been specified by the user
|
||||||
|
// otherwise assume the player is installed
|
||||||
|
if (!playerPath) return vlcCommand(cb)
|
||||||
|
process.nextTick(() => cb(null))
|
||||||
|
}
|
||||||
|
|
||||||
|
function spawn (playerPath, url, title) {
|
||||||
|
if (playerPath) return spawnExternal(playerPath, [url])
|
||||||
|
|
||||||
|
// Try to find and use VLC if external player is not specified
|
||||||
|
vlcCommand((err, vlcPath) => {
|
||||||
|
if (err) return windows.main.dispatch('externalPlayerNotFound')
|
||||||
|
const args = [
|
||||||
|
'--play-and-exit',
|
||||||
|
'--quiet',
|
||||||
|
`--meta-title=${JSON.stringify(title)}`,
|
||||||
|
url
|
||||||
|
]
|
||||||
|
spawnExternal(vlcPath, args)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function kill () {
|
||||||
|
if (!proc) return
|
||||||
|
log(`Killing external player, pid ${proc.pid}`)
|
||||||
|
proc.kill('SIGKILL') // kill -9
|
||||||
|
proc = null
|
||||||
|
}
|
||||||
|
|
||||||
|
function spawnExternal (playerPath, args) {
|
||||||
|
log('Running external media player:', `${playerPath} ${args.join(' ')}`)
|
||||||
|
|
||||||
|
if (process.platform === 'darwin' && path.extname(playerPath) === '.app') {
|
||||||
|
// Mac: Use executable in packaged .app bundle
|
||||||
|
playerPath += `/Contents/MacOS/${path.basename(playerPath, '.app')}`
|
||||||
|
}
|
||||||
|
|
||||||
|
proc = cp.spawn(playerPath, args, { stdio: 'ignore' })
|
||||||
|
|
||||||
|
// If it works, close the modal after a second
|
||||||
|
const closeModalTimeout = setTimeout(() =>
|
||||||
|
windows.main.dispatch('exitModal'), 1000)
|
||||||
|
|
||||||
|
proc.on('close', code => {
|
||||||
|
clearTimeout(closeModalTimeout)
|
||||||
|
if (!proc) return // Killed
|
||||||
|
log('External player exited with code ', code)
|
||||||
|
if (code === 0) {
|
||||||
|
windows.main.dispatch('backToList')
|
||||||
|
} else {
|
||||||
|
windows.main.dispatch('externalPlayerNotFound')
|
||||||
|
}
|
||||||
|
proc = null
|
||||||
|
})
|
||||||
|
|
||||||
|
proc.on('error', err => {
|
||||||
|
log('External player error', err)
|
||||||
|
})
|
||||||
|
}
|
||||||
50
src/main/folder-watcher.js
Normal file
50
src/main/folder-watcher.js
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
const chokidar = require('chokidar')
|
||||||
|
const log = require('./log')
|
||||||
|
|
||||||
|
class FolderWatcher {
|
||||||
|
constructor ({ window, state }) {
|
||||||
|
this.window = window
|
||||||
|
this.state = state
|
||||||
|
this.torrentsFolderPath = null
|
||||||
|
this.watching = false
|
||||||
|
}
|
||||||
|
|
||||||
|
isEnabled () {
|
||||||
|
return this.state.saved.prefs.autoAddTorrents
|
||||||
|
}
|
||||||
|
|
||||||
|
start () {
|
||||||
|
// Stop watching previous folder before
|
||||||
|
// start watching a new one.
|
||||||
|
if (this.watching) this.stop()
|
||||||
|
|
||||||
|
const torrentsFolderPath = this.state.saved.prefs.torrentsFolderPath
|
||||||
|
this.torrentsFolderPath = torrentsFolderPath
|
||||||
|
if (!torrentsFolderPath) return
|
||||||
|
|
||||||
|
const glob = `${torrentsFolderPath}/**/*.torrent`
|
||||||
|
log('Folder Watcher: watching: ', glob)
|
||||||
|
|
||||||
|
const options = {
|
||||||
|
ignoreInitial: true,
|
||||||
|
awaitWriteFinish: true
|
||||||
|
}
|
||||||
|
this.watcher = chokidar.watch(glob, options)
|
||||||
|
this.watcher
|
||||||
|
.on('add', (path) => {
|
||||||
|
log('Folder Watcher: added torrent: ', path)
|
||||||
|
this.window.dispatch('addTorrent', path)
|
||||||
|
})
|
||||||
|
|
||||||
|
this.watching = true
|
||||||
|
}
|
||||||
|
|
||||||
|
stop () {
|
||||||
|
log('Folder Watcher: stop.')
|
||||||
|
if (!this.watching) return
|
||||||
|
this.watcher.close()
|
||||||
|
this.watching = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = FolderWatcher
|
||||||
266
src/main/handlers.js
Normal file
266
src/main/handlers.js
Normal file
@@ -0,0 +1,266 @@
|
|||||||
|
module.exports = {
|
||||||
|
install,
|
||||||
|
uninstall
|
||||||
|
}
|
||||||
|
|
||||||
|
const config = require('../config')
|
||||||
|
const path = require('path')
|
||||||
|
|
||||||
|
function install () {
|
||||||
|
switch (process.platform) {
|
||||||
|
case 'darwin': installDarwin()
|
||||||
|
break
|
||||||
|
case 'win32': installWin32()
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function uninstall () {
|
||||||
|
switch (process.platform) {
|
||||||
|
case 'darwin': uninstallDarwin()
|
||||||
|
break
|
||||||
|
case 'win32': uninstallWin32()
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function installDarwin () {
|
||||||
|
const { app } = require('electron')
|
||||||
|
|
||||||
|
// On Mac, only protocols that are listed in `Info.plist` can be set as the
|
||||||
|
// default handler at runtime.
|
||||||
|
app.setAsDefaultProtocolClient('magnet')
|
||||||
|
app.setAsDefaultProtocolClient('stream-magnet')
|
||||||
|
|
||||||
|
// File handlers are defined in `Info.plist`.
|
||||||
|
}
|
||||||
|
|
||||||
|
function uninstallDarwin () {}
|
||||||
|
|
||||||
|
const EXEC_COMMAND = [process.execPath, '--']
|
||||||
|
|
||||||
|
if (!config.IS_PRODUCTION) {
|
||||||
|
EXEC_COMMAND.push(config.ROOT_PATH)
|
||||||
|
}
|
||||||
|
|
||||||
|
function installWin32 () {
|
||||||
|
const Registry = require('winreg')
|
||||||
|
|
||||||
|
const log = require('./log')
|
||||||
|
|
||||||
|
const iconPath = path.join(
|
||||||
|
process.resourcesPath, 'app.asar.unpacked', 'static', 'WebTorrentFile.ico'
|
||||||
|
)
|
||||||
|
registerProtocolHandlerWin32(
|
||||||
|
'magnet',
|
||||||
|
'URL:BitTorrent Magnet URL',
|
||||||
|
iconPath,
|
||||||
|
EXEC_COMMAND
|
||||||
|
)
|
||||||
|
registerProtocolHandlerWin32(
|
||||||
|
'stream-magnet',
|
||||||
|
'URL:BitTorrent Stream-Magnet URL',
|
||||||
|
iconPath,
|
||||||
|
EXEC_COMMAND
|
||||||
|
)
|
||||||
|
registerFileHandlerWin32(
|
||||||
|
'.torrent',
|
||||||
|
'io.webtorrent.torrent',
|
||||||
|
'BitTorrent Document',
|
||||||
|
iconPath,
|
||||||
|
EXEC_COMMAND
|
||||||
|
)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To add a protocol handler, the following keys must be added to the Windows registry:
|
||||||
|
*
|
||||||
|
* HKEY_CLASSES_ROOT
|
||||||
|
* $PROTOCOL
|
||||||
|
* (Default) = "$NAME"
|
||||||
|
* URL Protocol = ""
|
||||||
|
* DefaultIcon
|
||||||
|
* (Default) = "$ICON"
|
||||||
|
* shell
|
||||||
|
* open
|
||||||
|
* command
|
||||||
|
* (Default) = "$COMMAND" "%1"
|
||||||
|
*
|
||||||
|
* Source: https://msdn.microsoft.com/en-us/library/aa767914.aspx
|
||||||
|
*
|
||||||
|
* However, the "HKEY_CLASSES_ROOT" key can only be written by the Administrator user.
|
||||||
|
* So, we instead write to "HKEY_CURRENT_USER\Software\Classes", which is inherited by
|
||||||
|
* "HKEY_CLASSES_ROOT" anyway, and can be written by unprivileged users.
|
||||||
|
*/
|
||||||
|
|
||||||
|
function registerProtocolHandlerWin32 (protocol, name, icon, command) {
|
||||||
|
const protocolKey = new Registry({
|
||||||
|
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
||||||
|
key: '\\Software\\Classes\\' + protocol
|
||||||
|
})
|
||||||
|
|
||||||
|
setProtocol()
|
||||||
|
|
||||||
|
function setProtocol (err) {
|
||||||
|
if (err) return log.error(err.message)
|
||||||
|
protocolKey.set('', Registry.REG_SZ, name, setURLProtocol)
|
||||||
|
}
|
||||||
|
|
||||||
|
function setURLProtocol (err) {
|
||||||
|
if (err) return log.error(err.message)
|
||||||
|
protocolKey.set('URL Protocol', Registry.REG_SZ, '', setIcon)
|
||||||
|
}
|
||||||
|
|
||||||
|
function setIcon (err) {
|
||||||
|
if (err) return log.error(err.message)
|
||||||
|
|
||||||
|
const iconKey = new Registry({
|
||||||
|
hive: Registry.HKCU,
|
||||||
|
key: `\\Software\\Classes\\${protocol}\\DefaultIcon`
|
||||||
|
})
|
||||||
|
iconKey.set('', Registry.REG_SZ, icon, setCommand)
|
||||||
|
}
|
||||||
|
|
||||||
|
function setCommand (err) {
|
||||||
|
if (err) return log.error(err.message)
|
||||||
|
|
||||||
|
const commandKey = new Registry({
|
||||||
|
hive: Registry.HKCU,
|
||||||
|
key: `\\Software\\Classes\\${protocol}\\shell\\open\\command`
|
||||||
|
})
|
||||||
|
commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
|
||||||
|
}
|
||||||
|
|
||||||
|
function done (err) {
|
||||||
|
if (err) return log.error(err.message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To add a file handler, the following keys must be added to the Windows registry:
|
||||||
|
*
|
||||||
|
* HKEY_CLASSES_ROOT
|
||||||
|
* $EXTENSION
|
||||||
|
* (Default) = "$EXTENSION_ID"
|
||||||
|
* $EXTENSION_ID
|
||||||
|
* (Default) = "$NAME"
|
||||||
|
* DefaultIcon
|
||||||
|
* (Default) = "$ICON"
|
||||||
|
* shell
|
||||||
|
* open
|
||||||
|
* command
|
||||||
|
* (Default) = "$COMMAND" "%1"
|
||||||
|
*/
|
||||||
|
function registerFileHandlerWin32 (ext, id, name, icon, command) {
|
||||||
|
setExt()
|
||||||
|
|
||||||
|
function setExt () {
|
||||||
|
const extKey = new Registry({
|
||||||
|
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
||||||
|
key: `\\Software\\Classes\\${ext}`
|
||||||
|
})
|
||||||
|
extKey.set('', Registry.REG_SZ, id, setId)
|
||||||
|
}
|
||||||
|
|
||||||
|
function setId (err) {
|
||||||
|
if (err) return log.error(err.message)
|
||||||
|
|
||||||
|
const idKey = new Registry({
|
||||||
|
hive: Registry.HKCU,
|
||||||
|
key: `\\Software\\Classes\\${id}`
|
||||||
|
})
|
||||||
|
idKey.set('', Registry.REG_SZ, name, setIcon)
|
||||||
|
}
|
||||||
|
|
||||||
|
function setIcon (err) {
|
||||||
|
if (err) return log.error(err.message)
|
||||||
|
|
||||||
|
const iconKey = new Registry({
|
||||||
|
hive: Registry.HKCU,
|
||||||
|
key: `\\Software\\Classes\\${id}\\DefaultIcon`
|
||||||
|
})
|
||||||
|
iconKey.set('', Registry.REG_SZ, icon, setCommand)
|
||||||
|
}
|
||||||
|
|
||||||
|
function setCommand (err) {
|
||||||
|
if (err) return log.error(err.message)
|
||||||
|
|
||||||
|
const commandKey = new Registry({
|
||||||
|
hive: Registry.HKCU,
|
||||||
|
key: `\\Software\\Classes\\${id}\\shell\\open\\command`
|
||||||
|
})
|
||||||
|
commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
|
||||||
|
}
|
||||||
|
|
||||||
|
function done (err) {
|
||||||
|
if (err) return log.error(err.message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function uninstallWin32 () {
|
||||||
|
const Registry = require('winreg')
|
||||||
|
|
||||||
|
unregisterProtocolHandlerWin32('magnet', EXEC_COMMAND)
|
||||||
|
unregisterProtocolHandlerWin32('stream-magnet', EXEC_COMMAND)
|
||||||
|
unregisterFileHandlerWin32('.torrent', 'io.webtorrent.torrent', EXEC_COMMAND)
|
||||||
|
|
||||||
|
function unregisterProtocolHandlerWin32 (protocol, command) {
|
||||||
|
getCommand()
|
||||||
|
|
||||||
|
function getCommand () {
|
||||||
|
const commandKey = new Registry({
|
||||||
|
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
||||||
|
key: `\\Software\\Classes\\${protocol}\\shell\\open\\command`
|
||||||
|
})
|
||||||
|
commandKey.get('', (err, item) => {
|
||||||
|
if (!err && item.value.indexOf(commandToArgs(command)) >= 0) {
|
||||||
|
destroyProtocol()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function destroyProtocol () {
|
||||||
|
const protocolKey = new Registry({
|
||||||
|
hive: Registry.HKCU,
|
||||||
|
key: `\\Software\\Classes\\${protocol}`
|
||||||
|
})
|
||||||
|
protocolKey.destroy(() => {})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function unregisterFileHandlerWin32 (ext, id, command) {
|
||||||
|
eraseId()
|
||||||
|
|
||||||
|
function eraseId () {
|
||||||
|
const idKey = new Registry({
|
||||||
|
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
||||||
|
key: `\\Software\\Classes\\${id}`
|
||||||
|
})
|
||||||
|
idKey.destroy(getExt)
|
||||||
|
}
|
||||||
|
|
||||||
|
function getExt () {
|
||||||
|
const extKey = new Registry({
|
||||||
|
hive: Registry.HKCU,
|
||||||
|
key: `\\Software\\Classes\\${ext}`
|
||||||
|
})
|
||||||
|
extKey.get('', (err, item) => {
|
||||||
|
if (!err && item.value === id) {
|
||||||
|
destroyExt()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function destroyExt () {
|
||||||
|
const extKey = new Registry({
|
||||||
|
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
||||||
|
key: `\\Software\\Classes\\${ext}`
|
||||||
|
})
|
||||||
|
extKey.destroy(() => {})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function commandToArgs (command) {
|
||||||
|
return command.map((arg) => `"${arg}"`).join(' ')
|
||||||
|
}
|
||||||
240
src/main/index.js
Normal file
240
src/main/index.js
Normal file
@@ -0,0 +1,240 @@
|
|||||||
|
console.time('init')
|
||||||
|
|
||||||
|
require('@electron/remote/main').initialize()
|
||||||
|
const { app, ipcMain } = require('electron')
|
||||||
|
|
||||||
|
// Start crash reporter early, so it takes effect for child processes
|
||||||
|
const crashReporter = require('../crash-reporter')
|
||||||
|
crashReporter.init()
|
||||||
|
|
||||||
|
const parallel = require('run-parallel')
|
||||||
|
|
||||||
|
const config = require('../config')
|
||||||
|
const ipc = require('./ipc')
|
||||||
|
const log = require('./log')
|
||||||
|
const menu = require('./menu')
|
||||||
|
const State = require('../renderer/lib/state')
|
||||||
|
const windows = require('./windows')
|
||||||
|
|
||||||
|
const WEBTORRENT_VERSION = require('webtorrent/package.json').version
|
||||||
|
|
||||||
|
let shouldQuit = false
|
||||||
|
let argv = sliceArgv(process.argv)
|
||||||
|
|
||||||
|
// allow electron/chromium to play startup sounds (without user interaction)
|
||||||
|
app.commandLine.appendSwitch('autoplay-policy', 'no-user-gesture-required')
|
||||||
|
|
||||||
|
// Start the app without showing the main window when auto launching on login
|
||||||
|
// (On Windows and Linux, we get a flag. On MacOS, we get special API.)
|
||||||
|
const hidden = argv.includes('--hidden') ||
|
||||||
|
(process.platform === 'darwin' && app.getLoginItemSettings().wasOpenedAsHidden)
|
||||||
|
|
||||||
|
if (config.IS_PRODUCTION) {
|
||||||
|
// When Electron is running in production mode (packaged app), then run React
|
||||||
|
// in production mode too.
|
||||||
|
process.env.NODE_ENV = 'production'
|
||||||
|
}
|
||||||
|
|
||||||
|
if (process.platform === 'win32') {
|
||||||
|
const squirrelWin32 = require('./squirrel-win32')
|
||||||
|
shouldQuit = squirrelWin32.handleEvent(argv[0])
|
||||||
|
argv = argv.filter((arg) => !arg.includes('--squirrel'))
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!shouldQuit && !config.IS_PORTABLE) {
|
||||||
|
// Prevent multiple instances of app from running at same time. New instances
|
||||||
|
// signal this instance and quit. Note: This feature creates a lock file in
|
||||||
|
// %APPDATA%\Roaming\WebTorrent so we do not do it for the Portable App since
|
||||||
|
// we want to be "silent" as well as "portable".
|
||||||
|
if (!app.requestSingleInstanceLock()) {
|
||||||
|
shouldQuit = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (shouldQuit) {
|
||||||
|
app.quit()
|
||||||
|
} else {
|
||||||
|
init()
|
||||||
|
}
|
||||||
|
|
||||||
|
function init () {
|
||||||
|
app.on('second-instance', (event, commandLine, workingDirectory) => onAppOpen(commandLine))
|
||||||
|
if (config.IS_PORTABLE) {
|
||||||
|
const path = require('path')
|
||||||
|
// Put all user data into the "Portable Settings" folder
|
||||||
|
app.setPath('userData', config.CONFIG_PATH)
|
||||||
|
// Put Electron crash files, etc. into the "Portable Settings\Temp" folder
|
||||||
|
app.setPath('temp', path.join(config.CONFIG_PATH, 'Temp'))
|
||||||
|
}
|
||||||
|
|
||||||
|
let isReady = false // app ready, windows can be created
|
||||||
|
app.ipcReady = false // main window has finished loading and IPC is ready
|
||||||
|
app.isQuitting = false
|
||||||
|
|
||||||
|
parallel({
|
||||||
|
appReady: (cb) => app.on('ready', () => cb(null)),
|
||||||
|
state: (cb) => State.load(cb)
|
||||||
|
}, onReady)
|
||||||
|
|
||||||
|
function onReady (err, results) {
|
||||||
|
if (err) throw err
|
||||||
|
|
||||||
|
isReady = true
|
||||||
|
const state = results.state
|
||||||
|
|
||||||
|
menu.init()
|
||||||
|
windows.main.init(state, { hidden })
|
||||||
|
windows.webtorrent.init()
|
||||||
|
|
||||||
|
// To keep app startup fast, some code is delayed.
|
||||||
|
setTimeout(() => {
|
||||||
|
delayedInit(state)
|
||||||
|
}, config.DELAYED_INIT)
|
||||||
|
|
||||||
|
// Report uncaught exceptions
|
||||||
|
process.on('uncaughtException', (err) => {
|
||||||
|
console.error(err)
|
||||||
|
const error = { message: err.message, stack: err.stack }
|
||||||
|
windows.main.dispatch('uncaughtError', 'main', error)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enable app logging into default directory, i.e. /Library/Logs/WebTorrent
|
||||||
|
// on Mac, %APPDATA% on Windows, $XDG_CONFIG_HOME or ~/.config on Linux.
|
||||||
|
app.setAppLogsPath()
|
||||||
|
|
||||||
|
app.userAgentFallback = `WebTorrent/${WEBTORRENT_VERSION} (https://webtorrent.io)`
|
||||||
|
|
||||||
|
app.on('open-file', onOpen)
|
||||||
|
app.on('open-url', onOpen)
|
||||||
|
|
||||||
|
ipc.init()
|
||||||
|
|
||||||
|
app.once('ipcReady', () => {
|
||||||
|
log('Command line args:', argv)
|
||||||
|
processArgv(argv)
|
||||||
|
console.timeEnd('init')
|
||||||
|
})
|
||||||
|
|
||||||
|
app.on('before-quit', e => {
|
||||||
|
if (app.isQuitting) return
|
||||||
|
|
||||||
|
app.isQuitting = true
|
||||||
|
e.preventDefault()
|
||||||
|
windows.main.dispatch('stateSaveImmediate') // try to save state on exit
|
||||||
|
ipcMain.once('stateSaved', () => app.quit())
|
||||||
|
setTimeout(() => {
|
||||||
|
console.error('Saving state took too long. Quitting.')
|
||||||
|
app.quit()
|
||||||
|
}, 4000) // quit after 4 secs, at most
|
||||||
|
})
|
||||||
|
|
||||||
|
app.on('activate', () => {
|
||||||
|
if (isReady) windows.main.show()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function delayedInit (state) {
|
||||||
|
if (app.isQuitting) return
|
||||||
|
|
||||||
|
const announcement = require('./announcement')
|
||||||
|
const dock = require('./dock')
|
||||||
|
const updater = require('./updater')
|
||||||
|
const FolderWatcher = require('./folder-watcher')
|
||||||
|
const folderWatcher = new FolderWatcher({ window: windows.main, state })
|
||||||
|
|
||||||
|
announcement.init()
|
||||||
|
dock.init()
|
||||||
|
updater.init()
|
||||||
|
|
||||||
|
ipc.setModule('folderWatcher', folderWatcher)
|
||||||
|
if (folderWatcher.isEnabled()) {
|
||||||
|
folderWatcher.start()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (process.platform === 'win32') {
|
||||||
|
const userTasks = require('./user-tasks')
|
||||||
|
userTasks.init()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (process.platform !== 'darwin') {
|
||||||
|
const tray = require('./tray')
|
||||||
|
tray.init()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onOpen (e, torrentId) {
|
||||||
|
e.preventDefault()
|
||||||
|
|
||||||
|
if (app.ipcReady) {
|
||||||
|
// Magnet links opened from Chrome won't focus the app without a setTimeout.
|
||||||
|
// The confirmation dialog Chrome shows causes Chrome to steal back the focus.
|
||||||
|
// Electron issue: https://github.com/atom/electron/issues/4338
|
||||||
|
setTimeout(() => windows.main.show(), 100)
|
||||||
|
|
||||||
|
processArgv([torrentId])
|
||||||
|
} else {
|
||||||
|
argv.push(torrentId)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onAppOpen (newArgv) {
|
||||||
|
newArgv = sliceArgv(newArgv)
|
||||||
|
|
||||||
|
if (app.ipcReady) {
|
||||||
|
log('Second app instance opened, but was prevented:', newArgv)
|
||||||
|
windows.main.show()
|
||||||
|
|
||||||
|
processArgv(newArgv)
|
||||||
|
} else {
|
||||||
|
argv.push(...newArgv)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove leading args.
|
||||||
|
// Production: 1 arg, eg: /Applications/WebTorrent.app/Contents/MacOS/WebTorrent
|
||||||
|
// Development: 2 args, eg: electron .
|
||||||
|
// Test: 4 args, eg: electron -r .../mocks.js .
|
||||||
|
function sliceArgv (argv) {
|
||||||
|
return argv.slice(
|
||||||
|
config.IS_PRODUCTION
|
||||||
|
? 1
|
||||||
|
: config.IS_TEST
|
||||||
|
? 4
|
||||||
|
: 2
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function processArgv (argv) {
|
||||||
|
const torrentIds = []
|
||||||
|
argv.forEach(arg => {
|
||||||
|
if (arg === '-n' || arg === '-o' || arg === '-u') {
|
||||||
|
// Critical path: Only load the 'dialog' package if it is needed
|
||||||
|
const dialog = require('./dialog')
|
||||||
|
if (arg === '-n') {
|
||||||
|
dialog.openSeedDirectory()
|
||||||
|
} else if (arg === '-o') {
|
||||||
|
dialog.openTorrentFile()
|
||||||
|
} else if (arg === '-u') {
|
||||||
|
dialog.openTorrentAddress()
|
||||||
|
}
|
||||||
|
} else if (arg === '--hidden') {
|
||||||
|
// Ignore hidden argument, already being handled
|
||||||
|
} else if (arg.startsWith('-psn')) {
|
||||||
|
// Ignore Mac launchd "process serial number" argument
|
||||||
|
// Issue: https://github.com/webtorrent/webtorrent-desktop/issues/214
|
||||||
|
} else if (arg.startsWith('--')) {
|
||||||
|
// Ignore Spectron flags
|
||||||
|
} else if (arg === 'data:,') {
|
||||||
|
// Ignore weird Spectron argument
|
||||||
|
} else if (arg !== '.') {
|
||||||
|
// Ignore '.' argument, which gets misinterpreted as a torrent id, when a
|
||||||
|
// development copy of WebTorrent is started while a production version is
|
||||||
|
// running.
|
||||||
|
torrentIds.push(arg)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
if (torrentIds.length > 0) {
|
||||||
|
windows.main.dispatch('onOpen', torrentIds)
|
||||||
|
}
|
||||||
|
}
|
||||||
248
src/main/ipc.js
Normal file
248
src/main/ipc.js
Normal file
@@ -0,0 +1,248 @@
|
|||||||
|
module.exports = {
|
||||||
|
init,
|
||||||
|
setModule
|
||||||
|
}
|
||||||
|
|
||||||
|
const { app, ipcMain } = require('electron')
|
||||||
|
|
||||||
|
const log = require('./log')
|
||||||
|
const menu = require('./menu')
|
||||||
|
const windows = require('./windows')
|
||||||
|
|
||||||
|
// Messages from the main process, to be sent once the WebTorrent process starts
|
||||||
|
const messageQueueMainToWebTorrent = []
|
||||||
|
|
||||||
|
// Will hold modules injected from the app that will be used on fired
|
||||||
|
// IPC events.
|
||||||
|
const modules = {}
|
||||||
|
|
||||||
|
function setModule (name, module) {
|
||||||
|
modules[name] = module
|
||||||
|
}
|
||||||
|
|
||||||
|
function init () {
|
||||||
|
ipcMain.once('ipcReady', e => {
|
||||||
|
app.ipcReady = true
|
||||||
|
app.emit('ipcReady')
|
||||||
|
})
|
||||||
|
|
||||||
|
ipcMain.once('ipcReadyWebTorrent', e => {
|
||||||
|
app.ipcReadyWebTorrent = true
|
||||||
|
log('sending %d queued messages from the main win to the webtorrent window',
|
||||||
|
messageQueueMainToWebTorrent.length)
|
||||||
|
messageQueueMainToWebTorrent.forEach(message => {
|
||||||
|
windows.webtorrent.send(message.name, ...message.args)
|
||||||
|
log('webtorrent: sent queued %s', message.name)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Dialog
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipcMain.on('openTorrentFile', () => {
|
||||||
|
const dialog = require('./dialog')
|
||||||
|
dialog.openTorrentFile()
|
||||||
|
})
|
||||||
|
ipcMain.on('openFiles', () => {
|
||||||
|
const dialog = require('./dialog')
|
||||||
|
dialog.openFiles()
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Dock
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipcMain.on('setBadge', (e, ...args) => {
|
||||||
|
const dock = require('./dock')
|
||||||
|
dock.setBadge(...args)
|
||||||
|
})
|
||||||
|
ipcMain.on('downloadFinished', (e, ...args) => {
|
||||||
|
const dock = require('./dock')
|
||||||
|
dock.downloadFinished(...args)
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Player Events
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipcMain.on('onPlayerOpen', () => {
|
||||||
|
const powerSaveBlocker = require('./power-save-blocker')
|
||||||
|
const shortcuts = require('./shortcuts')
|
||||||
|
const thumbar = require('./thumbar')
|
||||||
|
|
||||||
|
menu.togglePlaybackControls(true)
|
||||||
|
powerSaveBlocker.enable()
|
||||||
|
shortcuts.enable()
|
||||||
|
thumbar.enable()
|
||||||
|
})
|
||||||
|
|
||||||
|
ipcMain.on('onPlayerUpdate', (e, ...args) => {
|
||||||
|
const thumbar = require('./thumbar')
|
||||||
|
|
||||||
|
menu.onPlayerUpdate(...args)
|
||||||
|
thumbar.onPlayerUpdate(...args)
|
||||||
|
})
|
||||||
|
|
||||||
|
ipcMain.on('onPlayerClose', () => {
|
||||||
|
const powerSaveBlocker = require('./power-save-blocker')
|
||||||
|
const shortcuts = require('./shortcuts')
|
||||||
|
const thumbar = require('./thumbar')
|
||||||
|
|
||||||
|
menu.togglePlaybackControls(false)
|
||||||
|
powerSaveBlocker.disable()
|
||||||
|
shortcuts.disable()
|
||||||
|
thumbar.disable()
|
||||||
|
})
|
||||||
|
|
||||||
|
ipcMain.on('onPlayerPlay', () => {
|
||||||
|
const powerSaveBlocker = require('./power-save-blocker')
|
||||||
|
const thumbar = require('./thumbar')
|
||||||
|
|
||||||
|
powerSaveBlocker.enable()
|
||||||
|
thumbar.onPlayerPlay()
|
||||||
|
})
|
||||||
|
|
||||||
|
ipcMain.on('onPlayerPause', () => {
|
||||||
|
const powerSaveBlocker = require('./power-save-blocker')
|
||||||
|
const thumbar = require('./thumbar')
|
||||||
|
|
||||||
|
powerSaveBlocker.disable()
|
||||||
|
thumbar.onPlayerPause()
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Folder Watcher Events
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipcMain.on('startFolderWatcher', () => {
|
||||||
|
if (!modules.folderWatcher) {
|
||||||
|
log('IPC ERR: folderWatcher module is not defined.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
modules.folderWatcher.start()
|
||||||
|
})
|
||||||
|
|
||||||
|
ipcMain.on('stopFolderWatcher', () => {
|
||||||
|
if (!modules.folderWatcher) {
|
||||||
|
log('IPC ERR: folderWatcher module is not defined.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
modules.folderWatcher.stop()
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shell
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipcMain.on('openPath', (e, ...args) => {
|
||||||
|
const shell = require('./shell')
|
||||||
|
shell.openPath(...args)
|
||||||
|
})
|
||||||
|
ipcMain.on('showItemInFolder', (e, ...args) => {
|
||||||
|
const shell = require('./shell')
|
||||||
|
shell.showItemInFolder(...args)
|
||||||
|
})
|
||||||
|
ipcMain.on('moveItemToTrash', (e, ...args) => {
|
||||||
|
const shell = require('./shell')
|
||||||
|
shell.moveItemToTrash(...args)
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* File handlers
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipcMain.on('setDefaultFileHandler', (e, flag) => {
|
||||||
|
const handlers = require('./handlers')
|
||||||
|
|
||||||
|
if (flag) handlers.install()
|
||||||
|
else handlers.uninstall()
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Auto start on login
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipcMain.on('setStartup', (e, flag) => {
|
||||||
|
const startup = require('./startup')
|
||||||
|
|
||||||
|
if (flag) startup.install()
|
||||||
|
else startup.uninstall()
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Windows: Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
const main = windows.main
|
||||||
|
|
||||||
|
ipcMain.on('setAspectRatio', (e, ...args) => main.setAspectRatio(...args))
|
||||||
|
ipcMain.on('setBounds', (e, ...args) => main.setBounds(...args))
|
||||||
|
ipcMain.on('setProgress', (e, ...args) => main.setProgress(...args))
|
||||||
|
ipcMain.on('setTitle', (e, ...args) => main.setTitle(...args))
|
||||||
|
ipcMain.on('show', () => main.show())
|
||||||
|
ipcMain.on('toggleFullScreen', (e, ...args) => main.toggleFullScreen(...args))
|
||||||
|
ipcMain.on('setAllowNav', (e, ...args) => menu.setAllowNav(...args))
|
||||||
|
|
||||||
|
/**
|
||||||
|
* External Media Player
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipcMain.on('checkForExternalPlayer', (e, path) => {
|
||||||
|
const externalPlayer = require('./external-player')
|
||||||
|
|
||||||
|
externalPlayer.checkInstall(path, err => {
|
||||||
|
windows.main.send('checkForExternalPlayer', !err)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
ipcMain.on('openExternalPlayer', (e, ...args) => {
|
||||||
|
const externalPlayer = require('./external-player')
|
||||||
|
const shortcuts = require('./shortcuts')
|
||||||
|
const thumbar = require('./thumbar')
|
||||||
|
|
||||||
|
menu.togglePlaybackControls(false)
|
||||||
|
shortcuts.disable()
|
||||||
|
thumbar.disable()
|
||||||
|
externalPlayer.spawn(...args)
|
||||||
|
})
|
||||||
|
|
||||||
|
ipcMain.on('quitExternalPlayer', () => {
|
||||||
|
const externalPlayer = require('./external-player')
|
||||||
|
externalPlayer.kill()
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Message passing
|
||||||
|
*/
|
||||||
|
|
||||||
|
const oldEmit = ipcMain.emit
|
||||||
|
ipcMain.emit = (name, e, ...args) => {
|
||||||
|
// Relay messages between the main window and the WebTorrent hidden window
|
||||||
|
if (name.startsWith('wt-') && !app.isQuitting) {
|
||||||
|
console.dir(e.sender.getTitle())
|
||||||
|
if (e.sender.getTitle() === 'WebTorrent Hidden Window') {
|
||||||
|
// Send message to main window
|
||||||
|
windows.main.send(name, ...args)
|
||||||
|
log('webtorrent: got %s', name)
|
||||||
|
} else if (app.ipcReadyWebTorrent) {
|
||||||
|
// Send message to webtorrent window
|
||||||
|
windows.webtorrent.send(name, ...args)
|
||||||
|
log('webtorrent: sent %s', name)
|
||||||
|
} else {
|
||||||
|
// Queue message for webtorrent window, it hasn't finished loading yet
|
||||||
|
messageQueueMainToWebTorrent.push({
|
||||||
|
name,
|
||||||
|
args
|
||||||
|
})
|
||||||
|
log('webtorrent: queueing %s', name)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Emit all other events normally
|
||||||
|
oldEmit.call(ipcMain, name, e, ...args)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,10 +8,8 @@ module.exports.error = error
|
|||||||
* where they can be viewed in Developer Tools.
|
* where they can be viewed in Developer Tools.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var electron = require('electron')
|
const { app } = require('electron')
|
||||||
var windows = require('./windows')
|
const windows = require('./windows')
|
||||||
|
|
||||||
var app = electron.app
|
|
||||||
|
|
||||||
function log (...args) {
|
function log (...args) {
|
||||||
if (app.ipcReady) {
|
if (app.ipcReady) {
|
||||||
@@ -1,49 +1,62 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
init,
|
init,
|
||||||
onPlayerClose,
|
togglePlaybackControls,
|
||||||
onPlayerOpen,
|
setWindowFocus,
|
||||||
|
setAllowNav,
|
||||||
|
onPlayerUpdate,
|
||||||
onToggleAlwaysOnTop,
|
onToggleAlwaysOnTop,
|
||||||
onToggleFullScreen,
|
onToggleFullScreen
|
||||||
onWindowBlur,
|
|
||||||
onWindowFocus
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var electron = require('electron')
|
const { app, Menu } = require('electron')
|
||||||
|
|
||||||
var app = electron.app
|
const config = require('../config')
|
||||||
|
const windows = require('./windows')
|
||||||
|
|
||||||
var config = require('../config')
|
let menu = null
|
||||||
var dialog = require('./dialog')
|
|
||||||
var shell = require('./shell')
|
|
||||||
var windows = require('./windows')
|
|
||||||
|
|
||||||
var menu
|
|
||||||
|
|
||||||
function init () {
|
function init () {
|
||||||
menu = electron.Menu.buildFromTemplate(getMenuTemplate())
|
menu = Menu.buildFromTemplate(getMenuTemplate())
|
||||||
electron.Menu.setApplicationMenu(menu)
|
Menu.setApplicationMenu(menu)
|
||||||
}
|
}
|
||||||
|
|
||||||
function onPlayerClose () {
|
function togglePlaybackControls (flag) {
|
||||||
getMenuItem('Play/Pause').enabled = false
|
getMenuItem('Play/Pause').enabled = flag
|
||||||
getMenuItem('Increase Volume').enabled = false
|
getMenuItem('Skip Next').enabled = flag
|
||||||
getMenuItem('Decrease Volume').enabled = false
|
getMenuItem('Skip Previous').enabled = flag
|
||||||
getMenuItem('Step Forward').enabled = false
|
getMenuItem('Increase Volume').enabled = flag
|
||||||
getMenuItem('Step Backward').enabled = false
|
getMenuItem('Decrease Volume').enabled = flag
|
||||||
getMenuItem('Increase Speed').enabled = false
|
getMenuItem('Step Forward').enabled = flag
|
||||||
getMenuItem('Decrease Speed').enabled = false
|
getMenuItem('Step Backward').enabled = flag
|
||||||
getMenuItem('Add Subtitles File...').enabled = false
|
getMenuItem('Increase Speed').enabled = flag
|
||||||
|
getMenuItem('Decrease Speed').enabled = flag
|
||||||
|
getMenuItem('Add Subtitles File...').enabled = flag
|
||||||
|
|
||||||
|
if (flag === false) {
|
||||||
|
getMenuItem('Skip Next').enabled = false
|
||||||
|
getMenuItem('Skip Previous').enabled = false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function onPlayerOpen () {
|
function onPlayerUpdate (hasNext, hasPrevious) {
|
||||||
getMenuItem('Play/Pause').enabled = true
|
getMenuItem('Skip Next').enabled = hasNext
|
||||||
getMenuItem('Increase Volume').enabled = true
|
getMenuItem('Skip Previous').enabled = hasPrevious
|
||||||
getMenuItem('Decrease Volume').enabled = true
|
}
|
||||||
getMenuItem('Step Forward').enabled = true
|
|
||||||
getMenuItem('Step Backward').enabled = true
|
function setWindowFocus (flag) {
|
||||||
getMenuItem('Increase Speed').enabled = true
|
getMenuItem('Full Screen').enabled = flag
|
||||||
getMenuItem('Decrease Speed').enabled = true
|
getMenuItem('Float on Top').enabled = flag
|
||||||
getMenuItem('Add Subtitles File...').enabled = true
|
}
|
||||||
|
|
||||||
|
// Disallow opening more screens on top of the current one.
|
||||||
|
function setAllowNav (flag) {
|
||||||
|
getMenuItem('Preferences').enabled = flag
|
||||||
|
if (process.platform === 'darwin') {
|
||||||
|
getMenuItem('Create New Torrent...').enabled = flag
|
||||||
|
} else {
|
||||||
|
getMenuItem('Create New Torrent from Folder...').enabled = flag
|
||||||
|
getMenuItem('Create New Torrent from File...').enabled = flag
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function onToggleAlwaysOnTop (flag) {
|
function onToggleAlwaysOnTop (flag) {
|
||||||
@@ -54,27 +67,16 @@ function onToggleFullScreen (flag) {
|
|||||||
getMenuItem('Full Screen').checked = flag
|
getMenuItem('Full Screen').checked = flag
|
||||||
}
|
}
|
||||||
|
|
||||||
function onWindowBlur () {
|
|
||||||
getMenuItem('Full Screen').enabled = false
|
|
||||||
getMenuItem('Float on Top').enabled = false
|
|
||||||
}
|
|
||||||
|
|
||||||
function onWindowFocus () {
|
|
||||||
getMenuItem('Full Screen').enabled = true
|
|
||||||
getMenuItem('Float on Top').enabled = true
|
|
||||||
}
|
|
||||||
|
|
||||||
function getMenuItem (label) {
|
function getMenuItem (label) {
|
||||||
for (var i = 0; i < menu.items.length; i++) {
|
for (const menuItem of menu.items) {
|
||||||
var menuItem = menu.items[i].submenu.items.find(function (item) {
|
const submenuItem = menuItem.submenu.items.find(item => item.label === label)
|
||||||
return item.label === label
|
if (submenuItem) return submenuItem
|
||||||
})
|
|
||||||
if (menuItem) return menuItem
|
|
||||||
}
|
}
|
||||||
|
return {}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getMenuTemplate () {
|
function getMenuTemplate () {
|
||||||
var template = [
|
const template = [
|
||||||
{
|
{
|
||||||
label: 'File',
|
label: 'File',
|
||||||
submenu: [
|
submenu: [
|
||||||
@@ -83,26 +85,31 @@ function getMenuTemplate () {
|
|||||||
? 'Create New Torrent...'
|
? 'Create New Torrent...'
|
||||||
: 'Create New Torrent from Folder...',
|
: 'Create New Torrent from Folder...',
|
||||||
accelerator: 'CmdOrCtrl+N',
|
accelerator: 'CmdOrCtrl+N',
|
||||||
click: () => dialog.openSeedDirectory()
|
click: () => {
|
||||||
|
const dialog = require('./dialog')
|
||||||
|
dialog.openSeedDirectory()
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Open Torrent File...',
|
label: 'Open Torrent File...',
|
||||||
accelerator: 'CmdOrCtrl+O',
|
accelerator: 'CmdOrCtrl+O',
|
||||||
click: () => dialog.openTorrentFile()
|
click: () => {
|
||||||
|
const dialog = require('./dialog')
|
||||||
|
dialog.openTorrentFile()
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Open Torrent Address...',
|
label: 'Open Torrent Address...',
|
||||||
accelerator: 'CmdOrCtrl+U',
|
accelerator: 'CmdOrCtrl+U',
|
||||||
click: () => dialog.openTorrentAddress()
|
click: () => {
|
||||||
|
const dialog = require('./dialog')
|
||||||
|
dialog.openTorrentAddress()
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'separator'
|
type: 'separator'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: process.platform === 'win32'
|
|
||||||
? 'Close'
|
|
||||||
: 'Close Window',
|
|
||||||
accelerator: 'CmdOrCtrl+W',
|
|
||||||
role: 'close'
|
role: 'close'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -111,32 +118,29 @@ function getMenuTemplate () {
|
|||||||
label: 'Edit',
|
label: 'Edit',
|
||||||
submenu: [
|
submenu: [
|
||||||
{
|
{
|
||||||
label: 'Cut',
|
role: 'undo'
|
||||||
accelerator: 'CmdOrCtrl+X',
|
|
||||||
role: 'cut'
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Copy',
|
role: 'redo'
|
||||||
accelerator: 'CmdOrCtrl+C',
|
|
||||||
role: 'copy'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Paste Torrent Address',
|
|
||||||
accelerator: 'CmdOrCtrl+V',
|
|
||||||
role: 'paste'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Select All',
|
|
||||||
accelerator: 'CmdOrCtrl+A',
|
|
||||||
role: 'selectall'
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'separator'
|
type: 'separator'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Preferences',
|
role: 'cut'
|
||||||
accelerator: 'CmdOrCtrl+,',
|
},
|
||||||
click: () => windows.main.dispatch('preferences')
|
{
|
||||||
|
role: 'copy'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Paste Torrent Address',
|
||||||
|
role: 'paste'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
role: 'delete'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
role: 'selectall'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -200,6 +204,21 @@ function getMenuTemplate () {
|
|||||||
{
|
{
|
||||||
type: 'separator'
|
type: 'separator'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: 'Skip Next',
|
||||||
|
accelerator: 'N',
|
||||||
|
click: () => windows.main.dispatch('nextTrack'),
|
||||||
|
enabled: false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Skip Previous',
|
||||||
|
accelerator: 'P',
|
||||||
|
click: () => windows.main.dispatch('previousTrack'),
|
||||||
|
enabled: false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'separator'
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: 'Increase Volume',
|
label: 'Increase Volume',
|
||||||
accelerator: 'CmdOrCtrl+Up',
|
accelerator: 'CmdOrCtrl+Up',
|
||||||
@@ -220,7 +239,7 @@ function getMenuTemplate () {
|
|||||||
accelerator: process.platform === 'darwin'
|
accelerator: process.platform === 'darwin'
|
||||||
? 'CmdOrCtrl+Alt+Right'
|
? 'CmdOrCtrl+Alt+Right'
|
||||||
: 'Alt+Right',
|
: 'Alt+Right',
|
||||||
click: () => windows.main.dispatch('skip', 1),
|
click: () => windows.main.dispatch('skip', 10),
|
||||||
enabled: false
|
enabled: false
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -228,7 +247,7 @@ function getMenuTemplate () {
|
|||||||
accelerator: process.platform === 'darwin'
|
accelerator: process.platform === 'darwin'
|
||||||
? 'CmdOrCtrl+Alt+Left'
|
? 'CmdOrCtrl+Alt+Left'
|
||||||
: 'Alt+Left',
|
: 'Alt+Left',
|
||||||
click: () => windows.main.dispatch('skip', -1),
|
click: () => windows.main.dispatch('skip', -10),
|
||||||
enabled: false
|
enabled: false
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -256,36 +275,79 @@ function getMenuTemplate () {
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: 'Transfers',
|
||||||
|
submenu: [
|
||||||
|
{
|
||||||
|
label: 'Pause All',
|
||||||
|
click: () => windows.main.dispatch('pauseAllTorrents')
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Resume All',
|
||||||
|
click: () => windows.main.dispatch('resumeAllTorrents')
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Remove All From List',
|
||||||
|
click: () => windows.main.dispatch('confirmDeleteAllTorrents', false)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Remove All Data Files',
|
||||||
|
click: () => windows.main.dispatch('confirmDeleteAllTorrents', true)
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: 'Help',
|
label: 'Help',
|
||||||
role: 'help',
|
role: 'help',
|
||||||
submenu: [
|
submenu: [
|
||||||
{
|
{
|
||||||
label: 'Learn more about ' + config.APP_NAME,
|
label: 'Learn more about ' + config.APP_NAME,
|
||||||
click: () => shell.openExternal(config.HOME_PAGE_URL)
|
click: () => {
|
||||||
|
const shell = require('./shell')
|
||||||
|
shell.openExternal(config.HOME_PAGE_URL)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Release Notes',
|
||||||
|
click: () => {
|
||||||
|
const shell = require('./shell')
|
||||||
|
shell.openExternal(config.GITHUB_URL_RELEASES)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Contribute on GitHub',
|
label: 'Contribute on GitHub',
|
||||||
click: () => shell.openExternal(config.GITHUB_URL)
|
click: () => {
|
||||||
|
const shell = require('./shell')
|
||||||
|
shell.openExternal(config.GITHUB_URL)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'separator'
|
type: 'separator'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Report an Issue...',
|
label: 'Report an Issue...',
|
||||||
click: () => shell.openExternal(config.GITHUB_URL_ISSUES)
|
click: () => {
|
||||||
|
const shell = require('./shell')
|
||||||
|
shell.openExternal(config.GITHUB_URL_ISSUES)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Follow us on Twitter',
|
||||||
|
click: () => {
|
||||||
|
const shell = require('./shell')
|
||||||
|
shell.openExternal(config.TWITTER_PAGE_URL)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
if (process.platform === 'darwin') {
|
if (process.platform === 'darwin') {
|
||||||
// Add WebTorrent app menu (OS X)
|
// WebTorrent menu (Mac)
|
||||||
template.unshift({
|
template.unshift({
|
||||||
label: config.APP_NAME,
|
label: config.APP_NAME,
|
||||||
submenu: [
|
submenu: [
|
||||||
{
|
{
|
||||||
label: 'About ' + config.APP_NAME,
|
|
||||||
role: 'about'
|
role: 'about'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -300,53 +362,58 @@ function getMenuTemplate () {
|
|||||||
type: 'separator'
|
type: 'separator'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Services',
|
role: 'services'
|
||||||
role: 'services',
|
|
||||||
submenu: []
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'separator'
|
type: 'separator'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Hide ' + config.APP_NAME,
|
|
||||||
accelerator: 'Command+H',
|
|
||||||
role: 'hide'
|
role: 'hide'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Hide Others',
|
|
||||||
accelerator: 'Command+Alt+H',
|
|
||||||
role: 'hideothers'
|
role: 'hideothers'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Show All',
|
|
||||||
role: 'unhide'
|
role: 'unhide'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'separator'
|
type: 'separator'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Quit',
|
role: 'quit'
|
||||||
accelerator: 'Command+Q',
|
|
||||||
click: () => app.quit()
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|
||||||
// Add Window menu (OS X)
|
// Edit menu (Mac)
|
||||||
template.splice(5, 0, {
|
template[2].submenu.push(
|
||||||
label: 'Window',
|
{
|
||||||
|
type: 'separator'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Speech',
|
||||||
|
submenu: [
|
||||||
|
{
|
||||||
|
role: 'startspeaking'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
role: 'stopspeaking'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// Window menu (Mac)
|
||||||
|
template.splice(6, 0, {
|
||||||
role: 'window',
|
role: 'window',
|
||||||
submenu: [
|
submenu: [
|
||||||
{
|
{
|
||||||
label: 'Minimize',
|
|
||||||
accelerator: 'CmdOrCtrl+M',
|
|
||||||
role: 'minimize'
|
role: 'minimize'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'separator'
|
type: 'separator'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Bring All to Front',
|
|
||||||
role: 'front'
|
role: 'front'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -359,11 +426,25 @@ function getMenuTemplate () {
|
|||||||
// File menu (Windows, Linux)
|
// File menu (Windows, Linux)
|
||||||
template[0].submenu.unshift({
|
template[0].submenu.unshift({
|
||||||
label: 'Create New Torrent from File...',
|
label: 'Create New Torrent from File...',
|
||||||
click: () => dialog.openSeedFile()
|
click: () => {
|
||||||
|
const dialog = require('./dialog')
|
||||||
|
dialog.openSeedFile()
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// Edit menu (Windows, Linux)
|
||||||
|
template[1].submenu.push(
|
||||||
|
{
|
||||||
|
type: 'separator'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Preferences',
|
||||||
|
accelerator: 'CmdOrCtrl+,',
|
||||||
|
click: () => windows.main.dispatch('preferences')
|
||||||
|
})
|
||||||
|
|
||||||
// Help menu (Windows, Linux)
|
// Help menu (Windows, Linux)
|
||||||
template[4].submenu.push(
|
template[5].submenu.push(
|
||||||
{
|
{
|
||||||
type: 'separator'
|
type: 'separator'
|
||||||
},
|
},
|
||||||
34
src/main/power-save-blocker.js
Normal file
34
src/main/power-save-blocker.js
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
module.exports = {
|
||||||
|
enable,
|
||||||
|
disable
|
||||||
|
}
|
||||||
|
|
||||||
|
const { powerSaveBlocker } = require('electron')
|
||||||
|
const log = require('./log')
|
||||||
|
|
||||||
|
let blockId = 0
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Block the system from entering low-power (sleep) mode or turning off the
|
||||||
|
* display.
|
||||||
|
*/
|
||||||
|
function enable () {
|
||||||
|
if (powerSaveBlocker.isStarted(blockId)) {
|
||||||
|
// If a power saver block already exists, do nothing.
|
||||||
|
return
|
||||||
|
}
|
||||||
|
blockId = powerSaveBlocker.start('prevent-display-sleep')
|
||||||
|
log(`powerSaveBlocker.enable: ${blockId}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stop blocking the system from entering low-power mode.
|
||||||
|
*/
|
||||||
|
function disable () {
|
||||||
|
if (!powerSaveBlocker.isStarted(blockId)) {
|
||||||
|
// If a power saver block does not exist, do nothing.
|
||||||
|
return
|
||||||
|
}
|
||||||
|
powerSaveBlocker.stop(blockId)
|
||||||
|
log(`powerSaveBlocker.disable: ${blockId}`)
|
||||||
|
}
|
||||||
42
src/main/shell.js
Normal file
42
src/main/shell.js
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
module.exports = {
|
||||||
|
openExternal,
|
||||||
|
openPath,
|
||||||
|
showItemInFolder,
|
||||||
|
moveItemToTrash
|
||||||
|
}
|
||||||
|
|
||||||
|
const { shell } = require('electron')
|
||||||
|
const log = require('./log')
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Open the given external protocol URL in the desktop’s default manner.
|
||||||
|
*/
|
||||||
|
function openExternal (url) {
|
||||||
|
log(`openExternal: ${url}`)
|
||||||
|
shell.openExternal(url)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Open the given file in the desktop’s default manner.
|
||||||
|
*/
|
||||||
|
|
||||||
|
function openPath (path) {
|
||||||
|
log(`openPath: ${path}`)
|
||||||
|
shell.openPath(path)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show the given file in a file manager. If possible, select the file.
|
||||||
|
*/
|
||||||
|
function showItemInFolder (path) {
|
||||||
|
log(`showItemInFolder: ${path}`)
|
||||||
|
shell.showItemInFolder(path)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Move the given file to trash and returns a boolean status for the operation.
|
||||||
|
*/
|
||||||
|
function moveItemToTrash (path) {
|
||||||
|
log(`moveItemToTrash: ${path}`)
|
||||||
|
shell.trashItem(path)
|
||||||
|
}
|
||||||
30
src/main/shortcuts.js
Normal file
30
src/main/shortcuts.js
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
module.exports = {
|
||||||
|
disable,
|
||||||
|
enable
|
||||||
|
}
|
||||||
|
|
||||||
|
const { globalShortcut } = require('electron')
|
||||||
|
const windows = require('./windows')
|
||||||
|
|
||||||
|
function enable () {
|
||||||
|
// Register play/pause media key, available on some keyboards.
|
||||||
|
globalShortcut.register(
|
||||||
|
'MediaPlayPause',
|
||||||
|
() => windows.main.dispatch('playPause')
|
||||||
|
)
|
||||||
|
globalShortcut.register(
|
||||||
|
'MediaNextTrack',
|
||||||
|
() => windows.main.dispatch('nextTrack')
|
||||||
|
)
|
||||||
|
globalShortcut.register(
|
||||||
|
'MediaPreviousTrack',
|
||||||
|
() => windows.main.dispatch('previousTrack')
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function disable () {
|
||||||
|
// Return the media key to the OS, so other apps can use it.
|
||||||
|
globalShortcut.unregister('MediaPlayPause')
|
||||||
|
globalShortcut.unregister('MediaNextTrack')
|
||||||
|
globalShortcut.unregister('MediaPreviousTrack')
|
||||||
|
}
|
||||||
40
src/main/squirrel-win32.js
Normal file
40
src/main/squirrel-win32.js
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
module.exports = {
|
||||||
|
handleEvent
|
||||||
|
}
|
||||||
|
|
||||||
|
const { app } = require('electron')
|
||||||
|
|
||||||
|
const path = require('path')
|
||||||
|
const spawn = require('child_process').spawn
|
||||||
|
|
||||||
|
const handlers = require('./handlers')
|
||||||
|
|
||||||
|
const EXE_NAME = path.basename(process.execPath)
|
||||||
|
const UPDATE_EXE = path.join(process.execPath, '..', '..', 'Update.exe')
|
||||||
|
|
||||||
|
const run = (args, done) => {
|
||||||
|
spawn(UPDATE_EXE, args, { detached: true })
|
||||||
|
.on('close', done)
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleEvent (cmd) {
|
||||||
|
if (cmd === '--squirrel-install' || cmd === '--squirrel-updated') {
|
||||||
|
run([`--createShortcut=${EXE_NAME}`], app.quit)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cmd === '--squirrel-uninstall') {
|
||||||
|
// Uninstall .torrent file and magnet link handlers
|
||||||
|
handlers.uninstall()
|
||||||
|
|
||||||
|
run([`--removeShortcut=${EXE_NAME}`], app.quit)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cmd === '--squirrel-obsolete') {
|
||||||
|
app.quit()
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
28
src/main/startup.js
Normal file
28
src/main/startup.js
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
module.exports = {
|
||||||
|
install,
|
||||||
|
uninstall
|
||||||
|
}
|
||||||
|
|
||||||
|
const { APP_NAME } = require('../config')
|
||||||
|
const AutoLaunch = require('auto-launch')
|
||||||
|
|
||||||
|
const appLauncher = new AutoLaunch({
|
||||||
|
name: APP_NAME,
|
||||||
|
isHidden: true
|
||||||
|
})
|
||||||
|
|
||||||
|
function install () {
|
||||||
|
return appLauncher
|
||||||
|
.isEnabled()
|
||||||
|
.then(enabled => {
|
||||||
|
if (!enabled) return appLauncher.enable()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function uninstall () {
|
||||||
|
return appLauncher
|
||||||
|
.isEnabled()
|
||||||
|
.then(enabled => {
|
||||||
|
if (enabled) return appLauncher.disable()
|
||||||
|
})
|
||||||
|
}
|
||||||
91
src/main/thumbar.js
Normal file
91
src/main/thumbar.js
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
module.exports = {
|
||||||
|
disable,
|
||||||
|
enable,
|
||||||
|
onPlayerPause,
|
||||||
|
onPlayerPlay,
|
||||||
|
onPlayerUpdate
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* On Windows, add a "thumbnail toolbar" with a play/pause button in the taskbar.
|
||||||
|
* This provides users a way to access play/pause functionality without restoring
|
||||||
|
* or activating the window.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const path = require('path')
|
||||||
|
const config = require('../config')
|
||||||
|
|
||||||
|
const windows = require('./windows')
|
||||||
|
|
||||||
|
const PREV_ICON = path.join(config.STATIC_PATH, 'PreviousTrackThumbnailBarButton.png')
|
||||||
|
const PLAY_ICON = path.join(config.STATIC_PATH, 'PlayThumbnailBarButton.png')
|
||||||
|
const PAUSE_ICON = path.join(config.STATIC_PATH, 'PauseThumbnailBarButton.png')
|
||||||
|
const NEXT_ICON = path.join(config.STATIC_PATH, 'NextTrackThumbnailBarButton.png')
|
||||||
|
|
||||||
|
// Array indices for each button
|
||||||
|
const PREV = 0
|
||||||
|
const PLAY_PAUSE = 1
|
||||||
|
const NEXT = 2
|
||||||
|
|
||||||
|
let buttons = []
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show the Windows thumbnail toolbar buttons.
|
||||||
|
*/
|
||||||
|
function enable () {
|
||||||
|
buttons = [
|
||||||
|
{
|
||||||
|
tooltip: 'Previous Track',
|
||||||
|
icon: PREV_ICON,
|
||||||
|
click: () => windows.main.dispatch('previousTrack')
|
||||||
|
},
|
||||||
|
{
|
||||||
|
tooltip: 'Pause',
|
||||||
|
icon: PAUSE_ICON,
|
||||||
|
click: () => windows.main.dispatch('playPause')
|
||||||
|
},
|
||||||
|
{
|
||||||
|
tooltip: 'Next Track',
|
||||||
|
icon: NEXT_ICON,
|
||||||
|
click: () => windows.main.dispatch('nextTrack')
|
||||||
|
}
|
||||||
|
]
|
||||||
|
update()
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hide the Windows thumbnail toolbar buttons.
|
||||||
|
*/
|
||||||
|
function disable () {
|
||||||
|
buttons = []
|
||||||
|
update()
|
||||||
|
}
|
||||||
|
|
||||||
|
function onPlayerPause () {
|
||||||
|
if (!isEnabled()) return
|
||||||
|
buttons[PLAY_PAUSE].tooltip = 'Play'
|
||||||
|
buttons[PLAY_PAUSE].icon = PLAY_ICON
|
||||||
|
update()
|
||||||
|
}
|
||||||
|
|
||||||
|
function onPlayerPlay () {
|
||||||
|
if (!isEnabled()) return
|
||||||
|
buttons[PLAY_PAUSE].tooltip = 'Pause'
|
||||||
|
buttons[PLAY_PAUSE].icon = PAUSE_ICON
|
||||||
|
update()
|
||||||
|
}
|
||||||
|
|
||||||
|
function onPlayerUpdate (state) {
|
||||||
|
if (!isEnabled()) return
|
||||||
|
buttons[PREV].flags = [state.hasPrevious ? 'enabled' : 'disabled']
|
||||||
|
buttons[NEXT].flags = [state.hasNext ? 'enabled' : 'disabled']
|
||||||
|
update()
|
||||||
|
}
|
||||||
|
|
||||||
|
function isEnabled () {
|
||||||
|
return buttons.length > 0
|
||||||
|
}
|
||||||
|
|
||||||
|
function update () {
|
||||||
|
windows.main.win.setThumbarButtons(buttons)
|
||||||
|
}
|
||||||
@@ -1,18 +1,15 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
hasTray,
|
hasTray,
|
||||||
init,
|
init,
|
||||||
onWindowBlur,
|
setWindowFocus
|
||||||
onWindowFocus
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var electron = require('electron')
|
const { app, Tray, Menu } = require('electron')
|
||||||
|
|
||||||
var app = electron.app
|
const config = require('../config')
|
||||||
|
const windows = require('./windows')
|
||||||
|
|
||||||
var config = require('../config')
|
let tray
|
||||||
var windows = require('./windows')
|
|
||||||
|
|
||||||
var tray
|
|
||||||
|
|
||||||
function init () {
|
function init () {
|
||||||
if (process.platform === 'linux') {
|
if (process.platform === 'linux') {
|
||||||
@@ -21,7 +18,7 @@ function init () {
|
|||||||
if (process.platform === 'win32') {
|
if (process.platform === 'win32') {
|
||||||
initWin32()
|
initWin32()
|
||||||
}
|
}
|
||||||
// OS X apps generally do not have menu bar icons
|
// Mac apps generally do not have menu bar icons
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -31,19 +28,14 @@ function hasTray () {
|
|||||||
return !!tray
|
return !!tray
|
||||||
}
|
}
|
||||||
|
|
||||||
function onWindowBlur () {
|
function setWindowFocus (flag) {
|
||||||
if (!tray) return
|
|
||||||
updateTrayMenu()
|
|
||||||
}
|
|
||||||
|
|
||||||
function onWindowFocus () {
|
|
||||||
if (!tray) return
|
if (!tray) return
|
||||||
updateTrayMenu()
|
updateTrayMenu()
|
||||||
}
|
}
|
||||||
|
|
||||||
function initLinux () {
|
function initLinux () {
|
||||||
checkLinuxTraySupport(function (supportsTray) {
|
checkLinuxTraySupport(err => {
|
||||||
if (supportsTray) createTray()
|
if (!err) createTray()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -52,24 +44,20 @@ function initWin32 () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check for libappindicator1 support before creating tray icon
|
* Check for libappindicator support before creating tray icon.
|
||||||
*/
|
*/
|
||||||
function checkLinuxTraySupport (cb) {
|
function checkLinuxTraySupport (cb) {
|
||||||
var cp = require('child_process')
|
const cp = require('child_process')
|
||||||
|
|
||||||
// Check that we're on Ubuntu (or another debian system) and that we have
|
// Check that libappindicator libraries are installed in system.
|
||||||
// libappindicator1. If WebTorrent was installed from the deb file, we should
|
cp.exec('ldconfig -p | grep libappindicator', (err, stdout) => {
|
||||||
// always have it. If it was installed from the zip file, we might not.
|
if (err) return cb(err)
|
||||||
cp.exec('dpkg --get-selections libappindicator1', function (err, stdout) {
|
cb(null)
|
||||||
if (err) return cb(false)
|
|
||||||
// Unfortunately there's no cleaner way, as far as I can tell, to check
|
|
||||||
// whether a debian package is installed:
|
|
||||||
cb(stdout.endsWith('\tinstall\n'))
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function createTray () {
|
function createTray () {
|
||||||
tray = new electron.Tray(getIconPath())
|
tray = new Tray(getIconPath())
|
||||||
|
|
||||||
// On Windows, left click opens the app, right click opens the context menu.
|
// On Windows, left click opens the app, right click opens the context menu.
|
||||||
// On Linux, any click (left or right) opens the context menu.
|
// On Linux, any click (left or right) opens the context menu.
|
||||||
@@ -80,7 +68,7 @@ function createTray () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function updateTrayMenu () {
|
function updateTrayMenu () {
|
||||||
var contextMenu = electron.Menu.buildFromTemplate(getMenuTemplate())
|
const contextMenu = Menu.buildFromTemplate(getMenuTemplate())
|
||||||
tray.setContextMenu(contextMenu)
|
tray.setContextMenu(contextMenu)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2,16 +2,17 @@ module.exports = {
|
|||||||
init
|
init
|
||||||
}
|
}
|
||||||
|
|
||||||
var electron = require('electron')
|
const { autoUpdater } = require('electron')
|
||||||
var get = require('simple-get')
|
const get = require('simple-get')
|
||||||
|
|
||||||
var config = require('../config')
|
const config = require('../config')
|
||||||
var log = require('./log')
|
const log = require('./log')
|
||||||
var windows = require('./windows')
|
const windows = require('./windows')
|
||||||
|
|
||||||
var AUTO_UPDATE_URL = config.AUTO_UPDATE_URL +
|
const AUTO_UPDATE_URL = config.AUTO_UPDATE_URL +
|
||||||
'?version=' + config.APP_VERSION +
|
'?version=' + config.APP_VERSION +
|
||||||
'&platform=' + process.platform
|
'&platform=' + process.platform +
|
||||||
|
'&sysarch=' + config.OS_SYSARCH
|
||||||
|
|
||||||
function init () {
|
function init () {
|
||||||
if (process.platform === 'linux') {
|
if (process.platform === 'linux') {
|
||||||
@@ -46,31 +47,31 @@ function onResponse (err, res, data) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function initDarwinWin32 () {
|
function initDarwinWin32 () {
|
||||||
electron.autoUpdater.on(
|
autoUpdater.on(
|
||||||
'error',
|
'error',
|
||||||
(err) => log.error(`Update error: ${err.message}`)
|
(err) => log.error(`Update error: ${err.message}`)
|
||||||
)
|
)
|
||||||
|
|
||||||
electron.autoUpdater.on(
|
autoUpdater.on(
|
||||||
'checking-for-update',
|
'checking-for-update',
|
||||||
() => log('Checking for update')
|
() => log('Checking for update')
|
||||||
)
|
)
|
||||||
|
|
||||||
electron.autoUpdater.on(
|
autoUpdater.on(
|
||||||
'update-available',
|
'update-available',
|
||||||
() => log('Update available')
|
() => log('Update available')
|
||||||
)
|
)
|
||||||
|
|
||||||
electron.autoUpdater.on(
|
autoUpdater.on(
|
||||||
'update-not-available',
|
'update-not-available',
|
||||||
() => log('Update not available')
|
() => log('No update available')
|
||||||
)
|
)
|
||||||
|
|
||||||
electron.autoUpdater.on(
|
autoUpdater.on(
|
||||||
'update-downloaded',
|
'update-downloaded',
|
||||||
(e, notes, name, date, url) => log(`Update downloaded: ${name}: ${url}`)
|
(e, notes, name, date, url) => log(`Update downloaded: ${name}: ${url}`)
|
||||||
)
|
)
|
||||||
|
|
||||||
electron.autoUpdater.setFeedURL(AUTO_UPDATE_URL)
|
autoUpdater.setFeedURL({ url: AUTO_UPDATE_URL })
|
||||||
electron.autoUpdater.checkForUpdates()
|
autoUpdater.checkForUpdates()
|
||||||
}
|
}
|
||||||
41
src/main/user-tasks.js
Normal file
41
src/main/user-tasks.js
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
module.exports = {
|
||||||
|
init
|
||||||
|
}
|
||||||
|
|
||||||
|
const { app } = require('electron')
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add a user task menu to the app icon on right-click. (Windows)
|
||||||
|
*/
|
||||||
|
function init () {
|
||||||
|
if (process.platform !== 'win32') return
|
||||||
|
app.setUserTasks(getUserTasks())
|
||||||
|
}
|
||||||
|
|
||||||
|
function getUserTasks () {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
arguments: '-n',
|
||||||
|
title: 'Create New Torrent...',
|
||||||
|
description: 'Create a new torrent'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arguments: '-o',
|
||||||
|
title: 'Open Torrent File...',
|
||||||
|
description: 'Open a .torrent file'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arguments: '-u',
|
||||||
|
title: 'Open Torrent Address...',
|
||||||
|
description: 'Open a torrent from a URL'
|
||||||
|
}
|
||||||
|
].map(getUserTasksItem)
|
||||||
|
}
|
||||||
|
|
||||||
|
function getUserTasksItem (item) {
|
||||||
|
return Object.assign(item, {
|
||||||
|
program: process.execPath,
|
||||||
|
iconPath: process.execPath,
|
||||||
|
iconIndex: 0
|
||||||
|
})
|
||||||
|
}
|
||||||
57
src/main/windows/about.js
Normal file
57
src/main/windows/about.js
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
const about = module.exports = {
|
||||||
|
init,
|
||||||
|
win: null
|
||||||
|
}
|
||||||
|
|
||||||
|
const config = require('../../config')
|
||||||
|
const { BrowserWindow } = require('electron')
|
||||||
|
|
||||||
|
function init () {
|
||||||
|
if (about.win) {
|
||||||
|
return about.win.show()
|
||||||
|
}
|
||||||
|
|
||||||
|
const win = about.win = new BrowserWindow({
|
||||||
|
backgroundColor: '#ECECEC',
|
||||||
|
center: true,
|
||||||
|
fullscreen: false,
|
||||||
|
height: 250,
|
||||||
|
icon: getIconPath(),
|
||||||
|
maximizable: false,
|
||||||
|
minimizable: false,
|
||||||
|
resizable: false,
|
||||||
|
show: false,
|
||||||
|
skipTaskbar: true,
|
||||||
|
title: 'About ' + config.APP_WINDOW_TITLE,
|
||||||
|
useContentSize: true,
|
||||||
|
webPreferences: {
|
||||||
|
nodeIntegration: true,
|
||||||
|
contextIsolation: false,
|
||||||
|
enableBlinkFeatures: 'AudioVideoTracks',
|
||||||
|
enableRemoteModule: true,
|
||||||
|
backgroundThrottling: false
|
||||||
|
},
|
||||||
|
width: 300
|
||||||
|
})
|
||||||
|
require('@electron/remote/main').enable(win.webContents)
|
||||||
|
|
||||||
|
win.loadURL(config.WINDOW_ABOUT)
|
||||||
|
|
||||||
|
win.once('ready-to-show', () => {
|
||||||
|
win.show()
|
||||||
|
// No menu on the About window
|
||||||
|
// Hack: BrowserWindow removeMenu method not working on electron@7
|
||||||
|
// https://github.com/electron/electron/issues/21088
|
||||||
|
win.setMenuBarVisibility(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
win.once('closed', () => {
|
||||||
|
about.win = null
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function getIconPath () {
|
||||||
|
return process.platform === 'win32'
|
||||||
|
? config.APP_ICON + '.ico'
|
||||||
|
: config.APP_ICON + '.png'
|
||||||
|
}
|
||||||
260
src/main/windows/main.js
Normal file
260
src/main/windows/main.js
Normal file
@@ -0,0 +1,260 @@
|
|||||||
|
const main = module.exports = {
|
||||||
|
dispatch,
|
||||||
|
hide,
|
||||||
|
init,
|
||||||
|
send,
|
||||||
|
setAspectRatio,
|
||||||
|
setBounds,
|
||||||
|
setProgress,
|
||||||
|
setTitle,
|
||||||
|
show,
|
||||||
|
toggleAlwaysOnTop,
|
||||||
|
toggleDevTools,
|
||||||
|
toggleFullScreen,
|
||||||
|
win: null
|
||||||
|
}
|
||||||
|
|
||||||
|
const { app, BrowserWindow, screen } = require('electron')
|
||||||
|
const debounce = require('debounce')
|
||||||
|
|
||||||
|
const config = require('../../config')
|
||||||
|
const log = require('../log')
|
||||||
|
const menu = require('../menu')
|
||||||
|
|
||||||
|
function init (state, options) {
|
||||||
|
if (main.win) {
|
||||||
|
return main.win.show()
|
||||||
|
}
|
||||||
|
|
||||||
|
const initialBounds = Object.assign(config.WINDOW_INITIAL_BOUNDS, state.saved.bounds)
|
||||||
|
|
||||||
|
const win = main.win = new BrowserWindow({
|
||||||
|
backgroundColor: '#282828',
|
||||||
|
darkTheme: true, // Forces dark theme (GTK+3)
|
||||||
|
height: initialBounds.height,
|
||||||
|
icon: getIconPath(), // Window icon (Windows, Linux)
|
||||||
|
minHeight: config.WINDOW_MIN_HEIGHT,
|
||||||
|
minWidth: config.WINDOW_MIN_WIDTH,
|
||||||
|
show: false,
|
||||||
|
title: config.APP_WINDOW_TITLE,
|
||||||
|
titleBarStyle: 'hiddenInset', // Hide title bar (Mac)
|
||||||
|
useContentSize: true, // Specify web page size without OS chrome
|
||||||
|
width: initialBounds.width,
|
||||||
|
webPreferences: {
|
||||||
|
nodeIntegration: true,
|
||||||
|
contextIsolation: false,
|
||||||
|
enableBlinkFeatures: 'AudioVideoTracks',
|
||||||
|
enableRemoteModule: true,
|
||||||
|
backgroundThrottling: false
|
||||||
|
},
|
||||||
|
x: initialBounds.x,
|
||||||
|
y: initialBounds.y
|
||||||
|
})
|
||||||
|
require('@electron/remote/main').enable(win.webContents)
|
||||||
|
|
||||||
|
win.loadURL(config.WINDOW_MAIN)
|
||||||
|
|
||||||
|
win.once('ready-to-show', () => {
|
||||||
|
if (!options.hidden) win.show()
|
||||||
|
})
|
||||||
|
|
||||||
|
if (win.setSheetOffset) {
|
||||||
|
win.setSheetOffset(config.UI_HEADER_HEIGHT)
|
||||||
|
}
|
||||||
|
|
||||||
|
win.webContents.on('dom-ready', () => {
|
||||||
|
menu.onToggleFullScreen(main.win.isFullScreen())
|
||||||
|
})
|
||||||
|
|
||||||
|
win.webContents.on('will-navigate', (e) => {
|
||||||
|
// Prevent drag-and-drop from navigating the Electron window, which can happen
|
||||||
|
// before our drag-and-drop handlers have been initialized.
|
||||||
|
e.preventDefault()
|
||||||
|
})
|
||||||
|
|
||||||
|
win.on('blur', onWindowBlur)
|
||||||
|
win.on('focus', onWindowFocus)
|
||||||
|
|
||||||
|
win.on('hide', onWindowBlur)
|
||||||
|
win.on('show', onWindowFocus)
|
||||||
|
|
||||||
|
win.on('enter-full-screen', () => {
|
||||||
|
menu.onToggleFullScreen(true)
|
||||||
|
send('fullscreenChanged', true)
|
||||||
|
win.setMenuBarVisibility(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
win.on('leave-full-screen', () => {
|
||||||
|
menu.onToggleFullScreen(false)
|
||||||
|
send('fullscreenChanged', false)
|
||||||
|
win.setMenuBarVisibility(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
win.on('move', debounce(e => {
|
||||||
|
send('windowBoundsChanged', main.win.getBounds())
|
||||||
|
}, 1000))
|
||||||
|
|
||||||
|
win.on('resize', debounce(e => {
|
||||||
|
send('windowBoundsChanged', main.win.getBounds())
|
||||||
|
}, 1000))
|
||||||
|
|
||||||
|
win.on('close', e => {
|
||||||
|
if (process.platform !== 'darwin') {
|
||||||
|
const tray = require('../tray')
|
||||||
|
if (!tray.hasTray()) {
|
||||||
|
app.quit()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!app.isQuitting) {
|
||||||
|
e.preventDefault()
|
||||||
|
hide()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function dispatch (...args) {
|
||||||
|
send('dispatch', ...args)
|
||||||
|
}
|
||||||
|
|
||||||
|
function hide () {
|
||||||
|
if (!main.win) return
|
||||||
|
dispatch('backToList')
|
||||||
|
main.win.hide()
|
||||||
|
}
|
||||||
|
|
||||||
|
function send (...args) {
|
||||||
|
if (!main.win) return
|
||||||
|
main.win.send(...args)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enforce window aspect ratio. Remove with 0. (Mac)
|
||||||
|
*/
|
||||||
|
function setAspectRatio (aspectRatio) {
|
||||||
|
if (!main.win) return
|
||||||
|
main.win.setAspectRatio(aspectRatio)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Change the size of the window.
|
||||||
|
* TODO: Clean this up? Seems overly complicated.
|
||||||
|
*/
|
||||||
|
function setBounds (bounds, maximize) {
|
||||||
|
// Do nothing in fullscreen
|
||||||
|
if (!main.win || main.win.isFullScreen()) {
|
||||||
|
log('setBounds: not setting bounds because already in full screen mode')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Maximize or minimize, if the second argument is present
|
||||||
|
if (maximize === true && !main.win.isMaximized()) {
|
||||||
|
log('setBounds: maximizing')
|
||||||
|
main.win.maximize()
|
||||||
|
} else if (maximize === false && main.win.isMaximized()) {
|
||||||
|
log('setBounds: minimizing')
|
||||||
|
main.win.unmaximize()
|
||||||
|
}
|
||||||
|
|
||||||
|
const willBeMaximized = typeof maximize === 'boolean' ? maximize : main.win.isMaximized()
|
||||||
|
// Assuming we're not maximized or maximizing, set the window size
|
||||||
|
if (!willBeMaximized) {
|
||||||
|
log(`setBounds: setting bounds to ${JSON.stringify(bounds)}`)
|
||||||
|
if (bounds.x === null && bounds.y === null) {
|
||||||
|
// X and Y not specified? By default, center on current screen
|
||||||
|
const scr = screen.getDisplayMatching(main.win.getBounds())
|
||||||
|
bounds.x = Math.round(scr.bounds.x + (scr.bounds.width / 2) - (bounds.width / 2))
|
||||||
|
bounds.y = Math.round(scr.bounds.y + (scr.bounds.height / 2) - (bounds.height / 2))
|
||||||
|
log(`setBounds: centered to ${JSON.stringify(bounds)}`)
|
||||||
|
}
|
||||||
|
// Resize the window's content area (so window border doesn't need to be taken
|
||||||
|
// into account)
|
||||||
|
if (bounds.contentBounds) {
|
||||||
|
main.win.setContentBounds(bounds, true)
|
||||||
|
} else {
|
||||||
|
main.win.setBounds(bounds, true)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
log('setBounds: not setting bounds because of window maximization')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set progress bar to [0, 1]. Indeterminate when > 1. Remove with < 0.
|
||||||
|
*/
|
||||||
|
function setProgress (progress) {
|
||||||
|
if (!main.win) return
|
||||||
|
main.win.setProgressBar(progress)
|
||||||
|
}
|
||||||
|
|
||||||
|
function setTitle (title) {
|
||||||
|
if (!main.win) return
|
||||||
|
main.win.setTitle(title)
|
||||||
|
}
|
||||||
|
|
||||||
|
function show () {
|
||||||
|
if (!main.win) return
|
||||||
|
main.win.show()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sets whether the window should always show on top of other windows
|
||||||
|
function toggleAlwaysOnTop (flag) {
|
||||||
|
if (!main.win) return
|
||||||
|
if (flag == null) {
|
||||||
|
flag = !main.win.isAlwaysOnTop()
|
||||||
|
}
|
||||||
|
log(`toggleAlwaysOnTop ${flag}`)
|
||||||
|
main.win.setAlwaysOnTop(flag)
|
||||||
|
menu.onToggleAlwaysOnTop(flag)
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleDevTools () {
|
||||||
|
if (!main.win) return
|
||||||
|
log('toggleDevTools')
|
||||||
|
if (main.win.webContents.isDevToolsOpened()) {
|
||||||
|
main.win.webContents.closeDevTools()
|
||||||
|
} else {
|
||||||
|
main.win.webContents.openDevTools({ mode: 'detach' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleFullScreen (flag) {
|
||||||
|
if (!main.win || !main.win.isVisible()) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (flag == null) flag = !main.win.isFullScreen()
|
||||||
|
|
||||||
|
log(`toggleFullScreen ${flag}`)
|
||||||
|
|
||||||
|
if (flag) {
|
||||||
|
// Fullscreen and aspect ratio do not play well together. (Mac)
|
||||||
|
main.win.setAspectRatio(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
main.win.setFullScreen(flag)
|
||||||
|
}
|
||||||
|
|
||||||
|
function onWindowBlur () {
|
||||||
|
menu.setWindowFocus(false)
|
||||||
|
|
||||||
|
if (process.platform !== 'darwin') {
|
||||||
|
const tray = require('../tray')
|
||||||
|
tray.setWindowFocus(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onWindowFocus () {
|
||||||
|
menu.setWindowFocus(true)
|
||||||
|
|
||||||
|
if (process.platform !== 'darwin') {
|
||||||
|
const tray = require('../tray')
|
||||||
|
tray.setWindowFocus(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getIconPath () {
|
||||||
|
return process.platform === 'win32'
|
||||||
|
? config.APP_ICON + '.ico'
|
||||||
|
: config.APP_ICON + '.png'
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
var webtorrent = module.exports = {
|
const webtorrent = module.exports = {
|
||||||
init,
|
init,
|
||||||
send,
|
send,
|
||||||
show,
|
show,
|
||||||
@@ -6,13 +6,12 @@ var webtorrent = module.exports = {
|
|||||||
win: null
|
win: null
|
||||||
}
|
}
|
||||||
|
|
||||||
var electron = require('electron')
|
const { app, BrowserWindow } = require('electron')
|
||||||
|
|
||||||
var config = require('../../config')
|
const config = require('../../config')
|
||||||
var log = require('../log')
|
|
||||||
|
|
||||||
function init () {
|
function init () {
|
||||||
var win = webtorrent.win = new electron.BrowserWindow({
|
const win = webtorrent.win = new BrowserWindow({
|
||||||
backgroundColor: '#1E1E1E',
|
backgroundColor: '#1E1E1E',
|
||||||
center: true,
|
center: true,
|
||||||
fullscreen: false,
|
fullscreen: false,
|
||||||
@@ -25,14 +24,22 @@ function init () {
|
|||||||
skipTaskbar: true,
|
skipTaskbar: true,
|
||||||
title: 'webtorrent-hidden-window',
|
title: 'webtorrent-hidden-window',
|
||||||
useContentSize: true,
|
useContentSize: true,
|
||||||
|
webPreferences: {
|
||||||
|
nodeIntegration: true,
|
||||||
|
contextIsolation: false,
|
||||||
|
enableBlinkFeatures: 'AudioVideoTracks',
|
||||||
|
enableRemoteModule: true,
|
||||||
|
backgroundThrottling: false
|
||||||
|
},
|
||||||
width: 150
|
width: 150
|
||||||
})
|
})
|
||||||
|
require('@electron/remote/main').enable(win.webContents)
|
||||||
|
|
||||||
win.loadURL(config.WINDOW_WEBTORRENT)
|
win.loadURL(config.WINDOW_WEBTORRENT)
|
||||||
|
|
||||||
// Prevent killing the WebTorrent process
|
// Prevent killing the WebTorrent process
|
||||||
win.on('close', function (e) {
|
win.on('close', e => {
|
||||||
if (electron.app.isQuitting) {
|
if (app.isQuitting) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
@@ -52,11 +59,10 @@ function send (...args) {
|
|||||||
|
|
||||||
function toggleDevTools () {
|
function toggleDevTools () {
|
||||||
if (!webtorrent.win) return
|
if (!webtorrent.win) return
|
||||||
log('toggleDevTools')
|
|
||||||
if (webtorrent.win.webContents.isDevToolsOpened()) {
|
if (webtorrent.win.webContents.isDevToolsOpened()) {
|
||||||
webtorrent.win.webContents.closeDevTools()
|
webtorrent.win.webContents.closeDevTools()
|
||||||
webtorrent.win.hide()
|
webtorrent.win.hide()
|
||||||
} else {
|
} else {
|
||||||
webtorrent.win.webContents.openDevTools({ detach: true })
|
webtorrent.win.webContents.openDevTools({ mode: 'detach' })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
26
src/renderer/components/create-torrent-error-page.js
Normal file
26
src/renderer/components/create-torrent-error-page.js
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
const React = require('react')
|
||||||
|
|
||||||
|
const { dispatcher } = require('../lib/dispatcher')
|
||||||
|
|
||||||
|
module.exports = class CreateTorrentErrorPage extends React.Component {
|
||||||
|
render () {
|
||||||
|
return (
|
||||||
|
<div className='create-torrent'>
|
||||||
|
<h2>Create torrent</h2>
|
||||||
|
<p className='torrent-info'>
|
||||||
|
<p>
|
||||||
|
Sorry, you must select at least one file that is not a hidden file.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Hidden files, starting with a . character, are not included.
|
||||||
|
</p>
|
||||||
|
</p>
|
||||||
|
<p className='float-right'>
|
||||||
|
<button className='button-flat light' onClick={dispatcher('cancel')}>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
31
src/renderer/components/delete-all-torrents-modal.js
Normal file
31
src/renderer/components/delete-all-torrents-modal.js
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
const React = require('react')
|
||||||
|
|
||||||
|
const ModalOKCancel = require('./modal-ok-cancel')
|
||||||
|
const { dispatch, dispatcher } = require('../lib/dispatcher')
|
||||||
|
|
||||||
|
module.exports = class DeleteAllTorrentsModal extends React.Component {
|
||||||
|
render () {
|
||||||
|
const { state: { modal: { deleteData } } } = this.props
|
||||||
|
const message = deleteData
|
||||||
|
? 'Are you sure you want to remove all the torrents from the list and delete the data files?'
|
||||||
|
: 'Are you sure you want to remove all the torrents from the list?'
|
||||||
|
const buttonText = deleteData ? 'REMOVE DATA' : 'REMOVE'
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<p><strong>{message}</strong></p>
|
||||||
|
<ModalOKCancel
|
||||||
|
cancelText='CANCEL'
|
||||||
|
onCancel={dispatcher('exitModal')}
|
||||||
|
okText={buttonText}
|
||||||
|
onOK={handleRemove}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
|
||||||
|
function handleRemove () {
|
||||||
|
dispatch('deleteAllTorrents', deleteData)
|
||||||
|
dispatch('exitModal')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
68
src/renderer/components/header.js
Normal file
68
src/renderer/components/header.js
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
const React = require('react')
|
||||||
|
|
||||||
|
const { dispatcher } = require('../lib/dispatcher')
|
||||||
|
|
||||||
|
class Header extends React.Component {
|
||||||
|
render () {
|
||||||
|
const loc = this.props.state.location
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className='header'
|
||||||
|
onMouseMove={dispatcher('mediaMouseMoved')}
|
||||||
|
onMouseEnter={dispatcher('mediaControlsMouseEnter')}
|
||||||
|
onMouseLeave={dispatcher('mediaControlsMouseLeave')}
|
||||||
|
role='navigation'
|
||||||
|
>
|
||||||
|
{this.getTitle()}
|
||||||
|
<div className='nav left float-left'>
|
||||||
|
<i
|
||||||
|
className={'icon back ' + (loc.hasBack() ? '' : 'disabled')}
|
||||||
|
title='Back'
|
||||||
|
onClick={dispatcher('back')}
|
||||||
|
role='button'
|
||||||
|
aria-disabled={!loc.hasBack()}
|
||||||
|
aria-label='Back'
|
||||||
|
>
|
||||||
|
chevron_left
|
||||||
|
</i>
|
||||||
|
<i
|
||||||
|
className={'icon forward ' + (loc.hasForward() ? '' : 'disabled')}
|
||||||
|
title='Forward'
|
||||||
|
onClick={dispatcher('forward')}
|
||||||
|
role='button'
|
||||||
|
aria-disabled={!loc.hasForward()}
|
||||||
|
aria-label='Forward'
|
||||||
|
>
|
||||||
|
chevron_right
|
||||||
|
</i>
|
||||||
|
</div>
|
||||||
|
<div className='nav right float-right'>
|
||||||
|
{this.getAddButton()}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
getTitle () {
|
||||||
|
if (process.platform !== 'darwin') return null
|
||||||
|
const state = this.props.state
|
||||||
|
return (<div className='title ellipsis'>{state.window.title}</div>)
|
||||||
|
}
|
||||||
|
|
||||||
|
getAddButton () {
|
||||||
|
const state = this.props.state
|
||||||
|
if (state.location.url() !== 'home') return null
|
||||||
|
return (
|
||||||
|
<i
|
||||||
|
className='icon add'
|
||||||
|
title='Add torrent'
|
||||||
|
onClick={dispatcher('openFiles')}
|
||||||
|
role='button'
|
||||||
|
>
|
||||||
|
add
|
||||||
|
</i>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = Header
|
||||||
35
src/renderer/components/heading.js
Normal file
35
src/renderer/components/heading.js
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
const React = require('react')
|
||||||
|
const PropTypes = require('prop-types')
|
||||||
|
|
||||||
|
const colors = require('material-ui/styles/colors')
|
||||||
|
|
||||||
|
class Heading extends React.Component {
|
||||||
|
static get propTypes () {
|
||||||
|
return {
|
||||||
|
level: PropTypes.number
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static get defaultProps () {
|
||||||
|
return {
|
||||||
|
level: 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
render () {
|
||||||
|
const HeadingTag = 'h' + this.props.level
|
||||||
|
const style = {
|
||||||
|
color: colors.grey100,
|
||||||
|
fontSize: 20,
|
||||||
|
marginBottom: 15,
|
||||||
|
marginTop: 30
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<HeadingTag style={style}>
|
||||||
|
{this.props.children}
|
||||||
|
</HeadingTag>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = Heading
|
||||||
27
src/renderer/components/modal-ok-cancel.js
Normal file
27
src/renderer/components/modal-ok-cancel.js
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
const React = require('react')
|
||||||
|
const FlatButton = require('material-ui/FlatButton').default
|
||||||
|
const RaisedButton = require('material-ui/RaisedButton').default
|
||||||
|
|
||||||
|
module.exports = class ModalOKCancel extends React.Component {
|
||||||
|
render () {
|
||||||
|
const cancelStyle = { marginRight: 10, color: 'black' }
|
||||||
|
const { cancelText, onCancel, okText, onOK } = this.props
|
||||||
|
return (
|
||||||
|
<div className='float-right'>
|
||||||
|
<FlatButton
|
||||||
|
className='control cancel'
|
||||||
|
style={cancelStyle}
|
||||||
|
label={cancelText}
|
||||||
|
onClick={onCancel}
|
||||||
|
/>
|
||||||
|
<RaisedButton
|
||||||
|
className='control ok'
|
||||||
|
primary
|
||||||
|
label={okText}
|
||||||
|
onClick={onOK}
|
||||||
|
autoFocus
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
51
src/renderer/components/open-torrent-address-modal.js
Normal file
51
src/renderer/components/open-torrent-address-modal.js
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
const React = require('react')
|
||||||
|
const TextField = require('material-ui/TextField').default
|
||||||
|
const { clipboard } = require('electron')
|
||||||
|
|
||||||
|
const ModalOKCancel = require('./modal-ok-cancel')
|
||||||
|
const { dispatch, dispatcher } = require('../lib/dispatcher')
|
||||||
|
const { isMagnetLink } = require('../lib/torrent-player')
|
||||||
|
|
||||||
|
module.exports = class OpenTorrentAddressModal extends React.Component {
|
||||||
|
render () {
|
||||||
|
return (
|
||||||
|
<div className='open-torrent-address-modal'>
|
||||||
|
<p><label>Enter torrent address or magnet link</label></p>
|
||||||
|
<div>
|
||||||
|
<TextField
|
||||||
|
id='torrent-address-field'
|
||||||
|
className='control'
|
||||||
|
ref={(c) => { this.torrentURL = c }}
|
||||||
|
fullWidth
|
||||||
|
onKeyDown={handleKeyDown.bind(this)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<ModalOKCancel
|
||||||
|
cancelText='CANCEL'
|
||||||
|
onCancel={dispatcher('exitModal')}
|
||||||
|
okText='OK'
|
||||||
|
onOK={handleOK.bind(this)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidMount () {
|
||||||
|
this.torrentURL.input.focus()
|
||||||
|
const clipboardContent = clipboard.readText()
|
||||||
|
|
||||||
|
if (isMagnetLink(clipboardContent)) {
|
||||||
|
this.torrentURL.input.value = clipboardContent
|
||||||
|
this.torrentURL.input.select()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleKeyDown (e) {
|
||||||
|
if (e.which === 13) handleOK.call(this) /* hit Enter to submit */
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleOK () {
|
||||||
|
dispatch('exitModal')
|
||||||
|
dispatch('addTorrent', this.torrentURL.input.value)
|
||||||
|
}
|
||||||
85
src/renderer/components/path-selector.js
Normal file
85
src/renderer/components/path-selector.js
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
const path = require('path')
|
||||||
|
|
||||||
|
const colors = require('material-ui/styles/colors')
|
||||||
|
const remote = require('@electron/remote')
|
||||||
|
const React = require('react')
|
||||||
|
const PropTypes = require('prop-types')
|
||||||
|
|
||||||
|
const RaisedButton = require('material-ui/RaisedButton').default
|
||||||
|
const TextField = require('material-ui/TextField').default
|
||||||
|
|
||||||
|
// Lets you pick a file or directory.
|
||||||
|
// Uses the system Open File dialog.
|
||||||
|
// You can't edit the text field directly.
|
||||||
|
class PathSelector extends React.Component {
|
||||||
|
static propTypes () {
|
||||||
|
return {
|
||||||
|
className: PropTypes.string,
|
||||||
|
dialog: PropTypes.object,
|
||||||
|
id: PropTypes.string,
|
||||||
|
onChange: PropTypes.func,
|
||||||
|
title: PropTypes.string.isRequired,
|
||||||
|
value: PropTypes.string
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor (props) {
|
||||||
|
super(props)
|
||||||
|
this.handleClick = this.handleClick.bind(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
handleClick () {
|
||||||
|
const opts = Object.assign({
|
||||||
|
defaultPath: path.dirname(this.props.value || ''),
|
||||||
|
properties: ['openFile', 'openDirectory']
|
||||||
|
}, this.props.dialog)
|
||||||
|
|
||||||
|
const filenames = remote.dialog.showOpenDialogSync(remote.getCurrentWindow(), opts)
|
||||||
|
if (!Array.isArray(filenames)) return
|
||||||
|
this.props.onChange && this.props.onChange(filenames[0])
|
||||||
|
}
|
||||||
|
|
||||||
|
render () {
|
||||||
|
const id = this.props.title.replace(' ', '-').toLowerCase()
|
||||||
|
const wrapperStyle = {
|
||||||
|
alignItems: 'center',
|
||||||
|
display: 'flex',
|
||||||
|
width: '100%'
|
||||||
|
}
|
||||||
|
const labelStyle = {
|
||||||
|
flex: '0 auto',
|
||||||
|
marginRight: 10,
|
||||||
|
overflow: 'hidden',
|
||||||
|
textOverflow: 'ellipsis',
|
||||||
|
whiteSpace: 'nowrap'
|
||||||
|
}
|
||||||
|
const textareaStyle = {
|
||||||
|
color: colors.grey50
|
||||||
|
}
|
||||||
|
const textFieldStyle = {
|
||||||
|
flex: '1'
|
||||||
|
}
|
||||||
|
const text = this.props.value || ''
|
||||||
|
const buttonStyle = {
|
||||||
|
marginLeft: 10
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={this.props.className} style={wrapperStyle}>
|
||||||
|
<div className='label' style={labelStyle}>
|
||||||
|
{this.props.title}:
|
||||||
|
</div>
|
||||||
|
<TextField
|
||||||
|
className='control' disabled id={id} value={text}
|
||||||
|
inputStyle={textareaStyle} style={textFieldStyle}
|
||||||
|
/>
|
||||||
|
<RaisedButton
|
||||||
|
className='control' label='Change' onClick={this.handleClick}
|
||||||
|
style={buttonStyle}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = PathSelector
|
||||||
31
src/renderer/components/remove-torrent-modal.js
Normal file
31
src/renderer/components/remove-torrent-modal.js
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
const React = require('react')
|
||||||
|
|
||||||
|
const ModalOKCancel = require('./modal-ok-cancel')
|
||||||
|
const { dispatch, dispatcher } = require('../lib/dispatcher')
|
||||||
|
|
||||||
|
module.exports = class RemoveTorrentModal extends React.Component {
|
||||||
|
render () {
|
||||||
|
const state = this.props.state
|
||||||
|
const message = state.modal.deleteData
|
||||||
|
? 'Are you sure you want to remove this torrent from the list and delete the data file?'
|
||||||
|
: 'Are you sure you want to remove this torrent from the list?'
|
||||||
|
const buttonText = state.modal.deleteData ? 'REMOVE DATA' : 'REMOVE'
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<p><strong>{message}</strong></p>
|
||||||
|
<ModalOKCancel
|
||||||
|
cancelText='CANCEL'
|
||||||
|
onCancel={dispatcher('exitModal')}
|
||||||
|
okText={buttonText}
|
||||||
|
onOK={handleRemove}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
|
||||||
|
function handleRemove () {
|
||||||
|
dispatch('deleteTorrent', state.modal.infoHash, state.modal.deleteData)
|
||||||
|
dispatch('exitModal')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
55
src/renderer/components/show-more.js
Normal file
55
src/renderer/components/show-more.js
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
const React = require('react')
|
||||||
|
const PropTypes = require('prop-types')
|
||||||
|
|
||||||
|
const RaisedButton = require('material-ui/RaisedButton').default
|
||||||
|
|
||||||
|
class ShowMore extends React.Component {
|
||||||
|
static get propTypes () {
|
||||||
|
return {
|
||||||
|
defaultExpanded: PropTypes.bool,
|
||||||
|
hideLabel: PropTypes.string,
|
||||||
|
showLabel: PropTypes.string
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static get defaultProps () {
|
||||||
|
return {
|
||||||
|
hideLabel: 'Hide more...',
|
||||||
|
showLabel: 'Show more...'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor (props) {
|
||||||
|
super(props)
|
||||||
|
|
||||||
|
this.state = {
|
||||||
|
expanded: !!this.props.defaultExpanded
|
||||||
|
}
|
||||||
|
|
||||||
|
this.handleClick = this.handleClick.bind(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
handleClick () {
|
||||||
|
this.setState({
|
||||||
|
expanded: !this.state.expanded
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
render () {
|
||||||
|
const label = this.state.expanded
|
||||||
|
? this.props.hideLabel
|
||||||
|
: this.props.showLabel
|
||||||
|
return (
|
||||||
|
<div className='show-more' style={this.props.style}>
|
||||||
|
{this.state.expanded ? this.props.children : null}
|
||||||
|
<RaisedButton
|
||||||
|
className='control'
|
||||||
|
onClick={this.handleClick}
|
||||||
|
label={label}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = ShowMore
|
||||||
45
src/renderer/components/unsupported-media-modal.js
Normal file
45
src/renderer/components/unsupported-media-modal.js
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
const React = require('react')
|
||||||
|
const { shell } = require('electron')
|
||||||
|
|
||||||
|
const ModalOKCancel = require('./modal-ok-cancel')
|
||||||
|
const { dispatcher } = require('../lib/dispatcher')
|
||||||
|
|
||||||
|
module.exports = class UnsupportedMediaModal extends React.Component {
|
||||||
|
render () {
|
||||||
|
const state = this.props.state
|
||||||
|
const err = state.modal.error
|
||||||
|
const message = (err && err.getMessage)
|
||||||
|
? err.getMessage()
|
||||||
|
: err
|
||||||
|
const onAction = state.modal.externalPlayerInstalled
|
||||||
|
? dispatcher('openExternalPlayer')
|
||||||
|
: () => this.onInstall()
|
||||||
|
const actionText = state.modal.externalPlayerInstalled
|
||||||
|
? 'PLAY IN ' + state.getExternalPlayerName().toUpperCase()
|
||||||
|
: 'INSTALL VLC'
|
||||||
|
const errorMessage = state.modal.externalPlayerNotFound
|
||||||
|
? 'Couldn\'t run external player. Please make sure it\'s installed.'
|
||||||
|
: ''
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<p><strong>Sorry, we can't play that file.</strong></p>
|
||||||
|
<p>{message}</p>
|
||||||
|
<ModalOKCancel
|
||||||
|
cancelText='CANCEL'
|
||||||
|
onCancel={dispatcher('backToList')}
|
||||||
|
okText={actionText}
|
||||||
|
onOK={onAction}
|
||||||
|
/>
|
||||||
|
<p className='error-text'>{errorMessage}</p>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
onInstall () {
|
||||||
|
shell.openExternal('https://www.videolan.org/vlc/')
|
||||||
|
|
||||||
|
// TODO: dcposch send a dispatch rather than modifying state directly
|
||||||
|
const state = this.props.state
|
||||||
|
state.modal.externalPlayerInstalled = true // Assume they'll install it successfully
|
||||||
|
}
|
||||||
|
}
|
||||||
37
src/renderer/components/update-available-modal.js
Normal file
37
src/renderer/components/update-available-modal.js
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
const React = require('react')
|
||||||
|
const { shell } = require('electron')
|
||||||
|
|
||||||
|
const ModalOKCancel = require('./modal-ok-cancel')
|
||||||
|
const { dispatch } = require('../lib/dispatcher')
|
||||||
|
|
||||||
|
module.exports = class UpdateAvailableModal extends React.Component {
|
||||||
|
render () {
|
||||||
|
const state = this.props.state
|
||||||
|
return (
|
||||||
|
<div className='update-available-modal'>
|
||||||
|
<p><strong>A new version of WebTorrent is available: v{state.modal.version}</strong></p>
|
||||||
|
<p>
|
||||||
|
We have an auto-updater for Windows and Mac.
|
||||||
|
We don't have one for Linux yet, so you'll have to download the new version manually.
|
||||||
|
</p>
|
||||||
|
<ModalOKCancel
|
||||||
|
cancelText='SKIP THIS RELEASE'
|
||||||
|
onCancel={handleSkip}
|
||||||
|
okText='SHOW DOWNLOAD PAGE'
|
||||||
|
onOK={handleShow}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
|
||||||
|
function handleShow () {
|
||||||
|
// TODO: use the GitHub urls from config.js
|
||||||
|
shell.openExternal('https://github.com/webtorrent/webtorrent-desktop/releases')
|
||||||
|
dispatch('exitModal')
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleSkip () {
|
||||||
|
dispatch('skipVersion', state.modal.version)
|
||||||
|
dispatch('exitModal')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user