Compare commits
755 Commits
v0.7.1
...
redownload
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fb33d569ca | ||
|
|
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 | ||
|
|
01971e2a46 | ||
|
|
08cb82e255 | ||
|
|
962c563f2e | ||
|
|
bd6f2c2faf | ||
|
|
ee8fe1e7ff | ||
|
|
424d171656 | ||
|
|
7351133542 | ||
|
|
84deb403eb | ||
|
|
cae40b44e6 | ||
|
|
ab0bbcea94 | ||
|
|
06a7eff0ab | ||
|
|
341333c287 | ||
|
|
0f00985b75 | ||
|
|
c11a86d849 | ||
|
|
52e16c33b4 | ||
|
|
54e15644b6 | ||
|
|
6aa3a6c660 | ||
|
|
83350b3b57 | ||
|
|
8868128d6e | ||
|
|
f7ec537cd5 | ||
|
|
a81156b363 | ||
|
|
4b501ab90b | ||
|
|
90347c72e0 | ||
|
|
a51ab3573e | ||
|
|
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 | ||
|
|
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 | ||
|
|
9d3e26f15a | ||
|
|
8a95895254 | ||
|
|
5d71f9e9c6 | ||
|
|
0ec6fb5a93 | ||
|
|
5d410457ce | ||
|
|
c6cd21b8ff | ||
|
|
2235b2fa82 |
2
.github/ISSUE_TEMPLATE.md
vendored
2
.github/ISSUE_TEMPLATE.md
vendored
@@ -1,3 +1,5 @@
|
|||||||
|
<!-- DO NOT POST LINKS OR REFERENCES TO COPYRIGHTED CONTENT IN YOUR ISSUE. -->
|
||||||
|
|
||||||
**What version of WebTorrent Desktop?** (See the 'About WebTorrent' menu)
|
**What version of WebTorrent Desktop?** (See the 'About WebTorrent' menu)
|
||||||
|
|
||||||
**What operating system and version?**
|
**What operating system and version?**
|
||||||
|
|||||||
19
.github/config.yml
vendored
Normal file
19
.github/config.yml
vendored
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
# ProBot Request Info (https://probot.github.io/apps/request-info/)
|
||||||
|
|
||||||
|
requestInfoReplyComment: >
|
||||||
|
👋 We would appreciate it if you could provide us with more information about this
|
||||||
|
issue. <br><br> 
|
||||||
|
requestInfoLabelToAdd: 'need more info'
|
||||||
|
|
||||||
|
# ProBot Welcome (https://probot.github.io/apps/welcome/)
|
||||||
|
|
||||||
|
newPRWelcomeComment: >
|
||||||
|
🙌 Thanks for opening this pull request! You're awesome.
|
||||||
|
<br><br> 
|
||||||
|
firstPRMergeComment: >
|
||||||
|
🎉 Congrats on getting your first pull request landed! <br><br>
|
||||||
|

|
||||||
|
|
||||||
|
# ProBot WIP (https://probot.github.io/apps/wip/)
|
||||||
|
|
||||||
|
# (Requires no configuration)
|
||||||
4
.github/lock.yml
vendored
Normal file
4
.github/lock.yml
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
# ProBot Lock (https://probot.github.io/apps/lock/)
|
||||||
|
|
||||||
|
daysUntilLock: 90
|
||||||
|
lockComment: false
|
||||||
9
.github/no-response.yml
vendored
Normal file
9
.github/no-response.yml
vendored
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
# ProBot No Response (https://probot.github.io/apps/no-response/)
|
||||||
|
|
||||||
|
daysUntilClose: 7
|
||||||
|
responseRequiredLabel: 'need more info'
|
||||||
|
closeComment: >
|
||||||
|
This issue has been automatically closed because there was no response to a
|
||||||
|
request for more information from the issue opener. Please leave a comment or
|
||||||
|
open a new issue if you have additional information related to this issue.
|
||||||
|
<br><br> 
|
||||||
14
.github/stale.yml
vendored
Normal file
14
.github/stale.yml
vendored
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# ProBot Stale (https://probot.github.io/apps/stale/)
|
||||||
|
|
||||||
|
daysUntilStale: 90
|
||||||
|
daysUntilClose: 7
|
||||||
|
exemptLabels:
|
||||||
|
- accepted
|
||||||
|
- bug
|
||||||
|
- enhancement
|
||||||
|
- meta
|
||||||
|
staleLabel: stale
|
||||||
|
markComment: >
|
||||||
|
This issue has been automatically marked as stale because it has not had
|
||||||
|
recent activity. It will be closed if no further activity occurs.
|
||||||
|
closeComment: false
|
||||||
6
.gitignore
vendored
6
.gitignore
vendored
@@ -1,2 +1,4 @@
|
|||||||
node_modules
|
node_modules/
|
||||||
dist
|
build/
|
||||||
|
dist/
|
||||||
|
npm-debug.log*
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
language: node_js
|
language: node_js
|
||||||
node_js:
|
node_js:
|
||||||
- 'node'
|
- lts/*
|
||||||
install: npm install standard
|
|
||||||
|
|||||||
65
AUTHORS.md
65
AUTHORS.md
@@ -2,25 +2,50 @@
|
|||||||
|
|
||||||
#### 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)
|
||||||
|
- Emil Bay (github@tixz.dk)
|
||||||
|
- Borewit (borewit@users.noreply.github.com)
|
||||||
|
- greenkeeper[bot] (greenkeeper[bot]@users.noreply.github.com)
|
||||||
|
- Auyer (rafa_auyer@icloud.com)
|
||||||
|
- SimplyAhmazing (ahmad19526@gmail.com)
|
||||||
|
- Cezar Carneiro (cezargcarneiro@gmail.com)
|
||||||
|
- Terry Hau (terryhau@gmail.com)
|
||||||
|
- Vítor Galvão (info@vitorgalvao.com)
|
||||||
|
|
||||||
#### Generated by bin/update-authors.sh.
|
#### Generated by bin/update-authors.sh.
|
||||||
|
|||||||
302
CHANGELOG.md
302
CHANGELOG.md
@@ -1,14 +1,285 @@
|
|||||||
# WebTorrent Desktop Version History
|
# WebTorrent Desktop Version History
|
||||||
|
|
||||||
|
## 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
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Change "Step Forward" keyboard shortcut to `Alt+Left` (Windows)
|
||||||
|
- Change "Step Backward" keyboard shortcut to to `Alt+Right` (Windows)
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- 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)
|
||||||
@@ -18,7 +289,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
|
||||||
@@ -29,7 +299,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.
|
||||||
@@ -37,7 +306,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.
|
||||||
@@ -49,7 +317,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)
|
||||||
@@ -59,7 +326,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)
|
||||||
@@ -67,7 +333,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
|
||||||
@@ -78,23 +343,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)
|
||||||
@@ -103,7 +364,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.
|
||||||
@@ -126,7 +386,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.
|
||||||
@@ -137,7 +396,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)
|
||||||
@@ -162,24 +420,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)
|
||||||
@@ -187,17 +441,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)
|
||||||
@@ -205,14 +456,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
|
||||||
@@ -231,7 +480,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
|
||||||
@@ -240,12 +488,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
|
||||||
@@ -305,7 +551,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
|
||||||
|
|
||||||
|
|||||||
117
CONTRIBUTING.md
117
CONTRIBUTING.md
@@ -24,7 +24,7 @@ and to avoid style arguments. `npm test` runs `standard` automatically, so you d
|
|||||||
to!
|
to!
|
||||||
|
|
||||||
[standard-image]: https://cdn.rawgit.com/feross/standard/master/badge.svg
|
[standard-image]: https://cdn.rawgit.com/feross/standard/master/badge.svg
|
||||||
[standard-url]: https://github.com/feross/standard
|
[standard-url]: https://standardjs.com
|
||||||
|
|
||||||
## Project Governance
|
## Project Governance
|
||||||
|
|
||||||
@@ -36,7 +36,7 @@ standard guarded open source project.
|
|||||||
|
|
||||||
There are a few basic ground-rules for contributors:
|
There are a few basic ground-rules for contributors:
|
||||||
|
|
||||||
1. **No `--force` pushes** or modifying the Git history in any way.
|
1. **No `--force` pushes to master** or modifying history in any way. Rebasing and force pushing your own PR branch is fine.
|
||||||
2. **Non-master branches** should be used for ongoing work.
|
2. **Non-master branches** should be used for ongoing work.
|
||||||
3. **Significant modifications** like API changes should be subject to a **pull request**
|
3. **Significant modifications** like API changes should be subject to a **pull request**
|
||||||
to solicit feedback from other contributors.
|
to solicit feedback from other contributors.
|
||||||
@@ -73,3 +73,116 @@ By making a contribution to this project, I certify that:
|
|||||||
record of the contribution (including all personal information I submit with it,
|
record of the contribution (including all personal information I submit with it,
|
||||||
including my sign-off) is maintained indefinitely and may be redistributed consistent
|
including my sign-off) is maintained indefinitely and may be redistributed consistent
|
||||||
with this project or the open source license(s) involved.
|
with this project or the open source license(s) involved.
|
||||||
|
|
||||||
|
## Release Procedure
|
||||||
|
|
||||||
|
### 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
|
||||||
|
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.
|
||||||
|
|
||||||
|
See Smoke Tests below for details. Open DevTools
|
||||||
|
on Windows and Mac, and ensure that the auto updater is running. If the auto updater does not
|
||||||
|
run, users will successfully auto update to this new version, and then be stuck there forever.
|
||||||
|
|
||||||
|
### 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.
|
||||||
|
|
||||||
|
As soon as this PR is merged, Jenkins will automatically redeploy the WebTorrent website, and
|
||||||
|
hundreds of thousands of users around the world will start auto updating. **Merge with care.**
|
||||||
|
|
||||||
|
## Smoke Tests
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
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.
|
||||||
|
|||||||
124
README.md
124
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://gitter.im/webtorrent/webtorrent"><img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg" alt="gitter"></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://travis-ci.org/webtorrent/webtorrent-desktop"><img src="https://img.shields.io/travis/webtorrent/webtorrent-desktop/master.svg" alt="travis"></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 cask install 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 2016 12" Macbook.
|
||||||
|
|
||||||
|
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,30 +115,34 @@ $ 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
|
||||||
- `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/) needs to be installed. For example on Mac, first
|
||||||
|
install [XQuartz](http://www.xquartz.org/), then run:
|
||||||
|
|
||||||
```
|
```
|
||||||
brew install wine
|
brew install wine
|
||||||
@@ -81,9 +150,22 @@ brew install wine
|
|||||||
|
|
||||||
(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.
|
||||||
|
|
||||||
|
### 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
|
||||||
|
|
||||||
|
|||||||
43
SECURITY.md
Normal file
43
SECURITY.md
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
# Security Policies and Procedures
|
||||||
|
|
||||||
|
This document outlines security procedures and general policies for the WebTorrent
|
||||||
|
project.
|
||||||
|
|
||||||
|
* [Reporting a Bug](#reporting-a-bug)
|
||||||
|
* [Disclosure Policy](#disclosure-policy)
|
||||||
|
* [Comments on this Policy](#comments-on-this-policy)
|
||||||
|
|
||||||
|
## Reporting a Bug
|
||||||
|
|
||||||
|
The WebTorrent team and community take all security bugs in WebTorrent seriously.
|
||||||
|
Thank you for improving the security of WebTorrent. We appreciate your efforts and
|
||||||
|
responsible disclosure and will make every effort to acknowledge your
|
||||||
|
contributions.
|
||||||
|
|
||||||
|
Report security bugs by emailing the lead maintainer at feross@feross.org.
|
||||||
|
|
||||||
|
The lead maintainer will acknowledge your email within 48 hours, and will send a
|
||||||
|
more detailed response within 48 hours indicating the next steps in handling
|
||||||
|
your report. After the initial reply to your report, the security team will
|
||||||
|
endeavor to keep you informed of the progress towards a fix and full
|
||||||
|
announcement, and may ask for additional information or guidance.
|
||||||
|
|
||||||
|
Report security bugs in third-party modules to the person or team maintaining
|
||||||
|
the module. You can also report a vulnerability through the
|
||||||
|
[Node Security Project](https://nodesecurity.io/report).
|
||||||
|
|
||||||
|
## Disclosure Policy
|
||||||
|
|
||||||
|
When the security team receives a security bug report, they will assign it to a
|
||||||
|
primary handler. This person will coordinate the fix and release process,
|
||||||
|
involving the following steps:
|
||||||
|
|
||||||
|
* Confirm the problem and determine the affected versions.
|
||||||
|
* Audit code to find any potential similar problems.
|
||||||
|
* Prepare fixes for all releases still under maintenance. These fixes will be
|
||||||
|
released as fast as possible to npm.
|
||||||
|
|
||||||
|
## Comments on this Policy
|
||||||
|
|
||||||
|
If you have suggestions on how this process could be improved please submit a
|
||||||
|
pull request.
|
||||||
@@ -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
|
|
||||||
})
|
|
||||||
46
bin/extra-lint.js
Executable file
46
bin/extra-lint.js
Executable file
@@ -0,0 +1,46 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
|
||||||
|
const walkSync = require('walk-sync')
|
||||||
|
const fs = require('fs')
|
||||||
|
const path = require('path')
|
||||||
|
|
||||||
|
let hasErrors = false
|
||||||
|
|
||||||
|
// Find all Javascript source files
|
||||||
|
const files = walkSync('src', { globs: ['**/*.js'] })
|
||||||
|
console.log('Running extra-lint on ' + files.length + ' files...')
|
||||||
|
|
||||||
|
// Read each file, line by line
|
||||||
|
files.forEach(function (file) {
|
||||||
|
const filepath = path.join('src', file)
|
||||||
|
const lines = fs.readFileSync(filepath, 'utf8').split('\n')
|
||||||
|
|
||||||
|
lines.forEach(function (line, i) {
|
||||||
|
let error
|
||||||
|
|
||||||
|
// Consistent JSX tag closing
|
||||||
|
if (line.match(/' {2}\/> *$/) ||
|
||||||
|
line.match('[^ ]/> *$') ||
|
||||||
|
line.match(' > *$')) {
|
||||||
|
error = 'JSX tag spacing'
|
||||||
|
}
|
||||||
|
|
||||||
|
// No lines over 100 characters
|
||||||
|
if (line.length > 100) {
|
||||||
|
error = 'Line >100 chars'
|
||||||
|
}
|
||||||
|
|
||||||
|
if (line.match(/^var /) || line.match(/ var /)) {
|
||||||
|
error = 'Use const or let'
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
let name = path.basename(file)
|
||||||
|
console.log('%s:%d - %s:\n%s', name, i + 1, error, line)
|
||||||
|
hasErrors = true
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
if (hasErrors) process.exit(1)
|
||||||
|
else console.log('Looks good!')
|
||||||
@@ -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 opn = require('opn')
|
||||||
|
|
||||||
open(config.CONFIG_PATH)
|
opn(CONFIG_PATH)
|
||||||
|
|||||||
305
bin/package.js
305
bin/package.js
@@ -1,27 +1,29 @@
|
|||||||
#!/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 mkdirp = require('mkdirp')
|
||||||
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 series = require('run-series')
|
const series = require('run-series')
|
||||||
var zip = require('cross-zip')
|
const 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 +37,20 @@ var argv = minimist(process.argv.slice(2), {
|
|||||||
})
|
})
|
||||||
|
|
||||||
function build () {
|
function build () {
|
||||||
|
console.log('Reinstalling node_modules...')
|
||||||
|
rimraf.sync(NODE_MODULES_PATH)
|
||||||
|
cp.execSync('npm install', { stdio: 'inherit' })
|
||||||
|
cp.execSync('npm dedupe', { 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,26 +68,26 @@ 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,
|
'app-copyright': 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,
|
'app-version': 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,
|
'build-version': require('webtorrent/package.json').version,
|
||||||
|
|
||||||
@@ -82,7 +96,7 @@ var all = {
|
|||||||
|
|
||||||
// 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 +111,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 binaries 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',
|
'app-bundle-id': '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',
|
'app-category-type': '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',
|
'helper-bundle-id': '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 ia32 and x64 binaries.
|
||||||
arch: 'ia32',
|
arch: ['ia32', '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 +170,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 ia32 and x64 binaries.
|
||||||
arch: 'all'
|
arch: ['ia32', 'x64']
|
||||||
|
|
||||||
// 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,18 +183,18 @@ 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), function (err, buildPath) {
|
||||||
if (err) return cb(err)
|
if (err) return cb(err)
|
||||||
console.log('OS X: Packaged electron. ' + buildPath)
|
console.log('Mac: 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 = [
|
||||||
{
|
{
|
||||||
@@ -206,6 +220,12 @@ function buildDarwin (cb) {
|
|||||||
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' ]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -248,31 +268,31 @@ function buildDarwin (cb) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function signApp (cb) {
|
function signApp (cb) {
|
||||||
var sign = require('electron-osx-sign')
|
const sign = require('electron-osx-sign')
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 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 = {
|
||||||
app: appPath,
|
app: appPath,
|
||||||
platform: 'darwin',
|
platform: 'darwin',
|
||||||
verbose: true
|
verbose: true
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('OS X: Signing app...')
|
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)
|
cb(null)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -287,25 +307,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,13 +346,13 @@ 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)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -340,7 +360,7 @@ function buildDarwin (cb) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
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 +368,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:'
|
||||||
@@ -360,12 +380,12 @@ function buildWin32 (cb) {
|
|||||||
if (err) return cb(err)
|
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 +394,26 @@ 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))
|
const destArch = filesPath.split('-').pop()
|
||||||
}
|
|
||||||
if (argv.package === 'portable' || argv.package === 'all') {
|
if (argv.package === 'exe' || argv.package === 'all') {
|
||||||
tasks.push((cb) => packagePortable(cb))
|
tasks.push((cb) => packageInstaller(filesPath, destArch, cb))
|
||||||
}
|
}
|
||||||
|
if (argv.package === 'portable' || argv.package === 'all') {
|
||||||
|
tasks.push((cb) => packagePortable(filesPath, destArch, cb))
|
||||||
|
}
|
||||||
|
})
|
||||||
series(tasks, cb)
|
series(tasks, cb)
|
||||||
|
|
||||||
function packageInstaller (cb) {
|
function packageInstaller (filesPath, destArch, cb) {
|
||||||
console.log('Windows: Creating installer...')
|
console.log(`Windows: Creating ${destArch} installer...`)
|
||||||
|
|
||||||
|
const archStr = destArch === 'ia32' ? '-ia32' : ''
|
||||||
|
|
||||||
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,32 +423,98 @@ 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,
|
/**
|
||||||
setupExe: config.APP_NAME + 'Setup-v' + config.APP_VERSION + '.exe',
|
* Only create delta updates for the Windows x64 build because 90% of our
|
||||||
|
* users have Windows x64 and the delta files take a *very* long time to
|
||||||
|
* generate. Also, the ia32 files on GitHub have non-standard Squirrel
|
||||||
|
* names (i.e. RELEASES-ia32 instead of RELEASES) and so Squirrel won't
|
||||||
|
* find them unless we proxy the requests.
|
||||||
|
*/
|
||||||
|
// 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: destArch === 'x64'
|
||||||
|
// ? config.GITHUB_URL
|
||||||
|
// : undefined,
|
||||||
|
/**
|
||||||
|
* 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 + archStr + '.exe',
|
||||||
setupIcon: config.APP_ICON + '.ico',
|
setupIcon: config.APP_ICON + '.ico',
|
||||||
signWithParams: 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 ${destArch} 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))
|
||||||
|
})
|
||||||
|
|
||||||
|
if (destArch === 'ia32') {
|
||||||
|
console.log('Windows: Renaming ia32 installer files...')
|
||||||
|
|
||||||
|
// RELEASES -> RELEASES-ia32
|
||||||
|
const relPath = path.join(DIST_PATH, 'RELEASES-ia32')
|
||||||
|
fs.renameSync(
|
||||||
|
path.join(DIST_PATH, 'RELEASES'),
|
||||||
|
relPath
|
||||||
|
)
|
||||||
|
|
||||||
|
// WebTorrent-vX.X.X-full.nupkg -> WebTorrent-vX.X.X-ia32-full.nupkg
|
||||||
|
fs.renameSync(
|
||||||
|
path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-full.nupkg`),
|
||||||
|
path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-ia32-full.nupkg`)
|
||||||
|
)
|
||||||
|
|
||||||
|
// Change file name inside RELEASES-ia32 to match renamed file
|
||||||
|
const relContent = fs.readFileSync(relPath, 'utf8')
|
||||||
|
const relContent32 = relContent.replace('full.nupkg', 'ia32-full.nupkg')
|
||||||
|
fs.writeFileSync(relPath, relContent32)
|
||||||
|
|
||||||
|
if (relContent === relContent32) {
|
||||||
|
// Sanity check
|
||||||
|
throw new Error('Fixing RELEASES-ia32 failed. Replacement did not modify the file.')
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('Windows: Renamed ia32 installer files.')
|
||||||
|
}
|
||||||
|
|
||||||
|
cb(null)
|
||||||
|
})
|
||||||
|
.catch(cb)
|
||||||
}
|
}
|
||||||
|
|
||||||
function packagePortable (cb) {
|
function packagePortable (filesPath, destArch, cb) {
|
||||||
console.log('Windows: Creating portable app...')
|
console.log(`Windows: Creating ${destArch} portable app...`)
|
||||||
|
|
||||||
var portablePath = path.join(buildPath[0], 'Portable Settings')
|
const portablePath = path.join(filesPath, 'Portable Settings')
|
||||||
mkdirp.sync(portablePath)
|
mkdirp.sync(portablePath)
|
||||||
|
|
||||||
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')
|
mkdirp.sync(downloadsPath)
|
||||||
|
|
||||||
|
const tempPath = path.join(portablePath, 'Temp')
|
||||||
|
mkdirp.sync(tempPath)
|
||||||
|
|
||||||
|
const archStr = destArch === 'ia32' ? '-ia32' : ''
|
||||||
|
|
||||||
|
const inPath = path.join(DIST_PATH, path.basename(filesPath))
|
||||||
|
const outPath = path.join(DIST_PATH, BUILD_NAME + '-win' + archStr + '.zip')
|
||||||
zip.zipSync(inPath, outPath)
|
zip.zipSync(inPath, outPath)
|
||||||
|
|
||||||
console.log('Windows: Created portable app.')
|
console.log(`Windows: Created ${destArch} portable app.`)
|
||||||
cb(null)
|
cb(null)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -434,9 +526,9 @@ function buildLinux (cb) {
|
|||||||
if (err) return cb(err)
|
if (err) return cb(err)
|
||||||
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))
|
||||||
@@ -452,15 +544,15 @@ function buildLinux (cb) {
|
|||||||
// 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 deb = require('nobin-debian-installer')()
|
||||||
var destPath = path.join('/opt', pkg.name)
|
const destPath = path.join('/opt', pkg.name)
|
||||||
|
|
||||||
deb.pack({
|
deb.pack({
|
||||||
package: pkg,
|
package: pkg,
|
||||||
info: {
|
info: {
|
||||||
arch: destArch === 'x64' ? 'amd64' : 'i386',
|
arch: destArch === 'x64' ? 'amd64' : 'i386',
|
||||||
targetDir: DIST_PATH,
|
targetDir: DIST_PATH,
|
||||||
depends: 'libc6 (>= 2.4)',
|
depends: 'gconf2, libgtk2.0-0, libnss3, libxss1',
|
||||||
scripts: {
|
scripts: {
|
||||||
postinst: path.join(config.STATIC_PATH, 'linux', 'postinst'),
|
postinst: path.join(config.STATIC_PATH, 'linux', 'postinst'),
|
||||||
prerm: path.join(config.STATIC_PATH, 'linux', 'prerm')
|
prerm: path.join(config.STATIC_PATH, 'linux', 'prerm')
|
||||||
@@ -471,6 +563,11 @@ function buildLinux (cb) {
|
|||||||
dest: destPath,
|
dest: destPath,
|
||||||
expand: true,
|
expand: true,
|
||||||
cwd: filesPath
|
cwd: filesPath
|
||||||
|
}, {
|
||||||
|
src: ['./**'],
|
||||||
|
dest: path.join('/usr', 'share'),
|
||||||
|
expand: true,
|
||||||
|
cwd: path.join(config.STATIC_PATH, 'linux', 'share')
|
||||||
}], function (err) {
|
}], function (err) {
|
||||||
if (err) return cb(err)
|
if (err) return cb(err)
|
||||||
console.log(`Linux: Created ${destArch} deb.`)
|
console.log(`Linux: Created ${destArch} deb.`)
|
||||||
@@ -482,8 +579,10 @@ function buildLinux (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 archStr = destArch === 'ia32' ? '-ia32' : ''
|
||||||
var outPath = path.join(DIST_PATH, BUILD_NAME + '-linux-' + destArch + '.zip')
|
|
||||||
|
const inPath = path.join(DIST_PATH, path.basename(filesPath))
|
||||||
|
const outPath = path.join(DIST_PATH, BUILD_NAME + '-linux' + archStr + '.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,17 @@
|
|||||||
|
|
||||||
# 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)/;
|
||||||
$seen{$_} = push @authors, "- ", $_;
|
$seen{$_} = push @authors, "- ", $_;
|
||||||
}
|
}
|
||||||
END {
|
END {
|
||||||
|
|||||||
123
config.js
123
config.js
@@ -1,123 +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 ''
|
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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,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')
|
|
||||||
}
|
|
||||||
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,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'
|
|
||||||
}
|
|
||||||
12121
package-lock.json
generated
Normal file
12121
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
92
package.json
92
package.json
@@ -1,62 +1,79 @@
|
|||||||
{
|
{
|
||||||
"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.1",
|
"version": "0.20.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": {
|
|
||||||
"webtorrent-desktop": "./bin/cmd.js"
|
|
||||||
},
|
|
||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/feross/webtorrent-desktop/issues"
|
"url": "https://github.com/webtorrent/webtorrent-desktop/issues"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"airplayer": "^2.0.0",
|
"airplayer": "^2.0.0",
|
||||||
"application-config": "^0.2.1",
|
"application-config": "^1.0.0",
|
||||||
|
"arch": "^2.0.0",
|
||||||
|
"auto-launch": "^4.0.1",
|
||||||
"bitfield": "^1.0.2",
|
"bitfield": "^1.0.2",
|
||||||
"chromecasts": "^1.8.0",
|
"capture-frame": "^2.0.0",
|
||||||
|
"chokidar": "^2.0.4",
|
||||||
|
"chromecasts": "^1.9.1",
|
||||||
|
"cp-file": "^6.0.0",
|
||||||
"create-torrent": "^3.24.5",
|
"create-torrent": "^3.24.5",
|
||||||
|
"debounce": "^1.0.0",
|
||||||
"deep-equal": "^1.0.1",
|
"deep-equal": "^1.0.1",
|
||||||
"dlnacasts": "^0.1.0",
|
"dlnacasts": "^0.1.0",
|
||||||
"drag-drop": "^2.11.0",
|
"drag-drop": "^4.1.0",
|
||||||
"electron-prebuilt": "1.2.1",
|
"es6-error": "^4.0.0",
|
||||||
"fs-extra": "^0.27.0",
|
"fn-getter": "^1.0.0",
|
||||||
"hyperx": "^2.0.2",
|
|
||||||
"iso-639-1": "^1.2.1",
|
"iso-639-1": "^1.2.1",
|
||||||
"languagedetect": "^1.1.1",
|
"languagedetect": "^1.1.1",
|
||||||
"main-loop": "^3.2.0",
|
"location-history": "^1.0.0",
|
||||||
"musicmetadata": "^2.0.2",
|
"material-ui": "^0.17.0",
|
||||||
|
"mkdirp": "^0.5.1",
|
||||||
|
"music-metadata": "^3.1.0",
|
||||||
"network-address": "^1.1.0",
|
"network-address": "^1.1.0",
|
||||||
"parse-torrent": "^5.7.3",
|
"parse-torrent": "^6.0.1",
|
||||||
"prettier-bytes": "^1.0.1",
|
"prettier-bytes": "^1.0.1",
|
||||||
|
"react": "^15.4.2",
|
||||||
|
"react-dom": "^15.4.2",
|
||||||
|
"react-tap-event-plugin": "^2.0.1",
|
||||||
|
"rimraf": "^2.5.2",
|
||||||
"run-parallel": "^1.1.6",
|
"run-parallel": "^1.1.6",
|
||||||
"semver": "^5.1.0",
|
"semver": "^5.1.0",
|
||||||
"simple-concat": "^1.0.0",
|
"simple-concat": "^1.0.0",
|
||||||
"simple-get": "^2.0.0",
|
"simple-get": "^3.0.3",
|
||||||
"srt-to-vtt": "^1.1.1",
|
"srt-to-vtt": "^1.1.1",
|
||||||
"virtual-dom": "^2.1.1",
|
|
||||||
"vlc-command": "^1.0.1",
|
"vlc-command": "^1.0.1",
|
||||||
"webtorrent": "0.x",
|
"webtorrent": "0.x",
|
||||||
"winreg": "^1.2.0",
|
"winreg": "^1.2.0",
|
||||||
"zero-fill": "^2.2.3"
|
"zero-fill": "^2.2.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"babel-eslint": "^9.0.0",
|
||||||
|
"buble": "^0.19.3",
|
||||||
"cross-zip": "^2.0.1",
|
"cross-zip": "^2.0.1",
|
||||||
"electron-osx-sign": "^0.3.0",
|
"depcheck": "^0.6.4",
|
||||||
"electron-packager": "^7.0.0",
|
"electron": "1.6.16",
|
||||||
"electron-winstaller": "^2.3.0",
|
"electron-osx-sign": "^0.4.10",
|
||||||
"gh-release": "^2.0.3",
|
"electron-packager": "~8.5.1",
|
||||||
|
"electron-winstaller": "^2.6.4",
|
||||||
|
"gh-release": "^3.2.1",
|
||||||
"minimist": "^1.2.0",
|
"minimist": "^1.2.0",
|
||||||
"mkdirp": "^0.5.1",
|
"nobin-debian-installer": "0.0.10",
|
||||||
"nobin-debian-installer": "^0.0.10",
|
"nodemon": "^1.10.2",
|
||||||
"open": "0.0.5",
|
"opn": "^5.4.0",
|
||||||
"plist": "^1.2.0",
|
"plist": "^3.0.1",
|
||||||
"rimraf": "^2.5.2",
|
"pngjs": "^3.0.0",
|
||||||
"run-series": "^1.1.4",
|
"run-series": "^1.1.4",
|
||||||
"standard": "^7.0.0"
|
"spectron": "^3.3.0",
|
||||||
|
"standard": "*",
|
||||||
|
"tape": "^4.6.0",
|
||||||
|
"walk-sync": "^0.3.1"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=4.0.0"
|
||||||
},
|
},
|
||||||
"homepage": "https://webtorrent.io",
|
"homepage": "https://webtorrent.io",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
@@ -65,8 +82,8 @@
|
|||||||
"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",
|
||||||
@@ -74,17 +91,26 @@
|
|||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"appdmg": "^0.4.3"
|
"appdmg": "^0.4.3"
|
||||||
},
|
},
|
||||||
|
"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": "buble src --output build",
|
||||||
"clean": "node ./bin/clean.js",
|
"clean": "node ./bin/clean.js",
|
||||||
|
"gh-release": "gh-release",
|
||||||
"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 .",
|
"prepublish": "npm run build",
|
||||||
"test": "standard && node ./bin/check-deps.js",
|
"start": "npm run build && electron .",
|
||||||
"update-authors": "./bin/update-authors.sh"
|
"test": "standard && depcheck --ignores=standard,babel-eslint --ignore-dirs=build,dist && node ./bin/extra-lint.js",
|
||||||
|
"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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,88 +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)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Future migrations...
|
|
||||||
// if (semver.lt(version, '0.8.0')) {
|
|
||||||
// migrate_0_8_0(state)
|
|
||||||
// }
|
|
||||||
|
|
||||||
// Config is now on the new version
|
|
||||||
state.saved.version = config.APP_VERSION
|
|
||||||
}
|
|
||||||
|
|
||||||
function migrate_0_7_0 (state) {
|
|
||||||
console.log('migrate to 0.7.0')
|
|
||||||
|
|
||||||
var fs = require('fs-extra')
|
|
||||||
var path = require('path')
|
|
||||||
|
|
||||||
state.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
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -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')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
174
src/config.js
Normal file
174
src/config.js
Normal file
@@ -0,0 +1,174 @@
|
|||||||
|
const appConfig = require('application-config')('WebTorrent')
|
||||||
|
const path = require('path')
|
||||||
|
const electron = 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-2018 ' + 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)',
|
||||||
|
|
||||||
|
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',
|
||||||
|
|
||||||
|
HOME_PAGE_URL: 'https://webtorrent.io',
|
||||||
|
|
||||||
|
IS_PORTABLE: IS_PORTABLE,
|
||||||
|
IS_PRODUCTION: IS_PRODUCTION,
|
||||||
|
IS_TEST: 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_HEADER_HEIGHT,
|
||||||
|
UI_TORRENT_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 electron.remote.app.getPath(key)
|
||||||
|
} else {
|
||||||
|
// Electron main process
|
||||||
|
return electron.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)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,10 +2,10 @@ module.exports = {
|
|||||||
init
|
init
|
||||||
}
|
}
|
||||||
|
|
||||||
var config = require('./config')
|
|
||||||
var electron = require('electron')
|
|
||||||
|
|
||||||
function init () {
|
function init () {
|
||||||
|
const config = require('./config')
|
||||||
|
const electron = require('electron')
|
||||||
|
|
||||||
electron.crashReporter.start({
|
electron.crashReporter.start({
|
||||||
companyName: config.APP_NAME,
|
companyName: config.APP_NAME,
|
||||||
productName: config.APP_NAME,
|
productName: config.APP_NAME,
|
||||||
@@ -2,14 +2,13 @@ module.exports = {
|
|||||||
init
|
init
|
||||||
}
|
}
|
||||||
|
|
||||||
var electron = require('electron')
|
const electron = 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())
|
||||||
@@ -6,11 +6,10 @@ module.exports = {
|
|||||||
openFiles
|
openFiles
|
||||||
}
|
}
|
||||||
|
|
||||||
var electron = require('electron')
|
const electron = require('electron')
|
||||||
|
|
||||||
var config = require('../config')
|
const log = require('./log')
|
||||||
var log = require('./log')
|
const windows = require('./windows')
|
||||||
var windows = require('./windows')
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show open dialog to create a single-file torrent.
|
* Show open dialog to create a single-file torrent.
|
||||||
@@ -18,16 +17,11 @@ var windows = require('./windows')
|
|||||||
function openSeedFile () {
|
function openSeedFile () {
|
||||||
if (!windows.main.win) return
|
if (!windows.main.win) return
|
||||||
log('openSeedFile')
|
log('openSeedFile')
|
||||||
var opts = {
|
const opts = {
|
||||||
title: 'Select a file for the torrent.',
|
title: 'Select a file for the torrent.',
|
||||||
properties: [ 'openFile' ]
|
properties: [ 'openFile' ]
|
||||||
}
|
}
|
||||||
setTitle(opts.title)
|
showOpenSeed(opts)
|
||||||
electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
|
|
||||||
resetTitle()
|
|
||||||
if (!Array.isArray(selectedPaths)) return
|
|
||||||
windows.main.dispatch('showCreateTorrent', selectedPaths)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -38,7 +32,7 @@ function openSeedFile () {
|
|||||||
function openSeedDirectory () {
|
function openSeedDirectory () {
|
||||||
if (!windows.main.win) return
|
if (!windows.main.win) return
|
||||||
log('openSeedDirectory')
|
log('openSeedDirectory')
|
||||||
var opts = process.platform === 'darwin'
|
const opts = process.platform === 'darwin'
|
||||||
? {
|
? {
|
||||||
title: 'Select a file or folder for the torrent.',
|
title: 'Select a file or folder for the torrent.',
|
||||||
properties: [ 'openFile', 'openDirectory' ]
|
properties: [ 'openFile', 'openDirectory' ]
|
||||||
@@ -47,12 +41,7 @@ function openSeedDirectory () {
|
|||||||
title: 'Select a folder for the torrent.',
|
title: 'Select a folder for the torrent.',
|
||||||
properties: [ 'openDirectory' ]
|
properties: [ 'openDirectory' ]
|
||||||
}
|
}
|
||||||
setTitle(opts.title)
|
showOpenSeed(opts)
|
||||||
electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
|
|
||||||
resetTitle()
|
|
||||||
if (!Array.isArray(selectedPaths)) return
|
|
||||||
windows.main.dispatch('showCreateTorrent', selectedPaths)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -62,7 +51,7 @@ function openSeedDirectory () {
|
|||||||
function openFiles () {
|
function openFiles () {
|
||||||
if (!windows.main.win) return
|
if (!windows.main.win) return
|
||||||
log('openFiles')
|
log('openFiles')
|
||||||
var opts = process.platform === 'darwin'
|
const opts = process.platform === 'darwin'
|
||||||
? {
|
? {
|
||||||
title: 'Select a file or folder to add.',
|
title: 'Select a file or folder to add.',
|
||||||
properties: [ 'openFile', 'openDirectory' ]
|
properties: [ 'openFile', 'openDirectory' ]
|
||||||
@@ -85,7 +74,7 @@ function openFiles () {
|
|||||||
function openTorrentFile () {
|
function openTorrentFile () {
|
||||||
if (!windows.main.win) return
|
if (!windows.main.win) return
|
||||||
log('openTorrentFile')
|
log('openTorrentFile')
|
||||||
var opts = {
|
const opts = {
|
||||||
title: 'Select a .torrent file.',
|
title: 'Select a .torrent file.',
|
||||||
filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
|
filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
|
||||||
properties: [ 'openFile', 'multiSelections' ]
|
properties: [ 'openFile', 'multiSelections' ]
|
||||||
@@ -109,7 +98,7 @@ function openTorrentAddress () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Dialogs on do not show a title on OS X, so the window title is used instead.
|
* Dialogs on do not show a title on Mac, so the window title is used instead.
|
||||||
*/
|
*/
|
||||||
function setTitle (title) {
|
function setTitle (title) {
|
||||||
if (process.platform === 'darwin') {
|
if (process.platform === 'darwin') {
|
||||||
@@ -118,5 +107,18 @@ function setTitle (title) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function resetTitle () {
|
function resetTitle () {
|
||||||
setTitle(config.APP_WINDOW_TITLE)
|
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)
|
||||||
|
electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
|
||||||
|
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.setBadgeCount(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 == null) return vlcCommand(cb)
|
||||||
|
process.nextTick(() => cb(null))
|
||||||
|
}
|
||||||
|
|
||||||
|
function spawn (playerPath, url, title) {
|
||||||
|
if (playerPath != null) 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
|
||||||
@@ -3,58 +3,57 @@ module.exports = {
|
|||||||
uninstall
|
uninstall
|
||||||
}
|
}
|
||||||
|
|
||||||
var config = require('../config')
|
const config = require('../config')
|
||||||
var path = require('path')
|
const path = require('path')
|
||||||
|
|
||||||
function install () {
|
function install () {
|
||||||
if (process.platform === 'darwin') {
|
switch (process.platform) {
|
||||||
installDarwin()
|
case 'darwin': installDarwin()
|
||||||
}
|
break
|
||||||
if (process.platform === 'win32') {
|
case 'win32': installWin32()
|
||||||
installWin32()
|
break
|
||||||
}
|
case 'linux': installLinux()
|
||||||
if (process.platform === 'linux') {
|
break
|
||||||
installLinux()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function uninstall () {
|
function uninstall () {
|
||||||
if (process.platform === 'darwin') {
|
switch (process.platform) {
|
||||||
uninstallDarwin()
|
case 'darwin': uninstallDarwin()
|
||||||
}
|
break
|
||||||
if (process.platform === 'win32') {
|
case 'win32': uninstallWin32()
|
||||||
uninstallWin32()
|
break
|
||||||
}
|
case 'linux': uninstallLinux()
|
||||||
if (process.platform === 'linux') {
|
break
|
||||||
uninstallLinux()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function installDarwin () {
|
function installDarwin () {
|
||||||
var electron = require('electron')
|
const electron = require('electron')
|
||||||
var app = electron.app
|
const app = electron.app
|
||||||
|
|
||||||
// On OS X, only protocols that are listed in `Info.plist` can be set as the
|
// On Mac, only protocols that are listed in `Info.plist` can be set as the
|
||||||
// default handler at runtime.
|
// default handler at runtime.
|
||||||
app.setAsDefaultProtocolClient('magnet')
|
app.setAsDefaultProtocolClient('magnet')
|
||||||
|
app.setAsDefaultProtocolClient('stream-magnet')
|
||||||
|
|
||||||
// File handlers are defined in `Info.plist`.
|
// File handlers are defined in `Info.plist`.
|
||||||
}
|
}
|
||||||
|
|
||||||
function uninstallDarwin () {}
|
function uninstallDarwin () {}
|
||||||
|
|
||||||
var EXEC_COMMAND = [ process.execPath ]
|
const EXEC_COMMAND = [ process.execPath, '--' ]
|
||||||
|
|
||||||
if (!config.IS_PRODUCTION) {
|
if (!config.IS_PRODUCTION) {
|
||||||
EXEC_COMMAND.push(config.ROOT_PATH)
|
EXEC_COMMAND.push(config.ROOT_PATH)
|
||||||
}
|
}
|
||||||
|
|
||||||
function installWin32 () {
|
function installWin32 () {
|
||||||
var Registry = require('winreg')
|
const Registry = require('winreg')
|
||||||
|
|
||||||
var log = require('./log')
|
const log = require('./log')
|
||||||
|
|
||||||
var iconPath = path.join(
|
const iconPath = path.join(
|
||||||
process.resourcesPath, 'app.asar.unpacked', 'static', 'WebTorrentFile.ico'
|
process.resourcesPath, 'app.asar.unpacked', 'static', 'WebTorrentFile.ico'
|
||||||
)
|
)
|
||||||
registerProtocolHandlerWin32(
|
registerProtocolHandlerWin32(
|
||||||
@@ -63,6 +62,12 @@ function installWin32 () {
|
|||||||
iconPath,
|
iconPath,
|
||||||
EXEC_COMMAND
|
EXEC_COMMAND
|
||||||
)
|
)
|
||||||
|
registerProtocolHandlerWin32(
|
||||||
|
'stream-magnet',
|
||||||
|
'URL:BitTorrent Stream-Magnet URL',
|
||||||
|
iconPath,
|
||||||
|
EXEC_COMMAND
|
||||||
|
)
|
||||||
registerFileHandlerWin32(
|
registerFileHandlerWin32(
|
||||||
'.torrent',
|
'.torrent',
|
||||||
'io.webtorrent.torrent',
|
'io.webtorrent.torrent',
|
||||||
@@ -93,7 +98,7 @@ function installWin32 () {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function registerProtocolHandlerWin32 (protocol, name, icon, command) {
|
function registerProtocolHandlerWin32 (protocol, name, icon, command) {
|
||||||
var protocolKey = new Registry({
|
const protocolKey = new Registry({
|
||||||
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
||||||
key: '\\Software\\Classes\\' + protocol
|
key: '\\Software\\Classes\\' + protocol
|
||||||
})
|
})
|
||||||
@@ -101,37 +106,37 @@ function installWin32 () {
|
|||||||
setProtocol()
|
setProtocol()
|
||||||
|
|
||||||
function setProtocol (err) {
|
function setProtocol (err) {
|
||||||
if (err) log.error(err.message)
|
if (err) return log.error(err.message)
|
||||||
protocolKey.set('', Registry.REG_SZ, name, setURLProtocol)
|
protocolKey.set('', Registry.REG_SZ, name, setURLProtocol)
|
||||||
}
|
}
|
||||||
|
|
||||||
function setURLProtocol (err) {
|
function setURLProtocol (err) {
|
||||||
if (err) log.error(err.message)
|
if (err) return log.error(err.message)
|
||||||
protocolKey.set('URL Protocol', Registry.REG_SZ, '', setIcon)
|
protocolKey.set('URL Protocol', Registry.REG_SZ, '', setIcon)
|
||||||
}
|
}
|
||||||
|
|
||||||
function setIcon (err) {
|
function setIcon (err) {
|
||||||
if (err) log.error(err.message)
|
if (err) return log.error(err.message)
|
||||||
|
|
||||||
var iconKey = new Registry({
|
const iconKey = new Registry({
|
||||||
hive: Registry.HKCU,
|
hive: Registry.HKCU,
|
||||||
key: '\\Software\\Classes\\' + protocol + '\\DefaultIcon'
|
key: `\\Software\\Classes\\${protocol}\\DefaultIcon`
|
||||||
})
|
})
|
||||||
iconKey.set('', Registry.REG_SZ, icon, setCommand)
|
iconKey.set('', Registry.REG_SZ, icon, setCommand)
|
||||||
}
|
}
|
||||||
|
|
||||||
function setCommand (err) {
|
function setCommand (err) {
|
||||||
if (err) log.error(err.message)
|
if (err) return log.error(err.message)
|
||||||
|
|
||||||
var commandKey = new Registry({
|
const commandKey = new Registry({
|
||||||
hive: Registry.HKCU,
|
hive: Registry.HKCU,
|
||||||
key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
|
key: `\\Software\\Classes\\${protocol}\\shell\\open\\command`
|
||||||
})
|
})
|
||||||
commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
|
commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
|
||||||
}
|
}
|
||||||
|
|
||||||
function done (err) {
|
function done (err) {
|
||||||
if (err) log.error(err.message)
|
if (err) return log.error(err.message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,64 +159,65 @@ function installWin32 () {
|
|||||||
setExt()
|
setExt()
|
||||||
|
|
||||||
function setExt () {
|
function setExt () {
|
||||||
var extKey = new Registry({
|
const extKey = new Registry({
|
||||||
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
||||||
key: '\\Software\\Classes\\' + ext
|
key: `\\Software\\Classes\\${ext}`
|
||||||
})
|
})
|
||||||
extKey.set('', Registry.REG_SZ, id, setId)
|
extKey.set('', Registry.REG_SZ, id, setId)
|
||||||
}
|
}
|
||||||
|
|
||||||
function setId (err) {
|
function setId (err) {
|
||||||
if (err) log.error(err.message)
|
if (err) return log.error(err.message)
|
||||||
|
|
||||||
var idKey = new Registry({
|
const idKey = new Registry({
|
||||||
hive: Registry.HKCU,
|
hive: Registry.HKCU,
|
||||||
key: '\\Software\\Classes\\' + id
|
key: `\\Software\\Classes\\${id}`
|
||||||
})
|
})
|
||||||
idKey.set('', Registry.REG_SZ, name, setIcon)
|
idKey.set('', Registry.REG_SZ, name, setIcon)
|
||||||
}
|
}
|
||||||
|
|
||||||
function setIcon (err) {
|
function setIcon (err) {
|
||||||
if (err) log.error(err.message)
|
if (err) return log.error(err.message)
|
||||||
|
|
||||||
var iconKey = new Registry({
|
const iconKey = new Registry({
|
||||||
hive: Registry.HKCU,
|
hive: Registry.HKCU,
|
||||||
key: '\\Software\\Classes\\' + id + '\\DefaultIcon'
|
key: `\\Software\\Classes\\${id}\\DefaultIcon`
|
||||||
})
|
})
|
||||||
iconKey.set('', Registry.REG_SZ, icon, setCommand)
|
iconKey.set('', Registry.REG_SZ, icon, setCommand)
|
||||||
}
|
}
|
||||||
|
|
||||||
function setCommand (err) {
|
function setCommand (err) {
|
||||||
if (err) log.error(err.message)
|
if (err) return log.error(err.message)
|
||||||
|
|
||||||
var commandKey = new Registry({
|
const commandKey = new Registry({
|
||||||
hive: Registry.HKCU,
|
hive: Registry.HKCU,
|
||||||
key: '\\Software\\Classes\\' + id + '\\shell\\open\\command'
|
key: `\\Software\\Classes\\${id}\\shell\\open\\command`
|
||||||
})
|
})
|
||||||
commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
|
commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
|
||||||
}
|
}
|
||||||
|
|
||||||
function done (err) {
|
function done (err) {
|
||||||
if (err) log.error(err.message)
|
if (err) return log.error(err.message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function uninstallWin32 () {
|
function uninstallWin32 () {
|
||||||
var Registry = require('winreg')
|
const Registry = require('winreg')
|
||||||
|
|
||||||
unregisterProtocolHandlerWin32('magnet', EXEC_COMMAND)
|
unregisterProtocolHandlerWin32('magnet', EXEC_COMMAND)
|
||||||
|
unregisterProtocolHandlerWin32('stream-magnet', EXEC_COMMAND)
|
||||||
unregisterFileHandlerWin32('.torrent', 'io.webtorrent.torrent', EXEC_COMMAND)
|
unregisterFileHandlerWin32('.torrent', 'io.webtorrent.torrent', EXEC_COMMAND)
|
||||||
|
|
||||||
function unregisterProtocolHandlerWin32 (protocol, command) {
|
function unregisterProtocolHandlerWin32 (protocol, command) {
|
||||||
getCommand()
|
getCommand()
|
||||||
|
|
||||||
function getCommand () {
|
function getCommand () {
|
||||||
var commandKey = new Registry({
|
const commandKey = new Registry({
|
||||||
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
||||||
key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
|
key: `\\Software\\Classes\\${protocol}\\shell\\open\\command`
|
||||||
})
|
})
|
||||||
commandKey.get('', function (err, item) {
|
commandKey.get('', (err, item) => {
|
||||||
if (!err && item.value.indexOf(commandToArgs(command)) >= 0) {
|
if (!err && item.value.indexOf(commandToArgs(command)) >= 0) {
|
||||||
destroyProtocol()
|
destroyProtocol()
|
||||||
}
|
}
|
||||||
@@ -219,11 +225,11 @@ function uninstallWin32 () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function destroyProtocol () {
|
function destroyProtocol () {
|
||||||
var protocolKey = new Registry({
|
const protocolKey = new Registry({
|
||||||
hive: Registry.HKCU,
|
hive: Registry.HKCU,
|
||||||
key: '\\Software\\Classes\\' + protocol
|
key: `\\Software\\Classes\\${protocol}`
|
||||||
})
|
})
|
||||||
protocolKey.destroy(function () {})
|
protocolKey.destroy(() => {})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -231,19 +237,19 @@ function uninstallWin32 () {
|
|||||||
eraseId()
|
eraseId()
|
||||||
|
|
||||||
function eraseId () {
|
function eraseId () {
|
||||||
var idKey = new Registry({
|
const idKey = new Registry({
|
||||||
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
||||||
key: '\\Software\\Classes\\' + id
|
key: `\\Software\\Classes\\${id}`
|
||||||
})
|
})
|
||||||
idKey.destroy(getExt)
|
idKey.destroy(getExt)
|
||||||
}
|
}
|
||||||
|
|
||||||
function getExt () {
|
function getExt () {
|
||||||
var extKey = new Registry({
|
const extKey = new Registry({
|
||||||
hive: Registry.HKCU,
|
hive: Registry.HKCU,
|
||||||
key: '\\Software\\Classes\\' + ext
|
key: `\\Software\\Classes\\${ext}`
|
||||||
})
|
})
|
||||||
extKey.get('', function (err, item) {
|
extKey.get('', (err, item) => {
|
||||||
if (!err && item.value === id) {
|
if (!err && item.value === id) {
|
||||||
destroyExt()
|
destroyExt()
|
||||||
}
|
}
|
||||||
@@ -251,11 +257,11 @@ function uninstallWin32 () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function destroyExt () {
|
function destroyExt () {
|
||||||
var extKey = new Registry({
|
const extKey = new Registry({
|
||||||
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
hive: Registry.HKCU, // HKEY_CURRENT_USER
|
||||||
key: '\\Software\\Classes\\' + ext
|
key: `\\Software\\Classes\\${ext}`
|
||||||
})
|
})
|
||||||
extKey.destroy(function () {})
|
extKey.destroy(() => {})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -265,18 +271,21 @@ function commandToArgs (command) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function installLinux () {
|
function installLinux () {
|
||||||
var fs = require('fs-extra')
|
const fs = require('fs')
|
||||||
var os = require('os')
|
const os = require('os')
|
||||||
var path = require('path')
|
const path = require('path')
|
||||||
|
|
||||||
var config = require('../config')
|
const config = require('../config')
|
||||||
var log = require('./log')
|
const log = require('./log')
|
||||||
|
|
||||||
|
// Do not install in user dir if running on system
|
||||||
|
if (/^\/opt/.test(process.execPath)) return
|
||||||
|
|
||||||
installDesktopFile()
|
installDesktopFile()
|
||||||
installIconFile()
|
installIconFile()
|
||||||
|
|
||||||
function installDesktopFile () {
|
function installDesktopFile () {
|
||||||
var templatePath = path.join(
|
const templatePath = path.join(
|
||||||
config.STATIC_PATH, 'linux', 'webtorrent-desktop.desktop'
|
config.STATIC_PATH, 'linux', 'webtorrent-desktop.desktop'
|
||||||
)
|
)
|
||||||
fs.readFile(templatePath, 'utf8', writeDesktopFile)
|
fs.readFile(templatePath, 'utf8', writeDesktopFile)
|
||||||
@@ -285,16 +294,17 @@ function installLinux () {
|
|||||||
function writeDesktopFile (err, desktopFile) {
|
function writeDesktopFile (err, desktopFile) {
|
||||||
if (err) return log.error(err.message)
|
if (err) return log.error(err.message)
|
||||||
|
|
||||||
var appPath = config.IS_PRODUCTION
|
const appPath = config.IS_PRODUCTION
|
||||||
? path.dirname(process.execPath)
|
? path.dirname(process.execPath)
|
||||||
: config.ROOT_PATH
|
: config.ROOT_PATH
|
||||||
|
|
||||||
desktopFile = desktopFile.replace(/\$APP_NAME/g, config.APP_NAME)
|
desktopFile = desktopFile
|
||||||
desktopFile = desktopFile.replace(/\$APP_PATH/g, appPath)
|
.replace(/\$APP_NAME/g, config.APP_NAME)
|
||||||
desktopFile = desktopFile.replace(/\$EXEC_PATH/g, EXEC_COMMAND.join(' '))
|
.replace(/\$APP_PATH/g, appPath)
|
||||||
desktopFile = desktopFile.replace(/\$TRY_EXEC_PATH/g, process.execPath)
|
.replace(/\$EXEC_PATH/g, EXEC_COMMAND.join(' '))
|
||||||
|
.replace(/\$TRY_EXEC_PATH/g, process.execPath)
|
||||||
|
|
||||||
var desktopFilePath = path.join(
|
const desktopFilePath = path.join(
|
||||||
os.homedir(),
|
os.homedir(),
|
||||||
'.local',
|
'.local',
|
||||||
'share',
|
'share',
|
||||||
@@ -302,53 +312,57 @@ function installLinux () {
|
|||||||
'webtorrent-desktop.desktop'
|
'webtorrent-desktop.desktop'
|
||||||
)
|
)
|
||||||
fs.mkdirp(path.dirname(desktopFilePath))
|
fs.mkdirp(path.dirname(desktopFilePath))
|
||||||
fs.writeFile(desktopFilePath, desktopFile, function (err) {
|
fs.writeFile(desktopFilePath, desktopFile, err => {
|
||||||
if (err) return log.error(err.message)
|
if (err) return log.error(err.message)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function installIconFile () {
|
function installIconFile () {
|
||||||
var iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
|
const iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
|
||||||
fs.readFile(iconStaticPath, writeIconFile)
|
fs.readFile(iconStaticPath, writeIconFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
function writeIconFile (err, iconFile) {
|
function writeIconFile (err, iconFile) {
|
||||||
if (err) return log.error(err.message)
|
if (err) return log.error(err.message)
|
||||||
|
|
||||||
var iconFilePath = path.join(
|
const mkdirp = require('mkdirp')
|
||||||
|
|
||||||
|
const iconFilePath = path.join(
|
||||||
os.homedir(),
|
os.homedir(),
|
||||||
'.local',
|
'.local',
|
||||||
'share',
|
'share',
|
||||||
'icons',
|
'icons',
|
||||||
'webtorrent-desktop.png'
|
'webtorrent-desktop.png'
|
||||||
)
|
)
|
||||||
fs.mkdirp(path.dirname(iconFilePath))
|
mkdirp(path.dirname(iconFilePath), err => {
|
||||||
fs.writeFile(iconFilePath, iconFile, function (err) {
|
|
||||||
if (err) return log.error(err.message)
|
if (err) return log.error(err.message)
|
||||||
|
fs.writeFile(iconFilePath, iconFile, err => {
|
||||||
|
if (err) log.error(err.message)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function uninstallLinux () {
|
function uninstallLinux () {
|
||||||
var os = require('os')
|
const os = require('os')
|
||||||
var path = require('path')
|
const path = require('path')
|
||||||
var fs = require('fs-extra')
|
const rimraf = require('rimraf')
|
||||||
|
|
||||||
var desktopFilePath = path.join(
|
const desktopFilePath = path.join(
|
||||||
os.homedir(),
|
os.homedir(),
|
||||||
'.local',
|
'.local',
|
||||||
'share',
|
'share',
|
||||||
'applications',
|
'applications',
|
||||||
'webtorrent-desktop.desktop'
|
'webtorrent-desktop.desktop'
|
||||||
)
|
)
|
||||||
fs.removeSync(desktopFilePath)
|
rimraf(desktopFilePath)
|
||||||
|
|
||||||
var iconFilePath = path.join(
|
const iconFilePath = path.join(
|
||||||
os.homedir(),
|
os.homedir(),
|
||||||
'.local',
|
'.local',
|
||||||
'share',
|
'share',
|
||||||
'icons',
|
'icons',
|
||||||
'webtorrent-desktop.png'
|
'webtorrent-desktop.png'
|
||||||
)
|
)
|
||||||
fs.removeSync(iconFilePath)
|
rimraf(iconFilePath)
|
||||||
}
|
}
|
||||||
226
src/main/index.js
Normal file
226
src/main/index.js
Normal file
@@ -0,0 +1,226 @@
|
|||||||
|
console.time('init')
|
||||||
|
|
||||||
|
const electron = require('electron')
|
||||||
|
const app = electron.app
|
||||||
|
|
||||||
|
const parallel = require('run-parallel')
|
||||||
|
|
||||||
|
const config = require('../config')
|
||||||
|
const crashReporter = require('../crash-reporter')
|
||||||
|
const ipc = require('./ipc')
|
||||||
|
const log = require('./log')
|
||||||
|
const menu = require('./menu')
|
||||||
|
const State = require('../renderer/lib/state')
|
||||||
|
const windows = require('./windows')
|
||||||
|
|
||||||
|
let shouldQuit = false
|
||||||
|
let argv = sliceArgv(process.argv)
|
||||||
|
|
||||||
|
// 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".
|
||||||
|
shouldQuit = app.makeSingleInstance(onAppOpen)
|
||||||
|
if (shouldQuit) {
|
||||||
|
app.quit()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!shouldQuit) {
|
||||||
|
init()
|
||||||
|
}
|
||||||
|
|
||||||
|
function init () {
|
||||||
|
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'))
|
||||||
|
}
|
||||||
|
|
||||||
|
const ipcMain = electron.ipcMain
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
windows.main.init(state, { hidden: hidden })
|
||||||
|
windows.webtorrent.init()
|
||||||
|
menu.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)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
app.on('open-file', onOpen)
|
||||||
|
app.on('open-url', onOpen)
|
||||||
|
|
||||||
|
ipc.init()
|
||||||
|
|
||||||
|
app.once('will-finish-launching', function () {
|
||||||
|
crashReporter.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('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', function () {
|
||||||
|
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) {
|
||||||
|
let torrentIds = []
|
||||||
|
argv.forEach(function (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)
|
||||||
|
}
|
||||||
|
}
|
||||||
249
src/main/ipc.js
Normal file
249
src/main/ipc.js
Normal file
@@ -0,0 +1,249 @@
|
|||||||
|
module.exports = {
|
||||||
|
init,
|
||||||
|
setModule
|
||||||
|
}
|
||||||
|
|
||||||
|
const electron = require('electron')
|
||||||
|
|
||||||
|
const app = electron.app
|
||||||
|
|
||||||
|
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 () {
|
||||||
|
const 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', () => {
|
||||||
|
const dialog = require('./dialog')
|
||||||
|
dialog.openTorrentFile()
|
||||||
|
})
|
||||||
|
ipc.on('openFiles', () => {
|
||||||
|
const dialog = require('./dialog')
|
||||||
|
dialog.openFiles()
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Dock
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipc.on('setBadge', (e, ...args) => {
|
||||||
|
const dock = require('./dock')
|
||||||
|
dock.setBadge(...args)
|
||||||
|
})
|
||||||
|
ipc.on('downloadFinished', (e, ...args) => {
|
||||||
|
const dock = require('./dock')
|
||||||
|
dock.downloadFinished(...args)
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Player Events
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipc.on('onPlayerOpen', function () {
|
||||||
|
const powerSaveBlocker = require('./power-save-blocker')
|
||||||
|
const shortcuts = require('./shortcuts')
|
||||||
|
const thumbar = require('./thumbar')
|
||||||
|
|
||||||
|
menu.togglePlaybackControls(true)
|
||||||
|
powerSaveBlocker.enable()
|
||||||
|
shortcuts.enable()
|
||||||
|
thumbar.enable()
|
||||||
|
})
|
||||||
|
|
||||||
|
ipc.on('onPlayerUpdate', function (e, ...args) {
|
||||||
|
const thumbar = require('./thumbar')
|
||||||
|
|
||||||
|
menu.onPlayerUpdate(...args)
|
||||||
|
thumbar.onPlayerUpdate(...args)
|
||||||
|
})
|
||||||
|
|
||||||
|
ipc.on('onPlayerClose', function () {
|
||||||
|
const powerSaveBlocker = require('./power-save-blocker')
|
||||||
|
const shortcuts = require('./shortcuts')
|
||||||
|
const thumbar = require('./thumbar')
|
||||||
|
|
||||||
|
menu.togglePlaybackControls(false)
|
||||||
|
powerSaveBlocker.disable()
|
||||||
|
shortcuts.disable()
|
||||||
|
thumbar.disable()
|
||||||
|
})
|
||||||
|
|
||||||
|
ipc.on('onPlayerPlay', function () {
|
||||||
|
const powerSaveBlocker = require('./power-save-blocker')
|
||||||
|
const thumbar = require('./thumbar')
|
||||||
|
|
||||||
|
powerSaveBlocker.enable()
|
||||||
|
thumbar.onPlayerPlay()
|
||||||
|
})
|
||||||
|
|
||||||
|
ipc.on('onPlayerPause', function () {
|
||||||
|
const powerSaveBlocker = require('./power-save-blocker')
|
||||||
|
const thumbar = require('./thumbar')
|
||||||
|
|
||||||
|
powerSaveBlocker.disable()
|
||||||
|
thumbar.onPlayerPause()
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Folder Watcher Events
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipc.on('startFolderWatcher', function () {
|
||||||
|
if (!modules['folderWatcher']) {
|
||||||
|
log('IPC ERR: folderWatcher module is not defined.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
modules['folderWatcher'].start()
|
||||||
|
})
|
||||||
|
|
||||||
|
ipc.on('stopFolderWatcher', function () {
|
||||||
|
if (!modules['folderWatcher']) {
|
||||||
|
log('IPC ERR: folderWatcher module is not defined.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
modules['folderWatcher'].stop()
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shell
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipc.on('openItem', (e, ...args) => {
|
||||||
|
const shell = require('./shell')
|
||||||
|
shell.openItem(...args)
|
||||||
|
})
|
||||||
|
ipc.on('showItemInFolder', (e, ...args) => {
|
||||||
|
const shell = require('./shell')
|
||||||
|
shell.showItemInFolder(...args)
|
||||||
|
})
|
||||||
|
ipc.on('moveItemToTrash', (e, ...args) => {
|
||||||
|
const shell = require('./shell')
|
||||||
|
shell.moveItemToTrash(...args)
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* File handlers
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipc.on('setDefaultFileHandler', (e, flag) => {
|
||||||
|
const handlers = require('./handlers')
|
||||||
|
|
||||||
|
if (flag) handlers.install()
|
||||||
|
else handlers.uninstall()
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Auto start on login
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipc.on('setStartup', (e, flag) => {
|
||||||
|
const startup = require('./startup')
|
||||||
|
|
||||||
|
if (flag) startup.install()
|
||||||
|
else startup.uninstall()
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Windows: Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
const 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))
|
||||||
|
ipc.on('setAllowNav', (e, ...args) => menu.setAllowNav(...args))
|
||||||
|
|
||||||
|
/**
|
||||||
|
* External Media Player
|
||||||
|
*/
|
||||||
|
|
||||||
|
ipc.on('checkForExternalPlayer', function (e, path) {
|
||||||
|
const externalPlayer = require('./external-player')
|
||||||
|
|
||||||
|
externalPlayer.checkInstall(path, function (err) {
|
||||||
|
windows.main.send('checkForExternalPlayer', !err)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
ipc.on('openExternalPlayer', (e, ...args) => {
|
||||||
|
const externalPlayer = require('./external-player')
|
||||||
|
const thumbar = require('./thumbar')
|
||||||
|
|
||||||
|
menu.togglePlaybackControls(false)
|
||||||
|
thumbar.disable()
|
||||||
|
externalPlayer.spawn(...args)
|
||||||
|
})
|
||||||
|
|
||||||
|
ipc.on('quitExternalPlayer', () => {
|
||||||
|
const externalPlayer = require('./external-player')
|
||||||
|
externalPlayer.kill()
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Message passing
|
||||||
|
*/
|
||||||
|
|
||||||
|
const 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)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,10 +8,10 @@ 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 electron = require('electron')
|
||||||
var windows = require('./windows')
|
const windows = require('./windows')
|
||||||
|
|
||||||
var app = electron.app
|
const app = electron.app
|
||||||
|
|
||||||
function log (...args) {
|
function log (...args) {
|
||||||
if (app.ipcReady) {
|
if (app.ipcReady) {
|
||||||
@@ -1,49 +1,64 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
init,
|
init,
|
||||||
onPlayerClose,
|
togglePlaybackControls,
|
||||||
onPlayerOpen,
|
setWindowFocus,
|
||||||
|
setAllowNav,
|
||||||
|
onPlayerUpdate,
|
||||||
onToggleAlwaysOnTop,
|
onToggleAlwaysOnTop,
|
||||||
onToggleFullScreen,
|
onToggleFullScreen
|
||||||
onWindowBlur,
|
|
||||||
onWindowFocus
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var electron = require('electron')
|
const electron = require('electron')
|
||||||
|
|
||||||
var app = electron.app
|
const app = electron.app
|
||||||
|
|
||||||
var config = require('../config')
|
const config = require('../config')
|
||||||
var dialog = require('./dialog')
|
const windows = require('./windows')
|
||||||
var shell = require('./shell')
|
|
||||||
var windows = require('./windows')
|
|
||||||
|
|
||||||
var menu
|
let menu = null
|
||||||
|
|
||||||
function init () {
|
function init () {
|
||||||
menu = electron.Menu.buildFromTemplate(getMenuTemplate())
|
menu = electron.Menu.buildFromTemplate(getMenuTemplate())
|
||||||
electron.Menu.setApplicationMenu(menu)
|
electron.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,19 +69,9 @@ 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 (let i = 0; i < menu.items.length; i++) {
|
||||||
var menuItem = menu.items[i].submenu.items.find(function (item) {
|
const menuItem = menu.items[i].submenu.items.find(function (item) {
|
||||||
return item.label === label
|
return item.label === label
|
||||||
})
|
})
|
||||||
if (menuItem) return menuItem
|
if (menuItem) return menuItem
|
||||||
@@ -74,7 +79,7 @@ function getMenuItem (label) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function getMenuTemplate () {
|
function getMenuTemplate () {
|
||||||
var template = [
|
const template = [
|
||||||
{
|
{
|
||||||
label: 'File',
|
label: 'File',
|
||||||
submenu: [
|
submenu: [
|
||||||
@@ -83,26 +88,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 +121,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 +207,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 +242,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 +250,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 +278,57 @@ function getMenuTemplate () {
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: 'Transfers',
|
||||||
|
submenu: [
|
||||||
|
{
|
||||||
|
label: 'Pause All',
|
||||||
|
click: () => windows.main.dispatch('pauseAllTorrents')
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Resume All',
|
||||||
|
click: () => windows.main.dispatch('resumeAllTorrents')
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
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: '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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
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,7 +343,6 @@ function getMenuTemplate () {
|
|||||||
type: 'separator'
|
type: 'separator'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Services',
|
|
||||||
role: 'services',
|
role: 'services',
|
||||||
submenu: []
|
submenu: []
|
||||||
},
|
},
|
||||||
@@ -308,45 +350,52 @@ function getMenuTemplate () {
|
|||||||
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 +408,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 electron = 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 (electron.powerSaveBlocker.isStarted(blockId)) {
|
||||||
|
// If a power saver block already exists, do nothing.
|
||||||
|
return
|
||||||
|
}
|
||||||
|
blockId = electron.powerSaveBlocker.start('prevent-display-sleep')
|
||||||
|
log(`powerSaveBlocker.enable: ${blockId}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stop blocking the system from entering low-power mode.
|
||||||
|
*/
|
||||||
|
function disable () {
|
||||||
|
if (!electron.powerSaveBlocker.isStarted(blockId)) {
|
||||||
|
// If a power saver block does not exist, do nothing.
|
||||||
|
return
|
||||||
|
}
|
||||||
|
electron.powerSaveBlocker.stop(blockId)
|
||||||
|
log(`powerSaveBlocker.disable: ${blockId}`)
|
||||||
|
}
|
||||||
@@ -1,11 +1,12 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
openExternal,
|
openExternal,
|
||||||
openItem,
|
openItem,
|
||||||
showItemInFolder
|
showItemInFolder,
|
||||||
|
moveItemToTrash
|
||||||
}
|
}
|
||||||
|
|
||||||
var electron = require('electron')
|
const electron = require('electron')
|
||||||
var log = require('./log')
|
const log = require('./log')
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Open the given external protocol URL in the desktop’s default manner.
|
* Open the given external protocol URL in the desktop’s default manner.
|
||||||
@@ -30,3 +31,11 @@ function showItemInFolder (path) {
|
|||||||
log(`showItemInFolder: ${path}`)
|
log(`showItemInFolder: ${path}`)
|
||||||
electron.shell.showItemInFolder(path)
|
electron.shell.showItemInFolder(path)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Move the given file to trash and returns a boolean status for the operation.
|
||||||
|
*/
|
||||||
|
function moveItemToTrash (path) {
|
||||||
|
log(`moveItemToTrash: ${path}`)
|
||||||
|
electron.shell.moveItemToTrash(path)
|
||||||
|
}
|
||||||
30
src/main/shortcuts.js
Normal file
30
src/main/shortcuts.js
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
module.exports = {
|
||||||
|
disable,
|
||||||
|
enable
|
||||||
|
}
|
||||||
|
|
||||||
|
const electron = require('electron')
|
||||||
|
const windows = require('./windows')
|
||||||
|
|
||||||
|
function enable () {
|
||||||
|
// Register play/pause media key, available on some keyboards.
|
||||||
|
electron.globalShortcut.register(
|
||||||
|
'MediaPlayPause',
|
||||||
|
() => windows.main.dispatch('playPause')
|
||||||
|
)
|
||||||
|
electron.globalShortcut.register(
|
||||||
|
'MediaNextTrack',
|
||||||
|
() => windows.main.dispatch('nextTrack')
|
||||||
|
)
|
||||||
|
electron.globalShortcut.register(
|
||||||
|
'MediaPreviousTrack',
|
||||||
|
() => windows.main.dispatch('previousTrack')
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function disable () {
|
||||||
|
// Return the media key to the OS, so other apps can use it.
|
||||||
|
electron.globalShortcut.unregister('MediaPlayPause')
|
||||||
|
electron.globalShortcut.unregister('MediaNextTrack')
|
||||||
|
electron.globalShortcut.unregister('MediaPreviousTrack')
|
||||||
|
}
|
||||||
@@ -2,18 +2,18 @@ module.exports = {
|
|||||||
handleEvent
|
handleEvent
|
||||||
}
|
}
|
||||||
|
|
||||||
var cp = require('child_process')
|
const cp = require('child_process')
|
||||||
var electron = require('electron')
|
const electron = require('electron')
|
||||||
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 app = electron.app
|
const app = electron.app
|
||||||
|
|
||||||
var handlers = require('./handlers')
|
const handlers = require('./handlers')
|
||||||
|
|
||||||
var EXE_NAME = path.basename(process.execPath)
|
const EXE_NAME = path.basename(process.execPath)
|
||||||
var UPDATE_EXE = path.join(process.execPath, '..', '..', 'Update.exe')
|
const UPDATE_EXE = path.join(process.execPath, '..', '..', 'Update.exe')
|
||||||
|
|
||||||
function handleEvent (cmd) {
|
function handleEvent (cmd) {
|
||||||
if (cmd === '--squirrel-install') {
|
if (cmd === '--squirrel-install') {
|
||||||
@@ -73,9 +73,9 @@ function handleEvent (cmd) {
|
|||||||
* the output from standard out.
|
* the output from standard out.
|
||||||
*/
|
*/
|
||||||
function spawn (command, args, cb) {
|
function spawn (command, args, cb) {
|
||||||
var stdout = ''
|
let stdout = ''
|
||||||
|
let error = null
|
||||||
var child
|
let child = null
|
||||||
try {
|
try {
|
||||||
child = cp.spawn(command, args)
|
child = cp.spawn(command, args)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -90,10 +90,10 @@ function spawn (command, args, cb) {
|
|||||||
stdout += data
|
stdout += data
|
||||||
})
|
})
|
||||||
|
|
||||||
var error = null
|
|
||||||
child.on('error', function (processError) {
|
child.on('error', function (processError) {
|
||||||
error = processError
|
error = processError
|
||||||
})
|
})
|
||||||
|
|
||||||
child.on('close', function (code, signal) {
|
child.on('close', function (code, signal) {
|
||||||
if (code !== 0 && !error) error = new Error('Command failed: #{signal || code}')
|
if (code !== 0 && !error) error = new Error('Command failed: #{signal || code}')
|
||||||
if (error) error.stdout = stdout
|
if (error) error.stdout = stdout
|
||||||
@@ -122,12 +122,12 @@ function createShortcuts (cb) {
|
|||||||
* command.
|
* command.
|
||||||
*/
|
*/
|
||||||
function updateShortcuts (cb) {
|
function updateShortcuts (cb) {
|
||||||
var homeDir = os.homedir()
|
const homeDir = os.homedir()
|
||||||
if (homeDir) {
|
if (homeDir) {
|
||||||
var desktopShortcutPath = path.join(homeDir, 'Desktop', 'WebTorrent.lnk')
|
const desktopShortcutPath = path.join(homeDir, 'Desktop', 'WebTorrent.lnk')
|
||||||
// If the desktop shortcut was deleted by the user, then keep it deleted.
|
// If the desktop shortcut was deleted by the user, then keep it deleted.
|
||||||
fs.access(desktopShortcutPath, function (err) {
|
fs.access(desktopShortcutPath, function (err) {
|
||||||
var desktopShortcutExists = !err
|
const desktopShortcutExists = !err
|
||||||
createShortcuts(function () {
|
createShortcuts(function () {
|
||||||
if (desktopShortcutExists) {
|
if (desktopShortcutExists) {
|
||||||
cb()
|
cb()
|
||||||
36
src/main/startup.js
Normal file
36
src/main/startup.js
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
module.exports = {
|
||||||
|
install,
|
||||||
|
uninstall
|
||||||
|
}
|
||||||
|
|
||||||
|
const config = require('../config')
|
||||||
|
const AutoLaunch = require('auto-launch')
|
||||||
|
const { app } = require('electron')
|
||||||
|
|
||||||
|
// On Mac, work around a bug in auto-launch where it opens a Terminal window
|
||||||
|
// See https://github.com/Teamwork/node-auto-launch/issues/28#issuecomment-222194437
|
||||||
|
const appPath = process.platform === 'darwin'
|
||||||
|
? app.getPath('exe').replace(/\.app\/Content.*/, '.app')
|
||||||
|
: undefined // Use the default
|
||||||
|
|
||||||
|
const appLauncher = new AutoLaunch({
|
||||||
|
name: config.APP_NAME,
|
||||||
|
path: appPath,
|
||||||
|
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,17 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
hasTray,
|
hasTray,
|
||||||
init,
|
init,
|
||||||
onWindowBlur,
|
setWindowFocus
|
||||||
onWindowFocus
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var electron = require('electron')
|
const electron = require('electron')
|
||||||
|
|
||||||
var app = electron.app
|
const app = electron.app
|
||||||
|
|
||||||
var config = require('../config')
|
const config = require('../config')
|
||||||
var windows = require('./windows')
|
const windows = require('./windows')
|
||||||
|
|
||||||
var tray
|
let tray
|
||||||
|
|
||||||
function init () {
|
function init () {
|
||||||
if (process.platform === 'linux') {
|
if (process.platform === 'linux') {
|
||||||
@@ -21,7 +20,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 +30,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(function (err) {
|
||||||
if (supportsTray) createTray()
|
if (!err) createTray()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,16 +49,20 @@ function initWin32 () {
|
|||||||
* Check for libappindicator1 support before creating tray icon
|
* Check for libappindicator1 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 we're on Ubuntu (or another debian system) and that we have
|
||||||
// libappindicator1. If WebTorrent was installed from the deb file, we should
|
// libappindicator1. If WebTorrent was installed from the deb file, we should
|
||||||
// always have it. If it was installed from the zip file, we might not.
|
// always have it. If it was installed from the zip file, we might not.
|
||||||
cp.exec('dpkg --get-selections libappindicator1', function (err, stdout) {
|
cp.exec('dpkg --get-selections libappindicator1', function (err, stdout) {
|
||||||
if (err) return cb(false)
|
if (err) return cb(err)
|
||||||
// Unfortunately there's no cleaner way, as far as I can tell, to check
|
// Unfortunately there's no cleaner way, as far as I can tell, to check
|
||||||
// whether a debian package is installed:
|
// whether a debian package is installed:
|
||||||
cb(stdout.endsWith('\tinstall\n'))
|
if (stdout.endsWith('\tinstall\n')) {
|
||||||
|
cb(null)
|
||||||
|
} else {
|
||||||
|
cb(new Error('debian package not installed'))
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -80,7 +78,7 @@ function createTray () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function updateTrayMenu () {
|
function updateTrayMenu () {
|
||||||
var contextMenu = electron.Menu.buildFromTemplate(getMenuTemplate())
|
const contextMenu = electron.Menu.buildFromTemplate(getMenuTemplate())
|
||||||
tray.setContextMenu(contextMenu)
|
tray.setContextMenu(contextMenu)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2,16 +2,17 @@ module.exports = {
|
|||||||
init
|
init
|
||||||
}
|
}
|
||||||
|
|
||||||
var electron = require('electron')
|
const electron = 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') {
|
||||||
@@ -63,7 +64,7 @@ function initDarwinWin32 () {
|
|||||||
|
|
||||||
electron.autoUpdater.on(
|
electron.autoUpdater.on(
|
||||||
'update-not-available',
|
'update-not-available',
|
||||||
() => log('Update not available')
|
() => log('No update available')
|
||||||
)
|
)
|
||||||
|
|
||||||
electron.autoUpdater.on(
|
electron.autoUpdater.on(
|
||||||
43
src/main/user-tasks.js
Normal file
43
src/main/user-tasks.js
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
module.exports = {
|
||||||
|
init
|
||||||
|
}
|
||||||
|
|
||||||
|
const electron = require('electron')
|
||||||
|
|
||||||
|
const app = electron.app
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -1,17 +1,17 @@
|
|||||||
var about = module.exports = {
|
const about = module.exports = {
|
||||||
init,
|
init,
|
||||||
win: null
|
win: null
|
||||||
}
|
}
|
||||||
|
|
||||||
var config = require('../../config')
|
const config = require('../../config')
|
||||||
var electron = require('electron')
|
const electron = require('electron')
|
||||||
|
|
||||||
function init () {
|
function init () {
|
||||||
if (about.win) {
|
if (about.win) {
|
||||||
return about.win.show()
|
return about.win.show()
|
||||||
}
|
}
|
||||||
|
|
||||||
var win = about.win = new electron.BrowserWindow({
|
const win = about.win = new electron.BrowserWindow({
|
||||||
backgroundColor: '#ECECEC',
|
backgroundColor: '#ECECEC',
|
||||||
center: true,
|
center: true,
|
||||||
fullscreen: false,
|
fullscreen: false,
|
||||||
@@ -22,6 +22,7 @@ function init () {
|
|||||||
resizable: false,
|
resizable: false,
|
||||||
show: false,
|
show: false,
|
||||||
skipTaskbar: true,
|
skipTaskbar: true,
|
||||||
|
title: 'About ' + config.APP_WINDOW_TITLE,
|
||||||
useContentSize: true,
|
useContentSize: true,
|
||||||
width: 300
|
width: 300
|
||||||
})
|
})
|
||||||
@@ -31,7 +32,7 @@ function init () {
|
|||||||
// No menu on the About window
|
// No menu on the About window
|
||||||
win.setMenu(null)
|
win.setMenu(null)
|
||||||
|
|
||||||
win.webContents.once('did-finish-load', function () {
|
win.once('ready-to-show', function () {
|
||||||
win.show()
|
win.show()
|
||||||
})
|
})
|
||||||
|
|
||||||
255
src/main/windows/main.js
Normal file
255
src/main/windows/main.js
Normal file
@@ -0,0 +1,255 @@
|
|||||||
|
const main = module.exports = {
|
||||||
|
dispatch,
|
||||||
|
hide,
|
||||||
|
init,
|
||||||
|
send,
|
||||||
|
setAspectRatio,
|
||||||
|
setBounds,
|
||||||
|
setProgress,
|
||||||
|
setTitle,
|
||||||
|
show,
|
||||||
|
toggleAlwaysOnTop,
|
||||||
|
toggleDevTools,
|
||||||
|
toggleFullScreen,
|
||||||
|
win: null
|
||||||
|
}
|
||||||
|
|
||||||
|
const electron = require('electron')
|
||||||
|
const debounce = require('debounce')
|
||||||
|
|
||||||
|
const app = electron.app
|
||||||
|
|
||||||
|
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 electron.BrowserWindow({
|
||||||
|
backgroundColor: '#282828',
|
||||||
|
backgroundThrottling: false, // do not throttle animations/timers when page is background
|
||||||
|
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: 'hidden-inset', // Hide title bar (Mac)
|
||||||
|
useContentSize: true, // Specify web page size without OS chrome
|
||||||
|
width: initialBounds.width,
|
||||||
|
x: initialBounds.x,
|
||||||
|
y: initialBounds.y
|
||||||
|
})
|
||||||
|
|
||||||
|
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, url) => {
|
||||||
|
// 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', e.sender.getBounds())
|
||||||
|
}, 1000))
|
||||||
|
|
||||||
|
win.on('resize', debounce(e => {
|
||||||
|
send('windowBoundsChanged', e.sender.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 we're in full screen`)
|
||||||
|
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: unmaximizing')
|
||||||
|
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 = 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)}`)
|
||||||
|
}
|
||||||
|
// 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({ 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. (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,14 +6,14 @@ var webtorrent = module.exports = {
|
|||||||
win: null
|
win: null
|
||||||
}
|
}
|
||||||
|
|
||||||
var electron = require('electron')
|
const electron = 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 electron.BrowserWindow({
|
||||||
backgroundColor: '#1E1E1E',
|
backgroundColor: '#1E1E1E',
|
||||||
|
backgroundThrottling: false, // do not throttle animations/timers when page is background
|
||||||
center: true,
|
center: true,
|
||||||
fullscreen: false,
|
fullscreen: false,
|
||||||
fullscreenable: false,
|
fullscreenable: false,
|
||||||
@@ -52,7 +52,6 @@ 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()
|
||||||
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>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
55
src/renderer/components/header.js
Normal file
55
src/renderer/components/header.js
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
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')}>
|
||||||
|
{this.getTitle()}
|
||||||
|
<div className='nav left float-left'>
|
||||||
|
<i
|
||||||
|
className={'icon back ' + (loc.hasBack() ? '' : 'disabled')}
|
||||||
|
title='Back'
|
||||||
|
onClick={dispatcher('back')}>
|
||||||
|
chevron_left
|
||||||
|
</i>
|
||||||
|
<i
|
||||||
|
className={'icon forward ' + (loc.hasForward() ? '' : 'disabled')}
|
||||||
|
title='Forward'
|
||||||
|
onClick={dispatcher('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')}>
|
||||||
|
add
|
||||||
|
</i>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = Header
|
||||||
34
src/renderer/components/heading.js
Normal file
34
src/renderer/components/heading.js
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
const React = require('react')
|
||||||
|
|
||||||
|
const colors = require('material-ui/styles/colors')
|
||||||
|
|
||||||
|
class Heading extends React.Component {
|
||||||
|
static get propTypes () {
|
||||||
|
return {
|
||||||
|
level: React.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
|
||||||
25
src/renderer/components/modal-ok-cancel.js
Normal file
25
src/renderer/components/modal-ok-cancel.js
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
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>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
41
src/renderer/components/open-torrent-address-modal.js
Normal file
41
src/renderer/components/open-torrent-address-modal.js
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
const React = require('react')
|
||||||
|
const TextField = require('material-ui/TextField').default
|
||||||
|
|
||||||
|
const ModalOKCancel = require('./modal-ok-cancel')
|
||||||
|
const { dispatch, dispatcher } = require('../lib/dispatcher')
|
||||||
|
|
||||||
|
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()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleKeyDown (e) {
|
||||||
|
if (e.which === 13) handleOK.call(this) /* hit Enter to submit */
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleOK () {
|
||||||
|
dispatch('exitModal')
|
||||||
|
dispatch('addTorrent', this.torrentURL.input.value)
|
||||||
|
}
|
||||||
86
src/renderer/components/path-selector.js
Normal file
86
src/renderer/components/path-selector.js
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
const colors = require('material-ui/styles/colors')
|
||||||
|
const electron = require('electron')
|
||||||
|
const React = require('react')
|
||||||
|
|
||||||
|
const remote = electron.remote
|
||||||
|
|
||||||
|
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 get propTypes () {
|
||||||
|
return {
|
||||||
|
className: React.PropTypes.string,
|
||||||
|
dialog: React.PropTypes.object,
|
||||||
|
displayValue: React.PropTypes.string,
|
||||||
|
id: React.PropTypes.string,
|
||||||
|
onChange: React.PropTypes.func,
|
||||||
|
title: React.PropTypes.string.isRequired,
|
||||||
|
value: React.PropTypes.string
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor (props) {
|
||||||
|
super(props)
|
||||||
|
this.handleClick = this.handleClick.bind(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
handleClick () {
|
||||||
|
const opts = Object.assign({
|
||||||
|
defaultPath: this.props.value,
|
||||||
|
properties: [ 'openFile', 'openDirectory' ]
|
||||||
|
}, this.props.dialog)
|
||||||
|
|
||||||
|
remote.dialog.showOpenDialog(
|
||||||
|
remote.getCurrentWindow(),
|
||||||
|
opts,
|
||||||
|
(filenames) => {
|
||||||
|
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.displayValue || 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
|
||||||
30
src/renderer/components/remove-torrent-modal.js
Normal file
30
src/renderer/components/remove-torrent-modal.js
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
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')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
53
src/renderer/components/show-more.js
Normal file
53
src/renderer/components/show-more.js
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
const React = require('react')
|
||||||
|
|
||||||
|
const RaisedButton = require('material-ui/RaisedButton').default
|
||||||
|
|
||||||
|
class ShowMore extends React.Component {
|
||||||
|
static get propTypes () {
|
||||||
|
return {
|
||||||
|
defaultExpanded: React.PropTypes.bool,
|
||||||
|
hideLabel: React.PropTypes.string,
|
||||||
|
showLabel: React.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
|
||||||
44
src/renderer/components/unsupported-media-modal.js
Normal file
44
src/renderer/components/unsupported-media-modal.js
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
const React = require('react')
|
||||||
|
const electron = 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 () {
|
||||||
|
electron.shell.openExternal('http://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
|
||||||
|
}
|
||||||
|
}
|
||||||
36
src/renderer/components/update-available-modal.js
Normal file
36
src/renderer/components/update-available-modal.js
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
const React = require('react')
|
||||||
|
const electron = 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
|
||||||
|
electron.shell.openExternal('https://github.com/webtorrent/webtorrent-desktop/releases')
|
||||||
|
dispatch('exitModal')
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleSkip () {
|
||||||
|
dispatch('skipVersion', state.modal.version)
|
||||||
|
dispatch('exitModal')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
13
src/renderer/controllers/folder-watcher-controller.js
Normal file
13
src/renderer/controllers/folder-watcher-controller.js
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
const { ipcRenderer } = require('electron')
|
||||||
|
|
||||||
|
module.exports = class FolderWatcherController {
|
||||||
|
start () {
|
||||||
|
console.log('-- IPC: start folder watcher')
|
||||||
|
ipcRenderer.send('startFolderWatcher')
|
||||||
|
}
|
||||||
|
|
||||||
|
stop () {
|
||||||
|
console.log('-- IPC: stop folder watcher')
|
||||||
|
ipcRenderer.send('stopFolderWatcher')
|
||||||
|
}
|
||||||
|
}
|
||||||
80
src/renderer/controllers/media-controller.js
Normal file
80
src/renderer/controllers/media-controller.js
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
const { ipcRenderer } = require('electron')
|
||||||
|
const telemetry = require('../lib/telemetry')
|
||||||
|
const Playlist = require('../lib/playlist')
|
||||||
|
|
||||||
|
// Controls local play back: the <video>/<audio> tag and VLC
|
||||||
|
// Does not control remote casting (Chromecast etc)
|
||||||
|
module.exports = class MediaController {
|
||||||
|
constructor (state) {
|
||||||
|
this.state = state
|
||||||
|
}
|
||||||
|
|
||||||
|
mediaSuccess () {
|
||||||
|
telemetry.logPlayAttempt('success')
|
||||||
|
}
|
||||||
|
|
||||||
|
mediaStalled () {
|
||||||
|
this.state.playing.isStalled = true
|
||||||
|
}
|
||||||
|
|
||||||
|
mediaError (error) {
|
||||||
|
const state = this.state
|
||||||
|
if (state.location.url() === 'player') {
|
||||||
|
telemetry.logPlayAttempt('error')
|
||||||
|
state.playing.location = 'error'
|
||||||
|
ipcRenderer.send('checkForExternalPlayer', state.saved.prefs.externalPlayerPath)
|
||||||
|
ipcRenderer.once('checkForExternalPlayer', function (e, isInstalled) {
|
||||||
|
state.modal = {
|
||||||
|
id: 'unsupported-media-modal',
|
||||||
|
error: error,
|
||||||
|
externalPlayerInstalled: isInstalled
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mediaTimeUpdate () {
|
||||||
|
this.state.playing.lastTimeUpdate = new Date().getTime()
|
||||||
|
this.state.playing.isStalled = false
|
||||||
|
}
|
||||||
|
|
||||||
|
mediaMouseMoved () {
|
||||||
|
this.state.playing.mouseStationarySince = new Date().getTime()
|
||||||
|
}
|
||||||
|
|
||||||
|
controlsMouseEnter () {
|
||||||
|
this.state.playing.mouseInControls = true
|
||||||
|
this.state.playing.mouseStationarySince = new Date().getTime()
|
||||||
|
}
|
||||||
|
|
||||||
|
controlsMouseLeave () {
|
||||||
|
this.state.playing.mouseInControls = false
|
||||||
|
this.state.playing.mouseStationarySince = new Date().getTime()
|
||||||
|
}
|
||||||
|
|
||||||
|
openExternalPlayer () {
|
||||||
|
const state = this.state
|
||||||
|
state.playing.location = 'external'
|
||||||
|
|
||||||
|
const onServerRunning = function () {
|
||||||
|
state.playing.isReady = true
|
||||||
|
telemetry.logPlayAttempt('external')
|
||||||
|
|
||||||
|
const mediaURL = Playlist.getCurrentLocalURL(state)
|
||||||
|
ipcRenderer.send('openExternalPlayer',
|
||||||
|
state.saved.prefs.externalPlayerPath,
|
||||||
|
mediaURL,
|
||||||
|
state.window.title)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (state.server != null) onServerRunning()
|
||||||
|
else ipcRenderer.once('wt-server-running', onServerRunning)
|
||||||
|
}
|
||||||
|
|
||||||
|
externalPlayerNotFound () {
|
||||||
|
const modal = this.state.modal
|
||||||
|
if (modal && modal.id === 'unsupported-media-modal') {
|
||||||
|
modal.externalPlayerNotFound = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
380
src/renderer/controllers/playback-controller.js
Normal file
380
src/renderer/controllers/playback-controller.js
Normal file
@@ -0,0 +1,380 @@
|
|||||||
|
const electron = require('electron')
|
||||||
|
const path = require('path')
|
||||||
|
|
||||||
|
const Cast = require('../lib/cast')
|
||||||
|
const { dispatch } = require('../lib/dispatcher')
|
||||||
|
const telemetry = require('../lib/telemetry')
|
||||||
|
const { UnplayableFileError, UnplayableTorrentError } = require('../lib/errors')
|
||||||
|
const sound = require('../lib/sound')
|
||||||
|
const TorrentPlayer = require('../lib/torrent-player')
|
||||||
|
const TorrentSummary = require('../lib/torrent-summary')
|
||||||
|
const Playlist = require('../lib/playlist')
|
||||||
|
const State = require('../lib/state')
|
||||||
|
|
||||||
|
const ipcRenderer = electron.ipcRenderer
|
||||||
|
|
||||||
|
// Controls playback of torrents and files within torrents
|
||||||
|
// both local (<video>,<audio>,external player) and remote (cast)
|
||||||
|
module.exports = class PlaybackController {
|
||||||
|
constructor (state, config, update) {
|
||||||
|
this.state = state
|
||||||
|
this.config = config
|
||||||
|
this.update = update
|
||||||
|
}
|
||||||
|
|
||||||
|
// Play a file in a torrent.
|
||||||
|
// * Start torrenting, if necessary
|
||||||
|
// * Stream, if not already fully downloaded
|
||||||
|
// * If no file index is provided, restore the most recently viewed file or autoplay the first
|
||||||
|
playFile (infoHash, index /* optional */) {
|
||||||
|
this.pauseActiveTorrents(infoHash)
|
||||||
|
|
||||||
|
const state = this.state
|
||||||
|
if (state.location.url() === 'player') {
|
||||||
|
this.updatePlayer(infoHash, index, false, (err) => {
|
||||||
|
if (err) dispatch('error', err)
|
||||||
|
else this.play()
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
let initialized = false
|
||||||
|
state.location.go({
|
||||||
|
url: 'player',
|
||||||
|
setup: (cb) => {
|
||||||
|
const torrentSummary = TorrentSummary.getByKey(state, infoHash)
|
||||||
|
|
||||||
|
if (index === undefined || initialized) index = torrentSummary.mostRecentFileIndex
|
||||||
|
if (index === undefined) index = torrentSummary.files.findIndex(TorrentPlayer.isPlayable)
|
||||||
|
if (index === undefined) return cb(new UnplayableTorrentError())
|
||||||
|
|
||||||
|
initialized = true
|
||||||
|
|
||||||
|
this.openPlayer(infoHash, index, (err) => {
|
||||||
|
if (!err) this.play()
|
||||||
|
cb(err)
|
||||||
|
})
|
||||||
|
},
|
||||||
|
destroy: () => this.closePlayer()
|
||||||
|
}, (err) => {
|
||||||
|
if (err) dispatch('error', err)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Open a file in OS default app.
|
||||||
|
openItem (infoHash, index) {
|
||||||
|
const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
|
||||||
|
const filePath = path.join(
|
||||||
|
torrentSummary.path,
|
||||||
|
torrentSummary.files[index].path)
|
||||||
|
ipcRenderer.send('openItem', filePath)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Toggle (play or pause) the currently playing media
|
||||||
|
playPause () {
|
||||||
|
const state = this.state
|
||||||
|
if (state.location.url() !== 'player') return
|
||||||
|
|
||||||
|
// force rerendering if window is hidden,
|
||||||
|
// in order to bypass `raf` and play/pause media immediately
|
||||||
|
const mediaTag = document.querySelector('video,audio')
|
||||||
|
if (!state.window.isVisible && mediaTag) {
|
||||||
|
if (state.playing.isPaused) mediaTag.play()
|
||||||
|
else mediaTag.pause()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (state.playing.isPaused) this.play()
|
||||||
|
else this.pause()
|
||||||
|
}
|
||||||
|
|
||||||
|
pauseActiveTorrents (infoHash) {
|
||||||
|
// Playback Priority: pause all active torrents if needed.
|
||||||
|
if (!this.state.saved.prefs.highestPlaybackPriority) return
|
||||||
|
|
||||||
|
// Do not pause active torrents if playing a fully downloaded torrent.
|
||||||
|
const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
|
||||||
|
if (torrentSummary.status === 'seeding') return
|
||||||
|
|
||||||
|
dispatch('prioritizeTorrent', infoHash)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Play next file in list (if any)
|
||||||
|
nextTrack () {
|
||||||
|
const state = this.state
|
||||||
|
if (Playlist.hasNext(state) && state.playing.location !== 'external') {
|
||||||
|
this.updatePlayer(
|
||||||
|
state.playing.infoHash, Playlist.getNextIndex(state), false, (err) => {
|
||||||
|
if (err) dispatch('error', err)
|
||||||
|
else this.play()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Play previous track in list (if any)
|
||||||
|
previousTrack () {
|
||||||
|
const state = this.state
|
||||||
|
if (Playlist.hasPrevious(state) && state.playing.location !== 'external') {
|
||||||
|
this.updatePlayer(
|
||||||
|
state.playing.infoHash, Playlist.getPreviousIndex(state), false, (err) => {
|
||||||
|
if (err) dispatch('error', err)
|
||||||
|
else this.play()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Play (unpause) the current media
|
||||||
|
play () {
|
||||||
|
const state = this.state
|
||||||
|
if (!state.playing.isPaused) return
|
||||||
|
state.playing.isPaused = false
|
||||||
|
if (isCasting(state)) {
|
||||||
|
Cast.play()
|
||||||
|
}
|
||||||
|
ipcRenderer.send('onPlayerPlay')
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pause the currently playing media
|
||||||
|
pause () {
|
||||||
|
const state = this.state
|
||||||
|
if (state.playing.isPaused) return
|
||||||
|
state.playing.isPaused = true
|
||||||
|
if (isCasting(state)) {
|
||||||
|
Cast.pause()
|
||||||
|
}
|
||||||
|
ipcRenderer.send('onPlayerPause')
|
||||||
|
}
|
||||||
|
|
||||||
|
// Skip specified number of seconds (backwards if negative)
|
||||||
|
skip (time) {
|
||||||
|
this.skipTo(this.state.playing.currentTime + time)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Skip (aka seek) to a specific point, in seconds
|
||||||
|
skipTo (time) {
|
||||||
|
if (!Number.isFinite(time)) {
|
||||||
|
console.error('Tried to skip to a non-finite time ' + time)
|
||||||
|
return console.trace()
|
||||||
|
}
|
||||||
|
if (isCasting(this.state)) Cast.seek(time)
|
||||||
|
else this.state.playing.jumpToTime = time
|
||||||
|
}
|
||||||
|
|
||||||
|
// Change playback speed. 1 = faster, -1 = slower
|
||||||
|
// Playback speed ranges from 16 (fast forward) to 1 (normal playback)
|
||||||
|
// to 0.25 (quarter-speed playback), then goes to -0.25, -0.5, -1, -2, etc
|
||||||
|
// until -16 (fast rewind)
|
||||||
|
changePlaybackRate (direction) {
|
||||||
|
const state = this.state
|
||||||
|
let rate = state.playing.playbackRate
|
||||||
|
if (direction > 0 && rate < 2) {
|
||||||
|
rate += 0.25
|
||||||
|
} else if (direction < 0 && rate > 0.25 && rate <= 2) {
|
||||||
|
rate -= 0.25
|
||||||
|
} else if (direction > 0 && rate >= 1 && rate < 16) {
|
||||||
|
rate *= 2
|
||||||
|
} else if (direction < 0 && rate > 1 && rate <= 16) {
|
||||||
|
rate /= 2
|
||||||
|
}
|
||||||
|
state.playing.playbackRate = rate
|
||||||
|
if (isCasting(state) && !Cast.setRate(rate)) {
|
||||||
|
state.playing.playbackRate = 1
|
||||||
|
}
|
||||||
|
// Wait a bit before we hide the controls and header again
|
||||||
|
state.playing.mouseStationarySince = new Date().getTime()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Change the volume, in range [0, 1], by some amount
|
||||||
|
// For example, volume muted (0), changeVolume (0.3) increases to 30% volume
|
||||||
|
changeVolume (delta) {
|
||||||
|
// change volume with delta value
|
||||||
|
this.setVolume(this.state.playing.volume + delta)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set the volume to some value in [0, 1]
|
||||||
|
setVolume (volume) {
|
||||||
|
// check if its in [0.0 - 1.0] range
|
||||||
|
volume = Math.max(0, Math.min(1, volume))
|
||||||
|
|
||||||
|
const state = this.state
|
||||||
|
if (isCasting(state)) {
|
||||||
|
Cast.setVolume(volume)
|
||||||
|
} else {
|
||||||
|
state.playing.setVolume = volume
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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
|
||||||
|
showOrHidePlayerControls () {
|
||||||
|
const state = this.state
|
||||||
|
const hideControls = state.shouldHidePlayerControls()
|
||||||
|
|
||||||
|
if (hideControls !== state.playing.hideControls) {
|
||||||
|
state.playing.hideControls = hideControls
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// Opens the video player to a specific torrent
|
||||||
|
openPlayer (infoHash, index, cb) {
|
||||||
|
const state = this.state
|
||||||
|
const torrentSummary = TorrentSummary.getByKey(state, infoHash)
|
||||||
|
|
||||||
|
state.playing.infoHash = torrentSummary.infoHash
|
||||||
|
state.playing.isReady = false
|
||||||
|
|
||||||
|
// update UI to show pending playback
|
||||||
|
sound.play('PLAY')
|
||||||
|
|
||||||
|
this.startServer(torrentSummary)
|
||||||
|
ipcRenderer.send('onPlayerOpen')
|
||||||
|
this.updatePlayer(infoHash, index, true, cb)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Starts WebTorrent server for media streaming
|
||||||
|
startServer (torrentSummary) {
|
||||||
|
const state = this.state
|
||||||
|
|
||||||
|
if (torrentSummary.status === 'paused') {
|
||||||
|
dispatch('startTorrentingSummary', torrentSummary.torrentKey)
|
||||||
|
ipcRenderer.once('wt-ready-' + torrentSummary.infoHash,
|
||||||
|
() => onTorrentReady())
|
||||||
|
} else {
|
||||||
|
onTorrentReady()
|
||||||
|
}
|
||||||
|
|
||||||
|
function onTorrentReady () {
|
||||||
|
ipcRenderer.send('wt-start-server', torrentSummary.infoHash)
|
||||||
|
ipcRenderer.once('wt-server-running', () => { state.playing.isReady = true })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called each time the current file changes
|
||||||
|
updatePlayer (infoHash, index, resume, cb) {
|
||||||
|
const state = this.state
|
||||||
|
|
||||||
|
const torrentSummary = TorrentSummary.getByKey(state, infoHash)
|
||||||
|
const fileSummary = torrentSummary.files[index]
|
||||||
|
|
||||||
|
if (!TorrentPlayer.isPlayable(fileSummary)) {
|
||||||
|
torrentSummary.mostRecentFileIndex = undefined
|
||||||
|
return cb(new UnplayableFileError())
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentSummary.mostRecentFileIndex = index
|
||||||
|
|
||||||
|
// update state
|
||||||
|
state.playing.infoHash = infoHash
|
||||||
|
state.playing.fileIndex = index
|
||||||
|
state.playing.type = TorrentPlayer.isVideo(fileSummary) ? 'video'
|
||||||
|
: TorrentPlayer.isAudio(fileSummary) ? 'audio'
|
||||||
|
: 'other'
|
||||||
|
|
||||||
|
// pick up where we left off
|
||||||
|
let jumpToTime = 0
|
||||||
|
if (resume && fileSummary.currentTime) {
|
||||||
|
const fraction = fileSummary.currentTime / fileSummary.duration
|
||||||
|
const secondsLeft = fileSummary.duration - fileSummary.currentTime
|
||||||
|
if (fraction < 0.9 && secondsLeft > 10) {
|
||||||
|
jumpToTime = fileSummary.currentTime
|
||||||
|
}
|
||||||
|
}
|
||||||
|
state.playing.jumpToTime = jumpToTime
|
||||||
|
|
||||||
|
// if it's audio, parse out the metadata (artist, title, etc)
|
||||||
|
if (torrentSummary.status === 'paused') {
|
||||||
|
ipcRenderer.once('wt-ready-' + torrentSummary.infoHash, getAudioMetadata)
|
||||||
|
} else {
|
||||||
|
getAudioMetadata()
|
||||||
|
}
|
||||||
|
|
||||||
|
function getAudioMetadata () {
|
||||||
|
if (state.playing.type === 'audio') {
|
||||||
|
ipcRenderer.send('wt-get-audio-metadata', torrentSummary.infoHash, index)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// if it's video, check for subtitles files that are done downloading
|
||||||
|
dispatch('checkForSubtitles')
|
||||||
|
|
||||||
|
// enable previously selected subtitle track
|
||||||
|
if (fileSummary.selectedSubtitle) {
|
||||||
|
dispatch('addSubtitles', [fileSummary.selectedSubtitle], true)
|
||||||
|
}
|
||||||
|
|
||||||
|
state.window.title = fileSummary.name
|
||||||
|
|
||||||
|
// play in VLC if set as default player (Preferences / Playback / Play in VLC)
|
||||||
|
if (this.state.saved.prefs.openExternalPlayer) {
|
||||||
|
dispatch('openExternalPlayer')
|
||||||
|
this.update()
|
||||||
|
cb()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// otherwise, play the video
|
||||||
|
this.update()
|
||||||
|
|
||||||
|
ipcRenderer.send('onPlayerUpdate', Playlist.hasNext(state), Playlist.hasPrevious(state))
|
||||||
|
cb()
|
||||||
|
}
|
||||||
|
|
||||||
|
closePlayer () {
|
||||||
|
console.log('closePlayer')
|
||||||
|
|
||||||
|
// Quit any external players, like Chromecast/Airplay/etc or VLC
|
||||||
|
const state = this.state
|
||||||
|
if (isCasting(state)) {
|
||||||
|
Cast.stop()
|
||||||
|
}
|
||||||
|
if (state.playing.location === 'external') {
|
||||||
|
ipcRenderer.send('quitExternalPlayer')
|
||||||
|
}
|
||||||
|
|
||||||
|
// Save volume (this session only, not in state.saved)
|
||||||
|
state.previousVolume = state.playing.volume
|
||||||
|
|
||||||
|
if (!state.playing.isReady) telemetry.logPlayAttempt('abandoned') // user gave up waiting
|
||||||
|
|
||||||
|
// Reset the window contents back to the home screen
|
||||||
|
state.playing = State.getDefaultPlayState()
|
||||||
|
state.server = null
|
||||||
|
|
||||||
|
// Reset the window size and location back to where it was
|
||||||
|
if (state.window.isFullScreen) {
|
||||||
|
dispatch('toggleFullScreen', false)
|
||||||
|
}
|
||||||
|
restoreBounds(state)
|
||||||
|
|
||||||
|
// Tell the WebTorrent process to kill the torrent-to-HTTP server
|
||||||
|
ipcRenderer.send('wt-stop-server')
|
||||||
|
|
||||||
|
ipcRenderer.send('onPlayerClose')
|
||||||
|
|
||||||
|
// Playback Priority: resume previously paused downloads.
|
||||||
|
if (this.state.saved.prefs.highestPlaybackPriority) {
|
||||||
|
dispatch('resumePausedTorrents')
|
||||||
|
}
|
||||||
|
|
||||||
|
this.update()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Checks whether we are connected and already casting
|
||||||
|
// Returns false if we not casting (state.playing.location === 'local')
|
||||||
|
// or if we're trying to connect but haven't yet ('chromecast-pending', etc)
|
||||||
|
function isCasting (state) {
|
||||||
|
return state.playing.location === 'chromecast' ||
|
||||||
|
state.playing.location === 'airplay' ||
|
||||||
|
state.playing.location === 'dlna'
|
||||||
|
}
|
||||||
|
|
||||||
|
function restoreBounds (state) {
|
||||||
|
ipcRenderer.send('setAspectRatio', 0)
|
||||||
|
if (state.window.bounds) {
|
||||||
|
ipcRenderer.send('setBounds', state.window.bounds, false)
|
||||||
|
}
|
||||||
|
}
|
||||||
38
src/renderer/controllers/prefs-controller.js
Normal file
38
src/renderer/controllers/prefs-controller.js
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
const { dispatch } = require('../lib/dispatcher')
|
||||||
|
const ipcRenderer = require('electron').ipcRenderer
|
||||||
|
|
||||||
|
// Controls the Preferences screen
|
||||||
|
module.exports = class PrefsController {
|
||||||
|
constructor (state, config) {
|
||||||
|
this.state = state
|
||||||
|
this.config = config
|
||||||
|
}
|
||||||
|
|
||||||
|
// Goes to the Preferences screen
|
||||||
|
show () {
|
||||||
|
const state = this.state
|
||||||
|
state.location.go({
|
||||||
|
url: 'preferences',
|
||||||
|
setup: function (cb) {
|
||||||
|
// initialize preferences
|
||||||
|
state.window.title = 'Preferences'
|
||||||
|
ipcRenderer.send('setAllowNav', false)
|
||||||
|
cb()
|
||||||
|
},
|
||||||
|
destroy: () => {
|
||||||
|
ipcRenderer.send('setAllowNav', true)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Updates a single property in the saved prefs
|
||||||
|
// For example: updatePreferences('isFileHandler', true)
|
||||||
|
update (property, value) {
|
||||||
|
if (property === 'isFileHandler') ipcRenderer.send('setDefaultFileHandler', value)
|
||||||
|
else if (property === 'startup') ipcRenderer.send('setStartup', value)
|
||||||
|
|
||||||
|
this.state.saved.prefs[property] = value
|
||||||
|
dispatch('stateSaveImmediate')
|
||||||
|
dispatch('checkDownloadPath')
|
||||||
|
}
|
||||||
|
}
|
||||||
138
src/renderer/controllers/subtitles-controller.js
Normal file
138
src/renderer/controllers/subtitles-controller.js
Normal file
@@ -0,0 +1,138 @@
|
|||||||
|
const electron = require('electron')
|
||||||
|
const fs = require('fs')
|
||||||
|
const path = require('path')
|
||||||
|
const parallel = require('run-parallel')
|
||||||
|
|
||||||
|
const remote = electron.remote
|
||||||
|
|
||||||
|
const { dispatch } = require('../lib/dispatcher')
|
||||||
|
|
||||||
|
module.exports = class SubtitlesController {
|
||||||
|
constructor (state) {
|
||||||
|
this.state = state
|
||||||
|
}
|
||||||
|
|
||||||
|
openSubtitles () {
|
||||||
|
remote.dialog.showOpenDialog({
|
||||||
|
title: 'Select a subtitles file.',
|
||||||
|
filters: [ { name: 'Subtitles', extensions: ['vtt', 'srt'] } ],
|
||||||
|
properties: [ 'openFile' ]
|
||||||
|
}, (filenames) => {
|
||||||
|
if (!Array.isArray(filenames)) return
|
||||||
|
this.addSubtitles(filenames, true)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
selectSubtitle (ix) {
|
||||||
|
this.state.playing.subtitles.selectedIndex = ix
|
||||||
|
}
|
||||||
|
|
||||||
|
toggleSubtitlesMenu () {
|
||||||
|
const subtitles = this.state.playing.subtitles
|
||||||
|
subtitles.showMenu = !subtitles.showMenu
|
||||||
|
}
|
||||||
|
|
||||||
|
addSubtitles (files, autoSelect) {
|
||||||
|
// Subtitles are only supported when playing video files
|
||||||
|
if (this.state.playing.type !== 'video') return
|
||||||
|
if (files.length === 0) return
|
||||||
|
const subtitles = this.state.playing.subtitles
|
||||||
|
|
||||||
|
// Read the files concurrently, then add all resulting subtitle tracks
|
||||||
|
const tasks = files.map((file) => (cb) => loadSubtitle(file, cb))
|
||||||
|
parallel(tasks, function (err, tracks) {
|
||||||
|
if (err) return dispatch('error', err)
|
||||||
|
|
||||||
|
for (let i = 0; i < tracks.length; i++) {
|
||||||
|
// No dupes allowed
|
||||||
|
const track = tracks[i]
|
||||||
|
let trackIndex = subtitles.tracks.findIndex((t) =>
|
||||||
|
track.filePath === t.filePath)
|
||||||
|
|
||||||
|
// Add the track
|
||||||
|
if (trackIndex === -1) {
|
||||||
|
trackIndex = subtitles.tracks.push(track) - 1
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we're auto-selecting a track, try to find one in the user's language
|
||||||
|
if (autoSelect && (i === 0 || isSystemLanguage(track.language))) {
|
||||||
|
subtitles.selectedIndex = trackIndex
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Finally, make sure no two tracks have the same label
|
||||||
|
relabelSubtitles(subtitles)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
checkForSubtitles () {
|
||||||
|
if (this.state.playing.type !== 'video') return
|
||||||
|
const torrentSummary = this.state.getPlayingTorrentSummary()
|
||||||
|
if (!torrentSummary || !torrentSummary.progress) return
|
||||||
|
|
||||||
|
torrentSummary.progress.files.forEach((fp, ix) => {
|
||||||
|
if (fp.numPieces !== fp.numPiecesPresent) return // ignore incomplete files
|
||||||
|
const file = torrentSummary.files[ix]
|
||||||
|
if (!this.isSubtitle(file.name)) return
|
||||||
|
const filePath = path.join(torrentSummary.path, file.path)
|
||||||
|
this.addSubtitles([filePath], false)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
isSubtitle (file) {
|
||||||
|
const name = typeof file === 'string' ? file : file.name
|
||||||
|
const ext = path.extname(name).toLowerCase()
|
||||||
|
return ext === '.srt' || ext === '.vtt'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadSubtitle (file, cb) {
|
||||||
|
// Lazy load to keep startup fast
|
||||||
|
const concat = require('simple-concat')
|
||||||
|
const LanguageDetect = require('languagedetect')
|
||||||
|
const srtToVtt = require('srt-to-vtt')
|
||||||
|
|
||||||
|
// Read the .SRT or .VTT file, parse it, add subtitle track
|
||||||
|
const filePath = file.path || file
|
||||||
|
|
||||||
|
const vttStream = fs.createReadStream(filePath).pipe(srtToVtt())
|
||||||
|
|
||||||
|
concat(vttStream, function (err, buf) {
|
||||||
|
if (err) return dispatch('error', 'Can\'t parse subtitles file.')
|
||||||
|
|
||||||
|
// Detect what language the subtitles are in
|
||||||
|
const vttContents = buf.toString().replace(/(.*-->.*)/g, '')
|
||||||
|
let langDetected = (new LanguageDetect()).detect(vttContents, 2)
|
||||||
|
langDetected = langDetected.length ? langDetected[0][0] : 'subtitle'
|
||||||
|
langDetected = langDetected.slice(0, 1).toUpperCase() + langDetected.slice(1)
|
||||||
|
|
||||||
|
const track = {
|
||||||
|
buffer: 'data:text/vtt;base64,' + buf.toString('base64'),
|
||||||
|
language: langDetected,
|
||||||
|
label: langDetected,
|
||||||
|
filePath: filePath
|
||||||
|
}
|
||||||
|
|
||||||
|
cb(null, track)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Checks whether a language name like 'English' or 'German' matches the system
|
||||||
|
// language, aka the current locale
|
||||||
|
function isSystemLanguage (language) {
|
||||||
|
const iso639 = require('iso-639-1')
|
||||||
|
const osLangISO = window.navigator.language.split('-')[0] // eg 'en'
|
||||||
|
const langIso = iso639.getCode(language) // eg 'de' if language is 'German'
|
||||||
|
return langIso === osLangISO
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make sure we don't have two subtitle tracks with the same label
|
||||||
|
// Labels each track by language, eg 'German', 'English', 'English 2', ...
|
||||||
|
function relabelSubtitles (subtitles) {
|
||||||
|
const counts = {}
|
||||||
|
subtitles.tracks.forEach(function (track) {
|
||||||
|
const lang = track.language
|
||||||
|
counts[lang] = (counts[lang] || 0) + 1
|
||||||
|
track.label = counts[lang] > 1 ? (lang + ' ' + counts[lang]) : lang
|
||||||
|
})
|
||||||
|
}
|
||||||
186
src/renderer/controllers/torrent-controller.js
Normal file
186
src/renderer/controllers/torrent-controller.js
Normal file
@@ -0,0 +1,186 @@
|
|||||||
|
const path = require('path')
|
||||||
|
const ipcRenderer = require('electron').ipcRenderer
|
||||||
|
|
||||||
|
const TorrentSummary = require('../lib/torrent-summary')
|
||||||
|
const sound = require('../lib/sound')
|
||||||
|
const { dispatch } = require('../lib/dispatcher')
|
||||||
|
|
||||||
|
module.exports = class TorrentController {
|
||||||
|
constructor (state) {
|
||||||
|
this.state = state
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentInfoHash (torrentKey, infoHash) {
|
||||||
|
let torrentSummary = this.getTorrentSummary(torrentKey)
|
||||||
|
console.log('got infohash for %s torrent %s',
|
||||||
|
torrentSummary ? 'existing' : 'new', torrentKey)
|
||||||
|
|
||||||
|
if (!torrentSummary) {
|
||||||
|
const torrents = this.state.saved.torrents
|
||||||
|
|
||||||
|
// Check if an existing (non-active) torrent has the same info hash
|
||||||
|
if (torrents.find((t) => t.infoHash === infoHash)) {
|
||||||
|
ipcRenderer.send('wt-stop-torrenting', infoHash)
|
||||||
|
return dispatch('error', 'Cannot add duplicate torrent')
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentSummary = {
|
||||||
|
torrentKey: torrentKey,
|
||||||
|
status: 'new'
|
||||||
|
}
|
||||||
|
torrents.unshift(torrentSummary)
|
||||||
|
sound.play('ADD')
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentSummary.infoHash = infoHash
|
||||||
|
dispatch('update')
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentWarning (torrentKey, message) {
|
||||||
|
console.log('warning for torrent %s: %s', torrentKey, message)
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentError (torrentKey, message) {
|
||||||
|
// TODO: WebTorrent needs semantic errors
|
||||||
|
if (message.startsWith('Cannot add duplicate torrent')) {
|
||||||
|
// Remove infohash from the message
|
||||||
|
message = 'Cannot add duplicate torrent'
|
||||||
|
}
|
||||||
|
dispatch('error', message)
|
||||||
|
|
||||||
|
const torrentSummary = this.getTorrentSummary(torrentKey)
|
||||||
|
if (torrentSummary) {
|
||||||
|
console.log('Pausing torrent %s due to error: %s', torrentSummary.infoHash, message)
|
||||||
|
torrentSummary.status = 'paused'
|
||||||
|
dispatch('update')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentMetadata (torrentKey, torrentInfo) {
|
||||||
|
// Summarize torrent
|
||||||
|
const torrentSummary = this.getTorrentSummary(torrentKey)
|
||||||
|
torrentSummary.status = 'downloading'
|
||||||
|
torrentSummary.name = torrentSummary.displayName || torrentInfo.name
|
||||||
|
torrentSummary.path = torrentInfo.path
|
||||||
|
torrentSummary.magnetURI = torrentInfo.magnetURI
|
||||||
|
// TODO: make torrentInfo immutable, save separately as torrentSummary.info
|
||||||
|
// For now, check whether torrentSummary.files has already been set:
|
||||||
|
const hasDetailedFileInfo = torrentSummary.files && torrentSummary.files[0].path
|
||||||
|
if (!hasDetailedFileInfo) {
|
||||||
|
torrentSummary.files = torrentInfo.files
|
||||||
|
}
|
||||||
|
if (!torrentSummary.selections) {
|
||||||
|
torrentSummary.selections = torrentSummary.files.map((x) => true)
|
||||||
|
}
|
||||||
|
dispatch('update')
|
||||||
|
|
||||||
|
// Save the .torrent file, if it hasn't been saved already
|
||||||
|
if (!torrentSummary.torrentFileName) ipcRenderer.send('wt-save-torrent-file', torrentKey)
|
||||||
|
|
||||||
|
// Auto-generate a poster image, if it hasn't been generated already
|
||||||
|
if (!torrentSummary.posterFileName) ipcRenderer.send('wt-generate-torrent-poster', torrentKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentDone (torrentKey, torrentInfo) {
|
||||||
|
// Update the torrent summary
|
||||||
|
const torrentSummary = this.getTorrentSummary(torrentKey)
|
||||||
|
torrentSummary.status = 'seeding'
|
||||||
|
|
||||||
|
// Notify the user that a torrent finished, but only if we actually DL'd at least part of it.
|
||||||
|
// Don't notify if we merely finished verifying data files that were already on disk.
|
||||||
|
if (torrentInfo.bytesReceived > 0) {
|
||||||
|
if (!this.state.window.isFocused) {
|
||||||
|
this.state.dock.badge += 1
|
||||||
|
}
|
||||||
|
showDoneNotification(torrentSummary)
|
||||||
|
ipcRenderer.send('downloadFinished', getTorrentPath(torrentSummary))
|
||||||
|
}
|
||||||
|
|
||||||
|
dispatch('update')
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentProgress (progressInfo) {
|
||||||
|
// Overall progress across all active torrents, 0 to 1, or -1 to hide the progress bar
|
||||||
|
// Hide progress bar when client has no torrents, or progress is 100%
|
||||||
|
const progress = (!progressInfo.hasActiveTorrents || progressInfo.progress === 1)
|
||||||
|
? -1
|
||||||
|
: progressInfo.progress
|
||||||
|
|
||||||
|
// Show progress bar under the WebTorrent taskbar icon, on OSX
|
||||||
|
this.state.dock.progress = progress
|
||||||
|
|
||||||
|
// Update progress for each individual torrent
|
||||||
|
progressInfo.torrents.forEach((p) => {
|
||||||
|
const torrentSummary = this.getTorrentSummary(p.torrentKey)
|
||||||
|
if (!torrentSummary) {
|
||||||
|
console.log('warning: got progress for missing torrent %s', p.torrentKey)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
torrentSummary.progress = p
|
||||||
|
})
|
||||||
|
|
||||||
|
// TODO: Find an efficient way to re-enable this line, which allows subtitle
|
||||||
|
// files which are completed after a video starts to play to be added
|
||||||
|
// dynamically to the list of subtitles.
|
||||||
|
// checkForSubtitles()
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentFileModtimes (torrentKey, fileModtimes) {
|
||||||
|
const torrentSummary = this.getTorrentSummary(torrentKey)
|
||||||
|
if (!torrentSummary) throw new Error('Not saving modtimes for deleted torrent ' + torrentKey)
|
||||||
|
torrentSummary.fileModtimes = fileModtimes
|
||||||
|
dispatch('stateSave')
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentFileSaved (torrentKey, torrentFileName) {
|
||||||
|
console.log('torrent file saved %s: %s', torrentKey, torrentFileName)
|
||||||
|
const torrentSummary = this.getTorrentSummary(torrentKey)
|
||||||
|
torrentSummary.torrentFileName = torrentFileName
|
||||||
|
dispatch('stateSave')
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentPosterSaved (torrentKey, posterFileName) {
|
||||||
|
const torrentSummary = this.getTorrentSummary(torrentKey)
|
||||||
|
torrentSummary.posterFileName = posterFileName
|
||||||
|
dispatch('stateSave')
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentAudioMetadata (infoHash, index, info) {
|
||||||
|
const torrentSummary = this.getTorrentSummary(infoHash)
|
||||||
|
const fileSummary = torrentSummary.files[index]
|
||||||
|
fileSummary.audioInfo = info
|
||||||
|
dispatch('update')
|
||||||
|
}
|
||||||
|
|
||||||
|
torrentServerRunning (serverInfo) {
|
||||||
|
this.state.server = serverInfo
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gets a torrent summary {name, infoHash, status} from state.saved.torrents
|
||||||
|
// Returns undefined if we don't know that infoHash
|
||||||
|
getTorrentSummary (torrentKey) {
|
||||||
|
return TorrentSummary.getByKey(this.state, torrentKey)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getTorrentPath (torrentSummary) {
|
||||||
|
let itemPath = TorrentSummary.getFileOrFolder(torrentSummary)
|
||||||
|
if (torrentSummary.files.length > 1) {
|
||||||
|
itemPath = path.dirname(itemPath)
|
||||||
|
}
|
||||||
|
return itemPath
|
||||||
|
}
|
||||||
|
|
||||||
|
function showDoneNotification (torrent) {
|
||||||
|
const notif = new window.Notification('Download Complete', {
|
||||||
|
body: torrent.name,
|
||||||
|
silent: true
|
||||||
|
})
|
||||||
|
|
||||||
|
notif.onclick = function () {
|
||||||
|
ipcRenderer.send('show')
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only play notification sound if player is inactive
|
||||||
|
if (this.state.playing.isPaused) sound.play('DONE')
|
||||||
|
}
|
||||||
373
src/renderer/controllers/torrent-list-controller.js
Normal file
373
src/renderer/controllers/torrent-list-controller.js
Normal file
@@ -0,0 +1,373 @@
|
|||||||
|
const fs = require('fs')
|
||||||
|
const path = require('path')
|
||||||
|
const electron = require('electron')
|
||||||
|
|
||||||
|
const { dispatch } = require('../lib/dispatcher')
|
||||||
|
const { TorrentKeyNotFoundError } = require('../lib/errors')
|
||||||
|
const sound = require('../lib/sound')
|
||||||
|
const TorrentSummary = require('../lib/torrent-summary')
|
||||||
|
|
||||||
|
const ipcRenderer = electron.ipcRenderer
|
||||||
|
|
||||||
|
const instantIoRegex = /^(https:\/\/)?instant\.io\/#/
|
||||||
|
|
||||||
|
// Controls the torrent list: creating, adding, deleting, & manipulating torrents
|
||||||
|
module.exports = class TorrentListController {
|
||||||
|
constructor (state) {
|
||||||
|
this.state = state
|
||||||
|
}
|
||||||
|
|
||||||
|
// Adds a torrent to the list, starts downloading/seeding.
|
||||||
|
// TorrentID can be a magnet URI, infohash, or torrent file: https://git.io/vik9M
|
||||||
|
addTorrent (torrentId) {
|
||||||
|
if (torrentId.path) {
|
||||||
|
// Use path string instead of W3C File object
|
||||||
|
torrentId = torrentId.path
|
||||||
|
}
|
||||||
|
|
||||||
|
// Trim extra spaces off pasted magnet links
|
||||||
|
if (typeof torrentId === 'string') {
|
||||||
|
torrentId = torrentId.trim()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allow a instant.io link to be pasted
|
||||||
|
if (typeof torrentId === 'string' && instantIoRegex.test(torrentId)) {
|
||||||
|
torrentId = torrentId.slice(torrentId.indexOf('#') + 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
const torrentKey = this.state.nextTorrentKey++
|
||||||
|
const path = this.state.saved.prefs.downloadPath
|
||||||
|
|
||||||
|
ipcRenderer.send('wt-start-torrenting', torrentKey, torrentId, path)
|
||||||
|
|
||||||
|
dispatch('backToList')
|
||||||
|
}
|
||||||
|
|
||||||
|
// Shows the Create Torrent page with options to seed a given file or folder
|
||||||
|
showCreateTorrent (files) {
|
||||||
|
// You can only create torrents from the home screen.
|
||||||
|
if (this.state.location.url() !== 'home') {
|
||||||
|
return dispatch('error', 'Please go back to the torrent list before creating a new torrent.')
|
||||||
|
}
|
||||||
|
|
||||||
|
// Files will either be an array of file objects, which we can send directly
|
||||||
|
// to the create-torrent screen
|
||||||
|
if (files.length === 0 || typeof files[0] !== 'string') {
|
||||||
|
this.state.location.go({
|
||||||
|
url: 'create-torrent',
|
||||||
|
files: files,
|
||||||
|
setup: (cb) => {
|
||||||
|
this.state.window.title = 'Create New Torrent'
|
||||||
|
cb(null)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// ... or it will be an array of mixed file and folder paths. We have to walk
|
||||||
|
// through all the folders and find the files
|
||||||
|
findFilesRecursive(files, (allFiles) => this.showCreateTorrent(allFiles))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Creates a new torrent and start seeeding
|
||||||
|
createTorrent (options) {
|
||||||
|
const state = this.state
|
||||||
|
const torrentKey = state.nextTorrentKey++
|
||||||
|
ipcRenderer.send('wt-create-torrent', torrentKey, options)
|
||||||
|
state.location.cancel()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Starts downloading and/or seeding a given torrentSummary.
|
||||||
|
startTorrentingSummary (torrentKey) {
|
||||||
|
const s = TorrentSummary.getByKey(this.state, torrentKey)
|
||||||
|
if (!s) throw new TorrentKeyNotFoundError(torrentKey)
|
||||||
|
|
||||||
|
// New torrent: give it a path
|
||||||
|
if (!s.path) {
|
||||||
|
// Use Downloads folder by default
|
||||||
|
s.path = this.state.saved.prefs.downloadPath
|
||||||
|
return start()
|
||||||
|
}
|
||||||
|
|
||||||
|
const fileOrFolder = TorrentSummary.getFileOrFolder(s)
|
||||||
|
|
||||||
|
// New torrent: metadata not yet received
|
||||||
|
if (!fileOrFolder) return start()
|
||||||
|
|
||||||
|
// Existing torrent: check that the path is still there
|
||||||
|
fs.stat(fileOrFolder, function (err) {
|
||||||
|
if (err) {
|
||||||
|
s.error = 'path-missing'
|
||||||
|
dispatch('backToList')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
start()
|
||||||
|
})
|
||||||
|
|
||||||
|
function start () {
|
||||||
|
ipcRenderer.send('wt-start-torrenting',
|
||||||
|
s.torrentKey,
|
||||||
|
TorrentSummary.getTorrentId(s),
|
||||||
|
s.path,
|
||||||
|
s.fileModtimes,
|
||||||
|
s.selections)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: use torrentKey, not infoHash
|
||||||
|
toggleTorrent (infoHash) {
|
||||||
|
const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
|
||||||
|
if (torrentSummary.status === 'paused') {
|
||||||
|
torrentSummary.status = 'new'
|
||||||
|
this.startTorrentingSummary(torrentSummary.torrentKey)
|
||||||
|
sound.play('ENABLE')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this.pauseTorrent(torrentSummary, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
pauseAllTorrents () {
|
||||||
|
this.state.saved.torrents.forEach((torrentSummary) => {
|
||||||
|
if (torrentSummary.status === 'downloading' ||
|
||||||
|
torrentSummary.status === 'seeding') {
|
||||||
|
torrentSummary.status = 'paused'
|
||||||
|
ipcRenderer.send('wt-stop-torrenting', torrentSummary.infoHash)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
sound.play('DISABLE')
|
||||||
|
}
|
||||||
|
|
||||||
|
resumeAllTorrents () {
|
||||||
|
this.state.saved.torrents.forEach((torrentSummary) => {
|
||||||
|
if (torrentSummary.status === 'paused') {
|
||||||
|
torrentSummary.status = 'downloading'
|
||||||
|
this.startTorrentingSummary(torrentSummary.torrentKey)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
sound.play('ENABLE')
|
||||||
|
}
|
||||||
|
|
||||||
|
pauseTorrent (torrentSummary, playSound) {
|
||||||
|
torrentSummary.status = 'paused'
|
||||||
|
ipcRenderer.send('wt-stop-torrenting', torrentSummary.infoHash)
|
||||||
|
|
||||||
|
if (playSound) sound.play('DISABLE')
|
||||||
|
}
|
||||||
|
|
||||||
|
prioritizeTorrent (infoHash) {
|
||||||
|
this.state.saved.torrents
|
||||||
|
.filter((torrent) => { // We're interested in active torrents only.
|
||||||
|
return (['downloading', 'seeding'].indexOf(torrent.status) !== -1)
|
||||||
|
})
|
||||||
|
.map((torrent) => { // Pause all active torrents except the one that started playing.
|
||||||
|
if (infoHash === torrent.infoHash) return
|
||||||
|
|
||||||
|
// Pause torrent without playing sounds.
|
||||||
|
this.pauseTorrent(torrent, false)
|
||||||
|
|
||||||
|
this.state.saved.torrentsToResume.push(torrent.infoHash)
|
||||||
|
})
|
||||||
|
|
||||||
|
console.log('Playback Priority: paused torrents: ', this.state.saved.torrentsToResume)
|
||||||
|
}
|
||||||
|
|
||||||
|
resumePausedTorrents () {
|
||||||
|
console.log('Playback Priority: resuming paused torrents')
|
||||||
|
if (!this.state.saved.torrentsToResume || !this.state.saved.torrentsToResume.length) return
|
||||||
|
this.state.saved.torrentsToResume.map((infoHash) => {
|
||||||
|
this.toggleTorrent(infoHash)
|
||||||
|
})
|
||||||
|
|
||||||
|
// reset paused torrents
|
||||||
|
this.state.saved.torrentsToResume = []
|
||||||
|
}
|
||||||
|
|
||||||
|
toggleTorrentFile (infoHash, index) {
|
||||||
|
const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
|
||||||
|
torrentSummary.selections[index] = !torrentSummary.selections[index]
|
||||||
|
|
||||||
|
// Let the WebTorrent process know to start or stop fetching that file
|
||||||
|
if (torrentSummary.status !== 'paused') {
|
||||||
|
ipcRenderer.send('wt-select-files', infoHash, torrentSummary.selections)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
confirmDeleteTorrent (infoHash, deleteData) {
|
||||||
|
this.state.modal = {
|
||||||
|
id: 'remove-torrent-modal',
|
||||||
|
infoHash,
|
||||||
|
deleteData
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: use torrentKey, not infoHash
|
||||||
|
deleteTorrent (infoHash, deleteData) {
|
||||||
|
ipcRenderer.send('wt-stop-torrenting', infoHash)
|
||||||
|
|
||||||
|
const index = this.state.saved.torrents.findIndex((x) => x.infoHash === infoHash)
|
||||||
|
|
||||||
|
if (index > -1) {
|
||||||
|
const summary = this.state.saved.torrents[index]
|
||||||
|
|
||||||
|
// remove torrent and poster file
|
||||||
|
deleteFile(TorrentSummary.getTorrentPath(summary))
|
||||||
|
deleteFile(TorrentSummary.getPosterPath(summary))
|
||||||
|
|
||||||
|
// optionally delete the torrent data
|
||||||
|
if (deleteData) moveItemToTrash(summary)
|
||||||
|
|
||||||
|
// remove torrent from saved list
|
||||||
|
this.state.saved.torrents.splice(index, 1)
|
||||||
|
dispatch('stateSave')
|
||||||
|
}
|
||||||
|
|
||||||
|
// prevent user from going forward to a deleted torrent
|
||||||
|
this.state.location.clearForward('player')
|
||||||
|
sound.play('DELETE')
|
||||||
|
}
|
||||||
|
|
||||||
|
toggleSelectTorrent (infoHash) {
|
||||||
|
if (this.state.selectedInfoHash === infoHash) {
|
||||||
|
this.state.selectedInfoHash = null
|
||||||
|
} else {
|
||||||
|
this.state.selectedInfoHash = infoHash
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
openTorrentContextMenu (infoHash) {
|
||||||
|
const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
|
||||||
|
const menu = new electron.remote.Menu()
|
||||||
|
|
||||||
|
menu.append(new electron.remote.MenuItem({
|
||||||
|
label: 'Remove From List',
|
||||||
|
click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, false)
|
||||||
|
}))
|
||||||
|
|
||||||
|
menu.append(new electron.remote.MenuItem({
|
||||||
|
label: 'Remove Data File',
|
||||||
|
click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, true)
|
||||||
|
}))
|
||||||
|
|
||||||
|
menu.append(new electron.remote.MenuItem({
|
||||||
|
type: 'separator'
|
||||||
|
}))
|
||||||
|
|
||||||
|
if (torrentSummary.files) {
|
||||||
|
menu.append(new electron.remote.MenuItem({
|
||||||
|
label: process.platform === 'darwin' ? 'Show in Finder' : 'Show in Folder',
|
||||||
|
click: () => showItemInFolder(torrentSummary)
|
||||||
|
}))
|
||||||
|
menu.append(new electron.remote.MenuItem({
|
||||||
|
type: 'separator'
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
menu.append(new electron.remote.MenuItem({
|
||||||
|
label: 'Copy Magnet Link to Clipboard',
|
||||||
|
click: () => electron.clipboard.writeText(torrentSummary.magnetURI)
|
||||||
|
}))
|
||||||
|
|
||||||
|
menu.append(new electron.remote.MenuItem({
|
||||||
|
label: 'Copy Instant.io Link to Clipboard',
|
||||||
|
click: () => electron.clipboard.writeText(`https://instant.io/#${torrentSummary.infoHash}`)
|
||||||
|
}))
|
||||||
|
|
||||||
|
menu.append(new electron.remote.MenuItem({
|
||||||
|
label: 'Save Torrent File As...',
|
||||||
|
click: () => dispatch('saveTorrentFileAs', torrentSummary.torrentKey),
|
||||||
|
enabled: torrentSummary.torrentFileName != null
|
||||||
|
}))
|
||||||
|
|
||||||
|
menu.popup(electron.remote.getCurrentWindow())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Takes a torrentSummary or torrentKey
|
||||||
|
// Shows a Save File dialog, then saves the .torrent file wherever the user requests
|
||||||
|
saveTorrentFileAs (torrentKey) {
|
||||||
|
const torrentSummary = TorrentSummary.getByKey(this.state, torrentKey)
|
||||||
|
if (!torrentSummary) throw new Error('Missing torrentKey: ' + torrentKey)
|
||||||
|
const downloadPath = this.state.saved.prefs.downloadPath
|
||||||
|
const newFileName = path.parse(torrentSummary.name).name + '.torrent'
|
||||||
|
const win = electron.remote.getCurrentWindow()
|
||||||
|
const opts = {
|
||||||
|
title: 'Save Torrent File',
|
||||||
|
defaultPath: path.join(downloadPath, newFileName),
|
||||||
|
filters: [
|
||||||
|
{ name: 'Torrent Files', extensions: ['torrent'] },
|
||||||
|
{ name: 'All Files', extensions: ['*'] }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
electron.remote.dialog.showSaveDialog(win, opts, function (savePath) {
|
||||||
|
console.log('Saving torrent ' + torrentKey + ' to ' + savePath)
|
||||||
|
if (!savePath) return // They clicked Cancel
|
||||||
|
const torrentPath = TorrentSummary.getTorrentPath(torrentSummary)
|
||||||
|
fs.readFile(torrentPath, function (err, torrentFile) {
|
||||||
|
if (err) return dispatch('error', err)
|
||||||
|
fs.writeFile(savePath, torrentFile, function (err) {
|
||||||
|
if (err) return dispatch('error', err)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Recursively finds {name, path, size} for all files in a folder
|
||||||
|
// Calls `cb` on success, calls `onError` on failure
|
||||||
|
function findFilesRecursive (paths, cb_) {
|
||||||
|
if (paths.length > 1) {
|
||||||
|
let numComplete = 0
|
||||||
|
let ret = []
|
||||||
|
paths.forEach(function (path) {
|
||||||
|
findFilesRecursive([path], function (fileObjs) {
|
||||||
|
ret.push(...fileObjs)
|
||||||
|
if (++numComplete === paths.length) {
|
||||||
|
ret.sort((a, b) => a.path < b.path ? -1 : a.path > b.path)
|
||||||
|
cb_(ret)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const fileOrFolder = paths[0]
|
||||||
|
fs.stat(fileOrFolder, function (err, stat) {
|
||||||
|
if (err) return dispatch('error', err)
|
||||||
|
|
||||||
|
// Files: return name, path, and size
|
||||||
|
if (!stat.isDirectory()) {
|
||||||
|
const filePath = fileOrFolder
|
||||||
|
return cb_([{
|
||||||
|
name: path.basename(filePath),
|
||||||
|
path: filePath,
|
||||||
|
size: stat.size
|
||||||
|
}])
|
||||||
|
}
|
||||||
|
|
||||||
|
// Folders: recurse, make a list of all the files
|
||||||
|
const folderPath = fileOrFolder
|
||||||
|
fs.readdir(folderPath, function (err, fileNames) {
|
||||||
|
if (err) return dispatch('error', err)
|
||||||
|
const paths = fileNames.map((fileName) => path.join(folderPath, fileName))
|
||||||
|
findFilesRecursive(paths, cb_)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function deleteFile (path) {
|
||||||
|
if (!path) return
|
||||||
|
fs.unlink(path, function (err) {
|
||||||
|
if (err) dispatch('error', err)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete all files in a torrent
|
||||||
|
function moveItemToTrash (torrentSummary) {
|
||||||
|
const filePath = TorrentSummary.getFileOrFolder(torrentSummary)
|
||||||
|
if (filePath) ipcRenderer.send('moveItemToTrash', filePath)
|
||||||
|
}
|
||||||
|
|
||||||
|
function showItemInFolder (torrentSummary) {
|
||||||
|
ipcRenderer.send('showItemInFolder', TorrentSummary.getFileOrFolder(torrentSummary))
|
||||||
|
}
|
||||||
26
src/renderer/controllers/update-controller.js
Normal file
26
src/renderer/controllers/update-controller.js
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
const { dispatch } = require('../lib/dispatcher')
|
||||||
|
|
||||||
|
// Controls the UI checking for new versions of the app, prompting install
|
||||||
|
module.exports = class UpdateController {
|
||||||
|
constructor (state) {
|
||||||
|
this.state = state
|
||||||
|
}
|
||||||
|
|
||||||
|
// Shows a modal saying that we have an update
|
||||||
|
updateAvailable (version) {
|
||||||
|
const skipped = this.state.saved.skippedVersions
|
||||||
|
if (skipped && skipped.includes(version)) {
|
||||||
|
console.log('new version skipped by user: v' + version)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this.state.modal = { id: 'update-available-modal', version: version }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Don't show the modal again until the next version
|
||||||
|
skipVersion (version) {
|
||||||
|
let skipped = this.state.saved.skippedVersions
|
||||||
|
if (!skipped) skipped = this.state.saved.skippedVersions = []
|
||||||
|
skipped.push(version)
|
||||||
|
dispatch('stateSave')
|
||||||
|
}
|
||||||
|
}
|
||||||
527
src/renderer/lib/cast.js
Normal file
527
src/renderer/lib/cast.js
Normal file
@@ -0,0 +1,527 @@
|
|||||||
|
// The Cast module talks to Airplay and Chromecast
|
||||||
|
// * Modifies state when things change
|
||||||
|
// * Starts and stops casting, provides remote video controls
|
||||||
|
module.exports = {
|
||||||
|
init,
|
||||||
|
toggleMenu,
|
||||||
|
selectDevice,
|
||||||
|
stop,
|
||||||
|
play,
|
||||||
|
pause,
|
||||||
|
seek,
|
||||||
|
setVolume,
|
||||||
|
setRate
|
||||||
|
}
|
||||||
|
|
||||||
|
const http = require('http')
|
||||||
|
|
||||||
|
const config = require('../../config')
|
||||||
|
const { CastingError } = require('./errors')
|
||||||
|
|
||||||
|
// Lazy load these for a ~300ms improvement in startup time
|
||||||
|
let airplayer, chromecasts, dlnacasts
|
||||||
|
|
||||||
|
// App state. Cast modifies state.playing and state.errors in response to events
|
||||||
|
let state
|
||||||
|
|
||||||
|
// Callback to notify module users when state has changed
|
||||||
|
let update
|
||||||
|
|
||||||
|
// setInterval() for updating cast status
|
||||||
|
let statusInterval = null
|
||||||
|
|
||||||
|
// Start looking for cast devices on the local network
|
||||||
|
function init (appState, callback) {
|
||||||
|
state = appState
|
||||||
|
update = callback
|
||||||
|
|
||||||
|
// Don't actually cast during integration tests
|
||||||
|
// (Otherwise you'd need a physical Chromecast + AppleTV + DLNA TV to run them.)
|
||||||
|
if (config.IS_TEST) {
|
||||||
|
state.devices.chromecast = testPlayer('chromecast')
|
||||||
|
state.devices.airplay = testPlayer('airplay')
|
||||||
|
state.devices.dlna = testPlayer('dlna')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load modules, scan the network for devices
|
||||||
|
airplayer = require('airplayer')()
|
||||||
|
chromecasts = require('chromecasts')()
|
||||||
|
dlnacasts = require('dlnacasts')()
|
||||||
|
|
||||||
|
state.devices.chromecast = chromecastPlayer()
|
||||||
|
state.devices.dlna = dlnaPlayer()
|
||||||
|
state.devices.airplay = airplayPlayer()
|
||||||
|
|
||||||
|
// Listen for devices: Chromecast, DLNA and Airplay
|
||||||
|
chromecasts.on('update', function (device) {
|
||||||
|
// TODO: how do we tell if there are *no longer* any Chromecasts available?
|
||||||
|
// From looking at the code, chromecasts.players only grows, never shrinks
|
||||||
|
state.devices.chromecast.addDevice(device)
|
||||||
|
})
|
||||||
|
|
||||||
|
dlnacasts.on('update', function (device) {
|
||||||
|
state.devices.dlna.addDevice(device)
|
||||||
|
})
|
||||||
|
|
||||||
|
airplayer.on('update', function (device) {
|
||||||
|
state.devices.airplay.addDevice(device)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// integration test player implementation
|
||||||
|
function testPlayer (type) {
|
||||||
|
return {
|
||||||
|
getDevices,
|
||||||
|
open,
|
||||||
|
play,
|
||||||
|
pause,
|
||||||
|
stop,
|
||||||
|
status,
|
||||||
|
seek,
|
||||||
|
volume
|
||||||
|
}
|
||||||
|
|
||||||
|
function getDevices () {
|
||||||
|
return [{ name: type + '-1' }, { name: type + '-2' }]
|
||||||
|
}
|
||||||
|
|
||||||
|
function open () {}
|
||||||
|
function play () {}
|
||||||
|
function pause () {}
|
||||||
|
function stop () {}
|
||||||
|
function status () {}
|
||||||
|
function seek () {}
|
||||||
|
function volume () {}
|
||||||
|
}
|
||||||
|
|
||||||
|
// chromecast player implementation
|
||||||
|
function chromecastPlayer () {
|
||||||
|
const ret = {
|
||||||
|
device: null,
|
||||||
|
addDevice,
|
||||||
|
getDevices,
|
||||||
|
open,
|
||||||
|
play,
|
||||||
|
pause,
|
||||||
|
stop,
|
||||||
|
status,
|
||||||
|
seek,
|
||||||
|
volume
|
||||||
|
}
|
||||||
|
return ret
|
||||||
|
|
||||||
|
function getDevices () {
|
||||||
|
return chromecasts.players
|
||||||
|
}
|
||||||
|
|
||||||
|
function addDevice (device) {
|
||||||
|
device.on('error', function (err) {
|
||||||
|
if (device !== ret.device) return
|
||||||
|
state.playing.location = 'local'
|
||||||
|
state.errors.push({
|
||||||
|
time: new Date().getTime(),
|
||||||
|
message: 'Could not connect to Chromecast. ' + err.message
|
||||||
|
})
|
||||||
|
update()
|
||||||
|
})
|
||||||
|
device.on('disconnect', function () {
|
||||||
|
if (device !== ret.device) return
|
||||||
|
state.playing.location = 'local'
|
||||||
|
update()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function serveSubtitles (callback) {
|
||||||
|
const subtitles = state.playing.subtitles
|
||||||
|
const selectedSubtitle = subtitles.tracks[subtitles.selectedIndex]
|
||||||
|
if (!selectedSubtitle) {
|
||||||
|
callback()
|
||||||
|
} else {
|
||||||
|
ret.subServer = http.createServer((req, res) => {
|
||||||
|
res.writeHead(200, {
|
||||||
|
'Content-Type': 'text/vtt;charset=utf-8',
|
||||||
|
'Access-Control-Allow-Origin': '*',
|
||||||
|
'Transfer-Encoding': 'chunked'
|
||||||
|
})
|
||||||
|
res.end(Buffer.from(selectedSubtitle.buffer.substr(21), 'base64'))
|
||||||
|
}).listen(0, function () {
|
||||||
|
const port = ret.subServer.address().port
|
||||||
|
const subtitlesUrl = 'http://' + state.server.networkAddress + ':' + port + '/'
|
||||||
|
callback(subtitlesUrl)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function open () {
|
||||||
|
const torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
|
||||||
|
serveSubtitles(function (subtitlesUrl) {
|
||||||
|
ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, {
|
||||||
|
type: 'video/mp4',
|
||||||
|
title: config.APP_NAME + ' - ' + torrentSummary.name,
|
||||||
|
subtitles: subtitlesUrl ? [subtitlesUrl] : [],
|
||||||
|
autoSubtitles: !!subtitlesUrl
|
||||||
|
}, 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) {
|
||||||
|
ret.device.play(null, null, callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function pause (callback) {
|
||||||
|
ret.device.pause(callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function stop (callback) {
|
||||||
|
ret.device.stop(callback)
|
||||||
|
if (ret.subServer) {
|
||||||
|
ret.subServer.close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function status () {
|
||||||
|
ret.device.status(handleStatus)
|
||||||
|
}
|
||||||
|
|
||||||
|
function seek (time, callback) {
|
||||||
|
ret.device.seek(time, callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function volume (volume, callback) {
|
||||||
|
ret.device.volume(volume, callback)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// airplay player implementation
|
||||||
|
function airplayPlayer () {
|
||||||
|
const ret = {
|
||||||
|
device: null,
|
||||||
|
addDevice,
|
||||||
|
getDevices,
|
||||||
|
open,
|
||||||
|
play,
|
||||||
|
pause,
|
||||||
|
stop,
|
||||||
|
status,
|
||||||
|
seek,
|
||||||
|
volume
|
||||||
|
}
|
||||||
|
return ret
|
||||||
|
|
||||||
|
function addDevice (player) {
|
||||||
|
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 getDevices () {
|
||||||
|
return airplayer.players
|
||||||
|
}
|
||||||
|
|
||||||
|
function open () {
|
||||||
|
ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, 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) {
|
||||||
|
ret.device.resume(callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function pause (callback) {
|
||||||
|
ret.device.pause(callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function stop (callback) {
|
||||||
|
ret.device.stop(callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function status () {
|
||||||
|
ret.device.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) {
|
||||||
|
ret.device.scrub(time, callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function volume (volume, callback) {
|
||||||
|
// AirPlay doesn't support volume
|
||||||
|
// TODO: We should just disable the volume slider
|
||||||
|
state.playing.volume = volume
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// DLNA player implementation
|
||||||
|
function dlnaPlayer (player) {
|
||||||
|
const ret = {
|
||||||
|
device: null,
|
||||||
|
addDevice,
|
||||||
|
getDevices,
|
||||||
|
open,
|
||||||
|
play,
|
||||||
|
pause,
|
||||||
|
stop,
|
||||||
|
status,
|
||||||
|
seek,
|
||||||
|
volume
|
||||||
|
}
|
||||||
|
return ret
|
||||||
|
|
||||||
|
function getDevices () {
|
||||||
|
return dlnacasts.players
|
||||||
|
}
|
||||||
|
|
||||||
|
function addDevice (device) {
|
||||||
|
device.on('error', function (err) {
|
||||||
|
if (device !== ret.device) return
|
||||||
|
state.playing.location = 'local'
|
||||||
|
state.errors.push({
|
||||||
|
time: new Date().getTime(),
|
||||||
|
message: 'Could not connect to DLNA. ' + err.message
|
||||||
|
})
|
||||||
|
update()
|
||||||
|
})
|
||||||
|
device.on('disconnect', function () {
|
||||||
|
if (device !== ret.device) return
|
||||||
|
state.playing.location = 'local'
|
||||||
|
update()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function open () {
|
||||||
|
const torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
|
||||||
|
ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, {
|
||||||
|
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) {
|
||||||
|
ret.device.play(null, null, callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function pause (callback) {
|
||||||
|
ret.device.pause(callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function stop (callback) {
|
||||||
|
ret.device.stop(callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function status () {
|
||||||
|
ret.device.status(handleStatus)
|
||||||
|
}
|
||||||
|
|
||||||
|
function seek (time, callback) {
|
||||||
|
ret.device.seek(time, callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function volume (volume, callback) {
|
||||||
|
ret.device.volume(volume, function (err) {
|
||||||
|
// quick volume update
|
||||||
|
state.playing.volume = volume
|
||||||
|
callback(err)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleStatus (err, status) {
|
||||||
|
if (err || !status) {
|
||||||
|
return console.log('error getting %s status: %o',
|
||||||
|
state.playing.location,
|
||||||
|
err || 'missing response')
|
||||||
|
}
|
||||||
|
state.playing.isPaused = status.playerState === 'PAUSED'
|
||||||
|
state.playing.currentTime = status.currentTime
|
||||||
|
state.playing.volume = status.volume.muted ? 0 : status.volume.level
|
||||||
|
update()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start polling cast device state, whenever we're connected
|
||||||
|
function startStatusInterval () {
|
||||||
|
statusInterval = setInterval(function () {
|
||||||
|
const player = getPlayer()
|
||||||
|
if (player) player.status()
|
||||||
|
}, 1000)
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Shows the device menu for a given cast type ('chromecast', 'airplay', etc)
|
||||||
|
* The menu lists eg. all Chromecasts detected; the user can click one to cast.
|
||||||
|
* If the menu was already showing for that type, hides the menu.
|
||||||
|
*/
|
||||||
|
function toggleMenu (location) {
|
||||||
|
// If the menu is already showing, hide it
|
||||||
|
if (state.devices.castMenu && state.devices.castMenu.location === location) {
|
||||||
|
state.devices.castMenu = null
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Never cast to two devices at the same time
|
||||||
|
if (state.playing.location !== 'local') {
|
||||||
|
throw new CastingError(
|
||||||
|
`You can't connect to ${location} when already connected to another device`
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find all cast devices of the given type
|
||||||
|
const player = getPlayer(location)
|
||||||
|
const devices = player ? player.getDevices() : []
|
||||||
|
if (devices.length === 0) {
|
||||||
|
throw new CastingError(`No ${location} devices available`)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show a menu
|
||||||
|
state.devices.castMenu = { location, devices }
|
||||||
|
}
|
||||||
|
|
||||||
|
function selectDevice (index) {
|
||||||
|
const { location, devices } = state.devices.castMenu
|
||||||
|
|
||||||
|
// Start casting
|
||||||
|
const player = getPlayer(location)
|
||||||
|
player.device = devices[index]
|
||||||
|
player.open()
|
||||||
|
|
||||||
|
// Poll the casting device's status every few seconds
|
||||||
|
startStatusInterval()
|
||||||
|
|
||||||
|
// Show the Connecting... screen
|
||||||
|
state.devices.castMenu = null
|
||||||
|
state.playing.castName = devices[index].name
|
||||||
|
state.playing.location = location + '-pending'
|
||||||
|
update()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stops casting, move video back to local screen
|
||||||
|
function stop () {
|
||||||
|
const player = getPlayer()
|
||||||
|
if (player) {
|
||||||
|
player.stop(function () {
|
||||||
|
player.device = null
|
||||||
|
stoppedCasting()
|
||||||
|
})
|
||||||
|
clearInterval(statusInterval)
|
||||||
|
} else {
|
||||||
|
stoppedCasting()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function stoppedCasting () {
|
||||||
|
state.playing.location = 'local'
|
||||||
|
state.playing.jumpToTime = Number.isFinite(state.playing.currentTime)
|
||||||
|
? state.playing.currentTime
|
||||||
|
: 0
|
||||||
|
update()
|
||||||
|
}
|
||||||
|
|
||||||
|
function getPlayer (location) {
|
||||||
|
if (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 () {
|
||||||
|
const player = getPlayer()
|
||||||
|
if (player) player.play(castCallback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function pause () {
|
||||||
|
const player = getPlayer()
|
||||||
|
if (player) player.pause(castCallback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function setRate (rate) {
|
||||||
|
let player
|
||||||
|
let 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') {
|
||||||
|
player = state.devices.airplay
|
||||||
|
player.rate(rate, castCallback)
|
||||||
|
} else {
|
||||||
|
result = false
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
function seek (time) {
|
||||||
|
const player = getPlayer()
|
||||||
|
if (player) player.seek(time, castCallback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function setVolume (volume) {
|
||||||
|
const player = getPlayer()
|
||||||
|
if (player) player.volume(volume, castCallback)
|
||||||
|
}
|
||||||
|
|
||||||
|
function castCallback () {
|
||||||
|
console.log('%s callback: %o', state.playing.location, arguments)
|
||||||
|
}
|
||||||
@@ -4,8 +4,8 @@ module.exports = {
|
|||||||
setDispatch
|
setDispatch
|
||||||
}
|
}
|
||||||
|
|
||||||
var dispatchers = {}
|
const dispatchers = {}
|
||||||
var _dispatch = function () {}
|
let _dispatch = function () {}
|
||||||
|
|
||||||
function setDispatch (dispatch) {
|
function setDispatch (dispatch) {
|
||||||
_dispatch = dispatch
|
_dispatch = dispatch
|
||||||
@@ -17,11 +17,11 @@ function dispatch (...args) {
|
|||||||
|
|
||||||
// Most DOM event handlers are trivial functions like `() => dispatch(<args>)`.
|
// Most DOM event handlers are trivial functions like `() => dispatch(<args>)`.
|
||||||
// For these, `dispatcher(<args>)` is preferred because it memoizes the handler
|
// For these, `dispatcher(<args>)` is preferred because it memoizes the handler
|
||||||
// function. This prevents virtual-dom from updating the listener functions on
|
// function. This prevents React from updating the listener functions on
|
||||||
// each update().
|
// each update().
|
||||||
function dispatcher (...args) {
|
function dispatcher (...args) {
|
||||||
var str = JSON.stringify(args)
|
const str = JSON.stringify(args)
|
||||||
var handler = dispatchers[str]
|
let handler = dispatchers[str]
|
||||||
if (!handler) {
|
if (!handler) {
|
||||||
handler = dispatchers[str] = function (e) {
|
handler = dispatchers[str] = function (e) {
|
||||||
// Do not propagate click to elements below the button
|
// Do not propagate click to elements below the button
|
||||||
41
src/renderer/lib/errors.js
Normal file
41
src/renderer/lib/errors.js
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
const ExtendableError = require('es6-error')
|
||||||
|
|
||||||
|
/* Generic errors */
|
||||||
|
|
||||||
|
class CastingError extends ExtendableError {}
|
||||||
|
class PlaybackError extends ExtendableError {}
|
||||||
|
class SoundError extends ExtendableError {}
|
||||||
|
class TorrentError extends ExtendableError {}
|
||||||
|
|
||||||
|
/* Playback */
|
||||||
|
|
||||||
|
class UnplayableTorrentError extends PlaybackError {
|
||||||
|
constructor () { super('Can\'t play any files in torrent') }
|
||||||
|
}
|
||||||
|
|
||||||
|
class UnplayableFileError extends PlaybackError {
|
||||||
|
constructor () { super('Can\'t play that file') }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Sound */
|
||||||
|
|
||||||
|
class InvalidSoundNameError extends SoundError {
|
||||||
|
constructor (name) { super(`Invalid sound name: ${name}`) }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Torrent */
|
||||||
|
|
||||||
|
class TorrentKeyNotFoundError extends TorrentError {
|
||||||
|
constructor (torrentKey) { super(`Can't resolve torrent key ${torrentKey}`) }
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
CastingError,
|
||||||
|
PlaybackError,
|
||||||
|
SoundError,
|
||||||
|
TorrentError,
|
||||||
|
UnplayableTorrentError,
|
||||||
|
UnplayableFileError,
|
||||||
|
InvalidSoundNameError,
|
||||||
|
TorrentKeyNotFoundError
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user