Compare commits
1053 Commits
Author | SHA1 | Date | |
---|---|---|---|
5186ae66c9 | |||
c35e1ef517 | |||
|
8f6891142b | ||
|
b52e6d4908 | ||
30c44760e7 | |||
a3ae3c320d | |||
ea262889e6 | |||
445542b653 | |||
b7718220ef | |||
34c62e8658 | |||
a9fcc93670 | |||
68d7ef258f | |||
fdea4f5ea5 | |||
ac3039e587 | |||
3829a1cf26 | |||
c3daa0b751 | |||
3a072beea3 | |||
8e6f2798a9 | |||
9cbde9a6b4 | |||
0870aa9fdb | |||
172650e644 | |||
52ff2e54a8 | |||
61d80a93cf | |||
7be3ee52e9 | |||
981eb0fd9f | |||
47f3044a6d | |||
6d03cc5f8d | |||
290c405f52 | |||
fcdbd32872 | |||
eb6c37cc53 | |||
d922842186 | |||
69323d6d60 | |||
46a0fb8c48 | |||
ec8eb40941 | |||
d2074fae35 | |||
713bbc230f | |||
32ab9a552f | |||
c11c68d6d7 | |||
09fdb6e5f1 | |||
e86ad03b1e | |||
9dfbe89e87 | |||
98e75af486 | |||
e2f5c3badc | |||
cda07bb9aa | |||
7c18466e95 | |||
ce1c4d3f65 | |||
52d0489a1b | |||
f89aea6ac8 | |||
5f05ba1049 | |||
a20ee01cfa | |||
cf5cbba9a8 | |||
600b56033d | |||
fdea3659f1 | |||
7f3754fb64 | |||
2dac5db4da | |||
3456fc6564 | |||
35f2625f05 | |||
0b9948e367 | |||
96f3dbce65 | |||
895128a462 | |||
a94186455b | |||
7d3deee74c | |||
5980b64caa | |||
cbecb257ef | |||
8316ed08a7 | |||
7ff9ac53ee | |||
6faaaf4139 | |||
9b8b80cd24 | |||
15f3e2b8ec | |||
2be29e4019 | |||
e8dbf7a718 | |||
|
a968f4328d | ||
398b6fff05 | |||
f5da2f8526 | |||
|
73093ab86c | ||
fccaf9fcbe | |||
3122aa32e8 | |||
02fad2dd44 | |||
e0a7d1a187 | |||
d0f9a4102c | |||
9f178821b6 | |||
682fd0bc2a | |||
dfa8e66f34 | |||
8f51d22303 | |||
d41de84262 | |||
1bd20791b8 | |||
03aeab44cd | |||
6d723b6355 | |||
7b91bb699f | |||
14e33cc496 | |||
6f3bba99b0 | |||
2d848843d0 | |||
63b493fa9c | |||
001a37b8ef | |||
69d6884517 | |||
db73af3bdd | |||
59547efab2 | |||
f4336f9777 | |||
bec3ac52a9 | |||
ea37e81ece | |||
6a20783d48 | |||
21af75f410 | |||
a629792818 | |||
34dd78810d | |||
e1c504226c | |||
200a22228f | |||
bc10136331 | |||
06df6e0767 | |||
ba029b71f5 | |||
082802ddbe | |||
d5f1df0400 | |||
d00881e611 | |||
|
72bc7ec07b | ||
89b5aa266e | |||
926c0d5833 | |||
80e2568113 | |||
3b6417eff2 | |||
2812a6dff1 | |||
1991862a42 | |||
40e4d5c203 | |||
49e9731184 | |||
a4e85f254f | |||
|
4f47aeadcf | ||
|
e0c1356fea | ||
|
0d9b3d2499 | ||
8e5d15ead9 | |||
b8c28e6d21 | |||
9ea5e436fe | |||
b4c310638a | |||
159341ff3c | |||
|
29338b9b17 | ||
|
0eda8913b0 | ||
|
5ca50630e4 | ||
d0bfb262bf | |||
4f14f15ade | |||
d89a24fd11 | |||
a5859e3c82 | |||
dd2fa3fbd7 | |||
33e5d65785 | |||
|
d60ed77dbe | ||
|
e15c6816b5 | ||
|
4a4fe4b40d | ||
4881789970 | |||
be1e6fe988 | |||
f61e51e506 | |||
eba511749b | |||
de4c57a0cd | |||
e368c3c98a | |||
d17ca1d97a | |||
e9376e3782 | |||
7c217a7e33 | |||
a437fcbca1 | |||
1dcfecd66f | |||
6db4646336 | |||
8a6298e3fd | |||
194705c124 | |||
|
f4d5969003 | ||
9d92069a4b | |||
5614729eab | |||
d52ec8d36f | |||
37dfb4df02 | |||
42feea3ad5 | |||
bbc750d731 | |||
08dd01942f | |||
351144e763 | |||
aea4c0c61b | |||
7b9e935db7 | |||
048b165d76 | |||
ebe3012c69 | |||
a5dbed9525 | |||
811ddd903f | |||
f948809bcd | |||
7ceb9cd4cb | |||
57f1e037ef | |||
6ca8d58e43 | |||
e3211b95e2 | |||
b5e9e03f64 | |||
98bd8a983b | |||
f4996659ef | |||
e05684d5d1 | |||
4a7d23c0d9 | |||
1d44b6d9c6 | |||
811a183af2 | |||
fb0755eb89 | |||
2e8b896f3b | |||
4692cc297a | |||
3d855020eb | |||
c6d0168d2f | |||
d52213002e | |||
ec9290f41f | |||
6b91796e5a | |||
9f9ea569d5 | |||
4bd1150a0e | |||
8b62e2c467 | |||
7ec262a2e4 | |||
d32d5976ee | |||
58cff6513a | |||
783f229a6a | |||
aaf06da8e1 | |||
51a26a3cba | |||
762da4c859 | |||
daba940b45 | |||
79e61a62c7 | |||
06fe98323a | |||
5f820c53f5 | |||
c69f1f6569 | |||
5bdbd9e2e4 | |||
f729c44f88 | |||
f4966b0348 | |||
df2fc4a036 | |||
0ab2ae03ce | |||
95236daf41 | |||
294ce01bc3 | |||
13565d1c7a | |||
54b24ac37f | |||
c67e89f1dd | |||
|
4ba44d3ac3 | ||
8631cf6376 | |||
df4d547e2b | |||
|
006b71b496 | ||
5f03b0d89c | |||
6dc1ea0030 | |||
ff08754610 | |||
d1a6c0ad3d | |||
0260868968 | |||
b1f72dcb81 | |||
b0f353819b | |||
8f8d019861 | |||
21a7392493 | |||
|
0d5db15f87 | ||
431fde0d76 | |||
e022bf3081 | |||
c25a4f69ec | |||
82bdb248b9 | |||
b27114eaad | |||
|
051eb4a417 | ||
|
482704af2c | ||
|
af4229920d | ||
537ad3a5f8 | |||
6a8697fc3a | |||
94582496ef | |||
17ef5eae0f | |||
|
d5b6d4e8ee | ||
|
05190bc9e2 | ||
|
d211dd2d01 | ||
590547e407 | |||
2ad04c5c46 | |||
189569ccdf | |||
2872eeea09 | |||
|
c0cfeaa35d | ||
2fd780996c | |||
b390bb8ea5 | |||
847829e617 | |||
0f29da00de | |||
9b2a6de841 | |||
17a27c9922 | |||
6c9071b22b | |||
abfe42b7c1 | |||
72ae124418 | |||
bee6e7ba37 | |||
8079ffc742 | |||
6d6e33491b | |||
a8697a14a3 | |||
e2adac937a | |||
b4708c5d10 | |||
597abde115 | |||
2a824bbb8d | |||
9691eb0d08 | |||
4888e18fd2 | |||
0aa92a7913 | |||
db53e2156b | |||
1cce0f204e | |||
ce41c49a0e | |||
b8570e5eef | |||
1f24a2349d | |||
ca95460218 | |||
e801cc4cbf | |||
2c4c8de8b5 | |||
0b4461265c | |||
c008d55f26 | |||
9b990aecea | |||
299fa6afda | |||
c03e927565 | |||
bb6c553afa | |||
33d78ed757 | |||
84272ddd1e | |||
2f0fbbd3cb | |||
5bc414fd59 | |||
2eaeadb92c | |||
d8df6eccb1 | |||
db64b717eb | |||
1afe36a525 | |||
aa692f6978 | |||
c706824222 | |||
3ca6245fc2 | |||
2dd82aad13 | |||
3c4867a276 | |||
bae157cdb4 | |||
3b818ff1af | |||
5d12be2983 | |||
31a4e693e0 | |||
e49db9a4cb | |||
54142e61fe | |||
cd5ca0e302 | |||
95da900213 | |||
b5be4e0dd8 | |||
0c135aa89e | |||
e11ee4dafe | |||
05573f65f9 | |||
d986c808e3 | |||
5df63b00c2 | |||
903bb5af5e | |||
cc8453d4a8 | |||
800d4c1ec1 | |||
b4f97eefcf | |||
29f6de2590 | |||
23e5c4a7b1 | |||
e15717cb04 | |||
|
b995fc568a | ||
442d949371 | |||
263d0e6036 | |||
|
7c7d43021e | ||
5cdc7d7207 | |||
1bcbd1517f | |||
b72da45ae9 | |||
01041e43ac | |||
4c1a659f16 | |||
2e02f0b237 | |||
77f93d87f9 | |||
45c0f19a9d | |||
7c09deb143 | |||
449d406eab | |||
083ce238d8 | |||
5f9ffb8aad | |||
92bc3d5aa8 | |||
49ab8928b1 | |||
391efcb9bc | |||
963ad375e8 | |||
0a5ded2036 | |||
4843c7f05c | |||
6adbda2359 | |||
425cf7e0d6 | |||
8f5dd5aab5 | |||
733ae285f1 | |||
2e1c8ce34f | |||
c965bc38d1 | |||
37266ea095 | |||
8caac538c9 | |||
7c7f711bb4 | |||
d78897eb74 | |||
438c11af4f | |||
38df54baff | |||
98d187d133 | |||
5352cca058 | |||
3381909afd | |||
7219641859 | |||
f63851d95d | |||
e72301d062 | |||
2302e1009b | |||
40fea6cc7f | |||
5458c43f21 | |||
f78bec43d6 | |||
88876fb8f4 | |||
c71aec8882 | |||
ddfba0d864 | |||
ca9c0b22c1 | |||
6844d0a242 | |||
fd9319de27 | |||
726be70af3 | |||
19c9ecb3e7 | |||
f01a786e59 | |||
59f9bcc7d0 | |||
2796a2adb5 | |||
e07b191293 | |||
9bf650f5fc | |||
334795b263 | |||
51a6f216af | |||
238a2775f4 | |||
fec970d7d6 | |||
e642d50c47 | |||
fafcdac00a | |||
1785aa28ea | |||
f22c332cab | |||
b3bf523e1e | |||
06b2e11164 | |||
7972f07801 | |||
d89af7cc5b | |||
31a0c6ffb2 | |||
668a3b3a96 | |||
3938c61297 | |||
4f3bcd245d | |||
129c95f123 | |||
e2cdf27d40 | |||
4156365b18 | |||
d3ccddd8db | |||
13075a8704 | |||
e7d9f53a93 | |||
dc6dfd4aa1 | |||
0fba09b1e8 | |||
f08b9e85ec | |||
95fcc73c74 | |||
73492d8102 | |||
c69dd22ecf | |||
17b6c523a2 | |||
6c3f7604fe | |||
94f88f08e9 | |||
47327524be | |||
3b96419739 | |||
b7c9b4e9b4 | |||
13adb45444 | |||
b8fbee578e | |||
c1fb42b537 | |||
dcc12ec3ea | |||
8c554076b2 | |||
a10fbdf3a5 | |||
f246209685 | |||
41c561bd1d | |||
fc7d5463c3 | |||
3c2ce266f6 | |||
306cb87d67 | |||
23cda74487 | |||
3ceee63dfc | |||
4e5a6fe97b | |||
b3b1971dad | |||
2699f35b62 | |||
7a14583d6a | |||
660f6a1648 | |||
482fcb7102 | |||
b6cdb07e3f | |||
0875e7ee12 | |||
cb6482ebae | |||
87ea077281 | |||
c1aa4cf6b5 | |||
f5b6b1785f | |||
2553a150d1 | |||
b149d377dc | |||
0209159c5c | |||
e31820eb00 | |||
c4d69c27a4 | |||
3ee53b7436 | |||
64ec0963e1 | |||
27c4ed719c | |||
4f4b0cb3a8 | |||
48d312da0b | |||
1fe4b75ac7 | |||
c580fafc62 | |||
58040ecb10 | |||
2960a9b8f0 | |||
f52bb8eb89 | |||
ae0dc548ae | |||
051b85d08b | |||
d89ca0a2ef | |||
f1f640c1f6 | |||
9319aa7d1f | |||
656e62628e | |||
ba27adf255 | |||
88ca75e883 | |||
67c23b357f | |||
4a5271e2a7 | |||
fec5ad664c | |||
3cea5fb431 | |||
7fa44fba54 | |||
d6b5a29fdc | |||
a4a49d40f0 | |||
28fa85f05c | |||
1066e1ca2e | |||
39307f4313 | |||
a316ee3d48 | |||
569622099d | |||
017701867d | |||
c3d62bd337 | |||
dc9e9e705c | |||
9eee6683fa | |||
1265c7a072 | |||
c601541249 | |||
ae1184320f | |||
384e4c4f43 | |||
76a2b2498a | |||
2ab21b15cf | |||
|
7acdf7a19b | ||
af8716fcb1 | |||
5f2c66b729 | |||
e030f02431 | |||
bdeb75f4e4 | |||
4ce114986d | |||
8035bf3fcd | |||
85bf3ec7e8 | |||
0f17615b10 | |||
0c8145803e | |||
b2e0c3db97 | |||
ca283fcfff | |||
1d55070daf | |||
32fd75bdae | |||
99ad702163 | |||
6e3a9c2a78 | |||
ad1d4dfe23 | |||
14ba71005f | |||
22c4c0eb2c | |||
44f8d369c3 | |||
c0e6da144e | |||
51a1ae72ca | |||
79bbc92467 | |||
ae5be31c89 | |||
eebe25a378 | |||
0f3da4ec81 | |||
0b77dc1172 | |||
37cf47bc17 | |||
4cce2e04cb | |||
5465ac4e5c | |||
dd4d5a81ee | |||
a05e1914e3 | |||
ed79ee5d0f | |||
28e05e549d | |||
eaab7c5235 | |||
0552b3db82 | |||
c813e1854d | |||
32036df057 | |||
394829ee36 | |||
2a389f1ede | |||
3167f6c3e6 | |||
89c5f4b820 | |||
1c1169e5ce | |||
d5d34c5381 | |||
c0efbb22cc | |||
9f30e52713 | |||
1fd36c91d6 | |||
e663163de8 | |||
4827b90c3d | |||
e274c864f9 | |||
f4bc182954 | |||
3365be219c | |||
10708b3abd | |||
c1e939f1e3 | |||
21d53dabec | |||
a9417dbba6 | |||
|
4ca7b107eb | ||
61024bcee9 | |||
ea1b8749a6 | |||
2fcab1f1b1 | |||
bbd716383a | |||
6e1a0ab06c | |||
181942153b | |||
fe04af4a2b | |||
4240a1eb6a | |||
32349c1ddf | |||
a94d3d6b40 | |||
f916cda0f1 | |||
a8f0f1af15 | |||
0cf3a95f58 | |||
a89a526fda | |||
4d1e43e7b3 | |||
4f9749d09e | |||
7614f9aad3 | |||
97c0e42512 | |||
565bc0775d | |||
e6a3fa2899 | |||
2d82279d98 | |||
c5559a4ceb | |||
2572a537ab | |||
58db049496 | |||
8f309fcfd7 | |||
11461051f3 | |||
a4aa571870 | |||
e4086a8892 | |||
c45e4ddf90 | |||
675effd317 | |||
a4f67c9ab4 | |||
2538a29788 | |||
81d5802092 | |||
436edfde66 | |||
00c1cd56b8 | |||
a63154b581 | |||
53fe7ee983 | |||
6fb4098c16 | |||
7a024e8733 | |||
835e239be5 | |||
df8538c3b4 | |||
f832fe0de3 | |||
ebdb38bd57 | |||
e3201a9b99 | |||
eb50b84266 | |||
b3d778ff56 | |||
00861c406a | |||
01c8784bab | |||
3aa299e48a | |||
d1ce244135 | |||
c91754614b | |||
70b1ae4812 | |||
336e08aebf | |||
18134cdf01 | |||
5b89cbd042 | |||
74aca86b62 | |||
e5abaa4549 | |||
eb0eb71e86 | |||
4e73b0a4cf | |||
140074208f | |||
fa19d3da14 | |||
3d6657b483 | |||
f9b5e05974 | |||
ad4027779f | |||
98ec0b837f | |||
1afa3df316 | |||
d83aa1ef5b | |||
b610ec734e | |||
abf587377c | |||
437349bd27 | |||
000539d6a6 | |||
b4bef25a22 | |||
579e400a5d | |||
8af2b12fc0 | |||
bad4330330 | |||
42596752d3 | |||
16238c590b | |||
9f38dc3b6a | |||
485637d99a | |||
de14ff0b75 | |||
f947c37bd6 | |||
77eec0f696 | |||
18323f9f51 | |||
2cd2b6842d | |||
09f815903f | |||
c108478039 | |||
74289e43b7 | |||
2779f9ba09 | |||
59a8e556f0 | |||
074b137b5c | |||
3cb2540794 | |||
02c9934896 | |||
b2e1c95bca | |||
8c9e3ea6b6 | |||
db441607ad | |||
91c56783dc | |||
2c288eeeea | |||
57a1ea91fc | |||
06138a3927 | |||
84b053e672 | |||
0fe0cbc4ad | |||
62e6ce8363 | |||
a4f3ec6580 | |||
|
8b4e996b7e | ||
|
964540d30f | ||
fa69f4488f | |||
42c2876188 | |||
715244ff1b | |||
2333cd9095 | |||
c8225db4fe | |||
6741ca096b | |||
a897a7b3a2 | |||
0f8932e712 | |||
78023ef0fd | |||
|
d171f34e4e | ||
|
aa0dc4fa35 | ||
25f48592c0 | |||
398ac304d2 | |||
58a62f8272 | |||
86752c9a7e | |||
f9a7828d02 | |||
c97ff69148 | |||
1735bbcf8a | |||
9ae8ca65df | |||
00599cd24e | |||
6d5618a1f7 | |||
a1202a875d | |||
98946b4aa3 | |||
41b6bb77b6 | |||
e70a14ca56 | |||
b099da1156 | |||
01d1f922c2 | |||
47a80d67a8 | |||
16e3549455 | |||
be8c6b50ba | |||
a38fcf50ca | |||
82f6c7b3fe | |||
5586d2c104 | |||
62dc9fee2a | |||
ac96fca6dc | |||
25a6ceff10 | |||
b3e1d39d0f | |||
2833b7f22a | |||
cbdd305b69 | |||
b88890817e | |||
f66ab7d40b | |||
4cb3694cd5 | |||
a05d4c8bd9 | |||
22f87a74b2 | |||
ba57282879 | |||
9ccba6fba6 | |||
4f01c1166f | |||
0a51e7ad3d | |||
e541b922dc | |||
604abd5f9a | |||
7b311eae75 | |||
|
d4eb72cd99 | ||
b515215f4b | |||
a16686dfbf | |||
|
4275703941 | ||
c3342984ea | |||
ed4bdb5b33 | |||
0f0902c932 | |||
6508055b43 | |||
abc66511d8 | |||
9ed36c47b5 | |||
fd1b2a8470 | |||
8058749ab5 | |||
8737617e5f | |||
7e4f43f1e2 | |||
12b1b2afd6 | |||
0f9ac60fcd | |||
8c87f2948c | |||
e0fb817256 | |||
cdd2d94ba1 | |||
d5b7645cd2 | |||
9af5c1603e | |||
1035939309 | |||
3b542c04f6 | |||
a809b7c285 | |||
e883277400 | |||
23dfdc0933 | |||
edc24fff5b | |||
6cdccdf66b | |||
a4c9168551 | |||
821a1b7c3a | |||
b2b4256972 | |||
d2f46e4637 | |||
303fc293ba | |||
36c145da26 | |||
c822c74f42 | |||
dda4054d34 | |||
5b2546fdbc | |||
c11e3993ea | |||
02a382a99a | |||
c6c8f5cdf6 | |||
84842aed3c | |||
d9ced11cd1 | |||
25c90782dc | |||
e789c429cd | |||
93de471836 | |||
8b58e7dd13 | |||
b571bfa43d | |||
088d1c4647 | |||
f280c01802 | |||
1be10b310d | |||
a0469f3145 | |||
fcd81f03b3 | |||
76604d84d8 | |||
af822febbe | |||
8e207c3119 | |||
b6f8c8aab5 | |||
36f7cbd3e9 | |||
3b2643d949 | |||
9fd8bf1741 | |||
d5c9c5ba96 | |||
c8e27921ab | |||
6eaba07801 | |||
41929e0c72 | |||
4fcaca1a6e | |||
0e3c7f32d7 | |||
1c94625840 | |||
32f89f9dce | |||
234735a562 | |||
8b916eb854 | |||
29e1790c93 | |||
ac4c799a74 | |||
7c62883c37 | |||
02018253bf | |||
2aec884009 | |||
b3321ff030 | |||
16c1094875 | |||
5763d50409 | |||
ad43297358 | |||
b17800e0ef | |||
89c80d2997 | |||
6485b8744f | |||
a3a96b6b55 | |||
5bce3c6fdd | |||
5fa0c98d05 | |||
b166013770 | |||
02fe849046 | |||
d42393c83a | |||
c685bd622f | |||
dc83cc2194 | |||
7784f2024e | |||
4895079887 | |||
ab1ddc6dc8 | |||
87eade10cf | |||
1f3ac41b30 | |||
6a304bb330 | |||
b0642d1251 | |||
63b5139e93 | |||
e938784388 | |||
c436389426 | |||
5099e25f3f | |||
cf6fc3b8f6 | |||
f5141d0f8e | |||
5c753e7a7d | |||
17ce820cf3 | |||
5b4a3b9d7c | |||
f73997e563 | |||
437136804d | |||
e14683d21a | |||
5ae02ee0ed | |||
a2e9a3f34a | |||
bbf05e3dec | |||
d95839e5df | |||
5a303598fe | |||
db2103963e | |||
2c1105527a | |||
ed19dcb5c3 | |||
46f06c2685 | |||
d4f47e057c | |||
61712d0537 | |||
1f8f8c09e3 | |||
0522fa6215 | |||
0383a7d686 | |||
bd189984a9 | |||
58c01b2174 | |||
459558a514 | |||
721b316209 | |||
b1befa2ecc | |||
57a4cc4ab5 | |||
655e8db2b6 | |||
7cdf77cbb9 | |||
5a9aed4969 | |||
5b41f687d0 | |||
d6a62dc315 | |||
6d91788655 | |||
14785e5672 | |||
496d502cd2 | |||
7612411917 | |||
ed1402b5ec | |||
5adaee4821 | |||
2d82fe1489 | |||
783fd8129e | |||
4f29eff48e | |||
e0e7abb62b | |||
ae63a216a5 | |||
5d98295c59 | |||
0c580933f9 | |||
06f735aadd | |||
439d69d8e0 | |||
933df58712 | |||
165bbc412e | |||
6158fa072b | |||
0d3799e00d | |||
e977bed5a5 | |||
cacd5fede2 | |||
1bca99cb6a | |||
15fc367263 | |||
8bb6fb902b | |||
a57903cd5a | |||
1cd819b21d | |||
27afedc1b4 | |||
fac0a3f7eb | |||
03ca480fe8 | |||
c2915468a5 | |||
8805c53cb8 | |||
adbbe3f6cc | |||
14b694d3be | |||
72ce75c6e0 | |||
8381951168 | |||
b24032d124 | |||
8bc23f7c69 | |||
48b7371a18 | |||
61ecefb615 | |||
8ff65bf400 | |||
932057cca0 | |||
67d06cd887 | |||
cbb012a659 | |||
e4f33bcca9 | |||
fbba7c45b9 | |||
d9b6062767 | |||
d477cd1ccd | |||
f892db7dda | |||
16c1b5c506 | |||
d5ecc1c37d | |||
1b9ebd096b | |||
8619630269 | |||
2bc92556e3 | |||
f1ab823e7f | |||
8261d02cc7 | |||
8d3b8be95c | |||
60519910de | |||
0940afe41f | |||
3dc376c19f | |||
3e56ef842b | |||
5a44e3b8b9 | |||
732c2f119c | |||
81638f4b4a | |||
c547aa6422 | |||
d80980512e | |||
f9f802155d | |||
eef0955009 | |||
ec25900ac0 | |||
e5fe14a09e | |||
5dc91095f8 | |||
985ac8fc7a | |||
c9537a9963 | |||
4fd3c03804 | |||
a1e9dd0232 | |||
aa1f9b1b56 | |||
6069578b6e | |||
a84b768e24 | |||
d1a21af15d | |||
7423ae6ace | |||
3aa7ba9d96 | |||
fdbb4570be | |||
b643a0c2a9 | |||
6fa6f897aa | |||
2bfab0298d | |||
147a20385b | |||
afa18d6a2c | |||
66980eef23 | |||
65f468a30a | |||
a91c33ee4f | |||
f39482fe4c | |||
41f47b4d6b | |||
be40091102 | |||
665092be6a | |||
653cb699d0 | |||
8dbc5446ad | |||
750df4ed52 | |||
4772ae0756 | |||
23f703d5a5 | |||
6aa0ea277b | |||
780df1cd6e | |||
0b7da2e9cb | |||
01a059d26b | |||
a8dbece237 | |||
5efa00e059 | |||
02075ed1b1 | |||
fabd16ccea | |||
79928075b0 | |||
9b8eb6a197 | |||
1d263ef45a | |||
e0877add30 | |||
046cad8072 | |||
b2ce55be96 | |||
a6e9013495 | |||
14c69631a6 | |||
ccc4e42a49 | |||
d6e75fda31 | |||
fc89537f63 | |||
fd3423d03c | |||
878f77766f | |||
08001fd684 | |||
e2917d2f2e | |||
32dc58715e | |||
add0583776 | |||
6fed0e5473 | |||
a0636ac7a2 | |||
7aeb78e2f6 | |||
5cf512f2b2 | |||
7d96b0901f | |||
68e80bc066 | |||
ad971fb065 | |||
86052472bc | |||
ec30bb40fa | |||
2fa96e9793 | |||
78e44b7704 | |||
8bf9df4419 | |||
4bd54f096d | |||
877daf0a1e | |||
6d0fcc13fb | |||
f0256494fd | |||
39fa905733 | |||
c557389967 | |||
201773af50 | |||
f85e02fb0a | |||
73d98b9c0f | |||
b0ee888c82 | |||
5c4431778e | |||
ccfa213b77 | |||
22d6389d38 | |||
f53dfb0822 | |||
a966bd788d | |||
dd651adc15 | |||
ba5ae67aa7 | |||
da4a5bed09 | |||
947b521163 | |||
5674adbd5e | |||
290819de09 | |||
0d0b68a8f9 | |||
87d2357b41 | |||
e3186aebb0 | |||
1cd37e2b1b | |||
9c267f395f | |||
e2b8888130 | |||
b6ac2682f6 | |||
eddf50483f | |||
a71d65e666 | |||
9a640aed27 | |||
30b6c4680b | |||
7b6253de0f | |||
5aa3214ce5 | |||
9b70994f71 | |||
93cf341f2d | |||
01cb74c088 | |||
ec480dffad | |||
b7014cbff5 | |||
0cab921402 | |||
0e0ba1796e | |||
27d8565dc1 | |||
79dc44d707 | |||
bb6a0ad0d4 | |||
43db463ba6 | |||
9eb8ddbc40 | |||
972cba69ec | |||
962fe9529e | |||
da1b0cb1cd | |||
7f88e57e47 | |||
8865bf284f | |||
5fc2de5fcb | |||
4bae223d95 | |||
0486168b43 | |||
b64ab5c6d4 | |||
578fa5e6be | |||
4d33e78123 | |||
52ac3e4e4e | |||
8b99a98e24 | |||
cf171d5c38 | |||
6d49b4b934 | |||
b55d2a2d06 | |||
737eebf599 | |||
aef01b684c | |||
53bff61174 | |||
431a602a40 | |||
9afb81cee2 | |||
ea69b355b5 | |||
84dbc36bbf | |||
455c87b2e1 | |||
df991e3da6 | |||
13c96fd09a | |||
6f1a6a43ee | |||
e2afc09c4a | |||
e9db7cfacc | |||
755167c39a | |||
1cff93fbac | |||
6c775d6e0c | |||
876b1ab78b | |||
a321ecb1bc | |||
674c8fc37b | |||
e24652b83e | |||
5dee13c402 | |||
942a552c8e | |||
b5bd5d6126 | |||
715cf1f4f3 | |||
168bf5a358 | |||
636d17d287 | |||
294b819ff0 | |||
d763610383 | |||
2910473fec | |||
ca2d13226f | |||
95c65c981e |
@ -23,3 +23,5 @@
|
|||||||
**/values.dev.yaml
|
**/values.dev.yaml
|
||||||
LICENSE
|
LICENSE
|
||||||
README.md
|
README.md
|
||||||
|
Manga
|
||||||
|
settings
|
||||||
|
21
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
Normal file
21
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
name: Bug Report
|
||||||
|
description: File a bug report
|
||||||
|
title: "[It broke]: "
|
||||||
|
labels: ["bug"]
|
||||||
|
body:
|
||||||
|
- type: textarea
|
||||||
|
attributes:
|
||||||
|
label: What is broken?
|
||||||
|
description: What happened? How did we get here?
|
||||||
|
placeholder: The place where you tell me what you expected to happen, and what happened instead.
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
attributes:
|
||||||
|
label: Log-output
|
||||||
|
description: The output of `docker logs tranga-api`
|
||||||
|
render: C#
|
||||||
|
- type: textarea
|
||||||
|
attributes:
|
||||||
|
label: Additional stuff
|
||||||
|
description: Screenshots, anything you think might help
|
23
.github/ISSUE_TEMPLATE/new_connector.yml
vendored
Normal file
23
.github/ISSUE_TEMPLATE/new_connector.yml
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
name: New Connector Request
|
||||||
|
description: Request a new site to be added
|
||||||
|
title: "[New Connector]: "
|
||||||
|
labels: ["New Connector"]
|
||||||
|
body:
|
||||||
|
- type: input
|
||||||
|
attributes:
|
||||||
|
label: Website-Link
|
||||||
|
placeholder: https://
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: checkboxes
|
||||||
|
attributes:
|
||||||
|
label: Is the Website free to access?
|
||||||
|
description: We can't support pay-to-use sites.
|
||||||
|
options:
|
||||||
|
- label: The Website is freely accessible.
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
attributes:
|
||||||
|
label: Anything else?
|
||||||
|
validations:
|
||||||
|
required: false
|
7
.github/dependabot.yml
vendored
Normal file
7
.github/dependabot.yml
vendored
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
# Maintain dependencies for GitHub Actions
|
||||||
|
- package-ecosystem: "github-actions"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "daily"
|
45
.github/workflows/docker-image-cuttingedge.yml
vendored
Normal file
45
.github/workflows/docker-image-cuttingedge.yml
vendored
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
name: Docker Image CI
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ "cuttingedge" ]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
|
||||||
|
build:
|
||||||
|
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
# https://github.com/docker/setup-qemu-action#usage
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v3.2.0
|
||||||
|
|
||||||
|
# https://github.com/marketplace/actions/docker-setup-buildx
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
id: buildx
|
||||||
|
uses: docker/setup-buildx-action@v3.7.1
|
||||||
|
|
||||||
|
# https://github.com/docker/login-action#docker-hub
|
||||||
|
- name: Login to Docker Hub
|
||||||
|
uses: docker/login-action@v2
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
|
# https://github.com/docker/build-push-action#multi-platform-image
|
||||||
|
- name: Build and push API
|
||||||
|
uses: docker/build-push-action@v6.9.0
|
||||||
|
with:
|
||||||
|
context: ./
|
||||||
|
file: ./Dockerfile
|
||||||
|
#platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
pull: true
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
glax/tranga-api:cuttingedge
|
45
.github/workflows/docker-image-dev.yml
vendored
Normal file
45
.github/workflows/docker-image-dev.yml
vendored
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
name: Docker Image CI
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ "dev" ]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
|
||||||
|
build:
|
||||||
|
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
# https://github.com/docker/setup-qemu-action#usage
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v3.2.0
|
||||||
|
|
||||||
|
# https://github.com/marketplace/actions/docker-setup-buildx
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
id: buildx
|
||||||
|
uses: docker/setup-buildx-action@v3.7.1
|
||||||
|
|
||||||
|
# https://github.com/docker/login-action#docker-hub
|
||||||
|
- name: Login to Docker Hub
|
||||||
|
uses: docker/login-action@v2
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
|
# https://github.com/docker/build-push-action#multi-platform-image
|
||||||
|
- name: Build and push API
|
||||||
|
uses: docker/build-push-action@v6.9.0
|
||||||
|
with:
|
||||||
|
context: ./
|
||||||
|
file: ./Dockerfile
|
||||||
|
#platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
pull: true
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
glax/tranga-api:dev
|
45
.github/workflows/docker-image-master.yml
vendored
Normal file
45
.github/workflows/docker-image-master.yml
vendored
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
name: Docker Image CI
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ "master" ]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
|
||||||
|
build:
|
||||||
|
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
# https://github.com/docker/setup-qemu-action#usage
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v3.2.0
|
||||||
|
|
||||||
|
# https://github.com/marketplace/actions/docker-setup-buildx
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
id: buildx
|
||||||
|
uses: docker/setup-buildx-action@v3.7.1
|
||||||
|
|
||||||
|
# https://github.com/docker/login-action#docker-hub
|
||||||
|
- name: Login to Docker Hub
|
||||||
|
uses: docker/login-action@v2
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
|
# https://github.com/docker/build-push-action#multi-platform-image
|
||||||
|
- name: Build and push API
|
||||||
|
uses: docker/build-push-action@v6.9.0
|
||||||
|
with:
|
||||||
|
context: ./
|
||||||
|
file: ./Dockerfile
|
||||||
|
#platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
pull: true
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
glax/tranga-api:latest
|
45
.github/workflows/docker-image-serverv2.yml
vendored
Normal file
45
.github/workflows/docker-image-serverv2.yml
vendored
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
name: Docker Image CI
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ "Server-V2" ]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
|
||||||
|
build:
|
||||||
|
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
# https://github.com/docker/setup-qemu-action#usage
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v3.2.0
|
||||||
|
|
||||||
|
# https://github.com/marketplace/actions/docker-setup-buildx
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
id: buildx
|
||||||
|
uses: docker/setup-buildx-action@v3.7.1
|
||||||
|
|
||||||
|
# https://github.com/docker/login-action#docker-hub
|
||||||
|
- name: Login to Docker Hub
|
||||||
|
uses: docker/login-action@v2
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
|
# https://github.com/docker/build-push-action#multi-platform-image
|
||||||
|
- name: Build and push API
|
||||||
|
uses: docker/build-push-action@v6.9.0
|
||||||
|
with:
|
||||||
|
context: ./
|
||||||
|
file: ./Dockerfile
|
||||||
|
#platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
pull: true
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
glax/tranga-api:Server-V2
|
6
.gitignore
vendored
6
.gitignore
vendored
@ -17,3 +17,9 @@ riderModule.iml
|
|||||||
/dataSources/
|
/dataSources/
|
||||||
/dataSources.local.xml
|
/dataSources.local.xml
|
||||||
/.idea
|
/.idea
|
||||||
|
cover.jpg
|
||||||
|
cover.png
|
||||||
|
/.vscode
|
||||||
|
/Manga
|
||||||
|
/settings
|
||||||
|
*.DotSettings.user
|
@ -2,17 +2,14 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<RootNamespace>Tranga_CLI</RootNamespace>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
<LangVersion>12</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="..\.dockerignore">
|
<PackageReference Include="Spectre.Console.Cli" Version="0.47.1-preview.0.11" />
|
||||||
<Link>.dockerignore</Link>
|
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
157
CLI/Program.cs
Normal file
157
CLI/Program.cs
Normal file
@ -0,0 +1,157 @@
|
|||||||
|
using System.ComponentModel;
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
|
using Logging;
|
||||||
|
using Spectre.Console;
|
||||||
|
using Spectre.Console.Cli;
|
||||||
|
using Tranga;
|
||||||
|
|
||||||
|
var app = new CommandApp<TrangaCli>();
|
||||||
|
return app.Run(args);
|
||||||
|
|
||||||
|
internal sealed class TrangaCli : Command<TrangaCli.Settings>
|
||||||
|
{
|
||||||
|
public sealed class Settings : CommandSettings
|
||||||
|
{
|
||||||
|
[Description("Directory to which downloaded Manga are saved")]
|
||||||
|
[CommandOption("-d|--downloadLocation")]
|
||||||
|
[DefaultValue(null)]
|
||||||
|
public string? downloadLocation { get; init; }
|
||||||
|
|
||||||
|
[Description("Directory in which application-data is saved")]
|
||||||
|
[CommandOption("-w|--workingDirectory")]
|
||||||
|
[DefaultValue(null)]
|
||||||
|
public string? workingDirectory { get; init; }
|
||||||
|
|
||||||
|
[Description("Enables the file-logger")]
|
||||||
|
[CommandOption("-f")]
|
||||||
|
[DefaultValue(null)]
|
||||||
|
public bool? fileLogger { get; init; }
|
||||||
|
|
||||||
|
[Description("Path to save logfile to")]
|
||||||
|
[CommandOption("-l|--fPath")]
|
||||||
|
[DefaultValue(null)]
|
||||||
|
public string? fileLoggerPath { get; init; }
|
||||||
|
|
||||||
|
[Description("Port on which to run API on")]
|
||||||
|
[CommandOption("-p|--port")]
|
||||||
|
[DefaultValue(null)]
|
||||||
|
public int? apiPort { get; init; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public override int Execute([NotNull] CommandContext context, [NotNull] Settings settings)
|
||||||
|
{
|
||||||
|
List<Logger.LoggerType> enabledLoggers = new();
|
||||||
|
if(settings.fileLogger is true)
|
||||||
|
enabledLoggers.Add(Logger.LoggerType.FileLogger);
|
||||||
|
|
||||||
|
string? logFolderPath = settings.fileLoggerPath ?? "";
|
||||||
|
Logger logger = new(enabledLoggers.ToArray(), Console.Out, Console.OutputEncoding, logFolderPath);
|
||||||
|
|
||||||
|
if(settings.workingDirectory is not null)
|
||||||
|
TrangaSettings.LoadFromWorkingDirectory(settings.workingDirectory);
|
||||||
|
else
|
||||||
|
TrangaSettings.CreateOrUpdate();
|
||||||
|
if(settings.downloadLocation is not null)
|
||||||
|
TrangaSettings.CreateOrUpdate(downloadDirectory: settings.downloadLocation);
|
||||||
|
|
||||||
|
Tranga.Tranga? api = null;
|
||||||
|
|
||||||
|
Thread trangaApi = new Thread(() =>
|
||||||
|
{
|
||||||
|
api = new(logger);
|
||||||
|
});
|
||||||
|
trangaApi.Start();
|
||||||
|
|
||||||
|
HttpClient client = new();
|
||||||
|
|
||||||
|
bool exit = false;
|
||||||
|
while (!exit)
|
||||||
|
{
|
||||||
|
string menuSelect = AnsiConsole.Prompt(
|
||||||
|
new SelectionPrompt<string>()
|
||||||
|
.Title("Menu")
|
||||||
|
.PageSize(10)
|
||||||
|
.MoreChoicesText("Up/Down")
|
||||||
|
.AddChoices(new[]
|
||||||
|
{
|
||||||
|
"CustomRequest",
|
||||||
|
"Log",
|
||||||
|
"Exit"
|
||||||
|
}));
|
||||||
|
|
||||||
|
switch (menuSelect)
|
||||||
|
{
|
||||||
|
case "CustomRequest":
|
||||||
|
HttpMethod requestMethod = AnsiConsole.Prompt(
|
||||||
|
new SelectionPrompt<HttpMethod>()
|
||||||
|
.Title("Request Type")
|
||||||
|
.AddChoices(new[]
|
||||||
|
{
|
||||||
|
HttpMethod.Get,
|
||||||
|
HttpMethod.Delete,
|
||||||
|
HttpMethod.Post
|
||||||
|
}));
|
||||||
|
string requestPath = AnsiConsole.Prompt(
|
||||||
|
new TextPrompt<string>("Request Path:"));
|
||||||
|
List<ValueTuple<string, string>> parameters = new();
|
||||||
|
while (AnsiConsole.Confirm("Add Parameter?"))
|
||||||
|
{
|
||||||
|
string name = AnsiConsole.Ask<string>("Parameter Name:");
|
||||||
|
string value = AnsiConsole.Ask<string>("Parameter Value:");
|
||||||
|
parameters.Add(new ValueTuple<string, string>(name, value));
|
||||||
|
}
|
||||||
|
|
||||||
|
string requestString = $"http://localhost:{TrangaSettings.apiPortNumber}/{requestPath}";
|
||||||
|
if (parameters.Any())
|
||||||
|
{
|
||||||
|
requestString += "?";
|
||||||
|
foreach (ValueTuple<string, string> parameter in parameters)
|
||||||
|
requestString += $"{parameter.Item1}={parameter.Item2}&";
|
||||||
|
}
|
||||||
|
|
||||||
|
HttpRequestMessage request = new (requestMethod, requestString);
|
||||||
|
AnsiConsole.WriteLine($"Request: {request.Method} {request.RequestUri}");
|
||||||
|
HttpResponseMessage response;
|
||||||
|
if (AnsiConsole.Confirm("Send Request?"))
|
||||||
|
response = client.Send(request);
|
||||||
|
else break;
|
||||||
|
AnsiConsole.WriteLine($"Response: {(int)response.StatusCode} {response.StatusCode}");
|
||||||
|
AnsiConsole.WriteLine(response.Content.ReadAsStringAsync().Result);
|
||||||
|
break;
|
||||||
|
case "Log":
|
||||||
|
List<string> lines = logger.Tail(10).ToList();
|
||||||
|
Rows rows = new Rows(lines.Select(line => new Text(line)));
|
||||||
|
|
||||||
|
AnsiConsole.Live(rows).Start(context =>
|
||||||
|
{
|
||||||
|
bool running = true;
|
||||||
|
while (running)
|
||||||
|
{
|
||||||
|
string[] newLines = logger.GetNewLines();
|
||||||
|
if (newLines.Length > 0)
|
||||||
|
{
|
||||||
|
lines.AddRange(newLines);
|
||||||
|
rows = new Rows(lines.Select(line => new Text(line)));
|
||||||
|
context.UpdateTarget(rows);
|
||||||
|
}
|
||||||
|
Thread.Sleep(100);
|
||||||
|
if (AnsiConsole.Console.Input.IsKeyAvailable())
|
||||||
|
{
|
||||||
|
AnsiConsole.Console.Input.ReadKey(true); //Do not process input
|
||||||
|
running = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case "Exit":
|
||||||
|
exit = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (api is not null)
|
||||||
|
api.keepRunning = false;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
42
Dockerfile
Normal file
42
Dockerfile
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
# syntax=docker/dockerfile:1
|
||||||
|
ARG DOTNET=8.0
|
||||||
|
|
||||||
|
FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/runtime:$DOTNET AS base
|
||||||
|
WORKDIR /publish
|
||||||
|
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
|
||||||
|
ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y libx11-6 libx11-xcb1 libatk1.0-0 libgtk-3-0 libcups2 libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxrandr2 libgbm1 libpango-1.0-0 libcairo2 libasound2 libxshmfence1 libnss3 chromium \
|
||||||
|
&& apt-get autopurge -y \
|
||||||
|
&& apt-get autoclean -y
|
||||||
|
|
||||||
|
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:$DOTNET AS build-env
|
||||||
|
WORKDIR /src
|
||||||
|
|
||||||
|
COPY Tranga.sln /src
|
||||||
|
COPY CLI/CLI.csproj /src/CLI/CLI.csproj
|
||||||
|
COPY Logging/Logging.csproj /src/Logging/Logging.csproj
|
||||||
|
COPY Tranga/Tranga.csproj /src/Tranga/Tranga.csproj
|
||||||
|
RUN dotnet restore /src/Tranga.sln
|
||||||
|
|
||||||
|
COPY . /src/
|
||||||
|
RUN dotnet publish -c Release --property:OutputPath=/publish -maxcpucount:1
|
||||||
|
|
||||||
|
FROM --platform=$TARGETPLATFORM base AS runtime
|
||||||
|
EXPOSE 6531
|
||||||
|
ARG UNAME=tranga
|
||||||
|
ARG UID=1000
|
||||||
|
ARG GID=1000
|
||||||
|
RUN groupadd -g $GID -o $UNAME \
|
||||||
|
&& useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME \
|
||||||
|
&& mkdir /usr/share/tranga-api \
|
||||||
|
&& mkdir /Manga \
|
||||||
|
&& chown 1000:1000 /usr/share/tranga-api \
|
||||||
|
&& chown 1000:1000 /Manga
|
||||||
|
USER $UNAME
|
||||||
|
|
||||||
|
WORKDIR /publish
|
||||||
|
COPY --chown=1000:1000 --from=build-env /publish .
|
||||||
|
USER 0
|
||||||
|
ENTRYPOINT ["dotnet", "/publish/Tranga.dll"]
|
||||||
|
CMD ["-f", "-c", "-l", "/usr/share/tranga-api/logs"]
|
@ -1,26 +1,32 @@
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace Logging;
|
namespace Logging;
|
||||||
|
|
||||||
public class FileLogger : LoggerBase
|
public class FileLogger : LoggerBase
|
||||||
{
|
{
|
||||||
private string logFilePath { get; }
|
internal string logFilePath { get; }
|
||||||
|
private const int MaxNumberOfLogFiles = 5;
|
||||||
|
|
||||||
public FileLogger(string logFilePath, TextWriter? stdOut, Encoding? encoding = null) : base (stdOut, encoding)
|
public FileLogger(string logFilePath, Encoding? encoding = null) : base (encoding)
|
||||||
{
|
{
|
||||||
this.logFilePath = logFilePath;
|
this.logFilePath = logFilePath;
|
||||||
|
|
||||||
|
DirectoryInfo dir = Directory.CreateDirectory(new FileInfo(logFilePath).DirectoryName!);
|
||||||
|
|
||||||
|
//Remove oldest logfile if more than MaxNumberOfLogFiles
|
||||||
|
for (int fileCount = dir.EnumerateFiles().Count(); fileCount > MaxNumberOfLogFiles - 1; fileCount--) //-1 because we create own logfile later
|
||||||
|
File.Delete(dir.EnumerateFiles().MinBy(file => file.LastWriteTime)!.FullName);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void Write(LogMessage logMessage)
|
protected override void Write(LogMessage logMessage)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
File.AppendAllText(logFilePath, logMessage.ToString());
|
File.AppendAllText(logFilePath, logMessage.formattedMessage);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
stdOut?.WriteLine(e);
|
// ignored
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -4,14 +4,14 @@ namespace Logging;
|
|||||||
|
|
||||||
public class FormattedConsoleLogger : LoggerBase
|
public class FormattedConsoleLogger : LoggerBase
|
||||||
{
|
{
|
||||||
|
private readonly TextWriter _stdOut;
|
||||||
public FormattedConsoleLogger(TextWriter? stdOut, Encoding? encoding = null) : base(stdOut, encoding)
|
public FormattedConsoleLogger(TextWriter stdOut, Encoding? encoding = null) : base(encoding)
|
||||||
{
|
{
|
||||||
|
this._stdOut = stdOut;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void Write(LogMessage message)
|
protected override void Write(LogMessage message)
|
||||||
{
|
{
|
||||||
//Nothing to do yet
|
this._stdOut.Write(message.formattedMessage);
|
||||||
}
|
}
|
||||||
}
|
}
|
23
Logging/LogMessage.cs
Normal file
23
Logging/LogMessage.cs
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
namespace Logging;
|
||||||
|
|
||||||
|
public readonly struct LogMessage
|
||||||
|
{
|
||||||
|
public DateTime logTime { get; }
|
||||||
|
public string caller { get; }
|
||||||
|
public string value { get; }
|
||||||
|
public string formattedMessage => ToString();
|
||||||
|
|
||||||
|
public LogMessage(DateTime messageTime, string caller, string value)
|
||||||
|
{
|
||||||
|
this.logTime = messageTime;
|
||||||
|
this.caller = caller;
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
string dateTimeString = $"{logTime.ToShortDateString()} {logTime.ToLongTimeString()}.{logTime.Millisecond,-3}";
|
||||||
|
string name = caller.Split(new char[] { '.', '+' }).Last();
|
||||||
|
return $"[{dateTimeString}] {name.Substring(0, name.Length >= 13 ? 13 : name.Length),13} | {value}";
|
||||||
|
}
|
||||||
|
}
|
@ -1,10 +1,14 @@
|
|||||||
using System.Net.Mime;
|
using System.Runtime.InteropServices;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
namespace Logging;
|
namespace Logging;
|
||||||
|
|
||||||
public class Logger : TextWriter
|
public class Logger : TextWriter
|
||||||
{
|
{
|
||||||
|
private static readonly string LogDirectoryPath = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
|
||||||
|
? "/var/log/tranga-api"
|
||||||
|
: Path.Join(Directory.GetCurrentDirectory(), "logs");
|
||||||
|
public string? logFilePath => _fileLogger?.logFilePath;
|
||||||
public override Encoding Encoding { get; }
|
public override Encoding Encoding { get; }
|
||||||
public enum LoggerType
|
public enum LoggerType
|
||||||
{
|
{
|
||||||
@ -12,24 +16,34 @@ public class Logger : TextWriter
|
|||||||
ConsoleLogger
|
ConsoleLogger
|
||||||
}
|
}
|
||||||
|
|
||||||
private FileLogger? _fileLogger;
|
private readonly FileLogger? _fileLogger;
|
||||||
private FormattedConsoleLogger? _formattedConsoleLogger;
|
private readonly FormattedConsoleLogger? _formattedConsoleLogger;
|
||||||
private MemoryLogger _memoryLogger;
|
private readonly MemoryLogger _memoryLogger;
|
||||||
private TextWriter? stdOut;
|
|
||||||
|
|
||||||
public Logger(LoggerType[] enabledLoggers, TextWriter? stdOut, Encoding? encoding, string? logFilePath)
|
public Logger(LoggerType[] enabledLoggers, TextWriter? stdOut, Encoding? encoding, string? logFolderPath)
|
||||||
{
|
{
|
||||||
this.Encoding = encoding ?? Encoding.ASCII;
|
this.Encoding = encoding ?? Encoding.UTF8;
|
||||||
this.stdOut = stdOut ?? null;
|
DateTime now = DateTime.Now;
|
||||||
if (enabledLoggers.Contains(LoggerType.FileLogger) && logFilePath is not null)
|
if(enabledLoggers.Contains(LoggerType.FileLogger) && (logFolderPath is null || logFolderPath == ""))
|
||||||
_fileLogger = new FileLogger(logFilePath, null, encoding);
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
_fileLogger = null;
|
string filePath = Path.Join(LogDirectoryPath,
|
||||||
throw new ArgumentException($"logFilePath can not be null for LoggerType {LoggerType.FileLogger}");
|
$"{now.ToShortDateString()}_{now.Hour}-{now.Minute}-{now.Second}.log");
|
||||||
|
_fileLogger = new FileLogger(filePath, encoding);
|
||||||
|
}else if (enabledLoggers.Contains(LoggerType.FileLogger) && logFolderPath is not null)
|
||||||
|
_fileLogger = new FileLogger(Path.Join(logFolderPath, $"{now.ToShortDateString()}_{now.Hour}-{now.Minute}-{now.Second}.log") , encoding);
|
||||||
|
|
||||||
|
|
||||||
|
if (enabledLoggers.Contains(LoggerType.ConsoleLogger) && stdOut is not null)
|
||||||
|
{
|
||||||
|
_formattedConsoleLogger = new FormattedConsoleLogger(stdOut, encoding);
|
||||||
}
|
}
|
||||||
_formattedConsoleLogger = enabledLoggers.Contains(LoggerType.ConsoleLogger) ? new FormattedConsoleLogger(null, encoding) : null;
|
else if (enabledLoggers.Contains(LoggerType.ConsoleLogger) && stdOut is null)
|
||||||
_memoryLogger = new MemoryLogger(null, encoding);
|
{
|
||||||
|
_formattedConsoleLogger = null;
|
||||||
|
throw new ArgumentException($"stdOut can not be null for LoggerType {LoggerType.ConsoleLogger}");
|
||||||
|
}
|
||||||
|
_memoryLogger = new MemoryLogger(encoding);
|
||||||
|
WriteLine(GetType().ToString(), $"Logfile: {logFilePath}");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void WriteLine(string caller, string? value)
|
public void WriteLine(string caller, string? value)
|
||||||
@ -46,13 +60,21 @@ public class Logger : TextWriter
|
|||||||
|
|
||||||
_fileLogger?.Write(caller, value);
|
_fileLogger?.Write(caller, value);
|
||||||
_formattedConsoleLogger?.Write(caller, value);
|
_formattedConsoleLogger?.Write(caller, value);
|
||||||
|
|
||||||
_memoryLogger.Write(caller, value);
|
_memoryLogger.Write(caller, value);
|
||||||
stdOut?.Write(value);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public string[] Tail(uint? lines)
|
public string[] Tail(uint? lines)
|
||||||
{
|
{
|
||||||
return _memoryLogger.Tail(lines);
|
return _memoryLogger.Tail(lines);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string[] GetNewLines()
|
||||||
|
{
|
||||||
|
return _memoryLogger.GetNewLines();
|
||||||
|
}
|
||||||
|
|
||||||
|
public string[] GetLog()
|
||||||
|
{
|
||||||
|
return _memoryLogger.GetLogMessages();
|
||||||
|
}
|
||||||
}
|
}
|
@ -5,21 +5,10 @@ namespace Logging;
|
|||||||
public abstract class LoggerBase : TextWriter
|
public abstract class LoggerBase : TextWriter
|
||||||
{
|
{
|
||||||
public override Encoding Encoding { get; }
|
public override Encoding Encoding { get; }
|
||||||
protected TextWriter? stdOut { get; }
|
|
||||||
|
|
||||||
public LoggerBase(TextWriter? stdOut, Encoding? encoding = null)
|
public LoggerBase(Encoding? encoding = null)
|
||||||
{
|
{
|
||||||
this.Encoding = encoding ?? Encoding.ASCII;
|
this.Encoding = encoding ?? Encoding.ASCII;
|
||||||
this.stdOut = stdOut;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void WriteLine(string caller, string? value)
|
|
||||||
{
|
|
||||||
value = value is null ? Environment.NewLine : string.Join(value, Environment.NewLine);
|
|
||||||
|
|
||||||
LogMessage message = new LogMessage(DateTime.Now, caller, value);
|
|
||||||
|
|
||||||
Write(message);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Write(string caller, string? value)
|
public void Write(string caller, string? value)
|
||||||
@ -27,32 +16,10 @@ public abstract class LoggerBase : TextWriter
|
|||||||
if (value is null)
|
if (value is null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
LogMessage message = new LogMessage(DateTime.Now, caller, value);
|
LogMessage message = new (DateTime.Now, caller, value);
|
||||||
|
|
||||||
stdOut?.Write(message.ToString());
|
|
||||||
|
|
||||||
Write(message);
|
Write(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract void Write(LogMessage message);
|
protected abstract void Write(LogMessage message);
|
||||||
|
|
||||||
public class LogMessage
|
|
||||||
{
|
|
||||||
public DateTime logTime { get; }
|
|
||||||
public string caller { get; }
|
|
||||||
public string value { get; }
|
|
||||||
|
|
||||||
public LogMessage(DateTime now, string caller, string value)
|
|
||||||
{
|
|
||||||
this.logTime = now;
|
|
||||||
this.caller = caller;
|
|
||||||
this.value = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string ToString()
|
|
||||||
{
|
|
||||||
string dateTimeString = $"{logTime.ToShortDateString()} {logTime.ToLongTimeString()}";
|
|
||||||
return $"[{dateTimeString}] {caller,30} | {value}";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
@ -1,9 +1,10 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
<LangVersion>12</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -4,36 +4,71 @@ namespace Logging;
|
|||||||
|
|
||||||
public class MemoryLogger : LoggerBase
|
public class MemoryLogger : LoggerBase
|
||||||
{
|
{
|
||||||
private SortedList<DateTime, LogMessage> logMessages = new();
|
private readonly SortedList<DateTime, LogMessage> _logMessages = new();
|
||||||
|
private int _lastLogMessageIndex = 0;
|
||||||
|
|
||||||
public MemoryLogger(TextWriter? stdOut, Encoding? encoding = null) : base(stdOut, encoding)
|
public MemoryLogger(Encoding? encoding = null) : base(encoding)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void Write(LogMessage value)
|
protected override void Write(LogMessage value)
|
||||||
{
|
{
|
||||||
logMessages.Add(value.logTime, value);
|
lock (_logMessages)
|
||||||
|
{
|
||||||
|
_logMessages.Add(DateTime.Now, value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public string[] GetLogMessage()
|
public string[] GetLogMessages()
|
||||||
{
|
{
|
||||||
return Tail(Convert.ToUInt32(logMessages.Count));
|
return Tail(Convert.ToUInt32(_logMessages.Count));
|
||||||
}
|
}
|
||||||
|
|
||||||
public string[] Tail(uint? length)
|
public string[] Tail(uint? length)
|
||||||
{
|
{
|
||||||
int retLength;
|
int retLength;
|
||||||
if (length is null || length > logMessages.Count)
|
if (length is null || length > _logMessages.Count)
|
||||||
retLength = logMessages.Count;
|
retLength = _logMessages.Count;
|
||||||
else
|
else
|
||||||
retLength = (int)length;
|
retLength = (int)length;
|
||||||
|
|
||||||
string[] ret = new string[retLength];
|
string[] ret = new string[retLength];
|
||||||
|
|
||||||
for (int logMessageIndex = logMessages.Count - retLength; logMessageIndex < logMessages.Count; logMessageIndex++)
|
for (int retIndex = 0; retIndex < ret.Length; retIndex++)
|
||||||
ret[logMessageIndex + retLength - logMessages.Count] = logMessages.GetValueAtIndex(logMessageIndex).ToString();
|
{
|
||||||
|
lock (_logMessages)
|
||||||
|
{
|
||||||
|
ret[retIndex] = _logMessages.GetValueAtIndex(_logMessages.Count - retLength + retIndex).ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_lastLogMessageIndex = _logMessages.Count - 1;
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string[] GetNewLines()
|
||||||
|
{
|
||||||
|
int logMessageCount = _logMessages.Count;
|
||||||
|
List<string> ret = new();
|
||||||
|
|
||||||
|
int retIndex = 0;
|
||||||
|
for (; retIndex < logMessageCount - _lastLogMessageIndex; retIndex++)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
lock(_logMessages)
|
||||||
|
{
|
||||||
|
ret.Add(_logMessages.GetValueAtIndex(_lastLogMessageIndex + retIndex).ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (NullReferenceException)//Called when LogMessage has not finished writing
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_lastLogMessageIndex = _lastLogMessageIndex + retIndex;
|
||||||
|
return ret.ToArray();
|
||||||
|
}
|
||||||
}
|
}
|
89
README.md
89
README.md
@ -1,12 +1,3 @@
|
|||||||
<!-- PROJECT SHIELDS -->
|
|
||||||
<!--
|
|
||||||
*** I'm using markdown "reference style" links for readability.
|
|
||||||
*** Reference links are enclosed in brackets [ ] instead of parentheses ( ).
|
|
||||||
*** See the bottom of this document for the declaration of the reference variables
|
|
||||||
*** for contributors-url, forks-url, etc. This is an optional, concise syntax you may use.
|
|
||||||
*** https://www.markdownguide.org/basic-syntax/#reference-style-links
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- PROJECT LOGO -->
|
<!-- PROJECT LOGO -->
|
||||||
<br />
|
<br />
|
||||||
<div align="center">
|
<div align="center">
|
||||||
@ -16,10 +7,11 @@
|
|||||||
<p align="center">
|
<p align="center">
|
||||||
Automatic Manga and Metadata downloader
|
Automatic Manga and Metadata downloader
|
||||||
</p>
|
</p>
|
||||||
|
<p align="center">
|
||||||
|
This is the API for <a href="https://github.com/C9Glax/tranga-website">Tranga-Website</a>
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- TABLE OF CONTENTS -->
|
<!-- TABLE OF CONTENTS -->
|
||||||
<details>
|
<details>
|
||||||
<summary>Table of Contents</summary>
|
<summary>Table of Contents</summary>
|
||||||
@ -33,6 +25,7 @@
|
|||||||
<li>
|
<li>
|
||||||
<a href="#getting-started">Getting Started</a>
|
<a href="#getting-started">Getting Started</a>
|
||||||
<ul>
|
<ul>
|
||||||
|
<li><a href="#prerequisites">Usage</a></li>
|
||||||
<li><a href="#prerequisites">Prerequisites</a></li>
|
<li><a href="#prerequisites">Prerequisites</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
@ -48,54 +41,88 @@
|
|||||||
<!-- ABOUT THE PROJECT -->
|
<!-- ABOUT THE PROJECT -->
|
||||||
## About The Project
|
## About The Project
|
||||||
|
|
||||||
Tranga can download Chapters and Metadata from Scanlation sites such as
|
Tranga can download Chapters and Metadata from "Scanlation" sites such as
|
||||||
|
|
||||||
- [MangaDex.org](https://mangadex.org/)
|
- [MangaDex.org](https://mangadex.org/) (Multilingual)
|
||||||
|
- [Manganato.com](https://manganato.com/) (en)
|
||||||
|
- [Mangasee.com](https://mangasee123.com/) (en)
|
||||||
|
- [MangaKatana.com](https://mangakatana.com) (en)
|
||||||
|
- [Mangaworld.bz](https://www.mangaworld.bz/) (it)
|
||||||
|
- [Bato.to](https://bato.to/v3x) (en)
|
||||||
|
- [Manga4Life](https://manga4life.com) (en)
|
||||||
|
- [ManhuaPlus](https://manhuaplus.org/) (en)
|
||||||
|
- [MangaHere](https://www.mangahere.cc/) (en) (Their covers aren't scrapeable.)
|
||||||
|
- ❓ Open an [issue](https://github.com/C9Glax/tranga/issues/new?assignees=&labels=New+Connector&projects=&template=new_connector.yml&title=%5BNew+Connector%5D%3A+)
|
||||||
|
|
||||||
|
and trigger a library-scan with [Komga](https://komga.org/) and [Kavita](https://www.kavitareader.com/).
|
||||||
|
Notifications can be sent to your devices using [Gotify](https://gotify.net/), [LunaSea](https://www.lunasea.app/) or [Ntfy](https://ntfy.sh/
|
||||||
|
).
|
||||||
|
|
||||||
|
### What this does and doesn't do
|
||||||
|
|
||||||
|
Tranga (this git-repo) will open a port (standard 6531) and listen for requests to add Jobs to Monitor and/or download specific Manga.
|
||||||
|
The configuration is all done through HTTP-Requests.
|
||||||
|
_**For a web-frontend use [tranga-website](https://github.com/C9Glax/tranga-website).**_
|
||||||
|
|
||||||
|
This project downloads the images for a Manga from the specified Scanlation-Website and packages them with some metadata - from that same website - in a .cbz-archive (per chapter).
|
||||||
|
It does this on an interval, and checks for any Chapters (.cbz-Archive) not already existing in your specified Download-Location. (If you rename or move files, it will download those again)
|
||||||
|
Tranga can (if configured) trigger a scan in Komga or Kavita, however the directory in which the Manga reside has to be available to both Tranga and Komga/Kavita.
|
||||||
|
|
||||||
|
The project doesn't manage metadata, and doesn't curate, change or enhance any information that isn't available on the selected Scanlation-Site.
|
||||||
|
It will blindly use whatever is scrapes (yes this is a glorified Web-scraper).
|
||||||
|
|
||||||
and automatically start updates in [Komga](https://komga.org/) to import them.
|
|
||||||
|
|
||||||
### Inspiration:
|
### Inspiration:
|
||||||
|
|
||||||
Because [Kaizoku](https://github.com/oae/kaizoku) was relying on [mangal](https://github.com/metafates/mangal) and mangal
|
Because [Kaizoku](https://github.com/oae/kaizoku) was relying on [mangal](https://github.com/metafates/mangal) and mangal
|
||||||
hasn't received bugfixes for it's issues with Titles not showing up, or throwing errors because of illegal characters,
|
hasn't received bugfixes for its issues with Titles not showing up, or throwing errors because of illegal characters,
|
||||||
there were no alternatives for automatic downloads. However [Kaizoku](https://github.com/oae/kaizoku) certainly had a great Web-UI.
|
there were no alternatives for automatic downloads. However, [Kaizoku](https://github.com/oae/kaizoku) certainly had a great Web-UI.
|
||||||
|
|
||||||
That is why I wanted to create my own project, in a language I understand, and that I am able to maintain myself.
|
That is why I wanted to create my own project, in a language I understand, and that I am able to maintain myself.
|
||||||
|
|
||||||
<p align="right">(<a href="#readme-top">back to top</a>)</p>
|
<p align="right">(<a href="#readme-top">back to top</a>)</p>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### Built With
|
### Built With
|
||||||
|
|
||||||
- .NET-Core
|
- .NET-Core
|
||||||
- Newtonsoft.JSON
|
- Newtonsoft.JSON
|
||||||
- Love <3
|
- [PuppeteerSharp](https://www.puppeteersharp.com/)
|
||||||
|
- [Html Agility Pack (HAP)](https://html-agility-pack.net/)
|
||||||
|
- [Soenneker.Utils.String.NeedlemanWunsch](https://github.com/soenneker/soenneker.utils.string.needlemanwunsch)
|
||||||
|
- 💙 Blåhaj 🦈
|
||||||
|
|
||||||
<p align="right">(<a href="#readme-top">back to top</a>)</p>
|
<p align="right">(<a href="#readme-top">back to top</a>)</p>
|
||||||
|
|
||||||
|
## Star History
|
||||||
|
|
||||||
|
<a href="https://star-history.com/#c9glax/tranga&Date">
|
||||||
|
<picture>
|
||||||
|
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=c9glax/tranga&type=Date&theme=dark" />
|
||||||
|
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=c9glax/tranga&type=Date" />
|
||||||
|
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=c9glax/tranga&type=Date" />
|
||||||
|
</picture>
|
||||||
|
</a>
|
||||||
|
|
||||||
<!-- GETTING STARTED -->
|
<!-- GETTING STARTED -->
|
||||||
## Getting Started
|
## Getting Started
|
||||||
|
|
||||||
To use head over to [releases](https://git.bernloehr.eu/glax/Tranga/releases) and download a release.
|
### Docker
|
||||||
|
|
||||||
A CLI will guide you through setup.
|
Download [docker-compose.yaml](https://git.bernloehr.eu/glax/Tranga/src/branch/master/docker-compose.yaml) and configure to your needs.
|
||||||
|
Mount `/Manga` to wherever you want your chapters (`.cbz`-Archives) downloaded (where Komga/Kavita can access them).
|
||||||
|
The `docker-compose` also includes [tranga-website](https://github.com/C9Glax/tranga-website) as frontend. For its configuration refer to the repo README.
|
||||||
|
|
||||||
|
For compatibility do not execute the compose as root (which you should not do anyways...) but as user that can
|
||||||
|
access the folder.
|
||||||
|
|
||||||
### Prerequisites
|
### Prerequisites
|
||||||
|
|
||||||
[.NET-Core 7.0](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)
|
#### To Build
|
||||||
|
[.NET-Core 8.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
|
||||||
|
#### To Run
|
||||||
|
[.NET-Core 8.0 Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) scroll down a bit, should be on the right the second item.
|
||||||
|
|
||||||
<!-- ROADMAP -->
|
See the [open issues](https://github.com/C9Glax/tranga/issues) for a full list of proposed features (and known issues).
|
||||||
## Roadmap
|
|
||||||
|
|
||||||
- [ ] Web-UI #1
|
|
||||||
- [ ] More Connectors
|
|
||||||
- [ ] Manganato #2
|
|
||||||
- [ ] ?
|
|
||||||
|
|
||||||
See the [open issues](https://git.bernloehr.eu/glax/Tranga/issues) for a full list of proposed features (and known issues).
|
|
||||||
|
|
||||||
<p align="right">(<a href="#readme-top">back to top</a>)</p>
|
<p align="right">(<a href="#readme-top">back to top</a>)</p>
|
||||||
|
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
|
|
||||||
WORKDIR /app
|
|
||||||
EXPOSE 80
|
|
||||||
EXPOSE 443
|
|
||||||
|
|
||||||
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
|
|
||||||
WORKDIR /src
|
|
||||||
COPY ["Tranga-API/Tranga-API.csproj", "Tranga-API/"]
|
|
||||||
RUN dotnet restore "Tranga-API/Tranga-API.csproj"
|
|
||||||
COPY . .
|
|
||||||
WORKDIR "/src/Tranga-API"
|
|
||||||
RUN dotnet build "Tranga-API.csproj" -c Release -o /app/build
|
|
||||||
|
|
||||||
FROM build AS publish
|
|
||||||
RUN dotnet publish "Tranga-API.csproj" -c Release -o /app/publish /p:UseAppHost=false
|
|
||||||
|
|
||||||
FROM base AS final
|
|
||||||
WORKDIR /app
|
|
||||||
COPY --from=publish /app/publish .
|
|
||||||
ENTRYPOINT ["dotnet", "Tranga-API.dll"]
|
|
@ -1,81 +0,0 @@
|
|||||||
using System.Text.Json;
|
|
||||||
using Tranga;
|
|
||||||
|
|
||||||
TaskManager taskManager = new (Directory.GetCurrentDirectory());
|
|
||||||
var builder = WebApplication.CreateBuilder(args);
|
|
||||||
var app = builder.Build();
|
|
||||||
|
|
||||||
app.MapGet("/GetConnectors", () => JsonSerializer.Serialize(taskManager.GetAvailableConnectors().Values.ToArray()));
|
|
||||||
|
|
||||||
app.MapGet("/GetPublications", (string connectorName, string? publicationName) =>
|
|
||||||
{
|
|
||||||
Connector connector = taskManager.GetConnector(connectorName);
|
|
||||||
|
|
||||||
Publication[] publications;
|
|
||||||
if (publicationName is not null)
|
|
||||||
publications = connector.GetPublications(publicationName);
|
|
||||||
else
|
|
||||||
publications = connector.GetPublications();
|
|
||||||
|
|
||||||
return JsonSerializer.Serialize(publications);
|
|
||||||
});
|
|
||||||
|
|
||||||
app.MapGet("/ListTasks", () => JsonSerializer.Serialize(taskManager.GetAllTasks()));
|
|
||||||
|
|
||||||
app.MapGet("/CreateTask",
|
|
||||||
(TrangaTask.Task task, string? connectorName, string? publicationName, TimeSpan reoccurrence, string? language) =>
|
|
||||||
{
|
|
||||||
switch (task)
|
|
||||||
{
|
|
||||||
case TrangaTask.Task.UpdateKomgaLibrary:
|
|
||||||
taskManager.AddTask(TrangaTask.Task.UpdateKomgaLibrary, null, null, reoccurrence);
|
|
||||||
break;
|
|
||||||
case TrangaTask.Task.DownloadNewChapters:
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Connector connector = taskManager.GetConnector(connectorName);
|
|
||||||
|
|
||||||
Publication[] publications;
|
|
||||||
if (publicationName is not null)
|
|
||||||
publications = connector.GetPublications(publicationName);
|
|
||||||
else
|
|
||||||
publications = connector.GetPublications();
|
|
||||||
|
|
||||||
Publication? publication = publications.FirstOrDefault(pub => pub.downloadUrl == publicationName);
|
|
||||||
if (publication is null)
|
|
||||||
JsonSerializer.Serialize($"Publication {publicationName} is unknown.");
|
|
||||||
taskManager.AddTask(TrangaTask.Task.DownloadNewChapters, connectorName, publication, reoccurrence, language ?? "");
|
|
||||||
return JsonSerializer.Serialize("Success");
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
return JsonSerializer.Serialize(e.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
default: return JsonSerializer.Serialize("Not Implemented");
|
|
||||||
}
|
|
||||||
|
|
||||||
return JsonSerializer.Serialize("Not Implemented");
|
|
||||||
});
|
|
||||||
|
|
||||||
app.MapGet("/RemoveTask", (TrangaTask.Task task, string? connectorName, string? publicationName) =>
|
|
||||||
{
|
|
||||||
switch (task)
|
|
||||||
{
|
|
||||||
case TrangaTask.Task.UpdateKomgaLibrary:
|
|
||||||
taskManager.RemoveTask(TrangaTask.Task.UpdateKomgaLibrary, null, null);
|
|
||||||
return JsonSerializer.Serialize("Success");
|
|
||||||
case TrangaTask.Task.DownloadNewChapters:
|
|
||||||
Publication? publication = taskManager.GetAllPublications().FirstOrDefault(pub => pub.downloadUrl == publicationName);
|
|
||||||
if (publication is null)
|
|
||||||
JsonSerializer.Serialize($"Publication {publicationName} is unknown.");
|
|
||||||
|
|
||||||
taskManager.RemoveTask(TrangaTask.Task.DownloadNewChapters, connectorName, publication);
|
|
||||||
|
|
||||||
return JsonSerializer.Serialize("Success");
|
|
||||||
|
|
||||||
default: return JsonSerializer.Serialize("Not Implemented");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.Run();
|
|
@ -1,37 +0,0 @@
|
|||||||
{
|
|
||||||
"iisSettings": {
|
|
||||||
"windowsAuthentication": false,
|
|
||||||
"anonymousAuthentication": true,
|
|
||||||
"iisExpress": {
|
|
||||||
"applicationUrl": "http://localhost:14826",
|
|
||||||
"sslPort": 44333
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"profiles": {
|
|
||||||
"http": {
|
|
||||||
"commandName": "Project",
|
|
||||||
"dotnetRunMessages": true,
|
|
||||||
"launchBrowser": true,
|
|
||||||
"applicationUrl": "http://localhost:5119",
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"https": {
|
|
||||||
"commandName": "Project",
|
|
||||||
"dotnetRunMessages": true,
|
|
||||||
"launchBrowser": true,
|
|
||||||
"applicationUrl": "https://localhost:7070;http://localhost:5119",
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"IIS Express": {
|
|
||||||
"commandName": "IISExpress",
|
|
||||||
"launchBrowser": true,
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,21 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<RootNamespace>Tranga_API</RootNamespace>
|
|
||||||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Content Include="..\.dockerignore">
|
|
||||||
<Link>.dockerignore</Link>
|
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\Tranga\Tranga.csproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"Logging": {
|
|
||||||
"LogLevel": {
|
|
||||||
"Default": "Information",
|
|
||||||
"Microsoft.AspNetCore": "Warning"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
"Logging": {
|
|
||||||
"LogLevel": {
|
|
||||||
"Default": "Information",
|
|
||||||
"Microsoft.AspNetCore": "Warning"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"AllowedHosts": "*"
|
|
||||||
}
|
|
@ -1 +0,0 @@
|
|||||||
[{"reoccurrence":"00:00:00","lastExecuted":"2023-05-19T17:34:40.5349215+02:00","connectorName":"MangaDex","task":0,"publication":{"sortName":null,"description":null,"tags":null,"posterUrl":null,"year":null,"originalLanguage":null,"status":null,"folderName":null,"downloadUrl":null},"language":"en"}]
|
|
@ -1,18 +0,0 @@
|
|||||||
FROM mcr.microsoft.com/dotnet/runtime:7.0 AS base
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
|
|
||||||
WORKDIR /src
|
|
||||||
COPY ["Tranga-CLI/Tranga-CLI.csproj", "Tranga-CLI/"]
|
|
||||||
RUN dotnet restore "Tranga-CLI/Tranga-CLI.csproj"
|
|
||||||
COPY . .
|
|
||||||
WORKDIR "/src/Tranga-CLI"
|
|
||||||
RUN dotnet build "Tranga-CLI.csproj" -c Release -o /app/build
|
|
||||||
|
|
||||||
FROM build AS publish
|
|
||||||
RUN dotnet publish "Tranga-CLI.csproj" -c Release -o /app/publish /p:UseAppHost=false
|
|
||||||
|
|
||||||
FROM base AS final
|
|
||||||
WORKDIR /app
|
|
||||||
COPY --from=publish /app/publish .
|
|
||||||
ENTRYPOINT ["dotnet", "Tranga-CLI.dll"]
|
|
@ -1,471 +0,0 @@
|
|||||||
using System.Globalization;
|
|
||||||
using Logging;
|
|
||||||
using Tranga;
|
|
||||||
|
|
||||||
namespace Tranga_CLI;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is written with pure hatred for readability.
|
|
||||||
* At some point do this properly.
|
|
||||||
* Read at own risk.
|
|
||||||
*/
|
|
||||||
|
|
||||||
public static class Tranga_Cli
|
|
||||||
{
|
|
||||||
public static void Main(string[] args)
|
|
||||||
{
|
|
||||||
Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, null,
|
|
||||||
Path.Join(Directory.GetCurrentDirectory(), $"log-{DateTime.Now:dd-M-yyyy-HH-mm-ss}.txt"));
|
|
||||||
|
|
||||||
logger.WriteLine("Tranga_CLI", "Loading Settings.");
|
|
||||||
TaskManager.SettingsData settings;
|
|
||||||
string settingsPath = Path.Join(Directory.GetCurrentDirectory(), "data.json");
|
|
||||||
if (File.Exists(settingsPath))
|
|
||||||
settings = TaskManager.LoadData(Directory.GetCurrentDirectory());
|
|
||||||
else
|
|
||||||
settings = new TaskManager.SettingsData(Directory.GetCurrentDirectory(), null, new HashSet<TrangaTask>());
|
|
||||||
|
|
||||||
|
|
||||||
logger.WriteLine("Tranga_CLI", "User Input");
|
|
||||||
Console.WriteLine($"Output folder path [{settings.downloadLocation}]:");
|
|
||||||
string? tmpPath = Console.ReadLine();
|
|
||||||
while(tmpPath is null)
|
|
||||||
tmpPath = Console.ReadLine();
|
|
||||||
if(tmpPath.Length > 0)
|
|
||||||
settings.downloadLocation = tmpPath;
|
|
||||||
|
|
||||||
Console.WriteLine($"Komga BaseURL [{settings.komga?.baseUrl}]:");
|
|
||||||
string? tmpUrl = Console.ReadLine();
|
|
||||||
while (tmpUrl is null)
|
|
||||||
tmpUrl = Console.ReadLine();
|
|
||||||
if (tmpUrl.Length > 0)
|
|
||||||
{
|
|
||||||
Console.WriteLine("Username:");
|
|
||||||
string? tmpUser = Console.ReadLine();
|
|
||||||
while (tmpUser is null || tmpUser.Length < 1)
|
|
||||||
tmpUser = Console.ReadLine();
|
|
||||||
|
|
||||||
Console.WriteLine("Password:");
|
|
||||||
string tmpPass = string.Empty;
|
|
||||||
ConsoleKey key;
|
|
||||||
do
|
|
||||||
{
|
|
||||||
var keyInfo = Console.ReadKey(intercept: true);
|
|
||||||
key = keyInfo.Key;
|
|
||||||
|
|
||||||
if (key == ConsoleKey.Backspace && tmpPass.Length > 0)
|
|
||||||
{
|
|
||||||
Console.Write("\b \b");
|
|
||||||
tmpPass = tmpPass[0..^1];
|
|
||||||
}
|
|
||||||
else if (!char.IsControl(keyInfo.KeyChar))
|
|
||||||
{
|
|
||||||
Console.Write("*");
|
|
||||||
tmpPass += keyInfo.KeyChar;
|
|
||||||
}
|
|
||||||
} while (key != ConsoleKey.Enter);
|
|
||||||
|
|
||||||
settings.komga = new Komga(tmpUrl, tmpUser, tmpPass, logger);
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.WriteLine("Tranga_CLI", "Loaded.");
|
|
||||||
TaskMode(settings, logger);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void TaskMode(TaskManager.SettingsData settings, Logger logger)
|
|
||||||
{
|
|
||||||
TaskManager taskManager = new (settings, logger);
|
|
||||||
ConsoleKey selection = PrintMenu(taskManager, settings.downloadLocation, logger);
|
|
||||||
while (selection != ConsoleKey.Q)
|
|
||||||
{
|
|
||||||
switch (selection)
|
|
||||||
{
|
|
||||||
case ConsoleKey.L:
|
|
||||||
PrintTasks(taskManager.GetAllTasks(), logger);
|
|
||||||
Console.WriteLine("Press any key.");
|
|
||||||
Console.ReadKey();
|
|
||||||
break;
|
|
||||||
case ConsoleKey.C:
|
|
||||||
CreateTask(taskManager, settings, logger);
|
|
||||||
Console.WriteLine("Press any key.");
|
|
||||||
Console.ReadKey();
|
|
||||||
break;
|
|
||||||
case ConsoleKey.D:
|
|
||||||
RemoveTask (taskManager, logger);
|
|
||||||
Console.WriteLine("Press any key.");
|
|
||||||
Console.ReadKey();
|
|
||||||
break;
|
|
||||||
case ConsoleKey.E:
|
|
||||||
ExecuteTaskNow(taskManager, logger);
|
|
||||||
Console.WriteLine("Press any key.");
|
|
||||||
Console.ReadKey();
|
|
||||||
break;
|
|
||||||
case ConsoleKey.S:
|
|
||||||
SearchTasks(taskManager, logger);
|
|
||||||
Console.WriteLine("Press any key.");
|
|
||||||
Console.ReadKey();
|
|
||||||
break;
|
|
||||||
case ConsoleKey.R:
|
|
||||||
PrintTasks(taskManager.GetAllTasks().Where(eTask => eTask.state == TrangaTask.ExecutionState.Running).ToArray(), logger);
|
|
||||||
Console.WriteLine("Press any key.");
|
|
||||||
Console.ReadKey();
|
|
||||||
break;
|
|
||||||
case ConsoleKey.K:
|
|
||||||
PrintTasks(taskManager.GetAllTasks().Where(qTask => qTask.state is TrangaTask.ExecutionState.Enqueued).ToArray(), logger);
|
|
||||||
Console.WriteLine("Press any key.");
|
|
||||||
Console.ReadKey();
|
|
||||||
break;
|
|
||||||
case ConsoleKey.F:
|
|
||||||
ShowLastLoglines(logger);
|
|
||||||
Console.WriteLine("Press any key.");
|
|
||||||
Console.ReadKey();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
selection = PrintMenu(taskManager, settings.downloadLocation, logger);
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.WriteLine("Tranga_CLI", "Exiting.");
|
|
||||||
if (taskManager.GetAllTasks().Any(task => task.state == TrangaTask.ExecutionState.Running))
|
|
||||||
{
|
|
||||||
Console.WriteLine("Force quit (Even with running tasks?) y/N");
|
|
||||||
selection = Console.ReadKey().Key;
|
|
||||||
while(selection != ConsoleKey.Y && selection != ConsoleKey.N)
|
|
||||||
selection = Console.ReadKey().Key;
|
|
||||||
taskManager.Shutdown(selection == ConsoleKey.Y);
|
|
||||||
}else
|
|
||||||
// ReSharper disable once RedundantArgumentDefaultValue Better readability
|
|
||||||
taskManager.Shutdown(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ConsoleKey PrintMenu(TaskManager taskManager, string folderPath, Logger logger)
|
|
||||||
{
|
|
||||||
int taskCount = taskManager.GetAllTasks().Length;
|
|
||||||
int taskRunningCount = taskManager.GetAllTasks().Count(task => task.state == TrangaTask.ExecutionState.Running);
|
|
||||||
int taskEnqueuedCount =
|
|
||||||
taskManager.GetAllTasks().Count(task => task.state == TrangaTask.ExecutionState.Enqueued);
|
|
||||||
Console.Clear();
|
|
||||||
Console.WriteLine($"Download Folder: {folderPath}");
|
|
||||||
Console.WriteLine($"Tasks (Running/Queue/Total)): {taskRunningCount}/{taskEnqueuedCount}/{taskCount}");
|
|
||||||
Console.WriteLine();
|
|
||||||
Console.WriteLine($"{"C: Create Task",-30}{"L: List tasks",-30}");
|
|
||||||
Console.WriteLine($"{"D: Delete Task",-30}{"R: List Running Tasks", -30}");
|
|
||||||
Console.WriteLine($"{"E: Execute Task now",-30}{"S: Search Tasks", -30}");
|
|
||||||
Console.WriteLine($"{"",-30}{"K: List Task Queue", -30}");
|
|
||||||
//Console.WriteLine();
|
|
||||||
Console.WriteLine($"{"F: Show Log",-30}{"",-30}");
|
|
||||||
Console.WriteLine($"{"U: Update this Screen",-30}{"Q: Exit",-30}");
|
|
||||||
ConsoleKey selection = Console.ReadKey().Key;
|
|
||||||
logger.WriteLine("Tranga_CLI", $"Menu selection: {selection}");
|
|
||||||
return selection;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void PrintTasks(TrangaTask[] tasks, Logger logger)
|
|
||||||
{
|
|
||||||
logger.WriteLine("Tranga_CLI", "Printing Tasks");
|
|
||||||
int taskCount = tasks.Length;
|
|
||||||
int taskRunningCount = tasks.Count(task => task.state == TrangaTask.ExecutionState.Running);
|
|
||||||
int taskEnqueuedCount = tasks.Count(task => task.state == TrangaTask.ExecutionState.Enqueued);
|
|
||||||
Console.Clear();
|
|
||||||
int tIndex = 0;
|
|
||||||
Console.WriteLine($"Tasks (Running/Queue/Total): {taskRunningCount}/{taskEnqueuedCount}/{taskCount}");
|
|
||||||
string header =
|
|
||||||
$"{"",-5}{"Task",-20} | {"Last Executed",-20} | {"Reoccurrence",-12} | {"State",-10} | {"Connector",-15} | Publication/Manga";
|
|
||||||
Console.WriteLine(header);
|
|
||||||
Console.WriteLine(new string('-', header.Length));
|
|
||||||
foreach(TrangaTask trangaTask in tasks)
|
|
||||||
Console.WriteLine($"{tIndex++:000}: {trangaTask}");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ShowLastLoglines(Logger logger)
|
|
||||||
{
|
|
||||||
Console.Clear();
|
|
||||||
logger.WriteLine("Tranga_CLI", "Menu: Show Log-lines");
|
|
||||||
|
|
||||||
Console.WriteLine("Enter q to abort");
|
|
||||||
Console.WriteLine($"Number of lines:");
|
|
||||||
|
|
||||||
string? chosenNumber = Console.ReadLine();
|
|
||||||
while(chosenNumber is null || chosenNumber.Length < 1)
|
|
||||||
chosenNumber = Console.ReadLine();
|
|
||||||
|
|
||||||
if (chosenNumber.Length == 1 && chosenNumber.ToLower() == "q")
|
|
||||||
{
|
|
||||||
Console.Clear();
|
|
||||||
Console.WriteLine("aborted.");
|
|
||||||
logger.WriteLine("Tranga_CLI", "aborted");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
string[] lines = logger.Tail(Convert.ToUInt32(chosenNumber));
|
|
||||||
Console.Clear();
|
|
||||||
foreach (string message in lines)
|
|
||||||
Console.Write(message);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Exception: {e.Message}");
|
|
||||||
logger.WriteLine("Tranga_CLI", e.Message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void CreateTask(TaskManager taskManager, TaskManager.SettingsData settings, Logger logger)
|
|
||||||
{
|
|
||||||
logger.WriteLine("Tranga_CLI", "Menu: Creating Task");
|
|
||||||
TrangaTask.Task? tmpTask = SelectTaskType(logger);
|
|
||||||
if (tmpTask is null)
|
|
||||||
return;
|
|
||||||
TrangaTask.Task task = (TrangaTask.Task)tmpTask!;
|
|
||||||
|
|
||||||
Connector? connector = null;
|
|
||||||
if (task != TrangaTask.Task.UpdateKomgaLibrary)
|
|
||||||
{
|
|
||||||
connector = SelectConnector(settings.downloadLocation, taskManager.GetAvailableConnectors().Values.ToArray(), logger);
|
|
||||||
if (connector is null)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Publication? publication = null;
|
|
||||||
if (task != TrangaTask.Task.UpdatePublications && task != TrangaTask.Task.UpdateKomgaLibrary)
|
|
||||||
{
|
|
||||||
publication = SelectPublication(connector!, logger);
|
|
||||||
if (publication is null)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
TimeSpan reoccurrence = SelectReoccurrence(logger);
|
|
||||||
logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
|
|
||||||
TrangaTask newTask = taskManager.AddTask(task, connector?.name, publication, reoccurrence, "en");
|
|
||||||
Console.WriteLine(newTask);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ExecuteTaskNow(TaskManager taskManager, Logger logger)
|
|
||||||
{
|
|
||||||
logger.WriteLine("Tranga_CLI", "Menu: Executing Task");
|
|
||||||
TrangaTask[] tasks = taskManager.GetAllTasks();
|
|
||||||
if (tasks.Length < 1)
|
|
||||||
{
|
|
||||||
Console.Clear();
|
|
||||||
Console.WriteLine("There are no available Tasks.");
|
|
||||||
logger.WriteLine("Tranga_CLI", "No available Tasks.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
PrintTasks(tasks, logger);
|
|
||||||
|
|
||||||
logger.WriteLine("Tranga_CLI", "Selecting Task to Execute");
|
|
||||||
Console.WriteLine("Enter q to abort");
|
|
||||||
Console.WriteLine($"Select Task (0-{tasks.Length - 1}):");
|
|
||||||
|
|
||||||
string? selectedTask = Console.ReadLine();
|
|
||||||
while(selectedTask is null || selectedTask.Length < 1)
|
|
||||||
selectedTask = Console.ReadLine();
|
|
||||||
|
|
||||||
if (selectedTask.Length == 1 && selectedTask.ToLower() == "q")
|
|
||||||
{
|
|
||||||
Console.Clear();
|
|
||||||
Console.WriteLine("aborted.");
|
|
||||||
logger.WriteLine("Tranga_CLI", "aborted");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
int selectedTaskIndex = Convert.ToInt32(selectedTask);
|
|
||||||
logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
|
|
||||||
taskManager.ExecuteTaskNow(tasks[selectedTaskIndex]);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Exception: {e.Message}");
|
|
||||||
logger.WriteLine("Tranga_CLI", e.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void RemoveTask(TaskManager taskManager, Logger logger)
|
|
||||||
{
|
|
||||||
logger.WriteLine("Tranga_CLI", "Menu: Remove Task");
|
|
||||||
TrangaTask[] tasks = taskManager.GetAllTasks();
|
|
||||||
if (tasks.Length < 1)
|
|
||||||
{
|
|
||||||
Console.Clear();
|
|
||||||
Console.WriteLine("There are no available Tasks.");
|
|
||||||
logger.WriteLine("Tranga_CLI", "No available Tasks");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
PrintTasks(tasks, logger);
|
|
||||||
|
|
||||||
logger.WriteLine("Tranga_CLI", "Selecting Task");
|
|
||||||
Console.WriteLine("Enter q to abort");
|
|
||||||
Console.WriteLine($"Select Task (0-{tasks.Length - 1}):");
|
|
||||||
|
|
||||||
string? selectedTask = Console.ReadLine();
|
|
||||||
while(selectedTask is null || selectedTask.Length < 1)
|
|
||||||
selectedTask = Console.ReadLine();
|
|
||||||
|
|
||||||
if (selectedTask.Length == 1 && selectedTask.ToLower() == "q")
|
|
||||||
{
|
|
||||||
Console.Clear();
|
|
||||||
Console.WriteLine("aborted.");
|
|
||||||
logger.WriteLine("Tranga_CLI", "aborted.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
int selectedTaskIndex = Convert.ToInt32(selectedTask);
|
|
||||||
logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
|
|
||||||
taskManager.RemoveTask(tasks[selectedTaskIndex].task, tasks[selectedTaskIndex].connectorName, tasks[selectedTaskIndex].publication);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Exception: {e.Message}");
|
|
||||||
logger.WriteLine("Tranga_CLI", e.Message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TrangaTask.Task? SelectTaskType(Logger logger)
|
|
||||||
{
|
|
||||||
logger.WriteLine("Tranga_CLI", "Menu: Select TaskType");
|
|
||||||
Console.Clear();
|
|
||||||
string[] taskNames = Enum.GetNames<TrangaTask.Task>();
|
|
||||||
|
|
||||||
int tIndex = 0;
|
|
||||||
Console.WriteLine("Available Tasks:");
|
|
||||||
foreach (string taskName in taskNames)
|
|
||||||
Console.WriteLine($"{tIndex++}: {taskName}");
|
|
||||||
|
|
||||||
Console.WriteLine("Enter q to abort");
|
|
||||||
Console.WriteLine($"Select Task (0-{taskNames.Length - 1}):");
|
|
||||||
|
|
||||||
string? selectedTask = Console.ReadLine();
|
|
||||||
while(selectedTask is null || selectedTask.Length < 1)
|
|
||||||
selectedTask = Console.ReadLine();
|
|
||||||
|
|
||||||
if (selectedTask.Length == 1 && selectedTask.ToLower() == "q")
|
|
||||||
{
|
|
||||||
Console.Clear();
|
|
||||||
Console.WriteLine("aborted.");
|
|
||||||
logger.WriteLine("Tranga_CLI", "aborted.");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
int selectedTaskIndex = Convert.ToInt32(selectedTask);
|
|
||||||
string selectedTaskName = taskNames[selectedTaskIndex];
|
|
||||||
return Enum.Parse<TrangaTask.Task>(selectedTaskName);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Exception: {e.Message}");
|
|
||||||
logger.WriteLine("Tranga_CLI", e.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TimeSpan SelectReoccurrence(Logger logger)
|
|
||||||
{
|
|
||||||
logger.WriteLine("Tranga_CLI", "Menu: Select Reoccurrence");
|
|
||||||
Console.WriteLine("Select reoccurrence Timer (Format hh:mm:ss):");
|
|
||||||
return TimeSpan.Parse(Console.ReadLine()!, new CultureInfo("en-US"));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Connector? SelectConnector(string folderPath, Connector[] connectors, Logger logger)
|
|
||||||
{
|
|
||||||
logger.WriteLine("Tranga_CLI", "Menu: Select Connector");
|
|
||||||
Console.Clear();
|
|
||||||
|
|
||||||
int cIndex = 0;
|
|
||||||
Console.WriteLine("Connectors:");
|
|
||||||
foreach (Connector connector in connectors)
|
|
||||||
Console.WriteLine($"{cIndex++}: {connector.name}");
|
|
||||||
|
|
||||||
Console.WriteLine("Enter q to abort");
|
|
||||||
Console.WriteLine($"Select Connector (0-{connectors.Length - 1}):");
|
|
||||||
|
|
||||||
string? selectedConnector = Console.ReadLine();
|
|
||||||
while(selectedConnector is null || selectedConnector.Length < 1)
|
|
||||||
selectedConnector = Console.ReadLine();
|
|
||||||
|
|
||||||
if (selectedConnector.Length == 1 && selectedConnector.ToLower() == "q")
|
|
||||||
{
|
|
||||||
Console.Clear();
|
|
||||||
Console.WriteLine("aborted.");
|
|
||||||
logger.WriteLine("Tranga_CLI", "aborted.");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
int selectedConnectorIndex = Convert.ToInt32(selectedConnector);
|
|
||||||
return connectors[selectedConnectorIndex];
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Exception: {e.Message}");
|
|
||||||
logger.WriteLine("Tranga_CLI", e.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Publication? SelectPublication(Connector connector, Logger logger)
|
|
||||||
{
|
|
||||||
logger.WriteLine("Tranga_CLI", "Menu: Select Publication");
|
|
||||||
|
|
||||||
Console.Clear();
|
|
||||||
Console.WriteLine($"Connector: {connector.name}");
|
|
||||||
Console.WriteLine("Publication search query (leave empty for all):");
|
|
||||||
string? query = Console.ReadLine();
|
|
||||||
|
|
||||||
Publication[] publications = connector.GetPublications(query ?? "");
|
|
||||||
|
|
||||||
int pIndex = 0;
|
|
||||||
Console.WriteLine("Publications:");
|
|
||||||
foreach(Publication publication in publications)
|
|
||||||
Console.WriteLine($"{pIndex++}: {publication.sortName}");
|
|
||||||
|
|
||||||
Console.WriteLine("Enter q to abort");
|
|
||||||
Console.WriteLine($"Select publication to Download (0-{publications.Length - 1}):");
|
|
||||||
|
|
||||||
string? selectedPublication = Console.ReadLine();
|
|
||||||
while(selectedPublication is null || selectedPublication.Length < 1)
|
|
||||||
selectedPublication = Console.ReadLine();
|
|
||||||
|
|
||||||
if (selectedPublication.Length == 1 && selectedPublication.ToLower() == "q")
|
|
||||||
{
|
|
||||||
Console.Clear();
|
|
||||||
Console.WriteLine("aborted.");
|
|
||||||
logger.WriteLine("Tranga_CLI", "aborted.");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
int selectedPublicationIndex = Convert.ToInt32(selectedPublication);
|
|
||||||
return publications[selectedPublicationIndex];
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Exception: {e.Message}");
|
|
||||||
logger.WriteLine("Tranga_CLI", e.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void SearchTasks(TaskManager taskManager, Logger logger)
|
|
||||||
{
|
|
||||||
logger.WriteLine("Tranga_CLI", "Menu: Search task");
|
|
||||||
Console.Clear();
|
|
||||||
Console.WriteLine("Enter search query:");
|
|
||||||
string? query = Console.ReadLine();
|
|
||||||
while (query is null || query.Length < 4)
|
|
||||||
query = Console.ReadLine();
|
|
||||||
PrintTasks(taskManager.GetAllTasks().Where(qTask =>
|
|
||||||
qTask.ToString().ToLower().Contains(query, StringComparison.OrdinalIgnoreCase)).ToArray(), logger);
|
|
||||||
}
|
|
||||||
}
|
|
18
Tranga.sln
18
Tranga.sln
@ -2,12 +2,10 @@
|
|||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga", ".\Tranga\Tranga.csproj", "{545E81B9-D96B-4C8F-A97F-2C02414DE566}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga", ".\Tranga\Tranga.csproj", "{545E81B9-D96B-4C8F-A97F-2C02414DE566}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga-CLI", "Tranga-CLI\Tranga-CLI.csproj", "{4899E3B2-B259-479A-B43E-042D043E9501}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga-API", "Tranga-API\Tranga-API.csproj", "{6284C936-4E90-486B-BC46-0AFAD85AD8EE}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logging", "Logging\Logging.csproj", "{415BE889-BB7D-426F-976F-8D977876A462}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logging", "Logging\Logging.csproj", "{415BE889-BB7D-426F-976F-8D977876A462}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CLI", "CLI\CLI.csproj", "{4324C816-F9D2-468F-8ED6-397FE2F0DCB3}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@ -18,17 +16,13 @@ Global
|
|||||||
{545E81B9-D96B-4C8F-A97F-2C02414DE566}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{545E81B9-D96B-4C8F-A97F-2C02414DE566}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{545E81B9-D96B-4C8F-A97F-2C02414DE566}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{545E81B9-D96B-4C8F-A97F-2C02414DE566}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{545E81B9-D96B-4C8F-A97F-2C02414DE566}.Release|Any CPU.Build.0 = Release|Any CPU
|
{545E81B9-D96B-4C8F-A97F-2C02414DE566}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{4899E3B2-B259-479A-B43E-042D043E9501}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{4899E3B2-B259-479A-B43E-042D043E9501}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{4899E3B2-B259-479A-B43E-042D043E9501}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{4899E3B2-B259-479A-B43E-042D043E9501}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{6284C936-4E90-486B-BC46-0AFAD85AD8EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{6284C936-4E90-486B-BC46-0AFAD85AD8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{6284C936-4E90-486B-BC46-0AFAD85AD8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{6284C936-4E90-486B-BC46-0AFAD85AD8EE}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{415BE889-BB7D-426F-976F-8D977876A462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{415BE889-BB7D-426F-976F-8D977876A462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{415BE889-BB7D-426F-976F-8D977876A462}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{415BE889-BB7D-426F-976F-8D977876A462}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{415BE889-BB7D-426F-976F-8D977876A462}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{415BE889-BB7D-426F-976F-8D977876A462}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{415BE889-BB7D-426F-976F-8D977876A462}.Release|Any CPU.Build.0 = Release|Any CPU
|
{415BE889-BB7D-426F-976F-8D977876A462}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{4324C816-F9D2-468F-8ED6-397FE2F0DCB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{4324C816-F9D2-468F-8ED6-397FE2F0DCB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{4324C816-F9D2-468F-8ED6-397FE2F0DCB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{4324C816-F9D2-468F-8ED6-397FE2F0DCB3}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
@ -1,3 +1,14 @@
|
|||||||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=altnames/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=authorsartists/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=Gotify/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=jjob/@EntryIndexedValue">True</s:Boolean>
|
||||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Komga/@EntryIndexedValue">True</s:Boolean>
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=Komga/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=lunasea/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=mangakatana/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=Manganato/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=Mangasee/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=Mangaworld/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=Ntfy/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=Taskmanager/@EntryIndexedValue">True</s:Boolean>
|
||||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Tranga/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=Tranga/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
|
@ -1,4 +1,5 @@
|
|||||||
using System.Globalization;
|
using System.Text.RegularExpressions;
|
||||||
|
using System.Xml.Linq;
|
||||||
|
|
||||||
namespace Tranga;
|
namespace Tranga;
|
||||||
|
|
||||||
@ -6,28 +7,128 @@ namespace Tranga;
|
|||||||
/// Has to be Part of a publication
|
/// Has to be Part of a publication
|
||||||
/// Includes the Chapter-Name, -VolumeNumber, -ChapterNumber, the location of the chapter on the internet and the saveName of the local file.
|
/// Includes the Chapter-Name, -VolumeNumber, -ChapterNumber, the location of the chapter on the internet and the saveName of the local file.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public struct Chapter
|
public readonly struct Chapter : IComparable
|
||||||
{
|
{
|
||||||
|
// ReSharper disable once MemberCanBePrivate.Global
|
||||||
|
public Manga parentManga { get; }
|
||||||
public string? name { get; }
|
public string? name { get; }
|
||||||
public string? volumeNumber { get; }
|
public string volumeNumber { get; }
|
||||||
public string? chapterNumber { get; }
|
public string chapterNumber { get; }
|
||||||
public string url { get; }
|
public string url { get; }
|
||||||
|
// ReSharper disable once MemberCanBePrivate.Global
|
||||||
public string fileName { get; }
|
public string fileName { get; }
|
||||||
public string sortNumber { get; }
|
|
||||||
|
|
||||||
public Chapter(string? name, string? volumeNumber, string? chapterNumber, string url)
|
private static readonly Regex LegalCharacters = new (@"([A-z]*[0-9]* *\.*-*,*\]*\[*'*\'*\)*\(*~*!*)*");
|
||||||
|
private static readonly Regex IllegalStrings = new(@"(Vol(ume)?|Ch(apter)?)\.?", RegexOptions.IgnoreCase);
|
||||||
|
private static readonly Regex Digits = new(@"[0-9\.]*");
|
||||||
|
public Chapter(Manga parentManga, string? name, string? volumeNumber, string chapterNumber, string url)
|
||||||
{
|
{
|
||||||
|
this.parentManga = parentManga;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.volumeNumber = volumeNumber is { Length: > 0 } ? volumeNumber : "1";
|
this.volumeNumber = volumeNumber is not null ? string.Concat(Digits.Matches(volumeNumber).Select(x => x.Value)) : "0";
|
||||||
this.chapterNumber = chapterNumber;
|
this.chapterNumber = string.Concat(Digits.Matches(chapterNumber).Select(x => x.Value));
|
||||||
this.url = url;
|
this.url = url;
|
||||||
string chapterName = string.Concat((name ?? "").Split(Path.GetInvalidFileNameChars()));
|
|
||||||
NumberFormatInfo nfi = new NumberFormatInfo()
|
string chapterVolNumStr;
|
||||||
|
if (volumeNumber is not null && volumeNumber.Length > 0)
|
||||||
|
chapterVolNumStr = $"Vol.{volumeNumber} Ch.{chapterNumber}";
|
||||||
|
else
|
||||||
|
chapterVolNumStr = $"Ch.{chapterNumber}";
|
||||||
|
|
||||||
|
if (name is not null && name.Length > 0)
|
||||||
{
|
{
|
||||||
NumberDecimalSeparator = "."
|
string chapterName = IllegalStrings.Replace(string.Concat(LegalCharacters.Matches(name)), "");
|
||||||
};
|
this.fileName = $"{chapterVolNumStr} - {chapterName}";
|
||||||
sortNumber = decimal.Round(Convert.ToDecimal(this.volumeNumber) * Convert.ToDecimal(this.chapterNumber, nfi), 1)
|
}
|
||||||
.ToString(nfi);
|
else
|
||||||
this.fileName = $"{chapterName} - V{volumeNumber}C{chapterNumber} - {sortNumber}";
|
this.fileName = chapterVolNumStr;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"Chapter {parentManga.sortName} {parentManga.internalId} {chapterNumber} {name}";
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool Equals(object? obj)
|
||||||
|
{
|
||||||
|
if (obj is not Chapter)
|
||||||
|
return false;
|
||||||
|
return CompareTo(obj) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int CompareTo(object? obj)
|
||||||
|
{
|
||||||
|
if(obj is not Chapter otherChapter)
|
||||||
|
throw new ArgumentException($"{obj} can not be compared to {this}");
|
||||||
|
|
||||||
|
if (float.TryParse(volumeNumber, GlobalBase.numberFormatDecimalPoint, out float volumeNumberFloat) &&
|
||||||
|
float.TryParse(chapterNumber, GlobalBase.numberFormatDecimalPoint, out float chapterNumberFloat) &&
|
||||||
|
float.TryParse(otherChapter.volumeNumber, GlobalBase.numberFormatDecimalPoint,
|
||||||
|
out float otherVolumeNumberFloat) &&
|
||||||
|
float.TryParse(otherChapter.chapterNumber, GlobalBase.numberFormatDecimalPoint,
|
||||||
|
out float otherChapterNumberFloat))
|
||||||
|
{
|
||||||
|
return volumeNumberFloat.CompareTo(otherVolumeNumberFloat) switch
|
||||||
|
{
|
||||||
|
<0 => -1,
|
||||||
|
>0 => 1,
|
||||||
|
_ => chapterNumberFloat.CompareTo(otherChapterNumberFloat)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
else throw new FormatException($"Value could not be parsed");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Checks if a chapter-archive is already present
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>true if chapter is present</returns>
|
||||||
|
internal bool CheckChapterIsDownloaded()
|
||||||
|
{
|
||||||
|
string mangaDirectory = Path.Join(TrangaSettings.downloadLocation, parentManga.folderName);
|
||||||
|
if (!Directory.Exists(mangaDirectory))
|
||||||
|
return false;
|
||||||
|
FileInfo[] archives = new DirectoryInfo(mangaDirectory).GetFiles("*.cbz");
|
||||||
|
Regex volChRex = new(@"(?:Vol(?:ume)?\.([0-9]+)\D*)?Ch(?:apter)?\.([0-9]+(?:\.[0-9]+)*)");
|
||||||
|
|
||||||
|
Chapter t = this;
|
||||||
|
string correctPath = GetArchiveFilePath();
|
||||||
|
FileInfo? archive = archives.FirstOrDefault(archive =>
|
||||||
|
{
|
||||||
|
Match m = volChRex.Match(archive.Name);
|
||||||
|
/*Uncommenting this section will only allow *Version without Volume number* -> *Version with Volume number* but not the other way
|
||||||
|
if (m.Groups[1].Success)
|
||||||
|
return m.Groups[1].Value == t.volumeNumber && m.Groups[2].Value == t.chapterNumber;
|
||||||
|
else*/
|
||||||
|
return m.Groups[2].Value == t.chapterNumber;
|
||||||
|
});
|
||||||
|
if(archive is not null && archive.FullName != correctPath)
|
||||||
|
archive.MoveTo(correctPath, true);
|
||||||
|
return (archive is not null);
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Creates full file path of chapter-archive
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>Filepath</returns>
|
||||||
|
internal string GetArchiveFilePath()
|
||||||
|
{
|
||||||
|
return Path.Join(TrangaSettings.downloadLocation, parentManga.folderName, $"{parentManga.folderName} - {this.fileName}.cbz");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Creates a string containing XML of publication and chapter.
|
||||||
|
/// See ComicInfo.xml
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>XML-string</returns>
|
||||||
|
internal string GetComicInfoXmlString()
|
||||||
|
{
|
||||||
|
XElement comicInfo = new XElement("ComicInfo",
|
||||||
|
new XElement("Tags", string.Join(',', parentManga.tags)),
|
||||||
|
new XElement("LanguageISO", parentManga.originalLanguage),
|
||||||
|
new XElement("Title", this.name),
|
||||||
|
new XElement("Writer", string.Join(',', parentManga.authors)),
|
||||||
|
new XElement("Volume", this.volumeNumber),
|
||||||
|
new XElement("Number", this.chapterNumber)
|
||||||
|
);
|
||||||
|
return comicInfo.ToString();
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,212 +0,0 @@
|
|||||||
using System.IO.Compression;
|
|
||||||
using System.Net;
|
|
||||||
using System.Xml.Linq;
|
|
||||||
using Logging;
|
|
||||||
|
|
||||||
namespace Tranga;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Base-Class for all Connectors
|
|
||||||
/// Provides some methods to be used by all Connectors, as well as a DownloadClient
|
|
||||||
/// </summary>
|
|
||||||
public abstract class Connector
|
|
||||||
{
|
|
||||||
internal string downloadLocation { get; } //Location of local files
|
|
||||||
protected DownloadClient downloadClient { get; }
|
|
||||||
|
|
||||||
protected Logger? logger;
|
|
||||||
|
|
||||||
protected Connector(string downloadLocation, uint downloadDelay, Logger? logger)
|
|
||||||
{
|
|
||||||
this.downloadLocation = downloadLocation;
|
|
||||||
this.downloadClient = new DownloadClient(downloadDelay);
|
|
||||||
this.logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract string name { get; } //Name of the Connector (e.g. Website)
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns all Publications with the given string.
|
|
||||||
/// If the string is empty or null, returns all Publication of the Connector
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="publicationTitle">Search-Query</param>
|
|
||||||
/// <returns>Publications matching the query</returns>
|
|
||||||
public abstract Publication[] GetPublications(string publicationTitle = "");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns all Chapters of the publication in the provided language.
|
|
||||||
/// If the language is empty or null, returns all Chapters in all Languages.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="publication">Publication to get Chapters for</param>
|
|
||||||
/// <param name="language">Language of the Chapters</param>
|
|
||||||
/// <returns>Array of Chapters matching Publication and Language</returns>
|
|
||||||
public abstract Chapter[] GetChapters(Publication publication, string language = "");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Retrieves the Chapter (+Images) from the website.
|
|
||||||
/// Should later call DownloadChapterImages to retrieve the individual Images of the Chapter.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="publication">Publication that contains Chapter</param>
|
|
||||||
/// <param name="chapter">Chapter with Images to retrieve</param>
|
|
||||||
public abstract void DownloadChapter(Publication publication, Chapter chapter);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Retrieves the Cover from the Website
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="publication">Publication to retrieve Cover for</param>
|
|
||||||
public abstract void DownloadCover(Publication publication);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Saves the series-info to series.json in the Publication Folder
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="publication">Publication to save series.json for</param>
|
|
||||||
public void SaveSeriesInfo(Publication publication)
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Saving series.json for {publication.sortName}");
|
|
||||||
//Check if Publication already has a Folder and a series.json
|
|
||||||
string publicationFolder = Path.Join(downloadLocation, publication.folderName);
|
|
||||||
if(!Directory.Exists(publicationFolder))
|
|
||||||
Directory.CreateDirectory(publicationFolder);
|
|
||||||
|
|
||||||
string seriesInfoPath = Path.Join(publicationFolder, "series.json");
|
|
||||||
if(!File.Exists(seriesInfoPath))
|
|
||||||
File.WriteAllText(seriesInfoPath,publication.GetSeriesInfoJson());
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creates a string containing XML of publication and chapter.
|
|
||||||
/// See ComicInfo.xml
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>XML-string</returns>
|
|
||||||
protected static string CreateComicInfo(Publication publication, Chapter chapter, Logger? logger)
|
|
||||||
{
|
|
||||||
logger?.WriteLine("Connector", $"Creating ComicInfo.Xml for {publication.sortName} Chapter {chapter.sortNumber}");
|
|
||||||
XElement comicInfo = new XElement("ComicInfo",
|
|
||||||
new XElement("Tags", string.Join(',',publication.tags)),
|
|
||||||
new XElement("LanguageISO", publication.originalLanguage),
|
|
||||||
new XElement("Title", chapter.name),
|
|
||||||
new XElement("Volume", chapter.volumeNumber),
|
|
||||||
new XElement("Number", chapter.chapterNumber) //TODO check if this is correct at some point
|
|
||||||
);
|
|
||||||
return comicInfo.ToString();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Checks if a chapter-archive is already present
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>true if chapter is present</returns>
|
|
||||||
public bool ChapterIsDownloaded(Publication publication, Chapter chapter)
|
|
||||||
{
|
|
||||||
return File.Exists(CreateFullFilepath(publication, chapter));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creates full file path of chapter-archive
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>Filepath</returns>
|
|
||||||
protected string CreateFullFilepath(Publication publication, Chapter chapter)
|
|
||||||
{
|
|
||||||
return Path.Join(downloadLocation, publication.folderName, chapter.fileName);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Downloads Image from URL and saves it to the given path(incl. fileName)
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="imageUrl"></param>
|
|
||||||
/// <param name="fullPath"></param>
|
|
||||||
/// <param name="downloadClient">DownloadClient of the connector</param>
|
|
||||||
protected static void DownloadImage(string imageUrl, string fullPath, DownloadClient downloadClient)
|
|
||||||
{
|
|
||||||
DownloadClient.RequestResult requestResult = downloadClient.MakeRequest(imageUrl);
|
|
||||||
byte[] buffer = new byte[requestResult.result.Length];
|
|
||||||
requestResult.result.ReadExactly(buffer, 0, buffer.Length);
|
|
||||||
File.WriteAllBytes(fullPath, buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Downloads all Images from URLs, Compresses to zip(cbz) and saves.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="imageUrls">List of URLs to download Images from</param>
|
|
||||||
/// <param name="saveArchiveFilePath">Full path to save archive to (without file ending .cbz)</param>
|
|
||||||
/// <param name="downloadClient">DownloadClient of the connector</param>
|
|
||||||
/// <param name="comicInfoPath">Path of the generate Chapter ComicInfo.xml, if it was generated</param>
|
|
||||||
protected static void DownloadChapterImages(string[] imageUrls, string saveArchiveFilePath, DownloadClient downloadClient, Logger? logger, string? comicInfoPath = null)
|
|
||||||
{
|
|
||||||
logger?.WriteLine("Connector", "Downloading Images");
|
|
||||||
//Check if Publication Directory already exists
|
|
||||||
string[] splitPath = saveArchiveFilePath.Split(Path.DirectorySeparatorChar);
|
|
||||||
string directoryPath = Path.Combine(splitPath.Take(splitPath.Length - 1).ToArray());
|
|
||||||
if (!Directory.Exists(directoryPath))
|
|
||||||
Directory.CreateDirectory(directoryPath);
|
|
||||||
|
|
||||||
string fullPath = $"{saveArchiveFilePath}.cbz";
|
|
||||||
if (File.Exists(fullPath)) //Don't download twice.
|
|
||||||
return;
|
|
||||||
|
|
||||||
//Create a temporary folder to store images
|
|
||||||
string tempFolder = Directory.CreateTempSubdirectory().FullName;
|
|
||||||
|
|
||||||
int chapter = 0;
|
|
||||||
//Download all Images to temporary Folder
|
|
||||||
foreach (string imageUrl in imageUrls)
|
|
||||||
{
|
|
||||||
string[] split = imageUrl.Split('.');
|
|
||||||
string extension = split[^1];
|
|
||||||
DownloadImage(imageUrl, Path.Join(tempFolder, $"{chapter++}.{extension}"), downloadClient);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(comicInfoPath is not null)
|
|
||||||
File.Copy(comicInfoPath, Path.Join(tempFolder, "ComicInfo.xml"));
|
|
||||||
|
|
||||||
logger?.WriteLine("Connector", "Creating archive");
|
|
||||||
//ZIP-it and ship-it
|
|
||||||
ZipFile.CreateFromDirectory(tempFolder, fullPath);
|
|
||||||
Directory.Delete(tempFolder, true); //Cleanup
|
|
||||||
}
|
|
||||||
|
|
||||||
protected class DownloadClient
|
|
||||||
{
|
|
||||||
private readonly TimeSpan _requestSpeed;
|
|
||||||
private DateTime _lastRequest;
|
|
||||||
private static readonly HttpClient Client = new();
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creates a httpClient
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="delay">minimum delay between requests (to avoid spam)</param>
|
|
||||||
public DownloadClient(uint delay)
|
|
||||||
{
|
|
||||||
_requestSpeed = TimeSpan.FromMilliseconds(delay);
|
|
||||||
_lastRequest = DateTime.Now.Subtract(_requestSpeed);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Request Webpage
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="url"></param>
|
|
||||||
/// <returns>RequestResult with StatusCode and Stream of received data</returns>
|
|
||||||
public RequestResult MakeRequest(string url)
|
|
||||||
{
|
|
||||||
while((DateTime.Now - _lastRequest) < _requestSpeed)
|
|
||||||
Thread.Sleep(10);
|
|
||||||
_lastRequest = DateTime.Now;
|
|
||||||
|
|
||||||
HttpRequestMessage requestMessage = new(HttpMethod.Get, url);
|
|
||||||
HttpResponseMessage response = Client.Send(requestMessage);
|
|
||||||
Stream resultString = response.IsSuccessStatusCode ? response.Content.ReadAsStream() : Stream.Null;
|
|
||||||
return new RequestResult(response.StatusCode, resultString);
|
|
||||||
}
|
|
||||||
|
|
||||||
public struct RequestResult
|
|
||||||
{
|
|
||||||
public HttpStatusCode statusCode { get; }
|
|
||||||
public Stream result { get; }
|
|
||||||
|
|
||||||
public RequestResult(HttpStatusCode statusCode, Stream result)
|
|
||||||
{
|
|
||||||
this.statusCode = statusCode;
|
|
||||||
this.result = result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,246 +0,0 @@
|
|||||||
using System.Globalization;
|
|
||||||
using System.Net;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Nodes;
|
|
||||||
using Logging;
|
|
||||||
|
|
||||||
namespace Tranga.Connectors;
|
|
||||||
public class MangaDex : Connector
|
|
||||||
{
|
|
||||||
public override string name { get; }
|
|
||||||
|
|
||||||
public MangaDex(string downloadLocation, uint downloadDelay, Logger? logger) : base(downloadLocation, downloadDelay, logger)
|
|
||||||
{
|
|
||||||
name = "MangaDex";
|
|
||||||
}
|
|
||||||
|
|
||||||
public MangaDex(string downloadLocation, Logger? logger) : base(downloadLocation, 750, logger)
|
|
||||||
{
|
|
||||||
name = "MangaDex";
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Publication[] GetPublications(string publicationTitle = "")
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
|
|
||||||
const int limit = 100; //How many values we want returned at once
|
|
||||||
int offset = 0; //"Page"
|
|
||||||
int total = int.MaxValue; //How many total results are there, is updated on first request
|
|
||||||
HashSet<Publication> publications = new();
|
|
||||||
while (offset < total) //As long as we haven't requested all "Pages"
|
|
||||||
{
|
|
||||||
//Request next Page
|
|
||||||
DownloadClient.RequestResult requestResult =
|
|
||||||
downloadClient.MakeRequest(
|
|
||||||
$"https://api.mangadex.org/manga?limit={limit}&title={publicationTitle}&offset={offset}");
|
|
||||||
if (requestResult.statusCode != HttpStatusCode.OK)
|
|
||||||
break;
|
|
||||||
JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
|
|
||||||
|
|
||||||
offset += limit;
|
|
||||||
if (result is null)
|
|
||||||
break;
|
|
||||||
|
|
||||||
total = result["total"]!.GetValue<int>(); //Update the total number of Publications
|
|
||||||
|
|
||||||
JsonArray mangaInResult = result["data"]!.AsArray(); //Manga-data-Array
|
|
||||||
//Loop each Manga and extract information from JSON
|
|
||||||
foreach (JsonNode? mangeNode in mangaInResult)
|
|
||||||
{
|
|
||||||
JsonObject manga = (JsonObject)mangeNode!;
|
|
||||||
JsonObject attributes = manga["attributes"]!.AsObject();
|
|
||||||
|
|
||||||
string title = attributes["title"]!.AsObject().ContainsKey("en") && attributes["title"]!["en"] is not null
|
|
||||||
? attributes["title"]!["en"]!.GetValue<string>()
|
|
||||||
: attributes["title"]![((IDictionary<string, JsonNode?>)attributes["title"]!.AsObject()).Keys.First()]!.GetValue<string>();
|
|
||||||
|
|
||||||
string? description = attributes["description"]!.AsObject().ContainsKey("en") && attributes["description"]!["en"] is not null
|
|
||||||
? attributes["description"]!["en"]!.GetValue<string?>()
|
|
||||||
: null;
|
|
||||||
|
|
||||||
JsonArray altTitlesObject = attributes["altTitles"]!.AsArray();
|
|
||||||
string[,] altTitles = new string[altTitlesObject.Count, 2];
|
|
||||||
int titleIndex = 0;
|
|
||||||
foreach (JsonNode? altTitleNode in altTitlesObject)
|
|
||||||
{
|
|
||||||
JsonObject altTitleObject = (JsonObject)altTitleNode!;
|
|
||||||
string key = ((IDictionary<string, JsonNode?>)altTitleObject).Keys.ToArray()[0];
|
|
||||||
altTitles[titleIndex, 0] = key;
|
|
||||||
altTitles[titleIndex++, 1] = altTitleObject[key]!.GetValue<string>();
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonArray tagsObject = attributes["tags"]!.AsArray();
|
|
||||||
HashSet<string> tags = new();
|
|
||||||
foreach (JsonNode? tagNode in tagsObject)
|
|
||||||
{
|
|
||||||
JsonObject tagObject = (JsonObject)tagNode!;
|
|
||||||
if(tagObject["attributes"]!["name"]!.AsObject().ContainsKey("en"))
|
|
||||||
tags.Add(tagObject["attributes"]!["name"]!["en"]!.GetValue<string>());
|
|
||||||
}
|
|
||||||
|
|
||||||
string? poster = null;
|
|
||||||
if (manga.ContainsKey("relationships") && manga["relationships"] is not null)
|
|
||||||
{
|
|
||||||
JsonArray relationships = manga["relationships"]!.AsArray();
|
|
||||||
poster = relationships.FirstOrDefault(relationship => relationship!["type"]!.GetValue<string>() == "cover_art")!["id"]!.GetValue<string>();
|
|
||||||
}
|
|
||||||
|
|
||||||
string[,]? links = null;
|
|
||||||
if (attributes.ContainsKey("links") && attributes["links"] is not null)
|
|
||||||
{
|
|
||||||
JsonObject linksObject = attributes["links"]!.AsObject();
|
|
||||||
links = new string[linksObject.Count, 2];
|
|
||||||
int linkIndex = 0;
|
|
||||||
foreach (string key in ((IDictionary<string, JsonNode?>)linksObject).Keys)
|
|
||||||
{
|
|
||||||
links[linkIndex, 0] = key;
|
|
||||||
links[linkIndex++, 1] = linksObject[key]!.GetValue<string>();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int? year = attributes.ContainsKey("year") && attributes["year"] is not null
|
|
||||||
? attributes["year"]!.GetValue<int?>()
|
|
||||||
: null;
|
|
||||||
|
|
||||||
string? originalLanguage = attributes.ContainsKey("originalLanguage") && attributes["originalLanguage"] is not null
|
|
||||||
? attributes["originalLanguage"]!.GetValue<string?>()
|
|
||||||
: null;
|
|
||||||
|
|
||||||
string status = attributes["status"]!.GetValue<string>();
|
|
||||||
|
|
||||||
Publication pub = new Publication(
|
|
||||||
title,
|
|
||||||
description,
|
|
||||||
altTitles,
|
|
||||||
tags.ToArray(),
|
|
||||||
poster,
|
|
||||||
links,
|
|
||||||
year,
|
|
||||||
originalLanguage,
|
|
||||||
status,
|
|
||||||
manga["id"]!.GetValue<string>()
|
|
||||||
);
|
|
||||||
publications.Add(pub); //Add Publication (Manga) to result
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return publications.ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Chapter[] GetChapters(Publication publication, string language = "")
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters {publication.sortName} (language={language})");
|
|
||||||
const int limit = 100; //How many values we want returned at once
|
|
||||||
int offset = 0; //"Page"
|
|
||||||
int total = int.MaxValue; //How many total results are there, is updated on first request
|
|
||||||
List<Chapter> chapters = new();
|
|
||||||
//As long as we haven't requested all "Pages"
|
|
||||||
while (offset < total)
|
|
||||||
{
|
|
||||||
//Request next "Page"
|
|
||||||
DownloadClient.RequestResult requestResult =
|
|
||||||
downloadClient.MakeRequest(
|
|
||||||
$"https://api.mangadex.org/manga/{publication.downloadUrl}/feed?limit={limit}&offset={offset}&translatedLanguage%5B%5D={language}");
|
|
||||||
if (requestResult.statusCode != HttpStatusCode.OK)
|
|
||||||
break;
|
|
||||||
JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
|
|
||||||
|
|
||||||
offset += limit;
|
|
||||||
if (result is null)
|
|
||||||
break;
|
|
||||||
|
|
||||||
total = result["total"]!.GetValue<int>();
|
|
||||||
JsonArray chaptersInResult = result["data"]!.AsArray();
|
|
||||||
//Loop through all Chapters in result and extract information from JSON
|
|
||||||
foreach (JsonNode? jsonNode in chaptersInResult)
|
|
||||||
{
|
|
||||||
JsonObject chapter = (JsonObject)jsonNode!;
|
|
||||||
JsonObject attributes = chapter["attributes"]!.AsObject();
|
|
||||||
string chapterId = chapter["id"]!.GetValue<string>();
|
|
||||||
|
|
||||||
string? title = attributes.ContainsKey("title") && attributes["title"] is not null
|
|
||||||
? attributes["title"]!.GetValue<string>()
|
|
||||||
: null;
|
|
||||||
|
|
||||||
string? volume = attributes.ContainsKey("volume") && attributes["volume"] is not null
|
|
||||||
? attributes["volume"]!.GetValue<string>()
|
|
||||||
: null;
|
|
||||||
|
|
||||||
string? chapterNum = attributes.ContainsKey("chapter") && attributes["chapter"] is not null
|
|
||||||
? attributes["chapter"]!.GetValue<string>()
|
|
||||||
: null;
|
|
||||||
|
|
||||||
chapters.Add(new Chapter(title, volume, chapterNum, chapterId));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Return Chapters ordered by Chapter-Number
|
|
||||||
NumberFormatInfo chapterNumberFormatInfo = new()
|
|
||||||
{
|
|
||||||
NumberDecimalSeparator = "."
|
|
||||||
};
|
|
||||||
return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void DownloadChapter(Publication publication, Chapter chapter)
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Download Chapter {publication.sortName} {chapter.volumeNumber}-{chapter.chapterNumber}");
|
|
||||||
//Request URLs for Chapter-Images
|
|
||||||
DownloadClient.RequestResult requestResult =
|
|
||||||
downloadClient.MakeRequest($"https://api.mangadex.org/at-home/server/{chapter.url}?forcePort443=false'");
|
|
||||||
if (requestResult.statusCode != HttpStatusCode.OK)
|
|
||||||
return;
|
|
||||||
JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
|
|
||||||
if (result is null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
string baseUrl = result["baseUrl"]!.GetValue<string>();
|
|
||||||
string hash = result["chapter"]!["hash"]!.GetValue<string>();
|
|
||||||
JsonArray imageFileNames = result["chapter"]!["data"]!.AsArray();
|
|
||||||
//Loop through all imageNames and construct urls (imageUrl)
|
|
||||||
HashSet<string> imageUrls = new();
|
|
||||||
foreach (JsonNode? image in imageFileNames)
|
|
||||||
imageUrls.Add($"{baseUrl}/data/{hash}/{image!.GetValue<string>()}");
|
|
||||||
|
|
||||||
string comicInfoPath = Path.GetTempFileName();
|
|
||||||
File.WriteAllText(comicInfoPath, CreateComicInfo(publication, chapter, logger));
|
|
||||||
|
|
||||||
//Download Chapter-Images
|
|
||||||
DownloadChapterImages(imageUrls.ToArray(), CreateFullFilepath(publication, chapter), downloadClient, logger, comicInfoPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void DownloadCover(Publication publication)
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Download cover {publication.sortName}");
|
|
||||||
//Check if Publication already has a Folder and cover
|
|
||||||
string publicationFolder = Path.Join(downloadLocation, publication.folderName);
|
|
||||||
if(!Directory.Exists(publicationFolder))
|
|
||||||
Directory.CreateDirectory(publicationFolder);
|
|
||||||
DirectoryInfo dirInfo = new (publicationFolder);
|
|
||||||
foreach(FileInfo fileInfo in dirInfo.EnumerateFiles())
|
|
||||||
if (fileInfo.Name.Contains("cover."))
|
|
||||||
return;
|
|
||||||
|
|
||||||
//Request information where to download Cover
|
|
||||||
DownloadClient.RequestResult requestResult =
|
|
||||||
downloadClient.MakeRequest($"https://api.mangadex.org/cover/{publication.posterUrl}");
|
|
||||||
if (requestResult.statusCode != HttpStatusCode.OK)
|
|
||||||
return;
|
|
||||||
JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
|
|
||||||
if (result is null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
string fileName = result["data"]!["attributes"]!["fileName"]!.GetValue<string>();
|
|
||||||
|
|
||||||
string coverUrl = $"https://uploads.mangadex.org/covers/{publication.downloadUrl}/{fileName}";
|
|
||||||
|
|
||||||
//Get file-extension (jpg, png)
|
|
||||||
string[] split = coverUrl.Split('.');
|
|
||||||
string extension = split[^1];
|
|
||||||
|
|
||||||
string outFolderPath = Path.Join(downloadLocation, publication.folderName);
|
|
||||||
Directory.CreateDirectory(outFolderPath);
|
|
||||||
|
|
||||||
//Download cover-Image
|
|
||||||
DownloadImage(coverUrl, Path.Join(downloadLocation, publication.folderName, $"cover.{extension}"), this.downloadClient);
|
|
||||||
}
|
|
||||||
}
|
|
143
Tranga/GlobalBase.cs
Normal file
143
Tranga/GlobalBase.cs
Normal file
@ -0,0 +1,143 @@
|
|||||||
|
using System.Globalization;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using Logging;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using Tranga.LibraryConnectors;
|
||||||
|
using Tranga.NotificationConnectors;
|
||||||
|
|
||||||
|
namespace Tranga;
|
||||||
|
|
||||||
|
public abstract class GlobalBase
|
||||||
|
{
|
||||||
|
[JsonIgnore]
|
||||||
|
public Logger? logger { get; init; }
|
||||||
|
protected HashSet<NotificationConnector> notificationConnectors { get; init; }
|
||||||
|
protected HashSet<LibraryConnector> libraryConnectors { get; init; }
|
||||||
|
private Dictionary<string, Manga> cachedPublications { get; init; }
|
||||||
|
public static readonly NumberFormatInfo numberFormatDecimalPoint = new (){ NumberDecimalSeparator = "." };
|
||||||
|
protected static readonly Regex baseUrlRex = new(@"https?:\/\/[0-9A-z\.-]+(:[0-9]+)?");
|
||||||
|
|
||||||
|
protected GlobalBase(GlobalBase clone)
|
||||||
|
{
|
||||||
|
this.logger = clone.logger;
|
||||||
|
this.notificationConnectors = clone.notificationConnectors;
|
||||||
|
this.libraryConnectors = clone.libraryConnectors;
|
||||||
|
this.cachedPublications = clone.cachedPublications;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected GlobalBase(Logger? logger)
|
||||||
|
{
|
||||||
|
this.logger = logger;
|
||||||
|
this.notificationConnectors = TrangaSettings.LoadNotificationConnectors(this);
|
||||||
|
this.libraryConnectors = TrangaSettings.LoadLibraryConnectors(this);
|
||||||
|
this.cachedPublications = new();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void AddMangaToCache(Manga manga)
|
||||||
|
{
|
||||||
|
if (!this.cachedPublications.TryAdd(manga.internalId, manga))
|
||||||
|
{
|
||||||
|
Log($"Overwriting Manga {manga.internalId}");
|
||||||
|
this.cachedPublications[manga.internalId] = manga;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected Manga? GetCachedManga(string internalId)
|
||||||
|
{
|
||||||
|
return cachedPublications.TryGetValue(internalId, out Manga manga) switch
|
||||||
|
{
|
||||||
|
true => manga,
|
||||||
|
_ => null
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
protected IEnumerable<Manga> GetAllCachedManga()
|
||||||
|
{
|
||||||
|
return cachedPublications.Values;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void Log(string message)
|
||||||
|
{
|
||||||
|
logger?.WriteLine(this.GetType().Name, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void Log(string fStr, params object?[] replace)
|
||||||
|
{
|
||||||
|
Log(string.Format(fStr, replace));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void SendNotifications(string title, string text, bool buffer = false)
|
||||||
|
{
|
||||||
|
foreach (NotificationConnector nc in notificationConnectors)
|
||||||
|
nc.SendNotification(title, text, buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void AddNotificationConnector(NotificationConnector notificationConnector)
|
||||||
|
{
|
||||||
|
Log($"Adding {notificationConnector}");
|
||||||
|
notificationConnectors.RemoveWhere(nc => nc.notificationConnectorType == notificationConnector.notificationConnectorType);
|
||||||
|
notificationConnectors.Add(notificationConnector);
|
||||||
|
|
||||||
|
while(IsFileInUse(TrangaSettings.notificationConnectorsFilePath))
|
||||||
|
Thread.Sleep(100);
|
||||||
|
Log("Exporting notificationConnectors");
|
||||||
|
File.WriteAllText(TrangaSettings.notificationConnectorsFilePath, JsonConvert.SerializeObject(notificationConnectors));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void DeleteNotificationConnector(NotificationConnector.NotificationConnectorType notificationConnectorType)
|
||||||
|
{
|
||||||
|
Log($"Removing {notificationConnectorType}");
|
||||||
|
notificationConnectors.RemoveWhere(nc => nc.notificationConnectorType == notificationConnectorType);
|
||||||
|
while(IsFileInUse(TrangaSettings.notificationConnectorsFilePath))
|
||||||
|
Thread.Sleep(100);
|
||||||
|
Log("Exporting notificationConnectors");
|
||||||
|
File.WriteAllText(TrangaSettings.notificationConnectorsFilePath, JsonConvert.SerializeObject(notificationConnectors));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void UpdateLibraries()
|
||||||
|
{
|
||||||
|
foreach(LibraryConnector lc in libraryConnectors)
|
||||||
|
lc.UpdateLibrary();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void AddLibraryConnector(LibraryConnector libraryConnector)
|
||||||
|
{
|
||||||
|
Log($"Adding {libraryConnector}");
|
||||||
|
libraryConnectors.RemoveWhere(lc => lc.libraryType == libraryConnector.libraryType);
|
||||||
|
libraryConnectors.Add(libraryConnector);
|
||||||
|
|
||||||
|
while(IsFileInUse(TrangaSettings.libraryConnectorsFilePath))
|
||||||
|
Thread.Sleep(100);
|
||||||
|
Log("Exporting libraryConnectors");
|
||||||
|
File.WriteAllText(TrangaSettings.libraryConnectorsFilePath, JsonConvert.SerializeObject(libraryConnectors, Formatting.Indented));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void DeleteLibraryConnector(LibraryConnector.LibraryType libraryType)
|
||||||
|
{
|
||||||
|
Log($"Removing {libraryType}");
|
||||||
|
libraryConnectors.RemoveWhere(lc => lc.libraryType == libraryType);
|
||||||
|
while(IsFileInUse(TrangaSettings.libraryConnectorsFilePath))
|
||||||
|
Thread.Sleep(100);
|
||||||
|
Log("Exporting libraryConnectors");
|
||||||
|
File.WriteAllText(TrangaSettings.libraryConnectorsFilePath, JsonConvert.SerializeObject(libraryConnectors, Formatting.Indented));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected bool IsFileInUse(string filePath) => IsFileInUse(filePath, this.logger);
|
||||||
|
|
||||||
|
public static bool IsFileInUse(string filePath, Logger? logger)
|
||||||
|
{
|
||||||
|
if (!File.Exists(filePath))
|
||||||
|
return false;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using FileStream stream = new (filePath, FileMode.Open, FileAccess.Read, FileShare.None);
|
||||||
|
stream.Close();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
catch (IOException)
|
||||||
|
{
|
||||||
|
logger?.WriteLine($"File is in use {filePath}");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
54
Tranga/Jobs/DownloadChapter.cs
Normal file
54
Tranga/Jobs/DownloadChapter.cs
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
using System.Net;
|
||||||
|
using Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
namespace Tranga.Jobs;
|
||||||
|
|
||||||
|
public class DownloadChapter : Job
|
||||||
|
{
|
||||||
|
public Chapter chapter { get; init; }
|
||||||
|
|
||||||
|
public DownloadChapter(GlobalBase clone, MangaConnector connector, Chapter chapter, DateTime lastExecution, string? parentJobId = null) : base(clone, JobType.DownloadChapterJob, connector, lastExecution, parentJobId: parentJobId)
|
||||||
|
{
|
||||||
|
this.chapter = chapter;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DownloadChapter(GlobalBase clone, MangaConnector connector, Chapter chapter, string? parentJobId = null) : base(clone, JobType.DownloadChapterJob, connector, parentJobId: parentJobId)
|
||||||
|
{
|
||||||
|
this.chapter = chapter;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override string GetId()
|
||||||
|
{
|
||||||
|
return $"{GetType()}-{chapter.parentManga.internalId}-{chapter.chapterNumber}";
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"{id} Chapter: {chapter}";
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override IEnumerable<Job> ExecuteReturnSubTasksInternal(JobBoss jobBoss)
|
||||||
|
{
|
||||||
|
Task downloadTask = new(delegate
|
||||||
|
{
|
||||||
|
mangaConnector.CopyCoverFromCacheToDownloadLocation(chapter.parentManga);
|
||||||
|
HttpStatusCode success = mangaConnector.DownloadChapter(chapter, this.progressToken);
|
||||||
|
chapter.parentManga.UpdateLatestDownloadedChapter(chapter);
|
||||||
|
if (success == HttpStatusCode.OK)
|
||||||
|
{
|
||||||
|
UpdateLibraries();
|
||||||
|
SendNotifications("Chapter downloaded", $"{chapter.parentManga.sortName} - {chapter.chapterNumber}", true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
downloadTask.Start();
|
||||||
|
return Array.Empty<Job>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool Equals(object? obj)
|
||||||
|
{
|
||||||
|
if (obj is not DownloadChapter otherJob)
|
||||||
|
return false;
|
||||||
|
return otherJob.mangaConnector == this.mangaConnector &&
|
||||||
|
otherJob.chapter.Equals(this.chapter);
|
||||||
|
}
|
||||||
|
}
|
59
Tranga/Jobs/DownloadNewChapters.cs
Normal file
59
Tranga/Jobs/DownloadNewChapters.cs
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
using Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
namespace Tranga.Jobs;
|
||||||
|
|
||||||
|
public class DownloadNewChapters : Job
|
||||||
|
{
|
||||||
|
public Manga manga { get; set; }
|
||||||
|
public string translatedLanguage { get; init; }
|
||||||
|
|
||||||
|
public DownloadNewChapters(GlobalBase clone, MangaConnector connector, Manga manga, DateTime lastExecution,
|
||||||
|
bool recurring = false, TimeSpan? recurrence = null, string? parentJobId = null, string translatedLanguage = "en") : base(clone, JobType.DownloadNewChaptersJob, connector, lastExecution, recurring,
|
||||||
|
recurrence, parentJobId)
|
||||||
|
{
|
||||||
|
this.manga = manga;
|
||||||
|
this.translatedLanguage = translatedLanguage;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DownloadNewChapters(GlobalBase clone, MangaConnector connector, Manga manga, bool recurring = false, TimeSpan? recurrence = null, string? parentJobId = null, string translatedLanguage = "en") : base (clone, JobType.DownloadNewChaptersJob, connector, recurring, recurrence, parentJobId)
|
||||||
|
{
|
||||||
|
this.manga = manga;
|
||||||
|
this.translatedLanguage = translatedLanguage;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override string GetId()
|
||||||
|
{
|
||||||
|
return $"{GetType()}-{manga.internalId}";
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"{id} Manga: {manga}";
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override IEnumerable<Job> ExecuteReturnSubTasksInternal(JobBoss jobBoss)
|
||||||
|
{
|
||||||
|
manga.SaveSeriesInfoJson();
|
||||||
|
Chapter[] chapters = mangaConnector.GetNewChapters(manga, this.translatedLanguage);
|
||||||
|
this.progressToken.increments = chapters.Length;
|
||||||
|
List<Job> jobs = new();
|
||||||
|
mangaConnector.CopyCoverFromCacheToDownloadLocation(manga);
|
||||||
|
foreach (Chapter chapter in chapters)
|
||||||
|
{
|
||||||
|
DownloadChapter downloadChapterJob = new(this, this.mangaConnector, chapter, parentJobId: this.id);
|
||||||
|
jobs.Add(downloadChapterJob);
|
||||||
|
}
|
||||||
|
UpdateMetadata updateMetadataJob = new(this, this.mangaConnector, this.manga, parentJobId: this.id);
|
||||||
|
jobs.Add(updateMetadataJob);
|
||||||
|
progressToken.Complete();
|
||||||
|
return jobs;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool Equals(object? obj)
|
||||||
|
{
|
||||||
|
if (obj is not DownloadNewChapters otherJob)
|
||||||
|
return false;
|
||||||
|
return otherJob.mangaConnector == this.mangaConnector &&
|
||||||
|
otherJob.manga.Equals(this.manga);
|
||||||
|
}
|
||||||
|
}
|
98
Tranga/Jobs/Job.cs
Normal file
98
Tranga/Jobs/Job.cs
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
using Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
namespace Tranga.Jobs;
|
||||||
|
|
||||||
|
public abstract class Job : GlobalBase
|
||||||
|
{
|
||||||
|
public MangaConnector mangaConnector { get; init; }
|
||||||
|
public ProgressToken progressToken { get; private set; }
|
||||||
|
public bool recurring { get; init; }
|
||||||
|
public TimeSpan? recurrenceTime { get; set; }
|
||||||
|
public DateTime? lastExecution { get; private set; }
|
||||||
|
public DateTime nextExecution => NextExecution();
|
||||||
|
public string id => GetId();
|
||||||
|
internal IEnumerable<Job>? subJobs { get; private set; }
|
||||||
|
public string? parentJobId { get; init; }
|
||||||
|
public enum JobType : byte { DownloadChapterJob, DownloadNewChaptersJob, UpdateMetaDataJob }
|
||||||
|
|
||||||
|
public JobType jobType;
|
||||||
|
|
||||||
|
internal Job(GlobalBase clone, JobType jobType, MangaConnector connector, bool recurring = false, TimeSpan? recurrenceTime = null, string? parentJobId = null) : base(clone)
|
||||||
|
{
|
||||||
|
this.jobType = jobType;
|
||||||
|
this.mangaConnector = connector;
|
||||||
|
this.progressToken = new ProgressToken(0);
|
||||||
|
this.recurring = recurring;
|
||||||
|
if (recurring && recurrenceTime is null)
|
||||||
|
throw new ArgumentException("If recurrence is set to true, a recurrence time has to be provided.");
|
||||||
|
else if(recurring && recurrenceTime is not null)
|
||||||
|
this.lastExecution = DateTime.Now.Subtract((TimeSpan)recurrenceTime);
|
||||||
|
this.recurrenceTime = recurrenceTime ?? TimeSpan.Zero;
|
||||||
|
this.parentJobId = parentJobId;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal Job(GlobalBase clone, JobType jobType, MangaConnector connector, DateTime lastExecution, bool recurring = false,
|
||||||
|
TimeSpan? recurrenceTime = null, string? parentJobId = null) : base(clone)
|
||||||
|
{
|
||||||
|
this.jobType = jobType;
|
||||||
|
this.mangaConnector = connector;
|
||||||
|
this.progressToken = new ProgressToken(0);
|
||||||
|
this.recurring = recurring;
|
||||||
|
if (recurring && recurrenceTime is null)
|
||||||
|
throw new ArgumentException("If recurrence is set to true, a recurrence time has to be provided.");
|
||||||
|
this.lastExecution = lastExecution;
|
||||||
|
this.recurrenceTime = recurrenceTime ?? TimeSpan.Zero;
|
||||||
|
this.parentJobId = parentJobId;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract string GetId();
|
||||||
|
|
||||||
|
public void AddSubJob(Job job)
|
||||||
|
{
|
||||||
|
subJobs ??= new List<Job>();
|
||||||
|
subJobs = subJobs.Append(job);
|
||||||
|
}
|
||||||
|
|
||||||
|
private DateTime NextExecution()
|
||||||
|
{
|
||||||
|
if(recurrenceTime.HasValue && lastExecution.HasValue)
|
||||||
|
return lastExecution.Value.Add(recurrenceTime.Value);
|
||||||
|
if(recurrenceTime.HasValue && !lastExecution.HasValue)
|
||||||
|
return DateTime.Now;
|
||||||
|
return DateTime.MaxValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ResetProgress()
|
||||||
|
{
|
||||||
|
this.progressToken.increments -= progressToken.incrementsCompleted;
|
||||||
|
this.lastExecution = DateTime.Now;
|
||||||
|
this.progressToken.Waiting();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ExecutionEnqueue()
|
||||||
|
{
|
||||||
|
this.progressToken.increments -= progressToken.incrementsCompleted;
|
||||||
|
this.progressToken.Standby();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Cancel()
|
||||||
|
{
|
||||||
|
Log($"Cancelling {this}");
|
||||||
|
this.progressToken.cancellationRequested = true;
|
||||||
|
this.progressToken.Cancel();
|
||||||
|
this.lastExecution = DateTime.Now;
|
||||||
|
if(subJobs is not null)
|
||||||
|
foreach(Job subJob in subJobs)
|
||||||
|
subJob.Cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<Job> ExecuteReturnSubTasks(JobBoss jobBoss)
|
||||||
|
{
|
||||||
|
progressToken.Start();
|
||||||
|
subJobs = ExecuteReturnSubTasksInternal(jobBoss);
|
||||||
|
lastExecution = DateTime.Now;
|
||||||
|
return subJobs;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract IEnumerable<Job> ExecuteReturnSubTasksInternal(JobBoss jobBoss);
|
||||||
|
}
|
279
Tranga/Jobs/JobBoss.cs
Normal file
279
Tranga/Jobs/JobBoss.cs
Normal file
@ -0,0 +1,279 @@
|
|||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
namespace Tranga.Jobs;
|
||||||
|
|
||||||
|
public class JobBoss : GlobalBase
|
||||||
|
{
|
||||||
|
public HashSet<Job> jobs { get; init; }
|
||||||
|
private Dictionary<MangaConnector, Queue<Job>> mangaConnectorJobQueue { get; init; }
|
||||||
|
|
||||||
|
public JobBoss(GlobalBase clone, HashSet<MangaConnector> connectors) : base(clone)
|
||||||
|
{
|
||||||
|
this.jobs = new();
|
||||||
|
LoadJobsList(connectors);
|
||||||
|
this.mangaConnectorJobQueue = new();
|
||||||
|
Log($"Next job in {jobs.MinBy(job => job.nextExecution)?.nextExecution.Subtract(DateTime.Now)} {jobs.MinBy(job => job.nextExecution)?.id}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AddJob(Job job)
|
||||||
|
{
|
||||||
|
if (ContainsJobLike(job))
|
||||||
|
{
|
||||||
|
Log($"Already Contains Job {job}");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Log($"Added {job}");
|
||||||
|
this.jobs.Add(job);
|
||||||
|
UpdateJobFile(job);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AddJobs(IEnumerable<Job> jobsToAdd)
|
||||||
|
{
|
||||||
|
foreach (Job job in jobsToAdd)
|
||||||
|
AddJob(job);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Compares contents of the provided job and all current jobs
|
||||||
|
/// Does not check if objects are the same
|
||||||
|
/// </summary>
|
||||||
|
public bool ContainsJobLike(Job job)
|
||||||
|
{
|
||||||
|
return this.jobs.Any(existingJob => existingJob.Equals(job));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RemoveJob(Job job)
|
||||||
|
{
|
||||||
|
Log($"Removing {job}");
|
||||||
|
job.Cancel();
|
||||||
|
this.jobs.Remove(job);
|
||||||
|
if(job.subJobs is not null && job.subJobs.Any())
|
||||||
|
RemoveJobs(job.subJobs);
|
||||||
|
UpdateJobFile(job);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RemoveJobs(IEnumerable<Job?> jobsToRemove)
|
||||||
|
{
|
||||||
|
List<Job?> toRemove = jobsToRemove.ToList(); //Prevent multiple enumeration
|
||||||
|
Log($"Removing {toRemove.Count()} jobs.");
|
||||||
|
foreach (Job? job in toRemove)
|
||||||
|
if(job is not null)
|
||||||
|
RemoveJob(job);
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<Job> GetJobsLike(string? connectorName = null, string? internalId = null, string? chapterNumber = null)
|
||||||
|
{
|
||||||
|
IEnumerable<Job> ret = this.jobs;
|
||||||
|
if (connectorName is not null)
|
||||||
|
ret = ret.Where(job => job.mangaConnector.name == connectorName);
|
||||||
|
|
||||||
|
if (internalId is not null && chapterNumber is not null)
|
||||||
|
ret = ret.Where(jjob =>
|
||||||
|
{
|
||||||
|
if (jjob is not DownloadChapter job)
|
||||||
|
return false;
|
||||||
|
return job.chapter.parentManga.internalId == internalId &&
|
||||||
|
job.chapter.chapterNumber == chapterNumber;
|
||||||
|
});
|
||||||
|
else if (internalId is not null)
|
||||||
|
ret = ret.Where(jjob =>
|
||||||
|
{
|
||||||
|
if (jjob is not DownloadNewChapters job)
|
||||||
|
return false;
|
||||||
|
return job.manga.internalId == internalId;
|
||||||
|
});
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<Job> GetJobsLike(MangaConnector? mangaConnector = null, Manga? publication = null,
|
||||||
|
Chapter? chapter = null)
|
||||||
|
{
|
||||||
|
if (chapter is not null)
|
||||||
|
return GetJobsLike(mangaConnector?.name, chapter.Value.parentManga.internalId, chapter.Value.chapterNumber);
|
||||||
|
else
|
||||||
|
return GetJobsLike(mangaConnector?.name, publication?.internalId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Job? GetJobById(string jobId)
|
||||||
|
{
|
||||||
|
if (this.jobs.FirstOrDefault(jjob => jjob.id == jobId) is { } job)
|
||||||
|
return job;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool TryGetJobById(string jobId, out Job? job)
|
||||||
|
{
|
||||||
|
if (this.jobs.FirstOrDefault(jjob => jjob.id == jobId) is { } ret)
|
||||||
|
{
|
||||||
|
job = ret;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
job = null;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool QueueContainsJob(Job job)
|
||||||
|
{
|
||||||
|
if (mangaConnectorJobQueue.TryAdd(job.mangaConnector, new Queue<Job>()))//If we can add the queue, there is certainly no job in it
|
||||||
|
return true;
|
||||||
|
return mangaConnectorJobQueue[job.mangaConnector].Contains(job);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AddJobToQueue(Job job)
|
||||||
|
{
|
||||||
|
Log($"Adding Job to Queue. {job}");
|
||||||
|
if(!QueueContainsJob(job))
|
||||||
|
mangaConnectorJobQueue[job.mangaConnector].Enqueue(job);
|
||||||
|
job.ExecutionEnqueue();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void AddJobsToQueue(IEnumerable<Job> newJobs)
|
||||||
|
{
|
||||||
|
foreach(Job job in newJobs)
|
||||||
|
AddJobToQueue(job);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void LoadJobsList(HashSet<MangaConnector> connectors)
|
||||||
|
{
|
||||||
|
if (!Directory.Exists(TrangaSettings.jobsFolderPath)) //No jobs to load
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(TrangaSettings.jobsFolderPath);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Regex idRex = new (@"(.*)\.json");
|
||||||
|
|
||||||
|
//Load json-job-files
|
||||||
|
foreach (FileInfo file in new DirectoryInfo(TrangaSettings.jobsFolderPath).EnumerateFiles().Where(fileInfo => idRex.IsMatch(fileInfo.Name)))
|
||||||
|
{
|
||||||
|
Log($"Adding {file.Name}");
|
||||||
|
Job? job = JsonConvert.DeserializeObject<Job>(File.ReadAllText(file.FullName),
|
||||||
|
new JobJsonConverter(this, new MangaConnectorJsonConverter(this, connectors)));
|
||||||
|
if (job is null)
|
||||||
|
{
|
||||||
|
string newName = file.FullName + ".failed";
|
||||||
|
Log($"Failed loading file {file.Name}.\nMoving to {newName}");
|
||||||
|
File.Move(file.FullName, newName);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Log($"Adding Job {job}");
|
||||||
|
this.jobs.Add(job);
|
||||||
|
UpdateJobFile(job, file.Name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Connect jobs to parent-jobs and add Publications to cache
|
||||||
|
foreach (Job job in this.jobs)
|
||||||
|
{
|
||||||
|
Log($"Loading Job {job}");
|
||||||
|
Job? parentJob = this.jobs.FirstOrDefault(jjob => jjob.id == job.parentJobId);
|
||||||
|
if (parentJob is not null)
|
||||||
|
{
|
||||||
|
parentJob.AddSubJob(job);
|
||||||
|
Log($"Parent Job {parentJob}");
|
||||||
|
}
|
||||||
|
if (job is DownloadNewChapters dncJob)
|
||||||
|
AddMangaToCache(dncJob.manga);
|
||||||
|
}
|
||||||
|
|
||||||
|
string[] coverFiles = Directory.GetFiles(TrangaSettings.coverImageCache);
|
||||||
|
foreach(string fileName in coverFiles.Where(fileName => !GetAllCachedManga().Any(manga => manga.coverFileNameInCache == fileName)))
|
||||||
|
File.Delete(fileName);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal void UpdateJobFile(Job job, string? oldFile = null)
|
||||||
|
{
|
||||||
|
string newJobFilePath = Path.Join(TrangaSettings.jobsFolderPath, $"{job.id}.json");
|
||||||
|
string oldFilePath = Path.Join(TrangaSettings.jobsFolderPath, oldFile??$"{job.id}.json");
|
||||||
|
|
||||||
|
//Delete old file
|
||||||
|
if (File.Exists(oldFilePath))
|
||||||
|
{
|
||||||
|
Log($"Deleting Job-file {oldFilePath}");
|
||||||
|
try
|
||||||
|
{
|
||||||
|
while(IsFileInUse(oldFilePath))
|
||||||
|
Thread.Sleep(10);
|
||||||
|
File.Delete(oldFilePath);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Log(e.ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Export job (in new file) if it is still in our jobs list
|
||||||
|
if (GetJobById(job.id) is not null)
|
||||||
|
{
|
||||||
|
Log($"Exporting Job {newJobFilePath}");
|
||||||
|
string jobStr = JsonConvert.SerializeObject(job, Formatting.Indented);
|
||||||
|
while(IsFileInUse(newJobFilePath))
|
||||||
|
Thread.Sleep(10);
|
||||||
|
File.WriteAllText(newJobFilePath, jobStr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdateAllJobFiles()
|
||||||
|
{
|
||||||
|
Log("Exporting Jobs");
|
||||||
|
foreach (Job job in this.jobs)
|
||||||
|
UpdateJobFile(job);
|
||||||
|
|
||||||
|
//Remove files with jobs not in this.jobs-list
|
||||||
|
Regex idRex = new (@"(.*)\.json");
|
||||||
|
foreach (FileInfo file in new DirectoryInfo(TrangaSettings.jobsFolderPath).EnumerateFiles())
|
||||||
|
{
|
||||||
|
if (idRex.IsMatch(file.Name))
|
||||||
|
{
|
||||||
|
string id = idRex.Match(file.Name).Groups[1].Value;
|
||||||
|
if (!this.jobs.Any(job => job.id == id))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
file.Delete();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Log(e.ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void CheckJobs()
|
||||||
|
{
|
||||||
|
AddJobsToQueue(jobs.Where(job => job.progressToken.state == ProgressToken.State.Waiting && job.nextExecution < DateTime.Now && !QueueContainsJob(job)).OrderBy(job => job.nextExecution));
|
||||||
|
foreach (Queue<Job> jobQueue in mangaConnectorJobQueue.Values)
|
||||||
|
{
|
||||||
|
if(jobQueue.Count < 1)
|
||||||
|
continue;
|
||||||
|
Job queueHead = jobQueue.Peek();
|
||||||
|
if (queueHead.progressToken.state is ProgressToken.State.Complete or ProgressToken.State.Cancelled)
|
||||||
|
{
|
||||||
|
if(!queueHead.recurring)
|
||||||
|
RemoveJob(queueHead);
|
||||||
|
else
|
||||||
|
queueHead.ResetProgress();
|
||||||
|
jobQueue.Dequeue();
|
||||||
|
Log($"Next job in {jobs.MinBy(job => job.nextExecution)?.nextExecution.Subtract(DateTime.Now)} {jobs.MinBy(job => job.nextExecution)?.id}");
|
||||||
|
}else if (queueHead.progressToken.state is ProgressToken.State.Standby)
|
||||||
|
{
|
||||||
|
Job eJob = jobQueue.Peek();
|
||||||
|
Job[] subJobs = eJob.ExecuteReturnSubTasks(this).ToArray();
|
||||||
|
UpdateJobFile(eJob);
|
||||||
|
AddJobs(subJobs);
|
||||||
|
AddJobsToQueue(subJobs);
|
||||||
|
}else if (queueHead.progressToken.state is ProgressToken.State.Running && DateTime.Now.Subtract(queueHead.progressToken.lastUpdate) > TimeSpan.FromMinutes(5))
|
||||||
|
{
|
||||||
|
Log($"{queueHead} inactive for more than 5 minutes. Cancelling.");
|
||||||
|
queueHead.Cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
84
Tranga/Jobs/JobJsonConverter.cs
Normal file
84
Tranga/Jobs/JobJsonConverter.cs
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
using Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
namespace Tranga.Jobs;
|
||||||
|
|
||||||
|
public class JobJsonConverter : JsonConverter
|
||||||
|
{
|
||||||
|
private GlobalBase _clone;
|
||||||
|
private MangaConnectorJsonConverter _mangaConnectorJsonConverter;
|
||||||
|
|
||||||
|
internal JobJsonConverter(GlobalBase clone, MangaConnectorJsonConverter mangaConnectorJsonConverter)
|
||||||
|
{
|
||||||
|
this._clone = clone;
|
||||||
|
this._mangaConnectorJsonConverter = mangaConnectorJsonConverter;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool CanConvert(Type objectType)
|
||||||
|
{
|
||||||
|
return (objectType == typeof(Job));
|
||||||
|
}
|
||||||
|
|
||||||
|
public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
JObject jo = JObject.Load(reader);
|
||||||
|
|
||||||
|
if (jo.ContainsKey("jobType") && jo["jobType"]!.Value<byte>() == (byte)Job.JobType.UpdateMetaDataJob)
|
||||||
|
{
|
||||||
|
return new UpdateMetadata(this._clone,
|
||||||
|
jo.GetValue("mangaConnector")!.ToObject<MangaConnector>(JsonSerializer.Create(new JsonSerializerSettings()
|
||||||
|
{
|
||||||
|
Converters =
|
||||||
|
{
|
||||||
|
this._mangaConnectorJsonConverter
|
||||||
|
}
|
||||||
|
}))!,
|
||||||
|
jo.GetValue("manga")!.ToObject<Manga>(),
|
||||||
|
jo.GetValue("parentJobId")!.Value<string?>());
|
||||||
|
}else if ((jo.ContainsKey("jobType") && jo["jobType"]!.Value<byte>() == (byte)Job.JobType.DownloadNewChaptersJob) || jo.ContainsKey("translatedLanguage"))//TODO change to jobType
|
||||||
|
{
|
||||||
|
DateTime lastExecution = jo.GetValue("lastExecution") is {} le
|
||||||
|
? le.ToObject<DateTime>()
|
||||||
|
: DateTime.UnixEpoch; //TODO do null checks on all variables
|
||||||
|
return new DownloadNewChapters(this._clone,
|
||||||
|
jo.GetValue("mangaConnector")!.ToObject<MangaConnector>(JsonSerializer.Create(new JsonSerializerSettings()
|
||||||
|
{
|
||||||
|
Converters =
|
||||||
|
{
|
||||||
|
this._mangaConnectorJsonConverter
|
||||||
|
}
|
||||||
|
}))!,
|
||||||
|
jo.GetValue("manga")!.ToObject<Manga>(),
|
||||||
|
lastExecution,
|
||||||
|
jo.GetValue("recurring")!.Value<bool>(),
|
||||||
|
jo.GetValue("recurrenceTime")!.ToObject<TimeSpan?>(),
|
||||||
|
jo.GetValue("parentJobId")!.Value<string?>());
|
||||||
|
}else if ((jo.ContainsKey("jobType") && jo["jobType"]!.Value<byte>() == (byte)Job.JobType.DownloadChapterJob) || jo.ContainsKey("chapter"))//TODO change to jobType
|
||||||
|
{
|
||||||
|
return new DownloadChapter(this._clone,
|
||||||
|
jo.GetValue("mangaConnector")!.ToObject<MangaConnector>(JsonSerializer.Create(new JsonSerializerSettings()
|
||||||
|
{
|
||||||
|
Converters =
|
||||||
|
{
|
||||||
|
this._mangaConnectorJsonConverter
|
||||||
|
}
|
||||||
|
}))!,
|
||||||
|
jo.GetValue("chapter")!.ToObject<Chapter>(),
|
||||||
|
DateTime.UnixEpoch,
|
||||||
|
jo.GetValue("parentJobId")!.Value<string?>());
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Exception();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool CanWrite => false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Don't call this
|
||||||
|
/// </summary>
|
||||||
|
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
throw new Exception("Dont call this");
|
||||||
|
}
|
||||||
|
}
|
78
Tranga/Jobs/ProgressToken.cs
Normal file
78
Tranga/Jobs/ProgressToken.cs
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
namespace Tranga.Jobs;
|
||||||
|
|
||||||
|
public class ProgressToken
|
||||||
|
{
|
||||||
|
public bool cancellationRequested { get; set; }
|
||||||
|
public int increments { get; set; }
|
||||||
|
public int incrementsCompleted { get; set; }
|
||||||
|
public float progress => GetProgress();
|
||||||
|
public DateTime lastUpdate { get; private set; }
|
||||||
|
public DateTime executionStarted { get; private set; }
|
||||||
|
public TimeSpan timeRemaining => GetTimeRemaining();
|
||||||
|
|
||||||
|
public enum State { Running, Complete, Standby, Cancelled, Waiting }
|
||||||
|
public State state { get; private set; }
|
||||||
|
|
||||||
|
public ProgressToken(int increments)
|
||||||
|
{
|
||||||
|
this.cancellationRequested = false;
|
||||||
|
this.increments = increments;
|
||||||
|
this.incrementsCompleted = 0;
|
||||||
|
this.state = State.Waiting;
|
||||||
|
this.executionStarted = DateTime.UnixEpoch;
|
||||||
|
this.lastUpdate = DateTime.UnixEpoch;
|
||||||
|
}
|
||||||
|
|
||||||
|
private float GetProgress()
|
||||||
|
{
|
||||||
|
if(increments > 0 && incrementsCompleted > 0)
|
||||||
|
return incrementsCompleted / (float)increments;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private TimeSpan GetTimeRemaining()
|
||||||
|
{
|
||||||
|
if (increments > 0 && incrementsCompleted > 0)
|
||||||
|
return DateTime.Now.Subtract(this.executionStarted).Divide(incrementsCompleted).Multiply(increments - incrementsCompleted);
|
||||||
|
return TimeSpan.MaxValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Increment()
|
||||||
|
{
|
||||||
|
this.lastUpdate = DateTime.Now;
|
||||||
|
this.incrementsCompleted++;
|
||||||
|
if (incrementsCompleted > increments)
|
||||||
|
state = State.Complete;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Standby()
|
||||||
|
{
|
||||||
|
this.lastUpdate = DateTime.Now;
|
||||||
|
state = State.Standby;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Start()
|
||||||
|
{
|
||||||
|
this.lastUpdate = DateTime.Now;
|
||||||
|
state = State.Running;
|
||||||
|
this.executionStarted = DateTime.Now;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Complete()
|
||||||
|
{
|
||||||
|
this.lastUpdate = DateTime.Now;
|
||||||
|
state = State.Complete;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Cancel()
|
||||||
|
{
|
||||||
|
this.lastUpdate = DateTime.Now;
|
||||||
|
state = State.Cancelled;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Waiting()
|
||||||
|
{
|
||||||
|
this.lastUpdate = DateTime.Now;
|
||||||
|
state = State.Waiting;
|
||||||
|
}
|
||||||
|
}
|
76
Tranga/Jobs/UpdateMetadata.cs
Normal file
76
Tranga/Jobs/UpdateMetadata.cs
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
using Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
namespace Tranga.Jobs;
|
||||||
|
|
||||||
|
public class UpdateMetadata : Job
|
||||||
|
{
|
||||||
|
public Manga manga { get; set; }
|
||||||
|
|
||||||
|
public UpdateMetadata(GlobalBase clone, MangaConnector connector, Manga manga, string? parentJobId = null) : base(clone, JobType.UpdateMetaDataJob, connector, parentJobId: parentJobId)
|
||||||
|
{
|
||||||
|
this.manga = manga;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override string GetId()
|
||||||
|
{
|
||||||
|
return $"{GetType()}-{manga.internalId}";
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"{id} Manga: {manga}";
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override IEnumerable<Job> ExecuteReturnSubTasksInternal(JobBoss jobBoss)
|
||||||
|
{
|
||||||
|
//Retrieve new Metadata
|
||||||
|
Manga? possibleUpdatedManga = mangaConnector.GetMangaFromId(manga.publicationId);
|
||||||
|
if (possibleUpdatedManga is { } updatedManga)
|
||||||
|
{
|
||||||
|
if (updatedManga.Equals(this.manga)) //Check if anything changed
|
||||||
|
{
|
||||||
|
this.progressToken.Complete();
|
||||||
|
return Array.Empty<Job>();
|
||||||
|
}
|
||||||
|
|
||||||
|
this.manga = manga.WithMetadata(updatedManga);
|
||||||
|
this.manga.SaveSeriesInfoJson(true);
|
||||||
|
this.mangaConnector.CopyCoverFromCacheToDownloadLocation(manga);
|
||||||
|
foreach (Job job in jobBoss.GetJobsLike(publication: this.manga))
|
||||||
|
{
|
||||||
|
string oldFile;
|
||||||
|
if (job is DownloadNewChapters dc)
|
||||||
|
{
|
||||||
|
oldFile = dc.id;
|
||||||
|
dc.manga = this.manga;
|
||||||
|
}
|
||||||
|
else if (job is UpdateMetadata um)
|
||||||
|
{
|
||||||
|
oldFile = um.id;
|
||||||
|
um.manga = this.manga;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
continue;
|
||||||
|
jobBoss.UpdateJobFile(job, oldFile);
|
||||||
|
}
|
||||||
|
this.progressToken.Complete();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Log($"Could not find Manga {manga}");
|
||||||
|
this.progressToken.Cancel();
|
||||||
|
return Array.Empty<Job>();
|
||||||
|
}
|
||||||
|
this.progressToken.Cancel();
|
||||||
|
return Array.Empty<Job>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool Equals(object? obj)
|
||||||
|
{
|
||||||
|
|
||||||
|
if (obj is not UpdateMetadata otherJob)
|
||||||
|
return false;
|
||||||
|
return otherJob.mangaConnector == this.mangaConnector &&
|
||||||
|
otherJob.manga.Equals(this.manga);
|
||||||
|
}
|
||||||
|
}
|
125
Tranga/Komga.cs
125
Tranga/Komga.cs
@ -1,125 +0,0 @@
|
|||||||
using System.Net.Http.Headers;
|
|
||||||
using System.Text.Json.Nodes;
|
|
||||||
using Logging;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
using JsonSerializer = System.Text.Json.JsonSerializer;
|
|
||||||
|
|
||||||
namespace Tranga;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Provides connectivity to Komga-API
|
|
||||||
/// Can fetch and update libraries
|
|
||||||
/// </summary>
|
|
||||||
public class Komga
|
|
||||||
{
|
|
||||||
public string baseUrl { get; }
|
|
||||||
public string auth { get; } //Base64 encoded, if you use your password everywhere, you have problems
|
|
||||||
|
|
||||||
private Logger? logger;
|
|
||||||
|
|
||||||
/// <param name="baseUrl">Base-URL of Komga instance, no trailing slashes(/)</param>
|
|
||||||
/// <param name="username">Komga Username</param>
|
|
||||||
/// <param name="password">Komga password, will be base64 encoded. yea</param>
|
|
||||||
public Komga(string baseUrl, string username, string password, Logger? logger)
|
|
||||||
{
|
|
||||||
this.baseUrl = baseUrl;
|
|
||||||
this.auth = Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes($"{username}:{password}"));
|
|
||||||
this.logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <param name="baseUrl">Base-URL of Komga instance, no trailing slashes(/)</param>
|
|
||||||
/// <param name="auth">Base64 string of username and password (username):(password)</param>
|
|
||||||
[JsonConstructor]
|
|
||||||
public Komga(string baseUrl, string auth, Logger? logger)
|
|
||||||
{
|
|
||||||
this.baseUrl = baseUrl;
|
|
||||||
this.auth = auth;
|
|
||||||
this.logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Fetches all libraries available to the user
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>Array of KomgaLibraries</returns>
|
|
||||||
public KomgaLibrary[] GetLibraries()
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Getting Libraries");
|
|
||||||
Stream data = NetClient.MakeRequest($"{baseUrl}/api/v1/libraries", auth);
|
|
||||||
JsonArray? result = JsonSerializer.Deserialize<JsonArray>(data);
|
|
||||||
if (result is null)
|
|
||||||
return Array.Empty<KomgaLibrary>();
|
|
||||||
|
|
||||||
HashSet<KomgaLibrary> ret = new();
|
|
||||||
|
|
||||||
foreach (JsonNode? jsonNode in result)
|
|
||||||
{
|
|
||||||
var jObject = (JsonObject?)jsonNode;
|
|
||||||
string libraryId = jObject!["id"]!.GetValue<string>();
|
|
||||||
string libraryName = jObject!["name"]!.GetValue<string>();
|
|
||||||
ret.Add(new KomgaLibrary(libraryId, libraryName));
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret.ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Updates library with given id
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="libraryId">Id of the Komga-Library</param>
|
|
||||||
/// <returns>true if successful</returns>
|
|
||||||
public bool UpdateLibrary(string libraryId)
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Updating Libraries");
|
|
||||||
return NetClient.MakePost($"{baseUrl}/api/v1/libraries/{libraryId}/scan", auth);
|
|
||||||
}
|
|
||||||
|
|
||||||
public struct KomgaLibrary
|
|
||||||
{
|
|
||||||
public string id { get; }
|
|
||||||
public string name { get; }
|
|
||||||
|
|
||||||
public KomgaLibrary(string id, string name)
|
|
||||||
{
|
|
||||||
this.id = id;
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class NetClient
|
|
||||||
{
|
|
||||||
public static Stream MakeRequest(string url, string auth)
|
|
||||||
{
|
|
||||||
HttpClient client = new();
|
|
||||||
HttpRequestMessage requestMessage = new HttpRequestMessage
|
|
||||||
{
|
|
||||||
Method = HttpMethod.Get,
|
|
||||||
RequestUri = new Uri(url),
|
|
||||||
Headers =
|
|
||||||
{
|
|
||||||
{ "Accept", "application/json" },
|
|
||||||
{ "Authorization", new AuthenticationHeaderValue("Basic", auth).ToString() }
|
|
||||||
}
|
|
||||||
};
|
|
||||||
HttpResponseMessage response = client.Send(requestMessage);
|
|
||||||
Stream resultString = response.IsSuccessStatusCode ? response.Content.ReadAsStream() : Stream.Null;
|
|
||||||
return resultString;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static bool MakePost(string url, string auth)
|
|
||||||
{
|
|
||||||
HttpClient client = new();
|
|
||||||
HttpRequestMessage requestMessage = new HttpRequestMessage
|
|
||||||
{
|
|
||||||
Method = HttpMethod.Post,
|
|
||||||
RequestUri = new Uri(url),
|
|
||||||
Headers =
|
|
||||||
{
|
|
||||||
{ "Accept", "application/json" },
|
|
||||||
{ "Authorization", new AuthenticationHeaderValue("Basic", auth).ToString() }
|
|
||||||
}
|
|
||||||
};
|
|
||||||
HttpResponseMessage response = client.Send(requestMessage);
|
|
||||||
return response.IsSuccessStatusCode;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
126
Tranga/LibraryConnectors/Kavita.cs
Normal file
126
Tranga/LibraryConnectors/Kavita.cs
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
using System.Text.Json.Nodes;
|
||||||
|
using Logging;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using JsonSerializer = System.Text.Json.JsonSerializer;
|
||||||
|
|
||||||
|
namespace Tranga.LibraryConnectors;
|
||||||
|
|
||||||
|
public class Kavita : LibraryConnector
|
||||||
|
{
|
||||||
|
|
||||||
|
public Kavita(GlobalBase clone, string baseUrl, string username, string password) :
|
||||||
|
base(clone, baseUrl, GetToken(baseUrl, username, password, clone.logger), LibraryType.Kavita)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
[JsonConstructor]
|
||||||
|
public Kavita(GlobalBase clone, string baseUrl, string auth) : base(clone, baseUrl, auth, LibraryType.Kavita)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"Kavita {baseUrl}";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string GetToken(string baseUrl, string username, string password, Logger? logger = null)
|
||||||
|
{
|
||||||
|
HttpClient client = new()
|
||||||
|
{
|
||||||
|
DefaultRequestHeaders =
|
||||||
|
{
|
||||||
|
{ "Accept", "application/json" }
|
||||||
|
}
|
||||||
|
};
|
||||||
|
HttpRequestMessage requestMessage = new ()
|
||||||
|
{
|
||||||
|
Method = HttpMethod.Post,
|
||||||
|
RequestUri = new Uri($"{baseUrl}/api/Account/login"),
|
||||||
|
Content = new StringContent($"{{\"username\":\"{username}\",\"password\":\"{password}\"}}", System.Text.Encoding.UTF8, "application/json")
|
||||||
|
};
|
||||||
|
try
|
||||||
|
{
|
||||||
|
HttpResponseMessage response = client.Send(requestMessage);
|
||||||
|
logger?.WriteLine($"Kavita | GetToken {requestMessage.RequestUri} -> {response.StatusCode}");
|
||||||
|
if (response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
JsonObject? result = JsonSerializer.Deserialize<JsonObject>(response.Content.ReadAsStream());
|
||||||
|
if (result is not null)
|
||||||
|
return result["token"]!.GetValue<string>();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger?.WriteLine($"Kavita | {response.Content}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (HttpRequestException e)
|
||||||
|
{
|
||||||
|
logger?.WriteLine($"Kavita | Unable to retrieve token:\n\r{e}");
|
||||||
|
}
|
||||||
|
logger?.WriteLine("Kavita | Did not receive token.");
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void UpdateLibraryInternal()
|
||||||
|
{
|
||||||
|
Log("Updating libraries.");
|
||||||
|
foreach (KavitaLibrary lib in GetLibraries())
|
||||||
|
NetClient.MakePost($"{baseUrl}/api/Library/scan?libraryId={lib.id}", "Bearer", auth, logger);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal override bool Test()
|
||||||
|
{
|
||||||
|
foreach (KavitaLibrary lib in GetLibraries())
|
||||||
|
if (NetClient.MakePost($"{baseUrl}/api/Library/scan?libraryId={lib.id}", "Bearer", auth, logger))
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Fetches all libraries available to the user
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>Array of KavitaLibrary</returns>
|
||||||
|
private IEnumerable<KavitaLibrary> GetLibraries()
|
||||||
|
{
|
||||||
|
Log("Getting libraries.");
|
||||||
|
Stream data = NetClient.MakeRequest($"{baseUrl}/api/Library/libraries", "Bearer", auth, logger);
|
||||||
|
if (data == Stream.Null)
|
||||||
|
{
|
||||||
|
Log("No libraries returned");
|
||||||
|
return Array.Empty<KavitaLibrary>();
|
||||||
|
}
|
||||||
|
JsonArray? result = JsonSerializer.Deserialize<JsonArray>(data);
|
||||||
|
if (result is null)
|
||||||
|
{
|
||||||
|
Log("No libraries returned");
|
||||||
|
return Array.Empty<KavitaLibrary>();
|
||||||
|
}
|
||||||
|
|
||||||
|
List<KavitaLibrary> ret = new();
|
||||||
|
|
||||||
|
foreach (JsonNode? jsonNode in result)
|
||||||
|
{
|
||||||
|
JsonObject? jObject = (JsonObject?)jsonNode;
|
||||||
|
if(jObject is null)
|
||||||
|
continue;
|
||||||
|
int libraryId = jObject!["id"]!.GetValue<int>();
|
||||||
|
string libraryName = jObject["name"]!.GetValue<string>();
|
||||||
|
ret.Add(new KavitaLibrary(libraryId, libraryName));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
private struct KavitaLibrary
|
||||||
|
{
|
||||||
|
public int id { get; }
|
||||||
|
// ReSharper disable once UnusedAutoPropertyAccessor.Local
|
||||||
|
public string name { get; }
|
||||||
|
|
||||||
|
public KavitaLibrary(int id, string name)
|
||||||
|
{
|
||||||
|
this.id = id;
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
88
Tranga/LibraryConnectors/Komga.cs
Normal file
88
Tranga/LibraryConnectors/Komga.cs
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
using System.Text.Json.Nodes;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using JsonSerializer = System.Text.Json.JsonSerializer;
|
||||||
|
|
||||||
|
namespace Tranga.LibraryConnectors;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Provides connectivity to Komga-API
|
||||||
|
/// Can fetch and update libraries
|
||||||
|
/// </summary>
|
||||||
|
public class Komga : LibraryConnector
|
||||||
|
{
|
||||||
|
public Komga(GlobalBase clone, string baseUrl, string username, string password)
|
||||||
|
: base(clone, baseUrl, Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes($"{username}:{password}")), LibraryType.Komga)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
[JsonConstructor]
|
||||||
|
public Komga(GlobalBase clone, string baseUrl, string auth) : base(clone, baseUrl, auth, LibraryType.Komga)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"Komga {baseUrl}";
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void UpdateLibraryInternal()
|
||||||
|
{
|
||||||
|
Log("Updating libraries.");
|
||||||
|
foreach (KomgaLibrary lib in GetLibraries())
|
||||||
|
NetClient.MakePost($"{baseUrl}/api/v1/libraries/{lib.id}/scan", "Basic", auth, logger);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal override bool Test()
|
||||||
|
{
|
||||||
|
foreach (KomgaLibrary lib in GetLibraries())
|
||||||
|
if (NetClient.MakePost($"{baseUrl}/api/v1/libraries/{lib.id}/scan", "Basic", auth, logger))
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Fetches all libraries available to the user
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>Array of KomgaLibraries</returns>
|
||||||
|
private IEnumerable<KomgaLibrary> GetLibraries()
|
||||||
|
{
|
||||||
|
Log("Getting Libraries");
|
||||||
|
Stream data = NetClient.MakeRequest($"{baseUrl}/api/v1/libraries", "Basic", auth, logger);
|
||||||
|
if (data == Stream.Null)
|
||||||
|
{
|
||||||
|
Log("No libraries returned");
|
||||||
|
return Array.Empty<KomgaLibrary>();
|
||||||
|
}
|
||||||
|
JsonArray? result = JsonSerializer.Deserialize<JsonArray>(data);
|
||||||
|
if (result is null)
|
||||||
|
{
|
||||||
|
Log("No libraries returned");
|
||||||
|
return Array.Empty<KomgaLibrary>();
|
||||||
|
}
|
||||||
|
|
||||||
|
HashSet<KomgaLibrary> ret = new();
|
||||||
|
|
||||||
|
foreach (JsonNode? jsonNode in result)
|
||||||
|
{
|
||||||
|
var jObject = (JsonObject?)jsonNode;
|
||||||
|
string libraryId = jObject!["id"]!.GetValue<string>();
|
||||||
|
string libraryName = jObject["name"]!.GetValue<string>();
|
||||||
|
ret.Add(new KomgaLibrary(libraryId, libraryName));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
private struct KomgaLibrary
|
||||||
|
{
|
||||||
|
public string id { get; }
|
||||||
|
// ReSharper disable once UnusedAutoPropertyAccessor.Local
|
||||||
|
public string name { get; }
|
||||||
|
|
||||||
|
public KomgaLibrary(string id, string name)
|
||||||
|
{
|
||||||
|
this.id = id;
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
144
Tranga/LibraryConnectors/LibraryConnector.cs
Normal file
144
Tranga/LibraryConnectors/LibraryConnector.cs
Normal file
@ -0,0 +1,144 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Net.Http.Headers;
|
||||||
|
using Logging;
|
||||||
|
|
||||||
|
namespace Tranga.LibraryConnectors;
|
||||||
|
|
||||||
|
public abstract class LibraryConnector : GlobalBase
|
||||||
|
{
|
||||||
|
public enum LibraryType : byte
|
||||||
|
{
|
||||||
|
Komga = 0,
|
||||||
|
Kavita = 1
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReSharper disable once UnusedAutoPropertyAccessor.Global
|
||||||
|
public LibraryType libraryType { get; }
|
||||||
|
public string baseUrl { get; }
|
||||||
|
// ReSharper disable once MemberCanBeProtected.Global
|
||||||
|
public string auth { get; } //Base64 encoded, if you use your password everywhere, you have problems
|
||||||
|
private DateTime? _updateLibraryRequested = null;
|
||||||
|
private readonly Thread? _libraryBufferThread = null;
|
||||||
|
private const int NoChangeTimeout = 2, BiggestInterval = 20;
|
||||||
|
|
||||||
|
protected LibraryConnector(GlobalBase clone, string baseUrl, string auth, LibraryType libraryType) : base(clone)
|
||||||
|
{
|
||||||
|
Log($"Creating libraryConnector {Enum.GetName(libraryType)}");
|
||||||
|
if (!baseUrlRex.IsMatch(baseUrl))
|
||||||
|
throw new ArgumentException("Base url does not match pattern");
|
||||||
|
if(auth == "")
|
||||||
|
throw new ArgumentNullException(nameof(auth), "Auth can not be empty");
|
||||||
|
this.baseUrl = baseUrlRex.Match(baseUrl).Value;
|
||||||
|
this.auth = auth;
|
||||||
|
this.libraryType = libraryType;
|
||||||
|
|
||||||
|
if (TrangaSettings.bufferLibraryUpdates)
|
||||||
|
{
|
||||||
|
_libraryBufferThread = new(CheckLibraryBuffer);
|
||||||
|
_libraryBufferThread.Start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void CheckLibraryBuffer()
|
||||||
|
{
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
if (_updateLibraryRequested is not null && DateTime.Now.Subtract((DateTime)_updateLibraryRequested) > TimeSpan.FromMinutes(NoChangeTimeout)) //If no updates have been requested for NoChangeTimeout minutes, update library
|
||||||
|
{
|
||||||
|
UpdateLibraryInternal();
|
||||||
|
_updateLibraryRequested = null;
|
||||||
|
}
|
||||||
|
Thread.Sleep(100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void UpdateLibrary()
|
||||||
|
{
|
||||||
|
_updateLibraryRequested ??= DateTime.Now;
|
||||||
|
if (!TrangaSettings.bufferLibraryUpdates)
|
||||||
|
{
|
||||||
|
UpdateLibraryInternal();
|
||||||
|
return;
|
||||||
|
}else if (_updateLibraryRequested is not null &&
|
||||||
|
DateTime.Now.Subtract((DateTime)_updateLibraryRequested) > TimeSpan.FromMinutes(BiggestInterval)) //If the last update has been more than BiggestInterval minutes ago, update library
|
||||||
|
{
|
||||||
|
UpdateLibraryInternal();
|
||||||
|
_updateLibraryRequested = null;
|
||||||
|
}
|
||||||
|
else if(_updateLibraryRequested is not null)
|
||||||
|
{
|
||||||
|
Log($"Buffering Library Updates (Updates in latest {((DateTime)_updateLibraryRequested).Add(TimeSpan.FromMinutes(BiggestInterval)).Subtract(DateTime.Now)} or {((DateTime)_updateLibraryRequested).Add(TimeSpan.FromMinutes(NoChangeTimeout)).Subtract(DateTime.Now)})");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract void UpdateLibraryInternal();
|
||||||
|
internal abstract bool Test();
|
||||||
|
|
||||||
|
protected static class NetClient
|
||||||
|
{
|
||||||
|
public static Stream MakeRequest(string url, string authScheme, string auth, Logger? logger)
|
||||||
|
{
|
||||||
|
HttpClient client = new();
|
||||||
|
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(authScheme, auth);
|
||||||
|
|
||||||
|
HttpRequestMessage requestMessage = new ()
|
||||||
|
{
|
||||||
|
Method = HttpMethod.Get,
|
||||||
|
RequestUri = new Uri(url)
|
||||||
|
};
|
||||||
|
try
|
||||||
|
{
|
||||||
|
|
||||||
|
HttpResponseMessage response = client.Send(requestMessage);
|
||||||
|
logger?.WriteLine("LibraryManager.NetClient",
|
||||||
|
$"GET {url} -> {(int)response.StatusCode}: {response.ReasonPhrase}");
|
||||||
|
|
||||||
|
if (response.StatusCode is HttpStatusCode.Unauthorized &&
|
||||||
|
response.RequestMessage!.RequestUri!.AbsoluteUri != url)
|
||||||
|
return MakeRequest(response.RequestMessage!.RequestUri!.AbsoluteUri, authScheme, auth, logger);
|
||||||
|
else if (response.IsSuccessStatusCode)
|
||||||
|
return response.Content.ReadAsStream();
|
||||||
|
else
|
||||||
|
return Stream.Null;
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
switch (e)
|
||||||
|
{
|
||||||
|
case HttpRequestException:
|
||||||
|
logger?.WriteLine("LibraryManager.NetClient", $"Failed to make Request:\n\r{e}\n\rContinuing.");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
return Stream.Null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool MakePost(string url, string authScheme, string auth, Logger? logger)
|
||||||
|
{
|
||||||
|
HttpClient client = new()
|
||||||
|
{
|
||||||
|
DefaultRequestHeaders =
|
||||||
|
{
|
||||||
|
{ "Accept", "application/json" },
|
||||||
|
{ "Authorization", new AuthenticationHeaderValue(authScheme, auth).ToString() }
|
||||||
|
}
|
||||||
|
};
|
||||||
|
HttpRequestMessage requestMessage = new ()
|
||||||
|
{
|
||||||
|
Method = HttpMethod.Post,
|
||||||
|
RequestUri = new Uri(url)
|
||||||
|
};
|
||||||
|
HttpResponseMessage response = client.Send(requestMessage);
|
||||||
|
logger?.WriteLine("LibraryManager.NetClient", $"POST {url} -> {(int)response.StatusCode}: {response.ReasonPhrase}");
|
||||||
|
|
||||||
|
if(response.StatusCode is HttpStatusCode.Unauthorized && response.RequestMessage!.RequestUri!.AbsoluteUri != url)
|
||||||
|
return MakePost(response.RequestMessage!.RequestUri!.AbsoluteUri, authScheme, auth, logger);
|
||||||
|
else if (response.IsSuccessStatusCode)
|
||||||
|
return true;
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
45
Tranga/LibraryConnectors/LibraryManagerJsonConverter.cs
Normal file
45
Tranga/LibraryConnectors/LibraryManagerJsonConverter.cs
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
|
||||||
|
namespace Tranga.LibraryConnectors;
|
||||||
|
|
||||||
|
public class LibraryManagerJsonConverter : JsonConverter
|
||||||
|
{
|
||||||
|
private readonly GlobalBase _clone;
|
||||||
|
|
||||||
|
internal LibraryManagerJsonConverter(GlobalBase clone)
|
||||||
|
{
|
||||||
|
this._clone = clone;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool CanConvert(Type objectType)
|
||||||
|
{
|
||||||
|
return (objectType == typeof(LibraryConnector));
|
||||||
|
}
|
||||||
|
|
||||||
|
public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
JObject jo = JObject.Load(reader);
|
||||||
|
if (jo["libraryType"]!.Value<byte>() == (byte)LibraryConnector.LibraryType.Komga)
|
||||||
|
return new Komga(this._clone,
|
||||||
|
jo.GetValue("baseUrl")!.Value<string>()!,
|
||||||
|
jo.GetValue("auth")!.Value<string>()!);
|
||||||
|
|
||||||
|
if (jo["libraryType"]!.Value<byte>() == (byte)LibraryConnector.LibraryType.Kavita)
|
||||||
|
return new Kavita(this._clone,
|
||||||
|
jo.GetValue("baseUrl")!.Value<string>()!,
|
||||||
|
jo.GetValue("auth")!.Value<string>()!);
|
||||||
|
|
||||||
|
throw new Exception();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool CanWrite => false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Don't call this
|
||||||
|
/// </summary>
|
||||||
|
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
throw new Exception("Dont call this");
|
||||||
|
}
|
||||||
|
}
|
222
Tranga/Manga.cs
Normal file
222
Tranga/Manga.cs
Normal file
@ -0,0 +1,222 @@
|
|||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using System.Web;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using static System.IO.UnixFileMode;
|
||||||
|
|
||||||
|
namespace Tranga;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Contains information on a Publication (Manga)
|
||||||
|
/// </summary>
|
||||||
|
public struct Manga
|
||||||
|
{
|
||||||
|
public string sortName { get; private set; }
|
||||||
|
public List<string> authors { get; private set; }
|
||||||
|
// ReSharper disable once UnusedAutoPropertyAccessor.Global
|
||||||
|
public Dictionary<string,string> altTitles { get; private set; }
|
||||||
|
// ReSharper disable once MemberCanBePrivate.Global
|
||||||
|
public string? description { get; private set; }
|
||||||
|
public string[] tags { get; private set; }
|
||||||
|
// ReSharper disable once UnusedAutoPropertyAccessor.Global
|
||||||
|
public string? coverUrl { get; private set; }
|
||||||
|
public string? coverFileNameInCache { get; private set; }
|
||||||
|
// ReSharper disable once UnusedAutoPropertyAccessor.Global
|
||||||
|
public Dictionary<string,string> links { get; }
|
||||||
|
// ReSharper disable once MemberCanBePrivate.Global
|
||||||
|
public int? year { get; private set; }
|
||||||
|
public string? originalLanguage { get; }
|
||||||
|
// ReSharper disable twice MemberCanBePrivate.Global
|
||||||
|
public string status { get; private set; }
|
||||||
|
public ReleaseStatusByte releaseStatus { get; private set; }
|
||||||
|
public enum ReleaseStatusByte : byte
|
||||||
|
{
|
||||||
|
Continuing = 0,
|
||||||
|
Completed = 1,
|
||||||
|
OnHiatus = 2,
|
||||||
|
Cancelled = 3,
|
||||||
|
Unreleased = 4
|
||||||
|
};
|
||||||
|
public string folderName { get; private set; }
|
||||||
|
public string publicationId { get; }
|
||||||
|
public string internalId { get; }
|
||||||
|
public float ignoreChaptersBelow { get; set; }
|
||||||
|
public float latestChapterDownloaded { get; set; }
|
||||||
|
public float latestChapterAvailable { get; set; }
|
||||||
|
|
||||||
|
public string? websiteUrl { get; private set; }
|
||||||
|
|
||||||
|
private static readonly Regex LegalCharacters = new (@"[A-Za-zÀ-ÖØ-öø-ÿ0-9 \.\-,'\'\)\(~!\+]*");
|
||||||
|
|
||||||
|
[JsonConstructor]
|
||||||
|
public Manga(string sortName, List<string> authors, string? description, Dictionary<string,string> altTitles, string[] tags, string? coverUrl, string? coverFileNameInCache, Dictionary<string,string>? links, int? year, string? originalLanguage, string publicationId, ReleaseStatusByte releaseStatus, string? websiteUrl = null, string? folderName = null, float? ignoreChaptersBelow = 0)
|
||||||
|
{
|
||||||
|
this.sortName = HttpUtility.HtmlDecode(sortName);
|
||||||
|
this.authors = authors.Select(HttpUtility.HtmlDecode).ToList()!;
|
||||||
|
this.description = HttpUtility.HtmlDecode(description);
|
||||||
|
this.altTitles = altTitles.ToDictionary(a => HttpUtility.HtmlDecode(a.Key), a => HttpUtility.HtmlDecode(a.Value));
|
||||||
|
this.tags = tags.Select(HttpUtility.HtmlDecode).ToArray()!;
|
||||||
|
this.coverFileNameInCache = coverFileNameInCache;
|
||||||
|
this.coverUrl = coverUrl;
|
||||||
|
this.links = links ?? new Dictionary<string, string>();
|
||||||
|
this.year = year;
|
||||||
|
this.originalLanguage = originalLanguage;
|
||||||
|
this.publicationId = publicationId;
|
||||||
|
this.folderName = folderName ?? string.Concat(LegalCharacters.Matches(HttpUtility.HtmlDecode(sortName)));
|
||||||
|
while (this.folderName.EndsWith('.'))
|
||||||
|
this.folderName = this.folderName.Substring(0, this.folderName.Length - 1);
|
||||||
|
string onlyLowerLetters = string.Concat(this.sortName.ToLower().Where(Char.IsLetter));
|
||||||
|
this.internalId = DateTime.Now.Ticks.ToString();
|
||||||
|
this.ignoreChaptersBelow = ignoreChaptersBelow ?? 0f;
|
||||||
|
this.latestChapterDownloaded = 0;
|
||||||
|
this.latestChapterAvailable = 0;
|
||||||
|
this.releaseStatus = releaseStatus;
|
||||||
|
this.status = Enum.GetName(releaseStatus) ?? "";
|
||||||
|
this.websiteUrl = websiteUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Manga WithMetadata(Manga newManga)
|
||||||
|
{
|
||||||
|
return this with
|
||||||
|
{
|
||||||
|
sortName = newManga.sortName,
|
||||||
|
description = newManga.description,
|
||||||
|
coverUrl = newManga.coverUrl,
|
||||||
|
authors = authors.Union(newManga.authors).ToList(),
|
||||||
|
altTitles = altTitles.UnionBy(newManga.altTitles, kv => kv.Key).ToDictionary(x => x.Key, x => x.Value),
|
||||||
|
tags = tags.Union(newManga.tags).ToArray(),
|
||||||
|
status = newManga.status,
|
||||||
|
releaseStatus = newManga.releaseStatus,
|
||||||
|
websiteUrl = newManga.websiteUrl,
|
||||||
|
year = newManga.year,
|
||||||
|
coverFileNameInCache = newManga.coverFileNameInCache
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool Equals(object? obj)
|
||||||
|
{
|
||||||
|
if (obj is not Manga compareManga)
|
||||||
|
return false;
|
||||||
|
return this.description == compareManga.description &&
|
||||||
|
this.year == compareManga.year &&
|
||||||
|
this.status == compareManga.status &&
|
||||||
|
this.releaseStatus == compareManga.releaseStatus &&
|
||||||
|
this.sortName == compareManga.sortName &&
|
||||||
|
this.latestChapterAvailable.Equals(compareManga.latestChapterAvailable) &&
|
||||||
|
this.authors.All(a => compareManga.authors.Contains(a)) &&
|
||||||
|
(this.coverFileNameInCache??"").Equals(compareManga.coverFileNameInCache) &&
|
||||||
|
(this.websiteUrl??"").Equals(compareManga.websiteUrl) &&
|
||||||
|
this.tags.All(t => compareManga.tags.Contains(t));
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"Publication {sortName} {internalId}";
|
||||||
|
}
|
||||||
|
|
||||||
|
public string CreatePublicationFolder(string downloadDirectory)
|
||||||
|
{
|
||||||
|
string publicationFolder = Path.Join(downloadDirectory, this.folderName);
|
||||||
|
if(!Directory.Exists(publicationFolder))
|
||||||
|
Directory.CreateDirectory(publicationFolder);
|
||||||
|
if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
|
File.SetUnixFileMode(publicationFolder, GroupRead | GroupWrite | GroupExecute | OtherRead | OtherWrite | OtherExecute | UserRead | UserWrite | UserExecute);
|
||||||
|
return publicationFolder;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void MovePublicationFolder(string downloadDirectory, string newFolderName)
|
||||||
|
{
|
||||||
|
string oldPath = Path.Join(downloadDirectory, this.folderName);
|
||||||
|
this.folderName = newFolderName;//Create new Path with the new folderName
|
||||||
|
string newPath = CreatePublicationFolder(downloadDirectory);
|
||||||
|
if (Directory.Exists(oldPath))
|
||||||
|
{
|
||||||
|
if (Directory.Exists(newPath)) //Move/Overwrite old Files, Delete old Directory
|
||||||
|
{
|
||||||
|
IEnumerable<string> newPathFileNames = new DirectoryInfo(newPath).GetFiles().Select(fi => fi.Name);
|
||||||
|
foreach(FileInfo fileInfo in new DirectoryInfo(oldPath).GetFiles().Where(fi => newPathFileNames.Contains(fi.Name) == false))
|
||||||
|
File.Move(fileInfo.FullName, Path.Join(newPath, fileInfo.Name), true);
|
||||||
|
Directory.Delete(oldPath);
|
||||||
|
}else
|
||||||
|
Directory.Move(oldPath, newPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void UpdateLatestDownloadedChapter(Chapter chapter)//TODO check files if chapters are all downloaded
|
||||||
|
{
|
||||||
|
float chapterNumber = Convert.ToSingle(chapter.chapterNumber, GlobalBase.numberFormatDecimalPoint);
|
||||||
|
latestChapterDownloaded = latestChapterDownloaded < chapterNumber ? chapterNumber : latestChapterDownloaded;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SaveSeriesInfoJson(bool overwrite = false)
|
||||||
|
{
|
||||||
|
string publicationFolder = CreatePublicationFolder(TrangaSettings.downloadLocation);
|
||||||
|
string seriesInfoPath = Path.Join(publicationFolder, "series.json");
|
||||||
|
if(overwrite || (!overwrite && !File.Exists(seriesInfoPath)))
|
||||||
|
File.WriteAllText(seriesInfoPath,this.GetSeriesInfoJson());
|
||||||
|
if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
|
File.SetUnixFileMode(seriesInfoPath, GroupRead | GroupWrite | OtherRead | OtherWrite | UserRead | UserWrite);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <returns>Serialized JSON String for series.json</returns>
|
||||||
|
private string GetSeriesInfoJson()
|
||||||
|
{
|
||||||
|
SeriesInfo si = new (new Metadata(this));
|
||||||
|
return System.Text.Json.JsonSerializer.Serialize(si);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Only for series.json
|
||||||
|
private struct SeriesInfo
|
||||||
|
{
|
||||||
|
// ReSharper disable once UnusedAutoPropertyAccessor.Local we need it, trust
|
||||||
|
[JsonRequired]public Metadata metadata { get; }
|
||||||
|
public SeriesInfo(Metadata metadata) => this.metadata = metadata;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Only for series.json what an abomination, why are all the fields not-null????
|
||||||
|
private struct Metadata
|
||||||
|
{
|
||||||
|
// ReSharper disable UnusedAutoPropertyAccessor.Local we need them all, trust me
|
||||||
|
[JsonRequired] public string type { get; }
|
||||||
|
[JsonRequired] public string publisher { get; }
|
||||||
|
// ReSharper disable twice IdentifierTypo
|
||||||
|
[JsonRequired] public int comicid { get; }
|
||||||
|
[JsonRequired] public string booktype { get; }
|
||||||
|
// ReSharper disable InconsistentNaming This one property is capitalized. Why?
|
||||||
|
[JsonRequired] public string ComicImage { get; }
|
||||||
|
[JsonRequired] public int total_issues { get; }
|
||||||
|
[JsonRequired] public string publication_run { get; }
|
||||||
|
[JsonRequired]public string name { get; }
|
||||||
|
[JsonRequired]public string year { get; }
|
||||||
|
[JsonRequired]public string status { get; }
|
||||||
|
[JsonRequired]public string description_text { get; }
|
||||||
|
|
||||||
|
public Metadata(Manga manga) : this(manga.sortName, manga.year.ToString() ?? string.Empty, manga.releaseStatus, manga.description ?? "")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public Metadata(string name, string year, ReleaseStatusByte status, string description_text)
|
||||||
|
{
|
||||||
|
this.name = name;
|
||||||
|
this.year = year;
|
||||||
|
this.status = status switch
|
||||||
|
{
|
||||||
|
ReleaseStatusByte.Continuing => "Continuing",
|
||||||
|
ReleaseStatusByte.Completed => "Ended",
|
||||||
|
_ => Enum.GetName(status) ?? "Ended"
|
||||||
|
};
|
||||||
|
this.description_text = description_text;
|
||||||
|
|
||||||
|
//kill it with fire, but otherwise Komga will not parse
|
||||||
|
type = "Manga";
|
||||||
|
publisher = "";
|
||||||
|
comicid = 0;
|
||||||
|
booktype = "";
|
||||||
|
ComicImage = "";
|
||||||
|
total_issues = 0;
|
||||||
|
publication_run = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
225
Tranga/MangaConnectors/Bato.cs
Normal file
225
Tranga/MangaConnectors/Bato.cs
Normal file
@ -0,0 +1,225 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using HtmlAgilityPack;
|
||||||
|
using Tranga.Jobs;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
public class Bato : MangaConnector
|
||||||
|
{
|
||||||
|
|
||||||
|
public Bato(GlobalBase clone) : base(clone, "Bato", ["en"])
|
||||||
|
{
|
||||||
|
this.downloadClient = new HttpDownloadClient(clone);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga[] GetManga(string publicationTitle = "")
|
||||||
|
{
|
||||||
|
Log($"Searching Publications. Term=\"{publicationTitle}\"");
|
||||||
|
string sanitizedTitle = string.Join(' ', Regex.Matches(publicationTitle, "[A-z]*").Where(m => m.Value.Length > 0)).ToLower();
|
||||||
|
string requestUrl = $"https://bato.to/v3x-search?word={sanitizedTitle}&lang=en";
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
{
|
||||||
|
Log($"Failed to retrieve site");
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga[] publications = ParsePublicationsFromHtml(requestResult.htmlDocument);
|
||||||
|
Log($"Retrieved {publications.Length} publications. Term=\"{publicationTitle}\"");
|
||||||
|
return publications;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromId(string publicationId)
|
||||||
|
{
|
||||||
|
return GetMangaFromUrl($"https://bato.to/title/{publicationId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromUrl(string url)
|
||||||
|
{
|
||||||
|
RequestResult requestResult = downloadClient.MakeRequest(url, RequestType.MangaInfo);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return null;
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
{
|
||||||
|
Log($"Failed to retrieve site");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return ParseSinglePublicationFromHtml(requestResult.htmlDocument, url.Split('/')[^1], url);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga[] ParsePublicationsFromHtml(HtmlDocument document)
|
||||||
|
{
|
||||||
|
HtmlNode mangaList = document.DocumentNode.SelectSingleNode("//div[@data-hk='0-0-2']");
|
||||||
|
if (!mangaList.ChildNodes.Any(node => node.Name == "div"))
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
|
||||||
|
List<string> urls = mangaList.ChildNodes
|
||||||
|
.Select(node => $"https://bato.to{node.Descendants("div").First().FirstChild.GetAttributeValue("href", "")}").ToList();
|
||||||
|
|
||||||
|
HashSet<Manga> ret = new();
|
||||||
|
foreach (string url in urls)
|
||||||
|
{
|
||||||
|
Manga? manga = GetMangaFromUrl(url);
|
||||||
|
if (manga is not null)
|
||||||
|
ret.Add((Manga)manga);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga ParseSinglePublicationFromHtml(HtmlDocument document, string publicationId, string websiteUrl)
|
||||||
|
{
|
||||||
|
HtmlNode infoNode = document.DocumentNode.SelectSingleNode("/html/body/div/main/div[1]/div[2]");
|
||||||
|
|
||||||
|
string sortName = infoNode.Descendants("h3").First().InnerText;
|
||||||
|
string description = document.DocumentNode
|
||||||
|
.SelectSingleNode("//div[contains(concat(' ',normalize-space(@class),' '),'prose')]").InnerText;
|
||||||
|
|
||||||
|
string[] altTitlesList = infoNode.ChildNodes[1].ChildNodes[2].InnerText.Split('/');
|
||||||
|
int i = 0;
|
||||||
|
Dictionary<string, string> altTitles = altTitlesList.ToDictionary(s => i++.ToString(), s => s);
|
||||||
|
|
||||||
|
string posterUrl = document.DocumentNode.SelectNodes("//img")
|
||||||
|
.First(child => child.GetAttributeValue("data-hk", "") == "0-1-0").GetAttributeValue("src", "").Replace("&", "&");
|
||||||
|
string coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId, RequestType.MangaCover);
|
||||||
|
|
||||||
|
List<HtmlNode> genreNodes = document.DocumentNode.SelectSingleNode("//b[text()='Genres:']/..").SelectNodes("span").ToList();
|
||||||
|
string[] tags = genreNodes.Select(node => node.FirstChild.InnerText).ToArray();
|
||||||
|
|
||||||
|
List<HtmlNode> authorsNodes = infoNode.ChildNodes[1].ChildNodes[3].Descendants("a").ToList();
|
||||||
|
List<string> authors = authorsNodes.Select(node => node.InnerText.Replace("amp;", "")).ToList();
|
||||||
|
|
||||||
|
HtmlNode? originalLanguageNode = document.DocumentNode.SelectSingleNode("//span[text()='Tr From']/..");
|
||||||
|
string originalLanguage = originalLanguageNode is not null ? originalLanguageNode.LastChild.InnerText : "";
|
||||||
|
|
||||||
|
if (!int.TryParse(
|
||||||
|
document.DocumentNode.SelectSingleNode("//span[text()='Original Publication:']/..").LastChild.InnerText.Split('-')[0],
|
||||||
|
out int year))
|
||||||
|
year = DateTime.Now.Year;
|
||||||
|
|
||||||
|
string status = document.DocumentNode.SelectSingleNode("//span[text()='Original Publication:']/..")
|
||||||
|
.ChildNodes[2].InnerText;
|
||||||
|
Manga.ReleaseStatusByte releaseStatus = Manga.ReleaseStatusByte.Unreleased;
|
||||||
|
switch (status.ToLower())
|
||||||
|
{
|
||||||
|
case "ongoing": releaseStatus = Manga.ReleaseStatusByte.Continuing; break;
|
||||||
|
case "completed": releaseStatus = Manga.ReleaseStatusByte.Completed; break;
|
||||||
|
case "hiatus": releaseStatus = Manga.ReleaseStatusByte.OnHiatus; break;
|
||||||
|
case "cancelled": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
|
||||||
|
case "pending": releaseStatus = Manga.ReleaseStatusByte.Unreleased; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga manga = new (sortName, authors, description, altTitles, tags, posterUrl, coverFileNameInCache, new Dictionary<string, string>(),
|
||||||
|
year, originalLanguage, publicationId, releaseStatus, websiteUrl: websiteUrl);
|
||||||
|
AddMangaToCache(manga);
|
||||||
|
return manga;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Chapter[] GetChapters(Manga manga, string language="en")
|
||||||
|
{
|
||||||
|
Log($"Getting chapters {manga}");
|
||||||
|
string requestUrl = $"https://bato.to/title/{manga.publicationId}";
|
||||||
|
// Leaving this in for verification if the page exists
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return Array.Empty<Chapter>();
|
||||||
|
|
||||||
|
//Return Chapters ordered by Chapter-Number
|
||||||
|
List<Chapter> chapters = ParseChaptersFromHtml(manga, requestUrl);
|
||||||
|
Log($"Got {chapters.Count} chapters. {manga}");
|
||||||
|
return chapters.Order().ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<Chapter> ParseChaptersFromHtml(Manga manga, string mangaUrl)
|
||||||
|
{
|
||||||
|
RequestResult result = downloadClient.MakeRequest(mangaUrl, RequestType.Default);
|
||||||
|
if ((int)result.statusCode < 200 || (int)result.statusCode >= 300 || result.htmlDocument is null)
|
||||||
|
{
|
||||||
|
Log("Failed to load site");
|
||||||
|
return new List<Chapter>();
|
||||||
|
}
|
||||||
|
|
||||||
|
List<Chapter> ret = new();
|
||||||
|
|
||||||
|
HtmlNode chapterList =
|
||||||
|
result.htmlDocument.DocumentNode.SelectSingleNode("/html/body/div/main/div[3]/astro-island/div/div[2]/div/div/astro-slot");
|
||||||
|
|
||||||
|
Regex numberRex = new(@"\/title\/.+\/[0-9]+(-vol_([0-9]+))?-ch_([0-9\.]+)");
|
||||||
|
|
||||||
|
foreach (HtmlNode chapterInfo in chapterList.SelectNodes("div"))
|
||||||
|
{
|
||||||
|
HtmlNode infoNode = chapterInfo.FirstChild.FirstChild;
|
||||||
|
string chapterUrl = infoNode.GetAttributeValue("href", "");
|
||||||
|
|
||||||
|
Match match = numberRex.Match(chapterUrl);
|
||||||
|
string? volumeNumber = match.Groups[2].Success ? match.Groups[2].Value : null;
|
||||||
|
string chapterNumber = match.Groups[3].Value;
|
||||||
|
string chapterName = chapterNumber;
|
||||||
|
string url = $"https://bato.to{chapterUrl}?load=2";
|
||||||
|
ret.Add(new Chapter(manga, chapterName, volumeNumber, chapterNumber, url));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null)
|
||||||
|
{
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
{
|
||||||
|
progressToken.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga chapterParentManga = chapter.parentManga;
|
||||||
|
Log($"Retrieving chapter-info {chapter} {chapterParentManga}");
|
||||||
|
string requestUrl = chapter.url;
|
||||||
|
// Leaving this in to check if the page exists
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
{
|
||||||
|
progressToken?.Cancel();
|
||||||
|
return requestResult.statusCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
string[] imageUrls = ParseImageUrlsFromHtml(requestUrl);
|
||||||
|
|
||||||
|
string comicInfoPath = Path.GetTempFileName();
|
||||||
|
File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
|
||||||
|
|
||||||
|
return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, "https://mangakatana.com/", progressToken:progressToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string[] ParseImageUrlsFromHtml(string mangaUrl)
|
||||||
|
{
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(mangaUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
{
|
||||||
|
return Array.Empty<string>();
|
||||||
|
}
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
{
|
||||||
|
Log($"Failed to retrieve site");
|
||||||
|
return Array.Empty<string>();
|
||||||
|
}
|
||||||
|
|
||||||
|
HtmlDocument document = requestResult.htmlDocument;
|
||||||
|
|
||||||
|
HtmlNode images = document.DocumentNode.SelectNodes("//astro-island").First(node =>
|
||||||
|
node.GetAttributeValue("component-url", "").Contains("/_astro/ImageList."));
|
||||||
|
|
||||||
|
string weirdString = images.OuterHtml;
|
||||||
|
string weirdString2 = Regex.Match(weirdString, @"props=\""(.*)}\""").Groups[1].Value;
|
||||||
|
string[] urls = Regex.Matches(weirdString2, @"(https:\/\/[A-z\-0-9\.\?\&\;\=\/]+)\\")
|
||||||
|
.Select(match => match.Groups[1].Value.Replace("&", "&")).ToArray();
|
||||||
|
|
||||||
|
return urls;
|
||||||
|
}
|
||||||
|
}
|
86
Tranga/MangaConnectors/ChromiumDownloadClient.cs
Normal file
86
Tranga/MangaConnectors/ChromiumDownloadClient.cs
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using HtmlAgilityPack;
|
||||||
|
using PuppeteerSharp;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
internal class ChromiumDownloadClient : DownloadClient
|
||||||
|
{
|
||||||
|
private static readonly IBrowser Browser = StartBrowser().Result;
|
||||||
|
private const int StartTimeoutMs = 10000;
|
||||||
|
private readonly HttpDownloadClient _httpDownloadClient;
|
||||||
|
|
||||||
|
private static async Task<IBrowser> StartBrowser()
|
||||||
|
{
|
||||||
|
return await Puppeteer.LaunchAsync(new LaunchOptions
|
||||||
|
{
|
||||||
|
Headless = true,
|
||||||
|
Args = new [] {
|
||||||
|
"--disable-gpu",
|
||||||
|
"--disable-dev-shm-usage",
|
||||||
|
"--disable-setuid-sandbox",
|
||||||
|
"--no-sandbox"},
|
||||||
|
Timeout = StartTimeoutMs
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public ChromiumDownloadClient(GlobalBase clone) : base(clone)
|
||||||
|
{
|
||||||
|
_httpDownloadClient = new(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private readonly Regex _imageUrlRex = new(@"https?:\/\/.*\.(?:p?jpe?g|gif|a?png|bmp|avif|webp)(\?.*)?");
|
||||||
|
internal override RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null)
|
||||||
|
{
|
||||||
|
return _imageUrlRex.IsMatch(url)
|
||||||
|
? _httpDownloadClient.MakeRequestInternal(url, referrer)
|
||||||
|
: MakeRequestBrowser(url, referrer, clickButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
private RequestResult MakeRequestBrowser(string url, string? referrer = null, string? clickButton = null)
|
||||||
|
{
|
||||||
|
IPage page = Browser.NewPageAsync().Result;
|
||||||
|
page.DefaultTimeout = 10000;
|
||||||
|
IResponse response;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
response = page.GoToAsync(url, WaitUntilNavigation.Networkidle0).Result;
|
||||||
|
Log("Page loaded.");
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Log($"Could not load Page:\n{e.Message}");
|
||||||
|
page.CloseAsync();
|
||||||
|
return new RequestResult(HttpStatusCode.InternalServerError, null, Stream.Null);
|
||||||
|
}
|
||||||
|
|
||||||
|
Stream stream = Stream.Null;
|
||||||
|
HtmlDocument? document = null;
|
||||||
|
|
||||||
|
if (response.Headers.TryGetValue("Content-Type", out string? content))
|
||||||
|
{
|
||||||
|
if (content.Contains("text/html"))
|
||||||
|
{
|
||||||
|
if (clickButton is not null && page.QuerySelectorAsync(clickButton).Result is not null)
|
||||||
|
page.ClickAsync(clickButton).Wait();
|
||||||
|
string htmlString = page.GetContentAsync().Result;
|
||||||
|
stream = new MemoryStream(Encoding.Default.GetBytes(htmlString));
|
||||||
|
document = new ();
|
||||||
|
document.LoadHtml(htmlString);
|
||||||
|
}else if (content.Contains("image"))
|
||||||
|
{
|
||||||
|
stream = new MemoryStream(response.BufferAsync().Result);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
page.CloseAsync();
|
||||||
|
return new RequestResult(HttpStatusCode.InternalServerError, null, Stream.Null);
|
||||||
|
}
|
||||||
|
|
||||||
|
page.CloseAsync();
|
||||||
|
return new RequestResult(response.Status, document, stream, false, "");
|
||||||
|
}
|
||||||
|
}
|
44
Tranga/MangaConnectors/DownloadClient.cs
Normal file
44
Tranga/MangaConnectors/DownloadClient.cs
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
using System.Net;
|
||||||
|
using HtmlAgilityPack;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
internal abstract class DownloadClient : GlobalBase
|
||||||
|
{
|
||||||
|
private readonly Dictionary<RequestType, DateTime> _lastExecutedRateLimit;
|
||||||
|
|
||||||
|
protected DownloadClient(GlobalBase clone) : base(clone)
|
||||||
|
{
|
||||||
|
this._lastExecutedRateLimit = new();
|
||||||
|
}
|
||||||
|
|
||||||
|
public RequestResult MakeRequest(string url, RequestType requestType, string? referrer = null, string? clickButton = null)
|
||||||
|
{
|
||||||
|
if (!TrangaSettings.requestLimits.ContainsKey(requestType))
|
||||||
|
{
|
||||||
|
Log("RequestType not configured for rate-limit.");
|
||||||
|
return new RequestResult(HttpStatusCode.NotAcceptable, null, Stream.Null);
|
||||||
|
}
|
||||||
|
|
||||||
|
int rateLimit = TrangaSettings.userAgent == TrangaSettings.DefaultUserAgent
|
||||||
|
? TrangaSettings.DefaultRequestLimits[requestType]
|
||||||
|
: TrangaSettings.requestLimits[requestType];
|
||||||
|
|
||||||
|
TimeSpan timeBetweenRequests = TimeSpan.FromMinutes(1).Divide(rateLimit);
|
||||||
|
_lastExecutedRateLimit.TryAdd(requestType, DateTime.Now.Subtract(timeBetweenRequests));
|
||||||
|
|
||||||
|
TimeSpan rateLimitTimeout = timeBetweenRequests.Subtract(DateTime.Now.Subtract(_lastExecutedRateLimit[requestType]));
|
||||||
|
|
||||||
|
if (rateLimitTimeout > TimeSpan.Zero)
|
||||||
|
{
|
||||||
|
Log($"Waiting {rateLimitTimeout.TotalSeconds} seconds");
|
||||||
|
Thread.Sleep(rateLimitTimeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
RequestResult result = MakeRequestInternal(url, referrer, clickButton);
|
||||||
|
_lastExecutedRateLimit[requestType] = DateTime.Now;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal abstract RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null);
|
||||||
|
}
|
75
Tranga/MangaConnectors/HttpDownloadClient.cs
Normal file
75
Tranga/MangaConnectors/HttpDownloadClient.cs
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Net.Http.Headers;
|
||||||
|
using HtmlAgilityPack;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
internal class HttpDownloadClient : DownloadClient
|
||||||
|
{
|
||||||
|
private static readonly HttpClient Client = new()
|
||||||
|
{
|
||||||
|
Timeout = TimeSpan.FromSeconds(10)
|
||||||
|
};
|
||||||
|
|
||||||
|
public HttpDownloadClient(GlobalBase clone) : base(clone)
|
||||||
|
{
|
||||||
|
Client.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", TrangaSettings.userAgent);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal override RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null)
|
||||||
|
{
|
||||||
|
if(clickButton is not null)
|
||||||
|
Log("Can not click button on static site.");
|
||||||
|
HttpResponseMessage? response = null;
|
||||||
|
while (response is null)
|
||||||
|
{
|
||||||
|
HttpRequestMessage requestMessage = new(HttpMethod.Get, url);
|
||||||
|
if (referrer is not null)
|
||||||
|
requestMessage.Headers.Referrer = new Uri(referrer);
|
||||||
|
//Log($"Requesting {requestType} {url}");
|
||||||
|
try
|
||||||
|
{
|
||||||
|
response = Client.Send(requestMessage);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
switch (e)
|
||||||
|
{
|
||||||
|
case TaskCanceledException:
|
||||||
|
Log($"Request timed out {url}.\n\r{e}");
|
||||||
|
return new RequestResult(HttpStatusCode.RequestTimeout, null, Stream.Null);
|
||||||
|
case HttpRequestException:
|
||||||
|
Log($"Request failed {url}\n\r{e}");
|
||||||
|
return new RequestResult(HttpStatusCode.BadRequest, null, Stream.Null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
Log($"Request-Error {response.StatusCode}: {url}");
|
||||||
|
return new RequestResult(response.StatusCode, null, Stream.Null);
|
||||||
|
}
|
||||||
|
|
||||||
|
Stream stream = response.Content.ReadAsStream();
|
||||||
|
|
||||||
|
HtmlDocument? document = null;
|
||||||
|
|
||||||
|
if (response.Content.Headers.ContentType?.MediaType == "text/html")
|
||||||
|
{
|
||||||
|
StreamReader reader = new (stream);
|
||||||
|
document = new ();
|
||||||
|
document.LoadHtml(reader.ReadToEnd());
|
||||||
|
stream.Position = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Request has been redirected to another page. For example, it redirects directly to the results when there is only 1 result
|
||||||
|
if (response.RequestMessage is not null && response.RequestMessage.RequestUri is not null)
|
||||||
|
{
|
||||||
|
return new RequestResult(response.StatusCode, document, stream, true,
|
||||||
|
response.RequestMessage.RequestUri.AbsoluteUri);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new RequestResult(response.StatusCode, document, stream);
|
||||||
|
}
|
||||||
|
}
|
307
Tranga/MangaConnectors/MangaConnector.cs
Normal file
307
Tranga/MangaConnectors/MangaConnector.cs
Normal file
@ -0,0 +1,307 @@
|
|||||||
|
using System.IO.Compression;
|
||||||
|
using System.Net;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using Tranga.Jobs;
|
||||||
|
using static System.IO.UnixFileMode;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Base-Class for all Connectors
|
||||||
|
/// Provides some methods to be used by all Connectors, as well as a DownloadClient
|
||||||
|
/// </summary>
|
||||||
|
public abstract class MangaConnector : GlobalBase
|
||||||
|
{
|
||||||
|
internal DownloadClient downloadClient { get; init; } = null!;
|
||||||
|
public string[] SupportedLanguages;
|
||||||
|
|
||||||
|
protected MangaConnector(GlobalBase clone, string name, string[] supportedLanguages) : base(clone)
|
||||||
|
{
|
||||||
|
this.name = name;
|
||||||
|
this.SupportedLanguages = supportedLanguages;
|
||||||
|
Directory.CreateDirectory(TrangaSettings.coverImageCache);
|
||||||
|
}
|
||||||
|
|
||||||
|
public string name { get; } //Name of the Connector (e.g. Website)
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Returns all Publications with the given string.
|
||||||
|
/// If the string is empty or null, returns all Publication of the Connector
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="publicationTitle">Search-Query</param>
|
||||||
|
/// <returns>Publications matching the query</returns>
|
||||||
|
public abstract Manga[] GetManga(string publicationTitle = "");
|
||||||
|
|
||||||
|
public abstract Manga? GetMangaFromUrl(string url);
|
||||||
|
|
||||||
|
public abstract Manga? GetMangaFromId(string publicationId);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Returns all Chapters of the publication in the provided language.
|
||||||
|
/// If the language is empty or null, returns all Chapters in all Languages.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="manga">Publication to get Chapters for</param>
|
||||||
|
/// <param name="language">Language of the Chapters</param>
|
||||||
|
/// <returns>Array of Chapters matching Publication and Language</returns>
|
||||||
|
public abstract Chapter[] GetChapters(Manga manga, string language="en");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Updates the available Chapters of a Publication
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="manga">Publication to check</param>
|
||||||
|
/// <param name="language">Language to receive chapters for</param>
|
||||||
|
/// <returns>List of Chapters that were previously not in collection</returns>
|
||||||
|
public Chapter[] GetNewChapters(Manga manga, string language = "en")
|
||||||
|
{
|
||||||
|
Log($"Getting new Chapters for {manga}");
|
||||||
|
Chapter[] allChapters = this.GetChapters(manga, language);
|
||||||
|
if (allChapters.Length < 1)
|
||||||
|
return Array.Empty<Chapter>();
|
||||||
|
|
||||||
|
Log($"Checking for duplicates {manga}");
|
||||||
|
List<Chapter> newChaptersList = allChapters.Where(nChapter => float.TryParse(nChapter.chapterNumber, numberFormatDecimalPoint, out float chapterNumber)
|
||||||
|
&& chapterNumber > manga.ignoreChaptersBelow
|
||||||
|
&& !nChapter.CheckChapterIsDownloaded()).ToList();
|
||||||
|
Log($"{newChaptersList.Count} new chapters. {manga}");
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Chapter latestChapterAvailable =
|
||||||
|
allChapters.Max();
|
||||||
|
manga.latestChapterAvailable =
|
||||||
|
Convert.ToSingle(latestChapterAvailable.chapterNumber, numberFormatDecimalPoint);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Log(e.ToString());
|
||||||
|
Log($"Failed getting new Chapters for {manga}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return newChaptersList.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Chapter[] SelectChapters(Manga manga, string searchTerm, string? language = null)
|
||||||
|
{
|
||||||
|
Chapter[] availableChapters = this.GetChapters(manga, language??"en");
|
||||||
|
Regex volumeRegex = new ("((v(ol)*(olume)*){1} *([0-9]+(-[0-9]+)?){1})", RegexOptions.IgnoreCase);
|
||||||
|
Regex chapterRegex = new ("((c(h)*(hapter)*){1} *([0-9]+(-[0-9]+)?){1})", RegexOptions.IgnoreCase);
|
||||||
|
Regex singleResultRegex = new("([0-9]+)", RegexOptions.IgnoreCase);
|
||||||
|
Regex rangeResultRegex = new("([0-9]+(-[0-9]+))", RegexOptions.IgnoreCase);
|
||||||
|
Regex allRegex = new("a(ll)?", RegexOptions.IgnoreCase);
|
||||||
|
if (volumeRegex.IsMatch(searchTerm) && chapterRegex.IsMatch(searchTerm))
|
||||||
|
{
|
||||||
|
string volume = singleResultRegex.Match(volumeRegex.Match(searchTerm).Value).Value;
|
||||||
|
string chapter = singleResultRegex.Match(chapterRegex.Match(searchTerm).Value).Value;
|
||||||
|
return availableChapters.Where(aCh => aCh.volumeNumber is not null &&
|
||||||
|
aCh.volumeNumber.Equals(volume, StringComparison.InvariantCultureIgnoreCase) &&
|
||||||
|
aCh.chapterNumber.Equals(chapter, StringComparison.InvariantCultureIgnoreCase))
|
||||||
|
.ToArray();
|
||||||
|
}
|
||||||
|
else if (volumeRegex.IsMatch(searchTerm))
|
||||||
|
{
|
||||||
|
string volume = volumeRegex.Match(searchTerm).Value;
|
||||||
|
if (rangeResultRegex.IsMatch(volume))
|
||||||
|
{
|
||||||
|
string range = rangeResultRegex.Match(volume).Value;
|
||||||
|
int start = Convert.ToInt32(range.Split('-')[0]);
|
||||||
|
int end = Convert.ToInt32(range.Split('-')[1]);
|
||||||
|
return availableChapters.Where(aCh => aCh.volumeNumber is not null &&
|
||||||
|
Convert.ToInt32(aCh.volumeNumber) >= start &&
|
||||||
|
Convert.ToInt32(aCh.volumeNumber) <= end).ToArray();
|
||||||
|
}
|
||||||
|
else if (singleResultRegex.IsMatch(volume))
|
||||||
|
{
|
||||||
|
string volumeNumber = singleResultRegex.Match(volume).Value;
|
||||||
|
return availableChapters.Where(aCh =>
|
||||||
|
aCh.volumeNumber is not null &&
|
||||||
|
aCh.volumeNumber.Equals(volumeNumber, StringComparison.InvariantCultureIgnoreCase)).ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (chapterRegex.IsMatch(searchTerm))
|
||||||
|
{
|
||||||
|
string chapter = chapterRegex.Match(searchTerm).Value;
|
||||||
|
if (rangeResultRegex.IsMatch(chapter))
|
||||||
|
{
|
||||||
|
string range = rangeResultRegex.Match(chapter).Value;
|
||||||
|
int start = Convert.ToInt32(range.Split('-')[0]);
|
||||||
|
int end = Convert.ToInt32(range.Split('-')[1]);
|
||||||
|
return availableChapters.Where(aCh => Convert.ToInt32(aCh.chapterNumber) >= start &&
|
||||||
|
Convert.ToInt32(aCh.chapterNumber) <= end).ToArray();
|
||||||
|
}
|
||||||
|
else if (singleResultRegex.IsMatch(chapter))
|
||||||
|
{
|
||||||
|
string chapterNumber = singleResultRegex.Match(chapter).Value;
|
||||||
|
return availableChapters.Where(aCh =>
|
||||||
|
aCh.chapterNumber.Equals(chapterNumber, StringComparison.InvariantCultureIgnoreCase)).ToArray();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (rangeResultRegex.IsMatch(searchTerm))
|
||||||
|
{
|
||||||
|
int start = Convert.ToInt32(searchTerm.Split('-')[0]);
|
||||||
|
int end = Convert.ToInt32(searchTerm.Split('-')[1]);
|
||||||
|
return availableChapters[start..(end + 1)];
|
||||||
|
}
|
||||||
|
else if(singleResultRegex.IsMatch(searchTerm))
|
||||||
|
return new [] { availableChapters[Convert.ToInt32(searchTerm)] };
|
||||||
|
else if (allRegex.IsMatch(searchTerm))
|
||||||
|
return availableChapters;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Array.Empty<Chapter>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public abstract HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Copies the already downloaded cover from cache to downloadLocation
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="manga">Publication to retrieve Cover for</param>
|
||||||
|
/// <param name="retries">Number of times to retry to copy the cover (or download it first)</param>
|
||||||
|
public void CopyCoverFromCacheToDownloadLocation(Manga manga, int? retries = 1)
|
||||||
|
{
|
||||||
|
Log($"Copy cover {manga}");
|
||||||
|
//Check if Publication already has a Folder and cover
|
||||||
|
string publicationFolder = manga.CreatePublicationFolder(TrangaSettings.downloadLocation);
|
||||||
|
DirectoryInfo dirInfo = new (publicationFolder);
|
||||||
|
if (dirInfo.EnumerateFiles().Any(info => info.Name.Contains("cover", StringComparison.InvariantCultureIgnoreCase)))
|
||||||
|
{
|
||||||
|
Log($"Cover exists {manga}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
string? fileInCache = manga.coverFileNameInCache;
|
||||||
|
if (fileInCache is null || !File.Exists(fileInCache))
|
||||||
|
{
|
||||||
|
Log($"Cloning cover failed: File missing {fileInCache}.");
|
||||||
|
if (retries > 0 && manga.coverUrl is not null)
|
||||||
|
{
|
||||||
|
Log($"Trying {retries} more times");
|
||||||
|
SaveCoverImageToCache(manga.coverUrl, manga.internalId, 0);
|
||||||
|
CopyCoverFromCacheToDownloadLocation(manga, --retries);
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
string newFilePath = Path.Join(publicationFolder, $"cover.{Path.GetFileName(fileInCache).Split('.')[^1]}" );
|
||||||
|
Log($"Cloning cover {fileInCache} -> {newFilePath}");
|
||||||
|
File.Copy(fileInCache, newFilePath, true);
|
||||||
|
if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
|
File.SetUnixFileMode(newFilePath, GroupRead | GroupWrite | UserRead | UserWrite);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Downloads Image from URL and saves it to the given path(incl. fileName)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="imageUrl"></param>
|
||||||
|
/// <param name="fullPath"></param>
|
||||||
|
/// <param name="requestType">RequestType for Rate-Limit</param>
|
||||||
|
/// <param name="referrer">referrer used in html request header</param>
|
||||||
|
private HttpStatusCode DownloadImage(string imageUrl, string fullPath, RequestType requestType, string? referrer = null)
|
||||||
|
{
|
||||||
|
RequestResult requestResult = downloadClient.MakeRequest(imageUrl, requestType, referrer);
|
||||||
|
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return requestResult.statusCode;
|
||||||
|
if (requestResult.result == Stream.Null)
|
||||||
|
return HttpStatusCode.NotFound;
|
||||||
|
|
||||||
|
FileStream fs = new (fullPath, FileMode.Create);
|
||||||
|
requestResult.result.CopyTo(fs);
|
||||||
|
fs.Close();
|
||||||
|
return requestResult.statusCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected HttpStatusCode DownloadChapterImages(string[] imageUrls, string saveArchiveFilePath, RequestType requestType, string? comicInfoPath = null, string? referrer = null, ProgressToken? progressToken = null)
|
||||||
|
{
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
Log($"Downloading Images for {saveArchiveFilePath}");
|
||||||
|
if (progressToken is not null)
|
||||||
|
progressToken.increments += imageUrls.Length;
|
||||||
|
//Check if Publication Directory already exists
|
||||||
|
string directoryPath = Path.GetDirectoryName(saveArchiveFilePath)!;
|
||||||
|
if (!Directory.Exists(directoryPath))
|
||||||
|
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
|
Directory.CreateDirectory(directoryPath,
|
||||||
|
UserRead | UserWrite | UserExecute | GroupRead | GroupWrite | GroupExecute );
|
||||||
|
else
|
||||||
|
Directory.CreateDirectory(directoryPath);
|
||||||
|
|
||||||
|
if (File.Exists(saveArchiveFilePath)) //Don't download twice.
|
||||||
|
{
|
||||||
|
progressToken?.Complete();
|
||||||
|
return HttpStatusCode.Created;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Create a temporary folder to store images
|
||||||
|
string tempFolder = Directory.CreateTempSubdirectory("trangatemp").FullName;
|
||||||
|
|
||||||
|
int chapter = 0;
|
||||||
|
//Download all Images to temporary Folder
|
||||||
|
if (imageUrls.Length == 0)
|
||||||
|
{
|
||||||
|
Log("No images found");
|
||||||
|
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
|
File.SetUnixFileMode(saveArchiveFilePath, UserRead | UserWrite | UserExecute | GroupRead | GroupWrite | GroupExecute);
|
||||||
|
Directory.Delete(tempFolder, true);
|
||||||
|
progressToken?.Complete();
|
||||||
|
return HttpStatusCode.NoContent;
|
||||||
|
}
|
||||||
|
foreach (string imageUrl in imageUrls)
|
||||||
|
{
|
||||||
|
string extension = imageUrl.Split('.')[^1].Split('?')[0];
|
||||||
|
Log($"Downloading image {chapter + 1:000}/{imageUrls.Length:000}"); //TODO
|
||||||
|
HttpStatusCode status = DownloadImage(imageUrl, Path.Join(tempFolder, $"{chapter++}.{extension}"), requestType, referrer);
|
||||||
|
Log($"{saveArchiveFilePath} {chapter + 1:000}/{imageUrls.Length:000} {status}");
|
||||||
|
if ((int)status < 200 || (int)status >= 300)
|
||||||
|
{
|
||||||
|
progressToken?.Complete();
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
{
|
||||||
|
progressToken.Complete();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
progressToken?.Increment();
|
||||||
|
}
|
||||||
|
|
||||||
|
if(comicInfoPath is not null){
|
||||||
|
File.Copy(comicInfoPath, Path.Join(tempFolder, "ComicInfo.xml"));
|
||||||
|
File.Delete(comicInfoPath); //Delete tmp-file
|
||||||
|
}
|
||||||
|
|
||||||
|
Log($"Creating archive {saveArchiveFilePath}");
|
||||||
|
//ZIP-it and ship-it
|
||||||
|
ZipFile.CreateFromDirectory(tempFolder, saveArchiveFilePath);
|
||||||
|
if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
|
File.SetUnixFileMode(saveArchiveFilePath, UserRead | UserWrite | UserExecute | GroupRead | GroupWrite | GroupExecute);
|
||||||
|
Directory.Delete(tempFolder, true); //Cleanup
|
||||||
|
|
||||||
|
progressToken?.Complete();
|
||||||
|
return HttpStatusCode.OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected string SaveCoverImageToCache(string url, string mangaInternalId, RequestType requestType)
|
||||||
|
{
|
||||||
|
Regex urlRex = new (@"https?:\/\/((?:[a-zA-Z0-9-]+\.)+[a-zA-Z0-9]+)\/(?:.+\/)*(.+\.([a-zA-Z]+))");
|
||||||
|
//https?:\/\/[a-zA-Z0-9-]+\.([a-zA-Z0-9-]+\.[a-zA-Z0-9]+)\/(?:.+\/)*(.+\.([a-zA-Z]+)) for only second level domains
|
||||||
|
Match match = urlRex.Match(url);
|
||||||
|
string filename = $"{match.Groups[1].Value}-{mangaInternalId}.{match.Groups[3].Value}";
|
||||||
|
string saveImagePath = Path.Join(TrangaSettings.coverImageCache, filename);
|
||||||
|
|
||||||
|
if (File.Exists(saveImagePath))
|
||||||
|
return saveImagePath;
|
||||||
|
|
||||||
|
RequestResult coverResult = downloadClient.MakeRequest(url, requestType);
|
||||||
|
using MemoryStream ms = new();
|
||||||
|
coverResult.result.CopyTo(ms);
|
||||||
|
Directory.CreateDirectory(TrangaSettings.coverImageCache);
|
||||||
|
File.WriteAllBytes(saveImagePath, ms.ToArray());
|
||||||
|
Log($"Saving cover to {saveImagePath}");
|
||||||
|
return saveImagePath;
|
||||||
|
}
|
||||||
|
}
|
54
Tranga/MangaConnectors/MangaConnectorJsonConverter.cs
Normal file
54
Tranga/MangaConnectors/MangaConnectorJsonConverter.cs
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
using System.Data;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
public class MangaConnectorJsonConverter : JsonConverter
|
||||||
|
{
|
||||||
|
private GlobalBase _clone;
|
||||||
|
private readonly HashSet<MangaConnector> _connectors;
|
||||||
|
|
||||||
|
internal MangaConnectorJsonConverter(GlobalBase clone, HashSet<MangaConnector> connectors)
|
||||||
|
{
|
||||||
|
this._clone = clone;
|
||||||
|
this._connectors = connectors;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool CanConvert(Type objectType)
|
||||||
|
{
|
||||||
|
return (objectType == typeof(MangaConnector));
|
||||||
|
}
|
||||||
|
|
||||||
|
public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
JObject jo = JObject.Load(reader);
|
||||||
|
string? connectorName = jo.Value<string>("name");
|
||||||
|
if (connectorName is null)
|
||||||
|
throw new ConstraintException("Name can not be null.");
|
||||||
|
return connectorName switch
|
||||||
|
{
|
||||||
|
"MangaDex" => this._connectors.First(c => c is MangaDex),
|
||||||
|
"Manganato" => this._connectors.First(c => c is Manganato),
|
||||||
|
"MangaKatana" => this._connectors.First(c => c is MangaKatana),
|
||||||
|
"Mangasee" => this._connectors.First(c => c is Mangasee),
|
||||||
|
"Mangaworld" => this._connectors.First(c => c is Mangaworld),
|
||||||
|
"Bato" => this._connectors.First(c => c is Bato),
|
||||||
|
"Manga4Life" => this._connectors.First(c => c is MangaLife),
|
||||||
|
"ManhuaPlus" => this._connectors.First(c => c is ManhuaPlus),
|
||||||
|
"MangaHere" => this._connectors.First(c => c is MangaHere),
|
||||||
|
_ => throw new UnreachableException($"Could not find Connector with name {connectorName}")
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool CanWrite => false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Don't call this
|
||||||
|
/// </summary>
|
||||||
|
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
throw new Exception("Dont call this");
|
||||||
|
}
|
||||||
|
}
|
298
Tranga/MangaConnectors/MangaDex.cs
Normal file
298
Tranga/MangaConnectors/MangaDex.cs
Normal file
@ -0,0 +1,298 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Text.Json.Nodes;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using Tranga.Jobs;
|
||||||
|
using JsonSerializer = System.Text.Json.JsonSerializer;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
public class MangaDex : MangaConnector
|
||||||
|
{
|
||||||
|
//https://api.mangadex.org/docs/3-enumerations/#language-codes--localization
|
||||||
|
//https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes
|
||||||
|
//https://gist.github.com/Josantonius/b455e315bc7f790d14b136d61d9ae469
|
||||||
|
public MangaDex(GlobalBase clone) : base(clone, "MangaDex", ["en","pt","pt-br","it","de","ru","aa","ab","ae","af","ak","am","an","ar-ae","ar-bh","ar-dz","ar-eg","ar-iq","ar-jo","ar-kw","ar-lb","ar-ly","ar-ma","ar-om","ar-qa","ar-sa","ar-sy","ar-tn","ar-ye","ar","as","av","ay","az","ba","be","bg","bh","bi","bm","bn","bo","br","bs","ca","ce","ch","co","cr","cs","cu","cv","cy","da","de-at","de-ch","de-de","de-li","de-lu","div","dv","dz","ee","el","en-au","en-bz","en-ca","en-cb","en-gb","en-ie","en-jm","en-nz","en-ph","en-tt","en-us","en-za","en-zw","eo","es-ar","es-bo","es-cl","es-co","es-cr","es-do","es-ec","es-es","es-gt","es-hn","es-la","es-mx","es-ni","es-pa","es-pe","es-pr","es-py","es-sv","es-us","es-uy","es-ve","es","et","eu","fa","ff","fi","fj","fo","fr-be","fr-ca","fr-ch","fr-fr","fr-lu","fr-mc","fr","fy","ga","gd","gl","gn","gu","gv","ha","he","hi","ho","hr-ba","hr-hr","hr","ht","hu","hy","hz","ia","id","ie","ig","ii","ik","in","io","is","it-ch","it-it","iu","iw","ja","ja-ro","ji","jv","jw","ka","kg","ki","kj","kk","kl","km","kn","ko","ko-ro","kr","ks","ku","kv","kw","ky","kz","la","lb","lg","li","ln","lo","ls","lt","lu","lv","mg","mh","mi","mk","ml","mn","mo","mr","ms-bn","ms-my","ms","mt","my","na","nb","nd","ne","ng","nl-be","nl-nl","nl","nn","no","nr","ns","nv","ny","oc","oj","om","or","os","pa","pi","pl","ps","pt-pt","qu-bo","qu-ec","qu-pe","qu","rm","rn","ro","rw","sa","sb","sc","sd","se-fi","se-no","se-se","se","sg","sh","si","sk","sl","sm","sn","so","sq","sr-ba","sr-sp","sr","ss","st","su","sv-fi","sv-se","sv","sw","sx","syr","ta","te","tg","th","ti","tk","tl","tn","to","tr","ts","tt","tw","ty","ug","uk","ur","us","uz","ve","vi","vo","wa","wo","xh","yi","yo","za","zh-cn","zh-hk","zh-mo","zh-ro","zh-sg","zh-tw","zh","zu"])
|
||||||
|
{
|
||||||
|
this.downloadClient = new HttpDownloadClient(clone);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga[] GetManga(string publicationTitle = "")
|
||||||
|
{
|
||||||
|
Log($"Searching Publications. Term={publicationTitle}");
|
||||||
|
const int limit = 100; //How many values we want returned at once
|
||||||
|
int offset = 0; //"Page"
|
||||||
|
int total = int.MaxValue; //How many total results are there, is updated on first request
|
||||||
|
HashSet<Manga> retManga = new();
|
||||||
|
int loadedPublicationData = 0;
|
||||||
|
List<JsonNode> results = new();
|
||||||
|
|
||||||
|
//Request all search-results
|
||||||
|
while (offset < total) //As long as we haven't requested all "Pages"
|
||||||
|
{
|
||||||
|
//Request next Page
|
||||||
|
RequestResult requestResult = downloadClient.MakeRequest(
|
||||||
|
$"https://api.mangadex.org/manga?limit={limit}&title={publicationTitle}&offset={offset}" +
|
||||||
|
$"&contentRating%5B%5D=safe&contentRating%5B%5D=suggestive&contentRating%5B%5D=erotica" +
|
||||||
|
$"&contentRating%5B%5D=pornographic" +
|
||||||
|
$"&includes%5B%5D=manga&includes%5B%5D=cover_art&includes%5B%5D=author" +
|
||||||
|
$"&includes%5B%5D=artist&includes%5B%5D=tag", RequestType.MangaInfo);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
break;
|
||||||
|
JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
|
||||||
|
|
||||||
|
offset += limit;
|
||||||
|
if (result is null)
|
||||||
|
break;
|
||||||
|
|
||||||
|
if(result.ContainsKey("total"))
|
||||||
|
total = result["total"]!.GetValue<int>(); //Update the total number of Publications
|
||||||
|
else continue;
|
||||||
|
|
||||||
|
if (result.ContainsKey("data"))
|
||||||
|
results.AddRange(result["data"]!.AsArray()!);//Manga-data-Array
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (JsonNode mangaNode in results)
|
||||||
|
{
|
||||||
|
Log($"Getting publication data. {++loadedPublicationData}/{total}");
|
||||||
|
if(MangaFromJsonObject(mangaNode.AsObject()) is { } manga)
|
||||||
|
retManga.Add(manga); //Add Publication (Manga) to result
|
||||||
|
}
|
||||||
|
Log($"Retrieved {retManga.Count} publications. Term={publicationTitle}");
|
||||||
|
return retManga.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromId(string publicationId)
|
||||||
|
{
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest($"https://api.mangadex.org/manga/{publicationId}?includes%5B%5D=manga&includes%5B%5D=cover_art&includes%5B%5D=author&includes%5B%5D=artist&includes%5B%5D=tag", RequestType.MangaInfo);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return null;
|
||||||
|
JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
|
||||||
|
if(result is not null)
|
||||||
|
return MangaFromJsonObject(result["data"]!.AsObject());
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromUrl(string url)
|
||||||
|
{
|
||||||
|
Regex idRex = new (@"https:\/\/mangadex.org\/title\/([A-z0-9-]*)\/.*");
|
||||||
|
string id = idRex.Match(url).Groups[1].Value;
|
||||||
|
Log($"Got id {id} from {url}");
|
||||||
|
return GetMangaFromId(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga? MangaFromJsonObject(JsonObject manga)
|
||||||
|
{
|
||||||
|
if (!manga.TryGetPropertyValue("id", out JsonNode? idNode))
|
||||||
|
return null;
|
||||||
|
string publicationId = idNode!.GetValue<string>();
|
||||||
|
|
||||||
|
if (!manga.TryGetPropertyValue("attributes", out JsonNode? attributesNode))
|
||||||
|
return null;
|
||||||
|
JsonObject attributes = attributesNode!.AsObject();
|
||||||
|
|
||||||
|
if (!attributes.TryGetPropertyValue("title", out JsonNode? titleNode))
|
||||||
|
return null;
|
||||||
|
string title = titleNode!.AsObject().ContainsKey("en") switch
|
||||||
|
{
|
||||||
|
true => titleNode.AsObject()["en"]!.GetValue<string>(),
|
||||||
|
false => titleNode.AsObject().First().Value!.GetValue<string>()
|
||||||
|
};
|
||||||
|
|
||||||
|
Dictionary<string, string> altTitlesDict = new();
|
||||||
|
if (attributes.TryGetPropertyValue("altTitles", out JsonNode? altTitlesNode))
|
||||||
|
{
|
||||||
|
foreach (JsonNode? altTitleNode in altTitlesNode!.AsArray())
|
||||||
|
{
|
||||||
|
JsonObject altTitleNodeObject = altTitleNode!.AsObject();
|
||||||
|
altTitlesDict.TryAdd(altTitleNodeObject.First().Key, altTitleNodeObject.First().Value!.GetValue<string>());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!attributes.TryGetPropertyValue("description", out JsonNode? descriptionNode))
|
||||||
|
return null;
|
||||||
|
string description = descriptionNode!.AsObject().ContainsKey("en") switch
|
||||||
|
{
|
||||||
|
true => descriptionNode.AsObject()["en"]!.GetValue<string>(),
|
||||||
|
false => descriptionNode.AsObject().FirstOrDefault().Value?.GetValue<string>() ?? ""
|
||||||
|
};
|
||||||
|
|
||||||
|
Dictionary<string, string> linksDict = new();
|
||||||
|
if (attributes.TryGetPropertyValue("links", out JsonNode? linksNode) && linksNode is not null)
|
||||||
|
foreach (KeyValuePair<string, JsonNode?> linkKv in linksNode!.AsObject())
|
||||||
|
linksDict.TryAdd(linkKv.Key, linkKv.Value.GetValue<string>());
|
||||||
|
|
||||||
|
string? originalLanguage =
|
||||||
|
attributes.TryGetPropertyValue("originalLanguage", out JsonNode? originalLanguageNode) switch
|
||||||
|
{
|
||||||
|
true => originalLanguageNode?.GetValue<string>(),
|
||||||
|
false => null
|
||||||
|
};
|
||||||
|
|
||||||
|
Manga.ReleaseStatusByte status = Manga.ReleaseStatusByte.Unreleased;
|
||||||
|
if (attributes.TryGetPropertyValue("status", out JsonNode? statusNode))
|
||||||
|
{
|
||||||
|
status = statusNode?.GetValue<string>().ToLower() switch
|
||||||
|
{
|
||||||
|
"ongoing" => Manga.ReleaseStatusByte.Continuing,
|
||||||
|
"completed" => Manga.ReleaseStatusByte.Completed,
|
||||||
|
"hiatus" => Manga.ReleaseStatusByte.OnHiatus,
|
||||||
|
"cancelled" => Manga.ReleaseStatusByte.Cancelled,
|
||||||
|
_ => Manga.ReleaseStatusByte.Unreleased
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
int? year = attributes.TryGetPropertyValue("year", out JsonNode? yearNode) switch
|
||||||
|
{
|
||||||
|
true => yearNode?.GetValue<int>(),
|
||||||
|
false => null
|
||||||
|
};
|
||||||
|
|
||||||
|
HashSet<string> tags = new(128);
|
||||||
|
if (attributes.TryGetPropertyValue("tags", out JsonNode? tagsNode))
|
||||||
|
foreach (JsonNode? tagNode in tagsNode!.AsArray())
|
||||||
|
tags.Add(tagNode!["attributes"]!["name"]!["en"]!.GetValue<string>());
|
||||||
|
|
||||||
|
|
||||||
|
if (!manga.TryGetPropertyValue("relationships", out JsonNode? relationshipsNode))
|
||||||
|
return null;
|
||||||
|
|
||||||
|
JsonNode? coverNode = relationshipsNode!.AsArray()
|
||||||
|
.FirstOrDefault(rel => rel!["type"]!.GetValue<string>().Equals("cover_art"));
|
||||||
|
if (coverNode is null)
|
||||||
|
return null;
|
||||||
|
string fileName = coverNode["attributes"]!["fileName"]!.GetValue<string>();
|
||||||
|
string coverUrl = $"https://uploads.mangadex.org/covers/{publicationId}/{fileName}";
|
||||||
|
string coverCacheName = SaveCoverImageToCache(coverUrl, publicationId, RequestType.MangaCover);
|
||||||
|
|
||||||
|
List<string> authors = new();
|
||||||
|
JsonNode?[] authorNodes = relationshipsNode.AsArray()
|
||||||
|
.Where(rel => rel!["type"]!.GetValue<string>().Equals("author") || rel!["type"]!.GetValue<string>().Equals("artist")).ToArray();
|
||||||
|
foreach (JsonNode? authorNode in authorNodes)
|
||||||
|
{
|
||||||
|
string authorName = authorNode!["attributes"]!["name"]!.GetValue<string>();
|
||||||
|
if(!authors.Contains(authorName))
|
||||||
|
authors.Add(authorName);
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga pub = new(
|
||||||
|
title,
|
||||||
|
authors,
|
||||||
|
description,
|
||||||
|
altTitlesDict,
|
||||||
|
tags.ToArray(),
|
||||||
|
coverUrl,
|
||||||
|
coverCacheName,
|
||||||
|
linksDict,
|
||||||
|
year,
|
||||||
|
originalLanguage,
|
||||||
|
publicationId,
|
||||||
|
status,
|
||||||
|
websiteUrl: $"https://mangadex.org/title/{publicationId}"
|
||||||
|
);
|
||||||
|
AddMangaToCache(pub);
|
||||||
|
return pub;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Chapter[] GetChapters(Manga manga, string language="en")
|
||||||
|
{
|
||||||
|
Log($"Getting chapters {manga}");
|
||||||
|
const int limit = 100; //How many values we want returned at once
|
||||||
|
int offset = 0; //"Page"
|
||||||
|
int total = int.MaxValue; //How many total results are there, is updated on first request
|
||||||
|
List<Chapter> chapters = new();
|
||||||
|
//As long as we haven't requested all "Pages"
|
||||||
|
while (offset < total)
|
||||||
|
{
|
||||||
|
//Request next "Page"
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(
|
||||||
|
$"https://api.mangadex.org/manga/{manga.publicationId}/feed?limit={limit}&offset={offset}&translatedLanguage%5B%5D={language}&contentRating%5B%5D=safe&contentRating%5B%5D=suggestive&contentRating%5B%5D=erotica&contentRating%5B%5D=pornographic", RequestType.MangaDexFeed);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
break;
|
||||||
|
JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
|
||||||
|
|
||||||
|
offset += limit;
|
||||||
|
if (result is null)
|
||||||
|
break;
|
||||||
|
|
||||||
|
total = result["total"]!.GetValue<int>();
|
||||||
|
JsonArray chaptersInResult = result["data"]!.AsArray();
|
||||||
|
//Loop through all Chapters in result and extract information from JSON
|
||||||
|
foreach (JsonNode? jsonNode in chaptersInResult)
|
||||||
|
{
|
||||||
|
JsonObject chapter = (JsonObject)jsonNode!;
|
||||||
|
JsonObject attributes = chapter["attributes"]!.AsObject();
|
||||||
|
|
||||||
|
string chapterId = chapter["id"]!.GetValue<string>();
|
||||||
|
|
||||||
|
string? title = attributes.ContainsKey("title") && attributes["title"] is not null
|
||||||
|
? attributes["title"]!.GetValue<string>()
|
||||||
|
: null;
|
||||||
|
|
||||||
|
string? volume = attributes.ContainsKey("volume") && attributes["volume"] is not null
|
||||||
|
? attributes["volume"]!.GetValue<string>()
|
||||||
|
: null;
|
||||||
|
|
||||||
|
string chapterNum = attributes.ContainsKey("chapter") && attributes["chapter"] is not null
|
||||||
|
? attributes["chapter"]!.GetValue<string>()
|
||||||
|
: "null";
|
||||||
|
|
||||||
|
|
||||||
|
if (attributes.ContainsKey("pages") && attributes["pages"] is not null &&
|
||||||
|
attributes["pages"]!.GetValue<int>() < 1)
|
||||||
|
{
|
||||||
|
Log($"Skipping {chapterId} Vol.{volume} Ch.{chapterNum} {title} because it has no pages or is externally linked.");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(chapterNum is not "null" && !chapters.Any(chp => chp.volumeNumber.Equals(volume) && chp.chapterNumber.Equals(chapterNum)))
|
||||||
|
chapters.Add(new Chapter(manga, title, volume, chapterNum, chapterId));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Return Chapters ordered by Chapter-Number
|
||||||
|
Log($"Got {chapters.Count} chapters. {manga}");
|
||||||
|
return chapters.Order().ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null)
|
||||||
|
{
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
{
|
||||||
|
progressToken.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga chapterParentManga = chapter.parentManga;
|
||||||
|
Log($"Retrieving chapter-info {chapter} {chapterParentManga}");
|
||||||
|
//Request URLs for Chapter-Images
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest($"https://api.mangadex.org/at-home/server/{chapter.url}?forcePort443=false", RequestType.MangaDexImage);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
{
|
||||||
|
progressToken?.Cancel();
|
||||||
|
return requestResult.statusCode;
|
||||||
|
}
|
||||||
|
JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
|
||||||
|
if (result is null)
|
||||||
|
{
|
||||||
|
progressToken?.Cancel();
|
||||||
|
return HttpStatusCode.NoContent;
|
||||||
|
}
|
||||||
|
|
||||||
|
string baseUrl = result["baseUrl"]!.GetValue<string>();
|
||||||
|
string hash = result["chapter"]!["hash"]!.GetValue<string>();
|
||||||
|
JsonArray imageFileNames = result["chapter"]!["data"]!.AsArray();
|
||||||
|
//Loop through all imageNames and construct urls (imageUrl)
|
||||||
|
HashSet<string> imageUrls = new();
|
||||||
|
foreach (JsonNode? image in imageFileNames)
|
||||||
|
imageUrls.Add($"{baseUrl}/data/{hash}/{image!.GetValue<string>()}");
|
||||||
|
|
||||||
|
string comicInfoPath = Path.GetTempFileName();
|
||||||
|
File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
|
||||||
|
|
||||||
|
//Download Chapter-Images
|
||||||
|
return DownloadChapterImages(imageUrls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
|
||||||
|
}
|
||||||
|
}
|
203
Tranga/MangaConnectors/MangaHere.cs
Normal file
203
Tranga/MangaConnectors/MangaHere.cs
Normal file
@ -0,0 +1,203 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using HtmlAgilityPack;
|
||||||
|
using Tranga.Jobs;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
public class MangaHere : MangaConnector
|
||||||
|
{
|
||||||
|
public MangaHere(GlobalBase clone) : base(clone, "MangaHere", ["en"])
|
||||||
|
{
|
||||||
|
this.downloadClient = new ChromiumDownloadClient(clone);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga[] GetManga(string publicationTitle = "")
|
||||||
|
{
|
||||||
|
Log($"Searching Publications. Term=\"{publicationTitle}\"");
|
||||||
|
string sanitizedTitle = string.Join('+', Regex.Matches(publicationTitle, "[A-z]*").Where(str => str.Length > 0)).ToLower();
|
||||||
|
string requestUrl = $"https://www.mangahere.cc/search?title={sanitizedTitle}";
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300 || requestResult.htmlDocument is null)
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
|
||||||
|
Manga[] publications = ParsePublicationsFromHtml(requestResult.htmlDocument);
|
||||||
|
Log($"Retrieved {publications.Length} publications. Term=\"{publicationTitle}\"");
|
||||||
|
return publications;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga[] ParsePublicationsFromHtml(HtmlDocument document)
|
||||||
|
{
|
||||||
|
if (document.DocumentNode.SelectNodes("//div[contains(concat(' ',normalize-space(@class),' '),' container ')]").Any(node => node.ChildNodes.Any(cNode => cNode.HasClass("search-keywords"))))
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
|
||||||
|
List<string> urls = document.DocumentNode
|
||||||
|
.SelectNodes("//a[contains(@href, '/manga/') and not(contains(@href, '.html'))]")
|
||||||
|
.Select(thumb => $"https://www.mangahere.cc{thumb.GetAttributeValue("href", "")}").Distinct().ToList();
|
||||||
|
|
||||||
|
HashSet<Manga> ret = new();
|
||||||
|
foreach (string url in urls)
|
||||||
|
{
|
||||||
|
Manga? manga = GetMangaFromUrl(url);
|
||||||
|
if (manga is not null)
|
||||||
|
ret.Add((Manga)manga);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromId(string publicationId)
|
||||||
|
{
|
||||||
|
return GetMangaFromUrl($"https://www.mangahere.cc/manga/{publicationId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromUrl(string url)
|
||||||
|
{
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(url, RequestType.MangaInfo);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300 || requestResult.htmlDocument is null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
Regex idRex = new (@"https:\/\/www\.mangahere\.[a-z]{0,63}\/manga\/([0-9A-z\-]+).*");
|
||||||
|
string id = idRex.Match(url).Groups[1].Value;
|
||||||
|
return ParseSinglePublicationFromHtml(requestResult.htmlDocument, id, url);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga ParseSinglePublicationFromHtml(HtmlDocument document, string publicationId, string websiteUrl)
|
||||||
|
{
|
||||||
|
string originalLanguage = "", status = "";
|
||||||
|
Dictionary<string, string> altTitles = new(), links = new();
|
||||||
|
Manga.ReleaseStatusByte releaseStatus = Manga.ReleaseStatusByte.Unreleased;
|
||||||
|
|
||||||
|
//We dont get posters, because same origin bs HtmlNode posterNode = document.DocumentNode.SelectSingleNode("//img[contains(concat(' ',normalize-space(@class),' '),' detail-info-cover-img ')]");
|
||||||
|
string posterUrl = "http://static.mangahere.cc/v20230914/mangahere/images/nopicture.jpg";
|
||||||
|
string coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId, RequestType.MangaCover);
|
||||||
|
|
||||||
|
HtmlNode titleNode = document.DocumentNode.SelectSingleNode("//span[contains(concat(' ',normalize-space(@class),' '),' detail-info-right-title-font ')]");
|
||||||
|
string sortName = titleNode.InnerText;
|
||||||
|
|
||||||
|
List<string> authors = document.DocumentNode
|
||||||
|
.SelectNodes("//p[contains(concat(' ',normalize-space(@class),' '),' detail-info-right-say ')]/a")
|
||||||
|
.Select(node => node.InnerText)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
HashSet<string> tags = document.DocumentNode
|
||||||
|
.SelectNodes("//p[contains(concat(' ',normalize-space(@class),' '),' detail-info-right-tag-list ')]/a")
|
||||||
|
.Select(node => node.InnerText)
|
||||||
|
.ToHashSet();
|
||||||
|
|
||||||
|
status = document.DocumentNode.SelectSingleNode("//span[contains(concat(' ',normalize-space(@class),' '),' detail-info-right-title-tip ')]").InnerText;
|
||||||
|
switch (status.ToLower())
|
||||||
|
{
|
||||||
|
case "cancelled": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
|
||||||
|
case "hiatus": releaseStatus = Manga.ReleaseStatusByte.OnHiatus; break;
|
||||||
|
case "discontinued": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
|
||||||
|
case "complete": releaseStatus = Manga.ReleaseStatusByte.Completed; break;
|
||||||
|
case "ongoing": releaseStatus = Manga.ReleaseStatusByte.Continuing; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
HtmlNode descriptionNode = document.DocumentNode
|
||||||
|
.SelectSingleNode("//p[contains(concat(' ',normalize-space(@class),' '),' fullcontent ')]");
|
||||||
|
string description = descriptionNode.InnerText;
|
||||||
|
|
||||||
|
Manga manga = new(sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl,
|
||||||
|
coverFileNameInCache, links,
|
||||||
|
null, originalLanguage, publicationId, releaseStatus, websiteUrl: websiteUrl);
|
||||||
|
AddMangaToCache(manga);
|
||||||
|
return manga;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Chapter[] GetChapters(Manga manga, string language="en")
|
||||||
|
{
|
||||||
|
Log($"Getting chapters {manga}");
|
||||||
|
string requestUrl = $"https://www.mangahere.cc/manga/{manga.publicationId}";
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300 || requestResult.htmlDocument is null)
|
||||||
|
return Array.Empty<Chapter>();
|
||||||
|
|
||||||
|
List<string> urls = requestResult.htmlDocument.DocumentNode.SelectNodes("//div[@id='list-2']/ul//li//a[contains(@href, '/manga/')]")
|
||||||
|
.Select(node => node.GetAttributeValue("href", "")).ToList();
|
||||||
|
Regex chapterRex = new(@".*\/manga\/[a-zA-Z0-9\-\._\~\!\$\&\'\(\)\*\+\,\;\=\:\@]+\/v([0-9(TBD)]+)\/c([0-9\.]+)\/.*");
|
||||||
|
|
||||||
|
List<Chapter> chapters = new();
|
||||||
|
foreach (string url in urls)
|
||||||
|
{
|
||||||
|
Match rexMatch = chapterRex.Match(url);
|
||||||
|
|
||||||
|
string volumeNumber = rexMatch.Groups[1].Value == "TBD" ? "0" : rexMatch.Groups[1].Value;
|
||||||
|
string chapterNumber = rexMatch.Groups[2].Value;
|
||||||
|
string fullUrl = $"https://www.mangahere.cc{url}";
|
||||||
|
chapters.Add(new Chapter(manga, "", volumeNumber, chapterNumber, fullUrl));
|
||||||
|
}
|
||||||
|
//Return Chapters ordered by Chapter-Number
|
||||||
|
Log($"Got {chapters.Count} chapters. {manga}");
|
||||||
|
return chapters.Order().ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null)
|
||||||
|
{
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
{
|
||||||
|
progressToken.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga chapterParentManga = chapter.parentManga;
|
||||||
|
Log($"Retrieving chapter-info {chapter} {chapterParentManga}");
|
||||||
|
|
||||||
|
List<string> imageUrls = new();
|
||||||
|
|
||||||
|
int downloaded = 1;
|
||||||
|
int images = 1;
|
||||||
|
string url = string.Join('/', chapter.url.Split('/')[..^1]);
|
||||||
|
do
|
||||||
|
{
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest($"{url}/{downloaded}.html", RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
{
|
||||||
|
progressToken?.Cancel();
|
||||||
|
return requestResult.statusCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
{
|
||||||
|
progressToken?.Cancel();
|
||||||
|
return HttpStatusCode.InternalServerError;
|
||||||
|
}
|
||||||
|
|
||||||
|
imageUrls.AddRange(ParseImageUrlsFromHtml(requestResult.htmlDocument));
|
||||||
|
|
||||||
|
images = requestResult.htmlDocument.DocumentNode
|
||||||
|
.SelectNodes("//a[contains(@href, '/manga/')]")
|
||||||
|
.MaxBy(node => node.GetAttributeValue("data-page", 0))!.GetAttributeValue("data-page", 0);
|
||||||
|
logger?.WriteLine($"MangaHere speciality: Get Image-url {downloaded}/{images}");
|
||||||
|
if (progressToken is not null)
|
||||||
|
{
|
||||||
|
progressToken.increments = images * 2;//we also have to download the images later
|
||||||
|
progressToken.Increment();
|
||||||
|
}
|
||||||
|
} while (downloaded++ <= images);
|
||||||
|
|
||||||
|
string comicInfoPath = Path.GetTempFileName();
|
||||||
|
File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
|
||||||
|
|
||||||
|
if (progressToken is not null)
|
||||||
|
progressToken.increments = images;//we blip to normal length, in downloadchapterimages it is increasaed by the amount of urls again
|
||||||
|
return DownloadChapterImages(imageUrls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string[] ParseImageUrlsFromHtml(HtmlDocument document)
|
||||||
|
{
|
||||||
|
return document.DocumentNode
|
||||||
|
.SelectNodes("//img[contains(concat(' ',normalize-space(@class),' '),' reader-main-img ')]")
|
||||||
|
.Select(node =>
|
||||||
|
{
|
||||||
|
string url = node.GetAttributeValue("src", "");
|
||||||
|
return url.StartsWith("//") ? $"https:{url}" : url;
|
||||||
|
})
|
||||||
|
.ToArray();
|
||||||
|
}
|
||||||
|
}
|
241
Tranga/MangaConnectors/MangaKatana.cs
Normal file
241
Tranga/MangaConnectors/MangaKatana.cs
Normal file
@ -0,0 +1,241 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using HtmlAgilityPack;
|
||||||
|
using Tranga.Jobs;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
public class MangaKatana : MangaConnector
|
||||||
|
{
|
||||||
|
public MangaKatana(GlobalBase clone) : base(clone, "MangaKatana", ["en"])
|
||||||
|
{
|
||||||
|
this.downloadClient = new HttpDownloadClient(clone);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga[] GetManga(string publicationTitle = "")
|
||||||
|
{
|
||||||
|
Log($"Searching Publications. Term=\"{publicationTitle}\"");
|
||||||
|
string sanitizedTitle = string.Join("%20", Regex.Matches(publicationTitle, "[A-z]*").Where(m => m.Value.Length > 0)).ToLower();
|
||||||
|
string requestUrl = $"https://mangakatana.com/?search={sanitizedTitle}&search_by=book_name";
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
|
||||||
|
// ReSharper disable once MergeIntoPattern
|
||||||
|
// If a single result is found, the user will be redirected to the results directly instead of a result page
|
||||||
|
if(requestResult.hasBeenRedirected
|
||||||
|
&& requestResult.redirectedToUrl is not null
|
||||||
|
&& requestResult.redirectedToUrl.Contains("mangakatana.com/manga"))
|
||||||
|
{
|
||||||
|
return new [] { ParseSinglePublicationFromHtml(requestResult.result, requestResult.redirectedToUrl.Split('/')[^1], requestResult.redirectedToUrl) };
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga[] publications = ParsePublicationsFromHtml(requestResult.result);
|
||||||
|
Log($"Retrieved {publications.Length} publications. Term=\"{publicationTitle}\"");
|
||||||
|
return publications;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromId(string publicationId)
|
||||||
|
{
|
||||||
|
return GetMangaFromUrl($"https://mangakatana.com/manga/{publicationId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromUrl(string url)
|
||||||
|
{
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(url, RequestType.MangaInfo);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return null;
|
||||||
|
return ParseSinglePublicationFromHtml(requestResult.result, url.Split('/')[^1], url);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga[] ParsePublicationsFromHtml(Stream html)
|
||||||
|
{
|
||||||
|
StreamReader reader = new(html);
|
||||||
|
string htmlString = reader.ReadToEnd();
|
||||||
|
HtmlDocument document = new();
|
||||||
|
document.LoadHtml(htmlString);
|
||||||
|
IEnumerable<HtmlNode> searchResults = document.DocumentNode.SelectNodes("//*[@id='book_list']/div");
|
||||||
|
if (searchResults is null || !searchResults.Any())
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
List<string> urls = new();
|
||||||
|
foreach (HtmlNode mangaResult in searchResults)
|
||||||
|
{
|
||||||
|
urls.Add(mangaResult.Descendants("a").First().GetAttributes()
|
||||||
|
.First(a => a.Name == "href").Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
HashSet<Manga> ret = new();
|
||||||
|
foreach (string url in urls)
|
||||||
|
{
|
||||||
|
Manga? manga = GetMangaFromUrl(url);
|
||||||
|
if (manga is not null)
|
||||||
|
ret.Add((Manga)manga);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga ParseSinglePublicationFromHtml(Stream html, string publicationId, string websiteUrl)
|
||||||
|
{
|
||||||
|
StreamReader reader = new(html);
|
||||||
|
string htmlString = reader.ReadToEnd();
|
||||||
|
HtmlDocument document = new();
|
||||||
|
document.LoadHtml(htmlString);
|
||||||
|
Dictionary<string, string> altTitles = new();
|
||||||
|
Dictionary<string, string>? links = null;
|
||||||
|
HashSet<string> tags = new();
|
||||||
|
string[] authors = Array.Empty<string>();
|
||||||
|
string originalLanguage = "";
|
||||||
|
Manga.ReleaseStatusByte releaseStatus = Manga.ReleaseStatusByte.Unreleased;
|
||||||
|
|
||||||
|
HtmlNode infoNode = document.DocumentNode.SelectSingleNode("//*[@id='single_book']");
|
||||||
|
string sortName = infoNode.Descendants("h1").First(n => n.HasClass("heading")).InnerText;
|
||||||
|
HtmlNode infoTable = infoNode.SelectSingleNode("//*[@id='single_book']/div[2]/div/ul");
|
||||||
|
|
||||||
|
foreach (HtmlNode row in infoTable.Descendants("li"))
|
||||||
|
{
|
||||||
|
string key = row.SelectNodes("div").First().InnerText.ToLower();
|
||||||
|
string value = row.SelectNodes("div").Last().InnerText;
|
||||||
|
string keySanitized = string.Concat(Regex.Matches(key, "[a-z]"));
|
||||||
|
|
||||||
|
switch (keySanitized)
|
||||||
|
{
|
||||||
|
case "altnames":
|
||||||
|
string[] alts = value.Split(" ; ");
|
||||||
|
for (int i = 0; i < alts.Length; i++)
|
||||||
|
altTitles.Add(i.ToString(), alts[i]);
|
||||||
|
break;
|
||||||
|
case "authorsartists":
|
||||||
|
authors = value.Split(',');
|
||||||
|
break;
|
||||||
|
case "status":
|
||||||
|
switch (value.ToLower())
|
||||||
|
{
|
||||||
|
case "ongoing": releaseStatus = Manga.ReleaseStatusByte.Continuing; break;
|
||||||
|
case "completed": releaseStatus = Manga.ReleaseStatusByte.Completed; break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case "genres":
|
||||||
|
tags = row.SelectNodes("div").Last().Descendants("a").Select(a => a.InnerText).ToHashSet();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
string posterUrl = document.DocumentNode.SelectSingleNode("//*[@id='single_book']/div[1]/div").Descendants("img").First()
|
||||||
|
.GetAttributes().First(a => a.Name == "src").Value;
|
||||||
|
|
||||||
|
string coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId, RequestType.MangaCover);
|
||||||
|
|
||||||
|
string description = document.DocumentNode.SelectSingleNode("//*[@id='single_book']/div[3]/p").InnerText;
|
||||||
|
while (description.StartsWith('\n'))
|
||||||
|
description = description.Substring(1);
|
||||||
|
|
||||||
|
int year = DateTime.Now.Year;
|
||||||
|
string yearString = infoTable.Descendants("div").First(d => d.HasClass("updateAt"))
|
||||||
|
.InnerText.Split('-')[^1];
|
||||||
|
|
||||||
|
if(yearString.Contains("ago") == false)
|
||||||
|
{
|
||||||
|
year = Convert.ToInt32(yearString);
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga manga = new (sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl, coverFileNameInCache, links,
|
||||||
|
year, originalLanguage, publicationId, releaseStatus, websiteUrl: websiteUrl);
|
||||||
|
AddMangaToCache(manga);
|
||||||
|
return manga;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Chapter[] GetChapters(Manga manga, string language="en")
|
||||||
|
{
|
||||||
|
Log($"Getting chapters {manga}");
|
||||||
|
string requestUrl = $"https://mangakatana.com/manga/{manga.publicationId}";
|
||||||
|
// Leaving this in for verification if the page exists
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return Array.Empty<Chapter>();
|
||||||
|
|
||||||
|
//Return Chapters ordered by Chapter-Number
|
||||||
|
List<Chapter> chapters = ParseChaptersFromHtml(manga, requestUrl);
|
||||||
|
Log($"Got {chapters.Count} chapters. {manga}");
|
||||||
|
return chapters.Order().ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<Chapter> ParseChaptersFromHtml(Manga manga, string mangaUrl)
|
||||||
|
{
|
||||||
|
// Using HtmlWeb will include the chapters since they are loaded with js
|
||||||
|
HtmlWeb web = new();
|
||||||
|
HtmlDocument document = web.Load(mangaUrl);
|
||||||
|
|
||||||
|
List<Chapter> ret = new();
|
||||||
|
|
||||||
|
HtmlNode chapterList = document.DocumentNode.SelectSingleNode("//div[contains(@class, 'chapters')]/table/tbody");
|
||||||
|
|
||||||
|
Regex volumeRex = new(@"[0-9a-z\-\.]+\/[0-9a-z\-]*v([0-9\.]+)");
|
||||||
|
Regex chapterNumRex = new(@"[0-9a-z\-\.]+\/[0-9a-z\-]*c([0-9\.]+)");
|
||||||
|
Regex chapterNameRex = new(@"Chapter [0-9\.]+:? (.*)");
|
||||||
|
|
||||||
|
foreach (HtmlNode chapterInfo in chapterList.Descendants("tr"))
|
||||||
|
{
|
||||||
|
string fullString = chapterInfo.Descendants("a").First().InnerText;
|
||||||
|
string url = chapterInfo.Descendants("a").First()
|
||||||
|
.GetAttributeValue("href", "");
|
||||||
|
|
||||||
|
string? volumeNumber = volumeRex.IsMatch(url) ? volumeRex.Match(url).Groups[1].Value : null;
|
||||||
|
string chapterNumber = chapterNumRex.Match(url).Groups[1].Value;
|
||||||
|
string chapterName = chapterNameRex.Match(fullString).Groups[1].Value;
|
||||||
|
ret.Add(new Chapter(manga, chapterName, volumeNumber, chapterNumber, url));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null)
|
||||||
|
{
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
{
|
||||||
|
progressToken.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga chapterParentManga = chapter.parentManga;
|
||||||
|
Log($"Retrieving chapter-info {chapter} {chapterParentManga}");
|
||||||
|
string requestUrl = chapter.url;
|
||||||
|
// Leaving this in to check if the page exists
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
{
|
||||||
|
progressToken?.Cancel();
|
||||||
|
return requestResult.statusCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
string[] imageUrls = ParseImageUrlsFromHtml(requestUrl);
|
||||||
|
|
||||||
|
string comicInfoPath = Path.GetTempFileName();
|
||||||
|
File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
|
||||||
|
|
||||||
|
return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, "https://mangakatana.com/", progressToken:progressToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string[] ParseImageUrlsFromHtml(string mangaUrl)
|
||||||
|
{
|
||||||
|
HtmlWeb web = new();
|
||||||
|
HtmlDocument document = web.Load(mangaUrl);
|
||||||
|
|
||||||
|
// Images are loaded dynamically, but the urls are present in a piece of js code on the page
|
||||||
|
string js = document.DocumentNode.SelectSingleNode("//script[contains(., 'data-src')]").InnerText
|
||||||
|
.Replace("\r", "")
|
||||||
|
.Replace("\n", "")
|
||||||
|
.Replace("\t", "");
|
||||||
|
|
||||||
|
// ReSharper disable once StringLiteralTypo
|
||||||
|
string regexPat = @"(var thzq=\[')(.*)(,];function)";
|
||||||
|
var group = Regex.Matches(js, regexPat).First().Groups[2].Value.Replace("'", "");
|
||||||
|
var urls = group.Split(',');
|
||||||
|
|
||||||
|
return urls;
|
||||||
|
}
|
||||||
|
}
|
199
Tranga/MangaConnectors/MangaLife.cs
Normal file
199
Tranga/MangaConnectors/MangaLife.cs
Normal file
@ -0,0 +1,199 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using HtmlAgilityPack;
|
||||||
|
using Tranga.Jobs;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
public class MangaLife : MangaConnector
|
||||||
|
{
|
||||||
|
public MangaLife(GlobalBase clone) : base(clone, "Manga4Life", ["en"])
|
||||||
|
{
|
||||||
|
this.downloadClient = new ChromiumDownloadClient(clone);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga[] GetManga(string publicationTitle = "")
|
||||||
|
{
|
||||||
|
Log($"Searching Publications. Term=\"{publicationTitle}\"");
|
||||||
|
string sanitizedTitle = WebUtility.UrlEncode(publicationTitle);
|
||||||
|
string requestUrl = $"https://manga4life.com/search/?name={sanitizedTitle}";
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
Manga[] publications = ParsePublicationsFromHtml(requestResult.htmlDocument);
|
||||||
|
Log($"Retrieved {publications.Length} publications. Term=\"{publicationTitle}\"");
|
||||||
|
return publications;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromId(string publicationId)
|
||||||
|
{
|
||||||
|
return GetMangaFromUrl($"https://manga4life.com/manga/{publicationId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromUrl(string url)
|
||||||
|
{
|
||||||
|
Regex publicationIdRex = new(@"https:\/\/(www\.)?manga4life.com\/manga\/(.*)(\/.*)*");
|
||||||
|
string publicationId = publicationIdRex.Match(url).Groups[2].Value;
|
||||||
|
|
||||||
|
RequestResult requestResult = this.downloadClient.MakeRequest(url, RequestType.MangaInfo);
|
||||||
|
if(requestResult.htmlDocument is not null)
|
||||||
|
return ParseSinglePublicationFromHtml(requestResult.htmlDocument, publicationId, url);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga[] ParsePublicationsFromHtml(HtmlDocument document)
|
||||||
|
{
|
||||||
|
HtmlNode resultsNode = document.DocumentNode.SelectSingleNode("//div[@class='BoxBody']/div[last()]/div[1]/div");
|
||||||
|
if (resultsNode.Descendants("div").Count() == 1 && resultsNode.Descendants("div").First().HasClass("NoResults"))
|
||||||
|
{
|
||||||
|
Log("No results.");
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
}
|
||||||
|
Log($"{resultsNode.SelectNodes("div").Count} items.");
|
||||||
|
|
||||||
|
HashSet<Manga> ret = new();
|
||||||
|
|
||||||
|
foreach (HtmlNode resultNode in resultsNode.SelectNodes("div"))
|
||||||
|
{
|
||||||
|
string url = resultNode.Descendants().First(d => d.HasClass("SeriesName")).GetAttributeValue("href", "");
|
||||||
|
Manga? manga = GetMangaFromUrl($"https://manga4life.com{url}");
|
||||||
|
if (manga is not null)
|
||||||
|
ret.Add((Manga)manga);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private Manga ParseSinglePublicationFromHtml(HtmlDocument document, string publicationId, string websiteUrl)
|
||||||
|
{
|
||||||
|
string originalLanguage = "", status = "";
|
||||||
|
Dictionary<string, string> altTitles = new(), links = new();
|
||||||
|
HashSet<string> tags = new();
|
||||||
|
Manga.ReleaseStatusByte releaseStatus = Manga.ReleaseStatusByte.Unreleased;
|
||||||
|
|
||||||
|
HtmlNode posterNode = document.DocumentNode.SelectSingleNode("//div[@class='BoxBody']//div[@class='row']//img");
|
||||||
|
string posterUrl = posterNode.GetAttributeValue("src", "");
|
||||||
|
string coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId, RequestType.MangaCover);
|
||||||
|
|
||||||
|
HtmlNode titleNode = document.DocumentNode.SelectSingleNode("//div[@class='BoxBody']//div[@class='row']//h1");
|
||||||
|
string sortName = titleNode.InnerText;
|
||||||
|
|
||||||
|
HtmlNode[] authorsNodes = document.DocumentNode
|
||||||
|
.SelectNodes("//div[@class='BoxBody']//div[@class='row']//span[text()='Author(s):']/..").Descendants("a")
|
||||||
|
.ToArray();
|
||||||
|
List<string> authors = new();
|
||||||
|
foreach (HtmlNode authorNode in authorsNodes)
|
||||||
|
authors.Add(authorNode.InnerText);
|
||||||
|
|
||||||
|
HtmlNode[] genreNodes = document.DocumentNode
|
||||||
|
.SelectNodes("//div[@class='BoxBody']//div[@class='row']//span[text()='Genre(s):']/..").Descendants("a")
|
||||||
|
.ToArray();
|
||||||
|
foreach (HtmlNode genreNode in genreNodes)
|
||||||
|
tags.Add(genreNode.InnerText);
|
||||||
|
|
||||||
|
HtmlNode yearNode = document.DocumentNode
|
||||||
|
.SelectNodes("//div[@class='BoxBody']//div[@class='row']//span[text()='Released:']/..").Descendants("a")
|
||||||
|
.First();
|
||||||
|
int year = Convert.ToInt32(yearNode.InnerText);
|
||||||
|
|
||||||
|
HtmlNode[] statusNodes = document.DocumentNode
|
||||||
|
.SelectNodes("//div[@class='BoxBody']//div[@class='row']//span[text()='Status:']/..").Descendants("a")
|
||||||
|
.ToArray();
|
||||||
|
foreach (HtmlNode statusNode in statusNodes)
|
||||||
|
if (statusNode.InnerText.Contains("publish", StringComparison.CurrentCultureIgnoreCase))
|
||||||
|
status = statusNode.InnerText.Split(' ')[0];
|
||||||
|
switch (status.ToLower())
|
||||||
|
{
|
||||||
|
case "cancelled": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
|
||||||
|
case "hiatus": releaseStatus = Manga.ReleaseStatusByte.OnHiatus; break;
|
||||||
|
case "discontinued": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
|
||||||
|
case "complete": releaseStatus = Manga.ReleaseStatusByte.Completed; break;
|
||||||
|
case "ongoing": releaseStatus = Manga.ReleaseStatusByte.Continuing; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
HtmlNode descriptionNode = document.DocumentNode
|
||||||
|
.SelectNodes("//div[@class='BoxBody']//div[@class='row']//span[text()='Description:']/..")
|
||||||
|
.Descendants("div").First();
|
||||||
|
string description = descriptionNode.InnerText;
|
||||||
|
|
||||||
|
Manga manga = new(sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl,
|
||||||
|
coverFileNameInCache, links, year, originalLanguage, publicationId, releaseStatus, websiteUrl: websiteUrl);
|
||||||
|
AddMangaToCache(manga);
|
||||||
|
return manga;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Chapter[] GetChapters(Manga manga, string language="en")
|
||||||
|
{
|
||||||
|
Log($"Getting chapters {manga}");
|
||||||
|
RequestResult result = downloadClient.MakeRequest($"https://manga4life.com/manga/{manga.publicationId}", RequestType.Default, clickButton:"[class*='ShowAllChapters']");
|
||||||
|
if ((int)result.statusCode < 200 || (int)result.statusCode >= 300 || result.htmlDocument is null)
|
||||||
|
{
|
||||||
|
return Array.Empty<Chapter>();
|
||||||
|
}
|
||||||
|
|
||||||
|
HtmlNodeCollection chapterNodes = result.htmlDocument.DocumentNode.SelectNodes(
|
||||||
|
"//a[contains(concat(' ',normalize-space(@class),' '),' ChapterLink ')]");
|
||||||
|
string[] urls = chapterNodes.Select(node => node.GetAttributeValue("href", "")).ToArray();
|
||||||
|
Regex urlRex = new (@"-chapter-([0-9\\.]+)(-index-([0-9\\.]+))?");
|
||||||
|
|
||||||
|
List<Chapter> chapters = new();
|
||||||
|
foreach (string url in urls)
|
||||||
|
{
|
||||||
|
Match rexMatch = urlRex.Match(url);
|
||||||
|
|
||||||
|
string volumeNumber = "1";
|
||||||
|
if (rexMatch.Groups[3].Value.Length > 0)
|
||||||
|
volumeNumber = rexMatch.Groups[3].Value;
|
||||||
|
string chapterNumber = rexMatch.Groups[1].Value;
|
||||||
|
string fullUrl = $"https://manga4life.com{url}";
|
||||||
|
fullUrl = fullUrl.Replace(Regex.Match(url,"(-page-[0-9])").Value,"");
|
||||||
|
chapters.Add(new Chapter(manga, "", volumeNumber, chapterNumber, fullUrl));
|
||||||
|
}
|
||||||
|
//Return Chapters ordered by Chapter-Number
|
||||||
|
Log($"Got {chapters.Count} chapters. {manga}");
|
||||||
|
return chapters.Order().ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null)
|
||||||
|
{
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
{
|
||||||
|
progressToken.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga chapterParentManga = chapter.parentManga;
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
{
|
||||||
|
progressToken.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
Log($"Retrieving chapter-info {chapter} {chapterParentManga}");
|
||||||
|
|
||||||
|
RequestResult requestResult = this.downloadClient.MakeRequest(chapter.url, RequestType.Default);
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
{
|
||||||
|
progressToken?.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
HtmlDocument document = requestResult.htmlDocument;
|
||||||
|
|
||||||
|
HtmlNode gallery = document.DocumentNode.Descendants("div").First(div => div.HasClass("ImageGallery"));
|
||||||
|
HtmlNode[] images = gallery.Descendants("img").Where(img => img.HasClass("img-fluid")).ToArray();
|
||||||
|
List<string> urls = new();
|
||||||
|
foreach(HtmlNode galleryImage in images)
|
||||||
|
urls.Add(galleryImage.GetAttributeValue("src", ""));
|
||||||
|
|
||||||
|
string comicInfoPath = Path.GetTempFileName();
|
||||||
|
File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
|
||||||
|
|
||||||
|
return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
|
||||||
|
}
|
||||||
|
}
|
234
Tranga/MangaConnectors/Manganato.cs
Normal file
234
Tranga/MangaConnectors/Manganato.cs
Normal file
@ -0,0 +1,234 @@
|
|||||||
|
using System.Globalization;
|
||||||
|
using System.Net;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using HtmlAgilityPack;
|
||||||
|
using Tranga.Jobs;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
public class Manganato : MangaConnector
|
||||||
|
{
|
||||||
|
public Manganato(GlobalBase clone) : base(clone, "Manganato", ["en"])
|
||||||
|
{
|
||||||
|
this.downloadClient = new HttpDownloadClient(clone);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga[] GetManga(string publicationTitle = "")
|
||||||
|
{
|
||||||
|
Log($"Searching Publications. Term=\"{publicationTitle}\"");
|
||||||
|
string sanitizedTitle = string.Join('_', Regex.Matches(publicationTitle, "[A-z]*").Where(str => str.Length > 0)).ToLower();
|
||||||
|
string requestUrl = $"https://manganato.com/search/story/{sanitizedTitle}";
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
Manga[] publications = ParsePublicationsFromHtml(requestResult.htmlDocument);
|
||||||
|
Log($"Retrieved {publications.Length} publications. Term=\"{publicationTitle}\"");
|
||||||
|
return publications;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga[] ParsePublicationsFromHtml(HtmlDocument document)
|
||||||
|
{
|
||||||
|
List<HtmlNode> searchResults = document.DocumentNode.Descendants("div").Where(n => n.HasClass("search-story-item")).ToList();
|
||||||
|
Log($"{searchResults.Count} items.");
|
||||||
|
List<string> urls = new();
|
||||||
|
foreach (HtmlNode mangaResult in searchResults)
|
||||||
|
{
|
||||||
|
urls.Add(mangaResult.Descendants("a").First(n => n.HasClass("item-title")).GetAttributes()
|
||||||
|
.First(a => a.Name == "href").Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
HashSet<Manga> ret = new();
|
||||||
|
foreach (string url in urls)
|
||||||
|
{
|
||||||
|
Manga? manga = GetMangaFromUrl(url);
|
||||||
|
if (manga is not null)
|
||||||
|
ret.Add((Manga)manga);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromId(string publicationId)
|
||||||
|
{
|
||||||
|
return GetMangaFromUrl($"https://chapmanganato.com/{publicationId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromUrl(string url)
|
||||||
|
{
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(url, RequestType.MangaInfo);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
return null;
|
||||||
|
return ParseSinglePublicationFromHtml(requestResult.htmlDocument, url.Split('/')[^1], url);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga ParseSinglePublicationFromHtml(HtmlDocument document, string publicationId, string websiteUrl)
|
||||||
|
{
|
||||||
|
Dictionary<string, string> altTitles = new();
|
||||||
|
Dictionary<string, string>? links = null;
|
||||||
|
HashSet<string> tags = new();
|
||||||
|
string[] authors = Array.Empty<string>();
|
||||||
|
string originalLanguage = "";
|
||||||
|
Manga.ReleaseStatusByte releaseStatus = Manga.ReleaseStatusByte.Unreleased;
|
||||||
|
|
||||||
|
HtmlNode infoNode = document.DocumentNode.Descendants("div").First(d => d.HasClass("story-info-right"));
|
||||||
|
|
||||||
|
string sortName = infoNode.Descendants("h1").First().InnerText;
|
||||||
|
|
||||||
|
HtmlNode infoTable = infoNode.Descendants().First(d => d.Name == "table");
|
||||||
|
|
||||||
|
foreach (HtmlNode row in infoTable.Descendants("tr"))
|
||||||
|
{
|
||||||
|
string key = row.SelectNodes("td").First().InnerText.ToLower();
|
||||||
|
string value = row.SelectNodes("td").Last().InnerText;
|
||||||
|
string keySanitized = string.Concat(Regex.Matches(key, "[a-z]"));
|
||||||
|
|
||||||
|
switch (keySanitized)
|
||||||
|
{
|
||||||
|
case "alternative":
|
||||||
|
string[] alts = value.Split(" ; ");
|
||||||
|
for(int i = 0; i < alts.Length; i++)
|
||||||
|
altTitles.Add(i.ToString(), alts[i]);
|
||||||
|
break;
|
||||||
|
case "authors":
|
||||||
|
authors = value.Split('-');
|
||||||
|
for (int i = 0; i < authors.Length; i++)
|
||||||
|
authors[i] = authors[i].Replace("\r\n", "");
|
||||||
|
break;
|
||||||
|
case "status":
|
||||||
|
switch (value.ToLower())
|
||||||
|
{
|
||||||
|
case "ongoing": releaseStatus = Manga.ReleaseStatusByte.Continuing; break;
|
||||||
|
case "completed": releaseStatus = Manga.ReleaseStatusByte.Completed; break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case "genres":
|
||||||
|
string[] genres = value.Split(" - ");
|
||||||
|
for (int i = 0; i < genres.Length; i++)
|
||||||
|
genres[i] = genres[i].Replace("\r\n", "");
|
||||||
|
tags = genres.ToHashSet();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
string posterUrl = document.DocumentNode.Descendants("span").First(s => s.HasClass("info-image")).Descendants("img").First()
|
||||||
|
.GetAttributes().First(a => a.Name == "src").Value;
|
||||||
|
|
||||||
|
string coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId, RequestType.MangaCover);
|
||||||
|
|
||||||
|
string description = document.DocumentNode.Descendants("div").First(d => d.HasClass("panel-story-info-description"))
|
||||||
|
.InnerText.Replace("Description :", "");
|
||||||
|
while (description.StartsWith('\n'))
|
||||||
|
description = description.Substring(1);
|
||||||
|
|
||||||
|
string pattern = "MMM dd,yyyy HH:mm";
|
||||||
|
|
||||||
|
HtmlNode oldestChapter = document.DocumentNode
|
||||||
|
.SelectNodes("//span[contains(concat(' ',normalize-space(@class),' '),' chapter-time ')]").MaxBy(
|
||||||
|
node => DateTime.ParseExact(node.GetAttributeValue("title", "Dec 31 2400, 23:59"), pattern,
|
||||||
|
CultureInfo.InvariantCulture).Millisecond)!;
|
||||||
|
|
||||||
|
|
||||||
|
int year = DateTime.ParseExact(oldestChapter.GetAttributeValue("title", "Dec 31 2400, 23:59"), pattern,
|
||||||
|
CultureInfo.InvariantCulture).Year;
|
||||||
|
|
||||||
|
Manga manga = new (sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl, coverFileNameInCache, links,
|
||||||
|
year, originalLanguage, publicationId, releaseStatus, websiteUrl: websiteUrl);
|
||||||
|
AddMangaToCache(manga);
|
||||||
|
return manga;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Chapter[] GetChapters(Manga manga, string language="en")
|
||||||
|
{
|
||||||
|
Log($"Getting chapters {manga}");
|
||||||
|
string requestUrl = $"https://chapmanganato.com/{manga.publicationId}";
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return Array.Empty<Chapter>();
|
||||||
|
|
||||||
|
//Return Chapters ordered by Chapter-Number
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
return Array.Empty<Chapter>();
|
||||||
|
List<Chapter> chapters = ParseChaptersFromHtml(manga, requestResult.htmlDocument);
|
||||||
|
Log($"Got {chapters.Count} chapters. {manga}");
|
||||||
|
return chapters.Order().ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<Chapter> ParseChaptersFromHtml(Manga manga, HtmlDocument document)
|
||||||
|
{
|
||||||
|
List<Chapter> ret = new();
|
||||||
|
|
||||||
|
HtmlNode chapterList = document.DocumentNode.Descendants("ul").First(l => l.HasClass("row-content-chapter"));
|
||||||
|
|
||||||
|
Regex volRex = new(@"Vol\.([0-9]+).*");
|
||||||
|
Regex chapterRex = new(@"https:\/\/chapmanganato.[A-z]+\/manga-[A-z0-9]+\/chapter-([0-9\.]+)");
|
||||||
|
Regex nameRex = new(@"Chapter ([0-9]+(\.[0-9]+)*){1}:? (.*)");
|
||||||
|
|
||||||
|
foreach (HtmlNode chapterInfo in chapterList.Descendants("li"))
|
||||||
|
{
|
||||||
|
string fullString = chapterInfo.Descendants("a").First(d => d.HasClass("chapter-name")).InnerText;
|
||||||
|
|
||||||
|
string url = chapterInfo.Descendants("a").First(d => d.HasClass("chapter-name"))
|
||||||
|
.GetAttributeValue("href", "");
|
||||||
|
string? volumeNumber = volRex.IsMatch(fullString) ? volRex.Match(fullString).Groups[1].Value : null;
|
||||||
|
string chapterNumber = chapterRex.Match(url).Groups[1].Value;
|
||||||
|
string chapterName = nameRex.Match(fullString).Groups[3].Value;
|
||||||
|
ret.Add(new Chapter(manga, chapterName, volumeNumber, chapterNumber, url));
|
||||||
|
}
|
||||||
|
ret.Reverse();
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null)
|
||||||
|
{
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
{
|
||||||
|
progressToken.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga chapterParentManga = chapter.parentManga;
|
||||||
|
Log($"Retrieving chapter-info {chapter} {chapterParentManga}");
|
||||||
|
string requestUrl = chapter.url;
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
{
|
||||||
|
progressToken?.Cancel();
|
||||||
|
return requestResult.statusCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
{
|
||||||
|
progressToken?.Cancel();
|
||||||
|
return HttpStatusCode.InternalServerError;
|
||||||
|
}
|
||||||
|
|
||||||
|
string[] imageUrls = ParseImageUrlsFromHtml(requestResult.htmlDocument);
|
||||||
|
|
||||||
|
string comicInfoPath = Path.GetTempFileName();
|
||||||
|
File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
|
||||||
|
|
||||||
|
return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, "https://chapmanganato.com/", progressToken:progressToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string[] ParseImageUrlsFromHtml(HtmlDocument document)
|
||||||
|
{
|
||||||
|
List<string> ret = new();
|
||||||
|
|
||||||
|
HtmlNode imageContainer =
|
||||||
|
document.DocumentNode.Descendants("div").First(i => i.HasClass("container-chapter-reader"));
|
||||||
|
foreach(HtmlNode imageNode in imageContainer.Descendants("img"))
|
||||||
|
ret.Add(imageNode.GetAttributeValue("src", ""));
|
||||||
|
|
||||||
|
return ret.ToArray();
|
||||||
|
}
|
||||||
|
}
|
230
Tranga/MangaConnectors/Mangasee.cs
Normal file
230
Tranga/MangaConnectors/Mangasee.cs
Normal file
@ -0,0 +1,230 @@
|
|||||||
|
using System.Data;
|
||||||
|
using System.Net;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using System.Xml.Linq;
|
||||||
|
using HtmlAgilityPack;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using Soenneker.Utils.String.NeedlemanWunsch;
|
||||||
|
using Tranga.Jobs;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
public class Mangasee : MangaConnector
|
||||||
|
{
|
||||||
|
public Mangasee(GlobalBase clone) : base(clone, "Mangasee", ["en"])
|
||||||
|
{
|
||||||
|
this.downloadClient = new ChromiumDownloadClient(clone);
|
||||||
|
}
|
||||||
|
|
||||||
|
private struct SearchResult
|
||||||
|
{
|
||||||
|
public string i { get; set; }
|
||||||
|
public string s { get; set; }
|
||||||
|
public string[] a { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga[] GetManga(string publicationTitle = "")
|
||||||
|
{
|
||||||
|
Log($"Searching Publications. Term=\"{publicationTitle}\"");
|
||||||
|
string requestUrl = "https://mangasee123.com/_search.php";
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
{
|
||||||
|
Log($"Failed to retrieve search: {requestResult.statusCode}");
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
SearchResult[] searchResults = JsonConvert.DeserializeObject<SearchResult[]>(requestResult.htmlDocument!.DocumentNode.InnerText) ??
|
||||||
|
throw new NoNullAllowedException();
|
||||||
|
SearchResult[] filteredResults = FilteredResults(publicationTitle, searchResults);
|
||||||
|
Log($"Total available manga: {searchResults.Length} Filtered down to: {filteredResults.Length}");
|
||||||
|
|
||||||
|
|
||||||
|
string[] urls = filteredResults.Select(result => $"https://mangasee123.com/manga/{result.i}").ToArray();
|
||||||
|
List<Manga> searchResultManga = new();
|
||||||
|
foreach (string url in urls)
|
||||||
|
{
|
||||||
|
Manga? newManga = GetMangaFromUrl(url);
|
||||||
|
if(newManga is { } manga)
|
||||||
|
searchResultManga.Add(manga);
|
||||||
|
}
|
||||||
|
Log($"Retrieved {searchResultManga.Count} publications. Term=\"{publicationTitle}\"");
|
||||||
|
return searchResultManga.ToArray();
|
||||||
|
}
|
||||||
|
catch (NoNullAllowedException)
|
||||||
|
{
|
||||||
|
Log("Failed to retrieve search");
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private readonly string[] _filterWords = {"a", "the", "of", "as", "to", "no", "for", "on", "with", "be", "and", "in", "wa", "at", "be", "ni"};
|
||||||
|
private string ToFilteredString(string input) => string.Join(' ', input.ToLower().Split(' ').Where(word => _filterWords.Contains(word) == false));
|
||||||
|
private SearchResult[] FilteredResults(string publicationTitle, SearchResult[] unfilteredSearchResults)
|
||||||
|
{
|
||||||
|
Dictionary<SearchResult, int> similarity = new();
|
||||||
|
foreach (SearchResult sr in unfilteredSearchResults)
|
||||||
|
{
|
||||||
|
List<int> scores = new();
|
||||||
|
string filteredPublicationString = ToFilteredString(publicationTitle);
|
||||||
|
string filteredSString = ToFilteredString(sr.s);
|
||||||
|
scores.Add(NeedlemanWunschStringUtil.CalculateSimilarity(filteredSString, filteredPublicationString));
|
||||||
|
foreach (string srA in sr.a)
|
||||||
|
{
|
||||||
|
string filteredAString = ToFilteredString(srA);
|
||||||
|
scores.Add(NeedlemanWunschStringUtil.CalculateSimilarity(filteredAString, filteredPublicationString));
|
||||||
|
}
|
||||||
|
similarity.Add(sr, scores.Sum() / scores.Count);
|
||||||
|
}
|
||||||
|
|
||||||
|
List<SearchResult> ret = similarity.OrderBy(s => s.Value).Take(10).Select(s => s.Key).ToList();
|
||||||
|
return ret.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromId(string publicationId)
|
||||||
|
{
|
||||||
|
return GetMangaFromUrl($"https://mangasee123.com/manga/{publicationId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromUrl(string url)
|
||||||
|
{
|
||||||
|
Regex publicationIdRex = new(@"https:\/\/mangasee123.com\/manga\/(.*)(\/.*)*");
|
||||||
|
string publicationId = publicationIdRex.Match(url).Groups[1].Value;
|
||||||
|
|
||||||
|
RequestResult requestResult = this.downloadClient.MakeRequest(url, RequestType.MangaInfo);
|
||||||
|
if((int)requestResult.statusCode < 300 && (int)requestResult.statusCode >= 200 && requestResult.htmlDocument is not null)
|
||||||
|
return ParseSinglePublicationFromHtml(requestResult.htmlDocument, publicationId, url);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga ParseSinglePublicationFromHtml(HtmlDocument document, string publicationId, string websiteUrl)
|
||||||
|
{
|
||||||
|
string originalLanguage = "", status = "";
|
||||||
|
Dictionary<string, string> altTitles = new(), links = new();
|
||||||
|
HashSet<string> tags = new();
|
||||||
|
Manga.ReleaseStatusByte releaseStatus = Manga.ReleaseStatusByte.Unreleased;
|
||||||
|
|
||||||
|
HtmlNode posterNode = document.DocumentNode.SelectSingleNode("//div[@class='BoxBody']//div[@class='row']//img");
|
||||||
|
string posterUrl = posterNode.GetAttributeValue("src", "");
|
||||||
|
string coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId, RequestType.MangaCover);
|
||||||
|
|
||||||
|
HtmlNode titleNode = document.DocumentNode.SelectSingleNode("//div[@class='BoxBody']//div[@class='row']//h1");
|
||||||
|
string sortName = titleNode.InnerText;
|
||||||
|
|
||||||
|
HtmlNode[] authorsNodes = document.DocumentNode
|
||||||
|
.SelectNodes("//div[@class='BoxBody']//div[@class='row']//span[text()='Author(s):']/..").Descendants("a")
|
||||||
|
.ToArray();
|
||||||
|
List<string> authors = new();
|
||||||
|
foreach (HtmlNode authorNode in authorsNodes)
|
||||||
|
authors.Add(authorNode.InnerText);
|
||||||
|
|
||||||
|
HtmlNode[] genreNodes = document.DocumentNode
|
||||||
|
.SelectNodes("//div[@class='BoxBody']//div[@class='row']//span[text()='Genre(s):']/..").Descendants("a")
|
||||||
|
.ToArray();
|
||||||
|
foreach (HtmlNode genreNode in genreNodes)
|
||||||
|
tags.Add(genreNode.InnerText);
|
||||||
|
|
||||||
|
HtmlNode yearNode = document.DocumentNode
|
||||||
|
.SelectNodes("//div[@class='BoxBody']//div[@class='row']//span[text()='Released:']/..").Descendants("a")
|
||||||
|
.First();
|
||||||
|
int year = Convert.ToInt32(yearNode.InnerText);
|
||||||
|
|
||||||
|
HtmlNode[] statusNodes = document.DocumentNode
|
||||||
|
.SelectNodes("//div[@class='BoxBody']//div[@class='row']//span[text()='Status:']/..").Descendants("a")
|
||||||
|
.ToArray();
|
||||||
|
foreach (HtmlNode statusNode in statusNodes)
|
||||||
|
if (statusNode.InnerText.Contains("publish", StringComparison.CurrentCultureIgnoreCase))
|
||||||
|
status = statusNode.InnerText.Split(' ')[0];
|
||||||
|
switch (status.ToLower())
|
||||||
|
{
|
||||||
|
case "cancelled": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
|
||||||
|
case "hiatus": releaseStatus = Manga.ReleaseStatusByte.OnHiatus; break;
|
||||||
|
case "discontinued": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
|
||||||
|
case "complete": releaseStatus = Manga.ReleaseStatusByte.Completed; break;
|
||||||
|
case "ongoing": releaseStatus = Manga.ReleaseStatusByte.Continuing; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
HtmlNode descriptionNode = document.DocumentNode
|
||||||
|
.SelectNodes("//div[@class='BoxBody']//div[@class='row']//span[text()='Description:']/..")
|
||||||
|
.Descendants("div").First();
|
||||||
|
string description = descriptionNode.InnerText;
|
||||||
|
|
||||||
|
Manga manga = new(sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl,
|
||||||
|
coverFileNameInCache, links,
|
||||||
|
year, originalLanguage, publicationId, releaseStatus, websiteUrl: websiteUrl);
|
||||||
|
AddMangaToCache(manga);
|
||||||
|
return manga;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Chapter[] GetChapters(Manga manga, string language="en")
|
||||||
|
{
|
||||||
|
Log($"Getting chapters {manga}");
|
||||||
|
try
|
||||||
|
{
|
||||||
|
XDocument doc = XDocument.Load($"https://mangasee123.com/rss/{manga.publicationId}.xml");
|
||||||
|
XElement[] chapterItems = doc.Descendants("item").ToArray();
|
||||||
|
List<Chapter> chapters = new();
|
||||||
|
Regex chVolRex = new(@".*chapter-([0-9\.]+)(?:-index-([0-9\.]+))?.*");
|
||||||
|
foreach (XElement chapter in chapterItems)
|
||||||
|
{
|
||||||
|
string url = chapter.Descendants("link").First().Value;
|
||||||
|
Match m = chVolRex.Match(url);
|
||||||
|
string? volumeNumber = m.Groups[2].Success ? m.Groups[2].Value : "1";
|
||||||
|
string chapterNumber = m.Groups[1].Value;
|
||||||
|
|
||||||
|
string chapterUrl = Regex.Replace(url, @"-page-[0-9]+(\.html)", ".html");
|
||||||
|
chapters.Add(new Chapter(manga, "", volumeNumber, chapterNumber, chapterUrl));
|
||||||
|
}
|
||||||
|
|
||||||
|
//Return Chapters ordered by Chapter-Number
|
||||||
|
Log($"Got {chapters.Count} chapters. {manga}");
|
||||||
|
return chapters.Order().ToArray();
|
||||||
|
}
|
||||||
|
catch (HttpRequestException e)
|
||||||
|
{
|
||||||
|
Log($"Failed to load https://mangasee123.com/rss/{manga.publicationId}.xml \n\r{e}");
|
||||||
|
return Array.Empty<Chapter>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null)
|
||||||
|
{
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
{
|
||||||
|
progressToken.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga chapterParentManga = chapter.parentManga;
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
{
|
||||||
|
progressToken.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
Log($"Retrieving chapter-info {chapter} {chapterParentManga}");
|
||||||
|
|
||||||
|
RequestResult requestResult = this.downloadClient.MakeRequest(chapter.url, RequestType.Default);
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
{
|
||||||
|
progressToken?.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
HtmlDocument document = requestResult.htmlDocument;
|
||||||
|
|
||||||
|
HtmlNode gallery = document.DocumentNode.Descendants("div").First(div => div.HasClass("ImageGallery"));
|
||||||
|
HtmlNode[] images = gallery.Descendants("img").Where(img => img.HasClass("img-fluid")).ToArray();
|
||||||
|
List<string> urls = new();
|
||||||
|
foreach(HtmlNode galleryImage in images)
|
||||||
|
urls.Add(galleryImage.GetAttributeValue("src", ""));
|
||||||
|
|
||||||
|
string comicInfoPath = Path.GetTempFileName();
|
||||||
|
File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
|
||||||
|
|
||||||
|
return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
|
||||||
|
}
|
||||||
|
}
|
227
Tranga/MangaConnectors/Mangaworld.cs
Normal file
227
Tranga/MangaConnectors/Mangaworld.cs
Normal file
@ -0,0 +1,227 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using HtmlAgilityPack;
|
||||||
|
using Tranga.Jobs;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
public class Mangaworld: MangaConnector
|
||||||
|
{
|
||||||
|
public Mangaworld(GlobalBase clone) : base(clone, "Mangaworld", ["it"])
|
||||||
|
{
|
||||||
|
this.downloadClient = new HttpDownloadClient(clone);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga[] GetManga(string publicationTitle = "")
|
||||||
|
{
|
||||||
|
Log($"Searching Publications. Term=\"{publicationTitle}\"");
|
||||||
|
string sanitizedTitle = string.Join(' ', Regex.Matches(publicationTitle, "[A-z]*").Where(str => str.Length > 0)).ToLower();
|
||||||
|
string requestUrl = $"https://www.mangaworld.ac/archive?keyword={sanitizedTitle}";
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
Manga[] publications = ParsePublicationsFromHtml(requestResult.htmlDocument);
|
||||||
|
Log($"Retrieved {publications.Length} publications. Term=\"{publicationTitle}\"");
|
||||||
|
return publications;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga[] ParsePublicationsFromHtml(HtmlDocument document)
|
||||||
|
{
|
||||||
|
if (!document.DocumentNode.SelectSingleNode("//div[@class='comics-grid']").ChildNodes
|
||||||
|
.Any(node => node.HasClass("entry")))
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
|
||||||
|
List<string> urls = document.DocumentNode
|
||||||
|
.SelectNodes(
|
||||||
|
"//div[@class='comics-grid']//div[@class='entry']//a[contains(concat(' ',normalize-space(@class),' '),'thumb')]")
|
||||||
|
.Select(thumb => thumb.GetAttributeValue("href", "")).ToList();
|
||||||
|
|
||||||
|
HashSet<Manga> ret = new();
|
||||||
|
foreach (string url in urls)
|
||||||
|
{
|
||||||
|
Manga? manga = GetMangaFromUrl(url);
|
||||||
|
if (manga is not null)
|
||||||
|
ret.Add((Manga)manga);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromId(string publicationId)
|
||||||
|
{
|
||||||
|
return GetMangaFromUrl($"https://www.mangaworld.ac/manga/{publicationId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromUrl(string url)
|
||||||
|
{
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(url, RequestType.MangaInfo);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
Regex idRex = new (@"https:\/\/www\.mangaworld\.[a-z]{0,63}\/manga\/([0-9]+\/[0-9A-z\-]+).*");
|
||||||
|
string id = idRex.Match(url).Groups[1].Value;
|
||||||
|
return ParseSinglePublicationFromHtml(requestResult.htmlDocument, id, url);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga ParseSinglePublicationFromHtml(HtmlDocument document, string publicationId, string websiteUrl)
|
||||||
|
{
|
||||||
|
Dictionary<string, string> altTitles = new();
|
||||||
|
Dictionary<string, string>? links = null;
|
||||||
|
string originalLanguage = "";
|
||||||
|
Manga.ReleaseStatusByte releaseStatus = Manga.ReleaseStatusByte.Unreleased;
|
||||||
|
|
||||||
|
HtmlNode infoNode = document.DocumentNode.Descendants("div").First(d => d.HasClass("info"));
|
||||||
|
|
||||||
|
string sortName = infoNode.Descendants("h1").First().InnerText;
|
||||||
|
|
||||||
|
HtmlNode metadata = infoNode.Descendants().First(d => d.HasClass("meta-data"));
|
||||||
|
|
||||||
|
HtmlNode altTitlesNode = metadata.SelectSingleNode("//span[text()='Titoli alternativi: ' or text()='Titolo alternativo: ']/..").ChildNodes[1];
|
||||||
|
|
||||||
|
string[] alts = altTitlesNode.InnerText.Split(", ");
|
||||||
|
for(int i = 0; i < alts.Length; i++)
|
||||||
|
altTitles.Add(i.ToString(), alts[i]);
|
||||||
|
|
||||||
|
HtmlNode genresNode =
|
||||||
|
metadata.SelectSingleNode("//span[text()='Generi: ' or text()='Genero: ']/..");
|
||||||
|
HashSet<string> tags = genresNode.SelectNodes("a").Select(node => node.InnerText).ToHashSet();
|
||||||
|
|
||||||
|
HtmlNode authorsNode =
|
||||||
|
metadata.SelectSingleNode("//span[text()='Autore: ' or text()='Autori: ']/..");
|
||||||
|
string[] authors = authorsNode.SelectNodes("a").Select(node => node.InnerText).ToArray();
|
||||||
|
|
||||||
|
string status = metadata.SelectSingleNode("//span[text()='Stato: ']/..").SelectNodes("a").First().InnerText;
|
||||||
|
// ReSharper disable 5 times StringLiteralTypo
|
||||||
|
switch (status.ToLower())
|
||||||
|
{
|
||||||
|
case "cancellato": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
|
||||||
|
case "in pausa": releaseStatus = Manga.ReleaseStatusByte.OnHiatus; break;
|
||||||
|
case "droppato": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
|
||||||
|
case "finito": releaseStatus = Manga.ReleaseStatusByte.Completed; break;
|
||||||
|
case "in corso": releaseStatus = Manga.ReleaseStatusByte.Continuing; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
string posterUrl = document.DocumentNode.SelectSingleNode("//img[@class='rounded']").GetAttributeValue("src", "");
|
||||||
|
|
||||||
|
string coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId.Replace('/', '-'), RequestType.MangaCover);
|
||||||
|
|
||||||
|
string description = document.DocumentNode.SelectSingleNode("//div[@id='noidungm']").InnerText;
|
||||||
|
|
||||||
|
string yearString = metadata.SelectSingleNode("//span[text()='Anno di uscita: ']/..").SelectNodes("a").First().InnerText;
|
||||||
|
int year = Convert.ToInt32(yearString);
|
||||||
|
|
||||||
|
Manga manga = new (sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl, coverFileNameInCache, links,
|
||||||
|
year, originalLanguage, publicationId, releaseStatus, websiteUrl: websiteUrl);
|
||||||
|
AddMangaToCache(manga);
|
||||||
|
return manga;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Chapter[] GetChapters(Manga manga, string language="en")
|
||||||
|
{
|
||||||
|
Log($"Getting chapters {manga}");
|
||||||
|
string requestUrl = $"https://www.mangaworld.ac/manga/{manga.publicationId}";
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return Array.Empty<Chapter>();
|
||||||
|
|
||||||
|
//Return Chapters ordered by Chapter-Number
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
return Array.Empty<Chapter>();
|
||||||
|
List<Chapter> chapters = ParseChaptersFromHtml(manga, requestResult.htmlDocument);
|
||||||
|
Log($"Got {chapters.Count} chapters. {manga}");
|
||||||
|
return chapters.Order().ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<Chapter> ParseChaptersFromHtml(Manga manga, HtmlDocument document)
|
||||||
|
{
|
||||||
|
List<Chapter> ret = new();
|
||||||
|
|
||||||
|
HtmlNode chaptersWrapper =
|
||||||
|
document.DocumentNode.SelectSingleNode(
|
||||||
|
"//div[contains(concat(' ',normalize-space(@class),' '),'chapters-wrapper')]");
|
||||||
|
|
||||||
|
if (chaptersWrapper.Descendants("div").Any(descendant => descendant.HasClass("volume-element")))
|
||||||
|
{
|
||||||
|
foreach (HtmlNode volNode in document.DocumentNode.SelectNodes("//div[contains(concat(' ',normalize-space(@class),' '),'volume-element')]"))
|
||||||
|
{
|
||||||
|
string volume = Regex.Match(volNode.SelectNodes("div").First(node => node.HasClass("volume")).SelectSingleNode("p").InnerText,
|
||||||
|
@"[Vv]olume ([0-9]+).*").Groups[1].Value;
|
||||||
|
foreach (HtmlNode chNode in volNode.SelectNodes("div").First(node => node.HasClass("volume-chapters")).SelectNodes("div"))
|
||||||
|
{
|
||||||
|
|
||||||
|
string number = Regex.Match(chNode.SelectSingleNode("a").SelectSingleNode("span").InnerText,
|
||||||
|
@"[Cc]apitolo ([0-9]+).*").Groups[1].Value;
|
||||||
|
string url = chNode.SelectSingleNode("a").GetAttributeValue("href", "");
|
||||||
|
ret.Add(new Chapter(manga, null, volume, number, url));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
foreach (HtmlNode chNode in chaptersWrapper.SelectNodes("div").Where(node => node.HasClass("chapter")))
|
||||||
|
{
|
||||||
|
string number = Regex.Match(chNode.SelectSingleNode("a").SelectSingleNode("span").InnerText,
|
||||||
|
@"[Cc]apitolo ([0-9]+).*").Groups[1].Value;
|
||||||
|
string url = chNode.SelectSingleNode("a").GetAttributeValue("href", "");
|
||||||
|
ret.Add(new Chapter(manga, null, null, number, url));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ret.Reverse();
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null)
|
||||||
|
{
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
{
|
||||||
|
progressToken.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga chapterParentManga = chapter.parentManga;
|
||||||
|
Log($"Retrieving chapter-info {chapter} {chapterParentManga}");
|
||||||
|
string requestUrl = $"{chapter.url}?style=list";
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
{
|
||||||
|
progressToken?.Cancel();
|
||||||
|
return requestResult.statusCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
{
|
||||||
|
progressToken?.Cancel();
|
||||||
|
return HttpStatusCode.InternalServerError;
|
||||||
|
}
|
||||||
|
|
||||||
|
string[] imageUrls = ParseImageUrlsFromHtml(requestResult.htmlDocument);
|
||||||
|
|
||||||
|
string comicInfoPath = Path.GetTempFileName();
|
||||||
|
File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
|
||||||
|
|
||||||
|
return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, "https://www.mangaworld.bz/", progressToken:progressToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string[] ParseImageUrlsFromHtml(HtmlDocument document)
|
||||||
|
{
|
||||||
|
List<string> ret = new();
|
||||||
|
|
||||||
|
HtmlNode imageContainer =
|
||||||
|
document.DocumentNode.SelectSingleNode("//div[@id='page']");
|
||||||
|
foreach(HtmlNode imageNode in imageContainer.Descendants("img"))
|
||||||
|
ret.Add(imageNode.GetAttributeValue("src", ""));
|
||||||
|
|
||||||
|
return ret.ToArray();
|
||||||
|
}
|
||||||
|
}
|
198
Tranga/MangaConnectors/ManhuaPlus.cs
Normal file
198
Tranga/MangaConnectors/ManhuaPlus.cs
Normal file
@ -0,0 +1,198 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using HtmlAgilityPack;
|
||||||
|
using Tranga.Jobs;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
public class ManhuaPlus : MangaConnector
|
||||||
|
{
|
||||||
|
public ManhuaPlus(GlobalBase clone) : base(clone, "ManhuaPlus", ["en"])
|
||||||
|
{
|
||||||
|
this.downloadClient = new ChromiumDownloadClient(clone);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga[] GetManga(string publicationTitle = "")
|
||||||
|
{
|
||||||
|
Log($"Searching Publications. Term=\"{publicationTitle}\"");
|
||||||
|
string sanitizedTitle = string.Join(' ', Regex.Matches(publicationTitle, "[A-z]*").Where(str => str.Length > 0)).ToLower();
|
||||||
|
string requestUrl = $"https://manhuaplus.org/search?keyword={sanitizedTitle}";
|
||||||
|
RequestResult requestResult =
|
||||||
|
downloadClient.MakeRequest(requestUrl, RequestType.Default);
|
||||||
|
if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
Manga[] publications = ParsePublicationsFromHtml(requestResult.htmlDocument);
|
||||||
|
Log($"Retrieved {publications.Length} publications. Term=\"{publicationTitle}\"");
|
||||||
|
return publications;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga[] ParsePublicationsFromHtml(HtmlDocument document)
|
||||||
|
{
|
||||||
|
if (document.DocumentNode.SelectSingleNode("//h1/../..").ChildNodes//I already want to not.
|
||||||
|
.Any(node => node.InnerText.Contains("No manga found")))
|
||||||
|
return Array.Empty<Manga>();
|
||||||
|
|
||||||
|
List<string> urls = document.DocumentNode
|
||||||
|
.SelectNodes("//h1/../..//a[contains(@href, 'https://manhuaplus.org/manga/') and contains(concat(' ',normalize-space(@class),' '),' clamp ') and not(contains(@href, '/chapter'))]")
|
||||||
|
.Select(mangaNode => mangaNode.GetAttributeValue("href", "")).ToList();
|
||||||
|
logger?.WriteLine($"Got {urls.Count} urls.");
|
||||||
|
|
||||||
|
HashSet<Manga> ret = new();
|
||||||
|
foreach (string url in urls)
|
||||||
|
{
|
||||||
|
Manga? manga = GetMangaFromUrl(url);
|
||||||
|
if (manga is not null)
|
||||||
|
ret.Add((Manga)manga);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromId(string publicationId)
|
||||||
|
{
|
||||||
|
return GetMangaFromUrl($"https://manhuaplus.org/manga/{publicationId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Manga? GetMangaFromUrl(string url)
|
||||||
|
{
|
||||||
|
Regex publicationIdRex = new(@"https:\/\/manhuaplus.org\/manga\/(.*)(\/.*)*");
|
||||||
|
string publicationId = publicationIdRex.Match(url).Groups[1].Value;
|
||||||
|
|
||||||
|
RequestResult requestResult = this.downloadClient.MakeRequest(url, RequestType.MangaInfo);
|
||||||
|
if((int)requestResult.statusCode < 300 && (int)requestResult.statusCode >= 200 && requestResult.htmlDocument is not null && requestResult.redirectedToUrl != "https://manhuaplus.org/home") //When manga doesnt exists it redirects to home
|
||||||
|
return ParseSinglePublicationFromHtml(requestResult.htmlDocument, publicationId, url);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Manga ParseSinglePublicationFromHtml(HtmlDocument document, string publicationId, string websiteUrl)
|
||||||
|
{
|
||||||
|
string originalLanguage = "", status = "";
|
||||||
|
Dictionary<string, string> altTitles = new(), links = new();
|
||||||
|
HashSet<string> tags = new();
|
||||||
|
Manga.ReleaseStatusByte releaseStatus = Manga.ReleaseStatusByte.Unreleased;
|
||||||
|
|
||||||
|
HtmlNode posterNode = document.DocumentNode.SelectSingleNode("/html/body/main/div/div/div[2]/div[1]/figure/a/img");//BRUH
|
||||||
|
Regex posterRex = new(@".*(\/uploads/covers/[a-zA-Z0-9\-\._\~\!\$\&\'\(\)\*\+\,\;\=\:\@]+).*");
|
||||||
|
string posterUrl = $"https://manhuaplus.org/{posterRex.Match(posterNode.GetAttributeValue("src", "")).Groups[1].Value}";
|
||||||
|
string coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId, RequestType.MangaCover);
|
||||||
|
|
||||||
|
HtmlNode titleNode = document.DocumentNode.SelectSingleNode("//h1");
|
||||||
|
string sortName = titleNode.InnerText.Replace("\n", "");
|
||||||
|
|
||||||
|
List<string> authors = new();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
HtmlNode[] authorsNodes = document.DocumentNode
|
||||||
|
.SelectNodes("//a[contains(@href, 'https://manhuaplus.org/authors/')]")
|
||||||
|
.ToArray();
|
||||||
|
foreach (HtmlNode authorNode in authorsNodes)
|
||||||
|
authors.Add(authorNode.InnerText);
|
||||||
|
}
|
||||||
|
catch (ArgumentNullException e)
|
||||||
|
{
|
||||||
|
Log("No authors found.");
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
HtmlNode[] genreNodes = document.DocumentNode
|
||||||
|
.SelectNodes("//a[contains(@href, 'https://manhuaplus.org/genres/')]").ToArray();
|
||||||
|
foreach (HtmlNode genreNode in genreNodes)
|
||||||
|
tags.Add(genreNode.InnerText.Replace("\n", ""));
|
||||||
|
}
|
||||||
|
catch (ArgumentNullException e)
|
||||||
|
{
|
||||||
|
Log("No genres found");
|
||||||
|
}
|
||||||
|
|
||||||
|
string yearNodeStr = document.DocumentNode
|
||||||
|
.SelectSingleNode("//aside//i[contains(concat(' ',normalize-space(@class),' '),' fa-clock ')]/../span").InnerText.Replace("\n", "");
|
||||||
|
int year = int.Parse(yearNodeStr.Split(' ')[0].Split('/')[^1]);
|
||||||
|
|
||||||
|
status = document.DocumentNode.SelectSingleNode("//aside//i[contains(concat(' ',normalize-space(@class),' '),' fa-rss ')]/../span").InnerText.Replace("\n", "");
|
||||||
|
switch (status.ToLower())
|
||||||
|
{
|
||||||
|
case "cancelled": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
|
||||||
|
case "hiatus": releaseStatus = Manga.ReleaseStatusByte.OnHiatus; break;
|
||||||
|
case "discontinued": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
|
||||||
|
case "complete": releaseStatus = Manga.ReleaseStatusByte.Completed; break;
|
||||||
|
case "ongoing": releaseStatus = Manga.ReleaseStatusByte.Continuing; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
HtmlNode descriptionNode = document.DocumentNode
|
||||||
|
.SelectSingleNode("//div[@id='syn-target']");
|
||||||
|
string description = descriptionNode.InnerText;
|
||||||
|
|
||||||
|
Manga manga = new(sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl,
|
||||||
|
coverFileNameInCache, links,
|
||||||
|
year, originalLanguage, publicationId, releaseStatus, websiteUrl: websiteUrl);
|
||||||
|
AddMangaToCache(manga);
|
||||||
|
return manga;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Chapter[] GetChapters(Manga manga, string language="en")
|
||||||
|
{
|
||||||
|
Log($"Getting chapters {manga}");
|
||||||
|
RequestResult result = downloadClient.MakeRequest($"https://manhuaplus.org/manga/{manga.publicationId}", RequestType.Default);
|
||||||
|
if ((int)result.statusCode < 200 || (int)result.statusCode >= 300 || result.htmlDocument is null)
|
||||||
|
{
|
||||||
|
return Array.Empty<Chapter>();
|
||||||
|
}
|
||||||
|
|
||||||
|
HtmlNodeCollection chapterNodes = result.htmlDocument.DocumentNode.SelectNodes("//li[contains(concat(' ',normalize-space(@class),' '),' chapter ')]//a");
|
||||||
|
string[] urls = chapterNodes.Select(node => node.GetAttributeValue("href", "")).ToArray();
|
||||||
|
Regex urlRex = new (@".*\/chapter-([0-9\-]+).*");
|
||||||
|
|
||||||
|
List<Chapter> chapters = new();
|
||||||
|
foreach (string url in urls)
|
||||||
|
{
|
||||||
|
Match rexMatch = urlRex.Match(url);
|
||||||
|
|
||||||
|
string volumeNumber = "1";
|
||||||
|
string chapterNumber = rexMatch.Groups[1].Value;
|
||||||
|
string fullUrl = url;
|
||||||
|
chapters.Add(new Chapter(manga, "", volumeNumber, chapterNumber, fullUrl));
|
||||||
|
}
|
||||||
|
//Return Chapters ordered by Chapter-Number
|
||||||
|
Log($"Got {chapters.Count} chapters. {manga}");
|
||||||
|
return chapters.Order().ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null)
|
||||||
|
{
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
{
|
||||||
|
progressToken.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
Manga chapterParentManga = chapter.parentManga;
|
||||||
|
if (progressToken?.cancellationRequested ?? false)
|
||||||
|
{
|
||||||
|
progressToken.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
Log($"Retrieving chapter-info {chapter} {chapterParentManga}");
|
||||||
|
|
||||||
|
RequestResult requestResult = this.downloadClient.MakeRequest(chapter.url, RequestType.Default);
|
||||||
|
if (requestResult.htmlDocument is null)
|
||||||
|
{
|
||||||
|
progressToken?.Cancel();
|
||||||
|
return HttpStatusCode.RequestTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
HtmlDocument document = requestResult.htmlDocument;
|
||||||
|
|
||||||
|
HtmlNode[] images = document.DocumentNode.SelectNodes("//a[contains(concat(' ',normalize-space(@class),' '),' readImg ')]/img").ToArray();
|
||||||
|
List<string> urls = images.Select(node => node.GetAttributeValue("src", "")).ToList();
|
||||||
|
|
||||||
|
string comicInfoPath = Path.GetTempFileName();
|
||||||
|
File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
|
||||||
|
|
||||||
|
return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
|
||||||
|
}
|
||||||
|
}
|
27
Tranga/MangaConnectors/RequestResult.cs
Normal file
27
Tranga/MangaConnectors/RequestResult.cs
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
using System.Net;
|
||||||
|
using HtmlAgilityPack;
|
||||||
|
|
||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
public struct RequestResult
|
||||||
|
{
|
||||||
|
public HttpStatusCode statusCode { get; }
|
||||||
|
public Stream result { get; }
|
||||||
|
public bool hasBeenRedirected { get; }
|
||||||
|
public string? redirectedToUrl { get; }
|
||||||
|
public HtmlDocument? htmlDocument { get; }
|
||||||
|
|
||||||
|
public RequestResult(HttpStatusCode statusCode, HtmlDocument? htmlDocument, Stream result)
|
||||||
|
{
|
||||||
|
this.statusCode = statusCode;
|
||||||
|
this.htmlDocument = htmlDocument;
|
||||||
|
this.result = result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public RequestResult(HttpStatusCode statusCode, HtmlDocument? htmlDocument, Stream result, bool hasBeenRedirected, string redirectedTo)
|
||||||
|
: this(statusCode, htmlDocument, result)
|
||||||
|
{
|
||||||
|
this.hasBeenRedirected = hasBeenRedirected;
|
||||||
|
redirectedToUrl = redirectedTo;
|
||||||
|
}
|
||||||
|
}
|
11
Tranga/MangaConnectors/RequestType.cs
Normal file
11
Tranga/MangaConnectors/RequestType.cs
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
namespace Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
public enum RequestType : byte
|
||||||
|
{
|
||||||
|
Default = 0,
|
||||||
|
MangaDexFeed = 1,
|
||||||
|
MangaImage = 2,
|
||||||
|
MangaCover = 3,
|
||||||
|
MangaDexImage = 5,
|
||||||
|
MangaInfo = 6
|
||||||
|
}
|
58
Tranga/NotificationConnectors/Gotify.cs
Normal file
58
Tranga/NotificationConnectors/Gotify.cs
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
using System.Text;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
namespace Tranga.NotificationConnectors;
|
||||||
|
|
||||||
|
public class Gotify : NotificationConnector
|
||||||
|
{
|
||||||
|
public string endpoint { get; }
|
||||||
|
// ReSharper disable once MemberCanBePrivate.Global
|
||||||
|
public string appToken { get; }
|
||||||
|
private readonly HttpClient _client = new();
|
||||||
|
|
||||||
|
[JsonConstructor]
|
||||||
|
public Gotify(GlobalBase clone, string endpoint, string appToken) : base(clone, NotificationConnectorType.Gotify)
|
||||||
|
{
|
||||||
|
if (!baseUrlRex.IsMatch(endpoint))
|
||||||
|
throw new ArgumentException("endpoint does not match pattern");
|
||||||
|
this.endpoint = baseUrlRex.Match(endpoint).Value;;
|
||||||
|
this.appToken = appToken;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"Gotify {endpoint}";
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void SendNotificationInternal(string title, string notificationText)
|
||||||
|
{
|
||||||
|
Log($"Sending notification: {title} - {notificationText}");
|
||||||
|
MessageData message = new(title, notificationText);
|
||||||
|
HttpRequestMessage request = new(HttpMethod.Post, $"{endpoint}/message");
|
||||||
|
request.Headers.Add("X-Gotify-Key", this.appToken);
|
||||||
|
request.Content = new StringContent(JsonConvert.SerializeObject(message, Formatting.None), Encoding.UTF8, "application/json");
|
||||||
|
HttpResponseMessage response = _client.Send(request);
|
||||||
|
if (!response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
StreamReader sr = new (response.Content.ReadAsStream());
|
||||||
|
Log($"{response.StatusCode}: {sr.ReadToEnd()}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class MessageData
|
||||||
|
{
|
||||||
|
// ReSharper disable four times UnusedAutoPropertyAccessor.Local
|
||||||
|
public string message { get; }
|
||||||
|
public long priority { get; }
|
||||||
|
public string title { get; }
|
||||||
|
public Dictionary<string, object> extras { get; }
|
||||||
|
|
||||||
|
public MessageData(string title, string message)
|
||||||
|
{
|
||||||
|
this.title = title;
|
||||||
|
this.message = message;
|
||||||
|
this.extras = new();
|
||||||
|
this.priority = 4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
49
Tranga/NotificationConnectors/LunaSea.cs
Normal file
49
Tranga/NotificationConnectors/LunaSea.cs
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
using System.Text;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
namespace Tranga.NotificationConnectors;
|
||||||
|
|
||||||
|
public class LunaSea : NotificationConnector
|
||||||
|
{
|
||||||
|
// ReSharper disable once MemberCanBePrivate.Global
|
||||||
|
public string id { get; init; }
|
||||||
|
private readonly HttpClient _client = new();
|
||||||
|
|
||||||
|
[JsonConstructor]
|
||||||
|
public LunaSea(GlobalBase clone, string id) : base(clone, NotificationConnectorType.LunaSea)
|
||||||
|
{
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"LunaSea {id}";
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void SendNotificationInternal(string title, string notificationText)
|
||||||
|
{
|
||||||
|
Log($"Sending notification: {title} - {notificationText}");
|
||||||
|
MessageData message = new(title, notificationText);
|
||||||
|
HttpRequestMessage request = new(HttpMethod.Post, $"https://notify.lunasea.app/v1/custom/{id}");
|
||||||
|
request.Content = new StringContent(JsonConvert.SerializeObject(message, Formatting.None), Encoding.UTF8, "application/json");
|
||||||
|
HttpResponseMessage response = _client.Send(request);
|
||||||
|
if (!response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
StreamReader sr = new (response.Content.ReadAsStream());
|
||||||
|
Log($"{response.StatusCode}: {sr.ReadToEnd()}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class MessageData
|
||||||
|
{
|
||||||
|
// ReSharper disable twice UnusedAutoPropertyAccessor.Local
|
||||||
|
public string title { get; }
|
||||||
|
public string body { get; }
|
||||||
|
|
||||||
|
public MessageData(string title, string body)
|
||||||
|
{
|
||||||
|
this.title = title;
|
||||||
|
this.body = body;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
74
Tranga/NotificationConnectors/NotificationConnector.cs
Normal file
74
Tranga/NotificationConnectors/NotificationConnector.cs
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
namespace Tranga.NotificationConnectors;
|
||||||
|
|
||||||
|
public abstract class NotificationConnector : GlobalBase
|
||||||
|
{
|
||||||
|
public readonly NotificationConnectorType notificationConnectorType;
|
||||||
|
private DateTime? _notificationRequested = null;
|
||||||
|
private readonly Thread? _notificationBufferThread = null;
|
||||||
|
private const int NoChangeTimeout = 3, BiggestInterval = 30;
|
||||||
|
private List<KeyValuePair<string, string>> _notifications = new();
|
||||||
|
|
||||||
|
protected NotificationConnector(GlobalBase clone, NotificationConnectorType notificationConnectorType) : base(clone)
|
||||||
|
{
|
||||||
|
Log($"Creating notificationConnector {Enum.GetName(notificationConnectorType)}");
|
||||||
|
this.notificationConnectorType = notificationConnectorType;
|
||||||
|
|
||||||
|
|
||||||
|
if (TrangaSettings.bufferLibraryUpdates)
|
||||||
|
{
|
||||||
|
_notificationBufferThread = new(CheckNotificationBuffer);
|
||||||
|
_notificationBufferThread.Start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void CheckNotificationBuffer()
|
||||||
|
{
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
if (_notificationRequested is not null && DateTime.Now.Subtract((DateTime)_notificationRequested) > TimeSpan.FromMinutes(NoChangeTimeout)) //If no updates have been requested for NoChangeTimeout minutes, update library
|
||||||
|
{
|
||||||
|
string[] uniqueTitles = _notifications.DistinctBy(n => n.Key).Select(n => n.Key).ToArray();
|
||||||
|
Log($"Notification Buffer sending! Notifications: {string.Join(", ", uniqueTitles)}");
|
||||||
|
foreach (string ut in uniqueTitles)
|
||||||
|
{
|
||||||
|
string[] texts = _notifications.Where(n => n.Key == ut).Select(n => n.Value).ToArray();
|
||||||
|
SendNotificationInternal($"{ut} ({texts.Length})", string.Join('\n', texts));
|
||||||
|
}
|
||||||
|
_notificationRequested = null;
|
||||||
|
_notifications.Clear();
|
||||||
|
}
|
||||||
|
Thread.Sleep(100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum NotificationConnectorType : byte { Gotify = 0, LunaSea = 1, Ntfy = 2 }
|
||||||
|
|
||||||
|
public void SendNotification(string title, string notificationText, bool buffer = false)
|
||||||
|
{
|
||||||
|
_notificationRequested ??= DateTime.Now;
|
||||||
|
if (!TrangaSettings.bufferNotifications || !buffer)
|
||||||
|
{
|
||||||
|
SendNotificationInternal(title, notificationText);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_notifications.Add(new(title, notificationText));
|
||||||
|
if (_notificationRequested is not null &&
|
||||||
|
DateTime.Now.Subtract((DateTime)_notificationRequested) > TimeSpan.FromMinutes(BiggestInterval)) //If the last update has been more than BiggestInterval minutes ago, update library
|
||||||
|
{
|
||||||
|
string[] uniqueTitles = _notifications.DistinctBy(n => n.Key).Select(n => n.Key).ToArray();
|
||||||
|
foreach (string ut in uniqueTitles)
|
||||||
|
{
|
||||||
|
string[] texts = _notifications.Where(n => n.Key == ut).Select(n => n.Value).ToArray();
|
||||||
|
SendNotificationInternal(ut, string.Join('\n', texts));
|
||||||
|
}
|
||||||
|
_notificationRequested = null;
|
||||||
|
_notifications.Clear();
|
||||||
|
}
|
||||||
|
else if(_notificationRequested is not null)
|
||||||
|
{
|
||||||
|
Log($"Buffering Notifications (Updates in latest {((DateTime)_notificationRequested).Add(TimeSpan.FromMinutes(BiggestInterval)).Subtract(DateTime.Now)} or {((DateTime)_notificationRequested).Add(TimeSpan.FromMinutes(NoChangeTimeout)).Subtract(DateTime.Now)})");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract void SendNotificationInternal(string title, string notificationText);
|
||||||
|
}
|
@ -0,0 +1,46 @@
|
|||||||
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
|
||||||
|
namespace Tranga.NotificationConnectors;
|
||||||
|
|
||||||
|
public class NotificationManagerJsonConverter : JsonConverter
|
||||||
|
{
|
||||||
|
private GlobalBase _clone;
|
||||||
|
|
||||||
|
public NotificationManagerJsonConverter(GlobalBase clone)
|
||||||
|
{
|
||||||
|
this._clone = clone;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool CanConvert(Type objectType)
|
||||||
|
{
|
||||||
|
return (objectType == typeof(NotificationConnector));
|
||||||
|
}
|
||||||
|
|
||||||
|
public override object ReadJson(JsonReader reader, Type objectType, object? existingValue,
|
||||||
|
JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
JObject jo = JObject.Load(reader);
|
||||||
|
switch (jo["notificationConnectorType"]!.Value<byte>())
|
||||||
|
{
|
||||||
|
case (byte)NotificationConnector.NotificationConnectorType.Gotify:
|
||||||
|
return new Gotify(this._clone, jo.GetValue("endpoint")!.Value<string>()!, jo.GetValue("appToken")!.Value<string>()!);
|
||||||
|
case (byte)NotificationConnector.NotificationConnectorType.LunaSea:
|
||||||
|
return new LunaSea(this._clone, jo.GetValue("id")!.Value<string>()!);
|
||||||
|
case (byte)NotificationConnector.NotificationConnectorType.Ntfy:
|
||||||
|
return new Ntfy(this._clone, jo.GetValue("endpoint")!.Value<string>()!, jo.GetValue("topic")!.Value<string>()!, jo.GetValue("auth")!.Value<string>()!);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Exception();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool CanWrite => false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Don't call this
|
||||||
|
/// </summary>
|
||||||
|
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
|
||||||
|
{
|
||||||
|
throw new Exception("Dont call this");
|
||||||
|
}
|
||||||
|
}
|
87
Tranga/NotificationConnectors/Ntfy.cs
Normal file
87
Tranga/NotificationConnectors/Ntfy.cs
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
using System.Text;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
namespace Tranga.NotificationConnectors;
|
||||||
|
|
||||||
|
public class Ntfy : NotificationConnector
|
||||||
|
{
|
||||||
|
// ReSharper disable twice MemberCanBePrivate.Global
|
||||||
|
public string endpoint { get; init; }
|
||||||
|
public string auth { get; init; }
|
||||||
|
public string topic { get; init; }
|
||||||
|
private readonly HttpClient _client = new();
|
||||||
|
|
||||||
|
[JsonConstructor]
|
||||||
|
public Ntfy(GlobalBase clone, string endpoint, string topic, string auth) : base(clone, NotificationConnectorType.Ntfy)
|
||||||
|
{
|
||||||
|
this.endpoint = endpoint;
|
||||||
|
this.topic = topic;
|
||||||
|
this.auth = auth;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Ntfy(GlobalBase clone, string endpoint, string username, string password, string? topic = null) :
|
||||||
|
this(clone, EndpointAndTopicFromUrl(endpoint)[0], topic??EndpointAndTopicFromUrl(endpoint)[1], AuthFromUsernamePassword(username, password))
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string AuthFromUsernamePassword(string username, string password)
|
||||||
|
{
|
||||||
|
string authHeader = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}:{password}"));
|
||||||
|
string authParam = Convert.ToBase64String(Encoding.UTF8.GetBytes(authHeader)).Replace("=","");
|
||||||
|
return authParam;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string[] EndpointAndTopicFromUrl(string url)
|
||||||
|
{
|
||||||
|
string[] ret = new string[2];
|
||||||
|
if (!baseUrlRex.IsMatch(url))
|
||||||
|
throw new ArgumentException("url does not match pattern");
|
||||||
|
Regex rootUriRex = new(@"(https?:\/\/[a-zA-Z0-9-\.]+\.[a-zA-Z0-9]+)(?:\/([a-zA-Z0-9-\.]+))?.*");
|
||||||
|
Match match = rootUriRex.Match(url);
|
||||||
|
if(!match.Success)
|
||||||
|
throw new ArgumentException($"Error getting URI from provided endpoint-URI: {url}");
|
||||||
|
|
||||||
|
ret[0] = match.Groups[1].Value;
|
||||||
|
ret[1] = match.Groups[2].Success && match.Groups[2].Value.Length > 0 ? match.Groups[2].Value : "tranga";
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"Ntfy {endpoint} {topic}";
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void SendNotificationInternal(string title, string notificationText)
|
||||||
|
{
|
||||||
|
Log($"Sending notification: {title} - {notificationText}");
|
||||||
|
MessageData message = new(title, topic, notificationText);
|
||||||
|
HttpRequestMessage request = new(HttpMethod.Post, $"{this.endpoint}?auth={this.auth}");
|
||||||
|
request.Content = new StringContent(JsonConvert.SerializeObject(message, Formatting.None), Encoding.UTF8, "application/json");
|
||||||
|
HttpResponseMessage response = _client.Send(request);
|
||||||
|
if (!response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
StreamReader sr = new (response.Content.ReadAsStream());
|
||||||
|
Log($"{response.StatusCode}: {sr.ReadToEnd()}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class MessageData
|
||||||
|
{
|
||||||
|
// ReSharper disable UnusedAutoPropertyAccessor.Local
|
||||||
|
public string topic { get; }
|
||||||
|
public string title { get; }
|
||||||
|
public string message { get; }
|
||||||
|
public int priority { get; }
|
||||||
|
|
||||||
|
public MessageData(string title, string topic, string message)
|
||||||
|
{
|
||||||
|
this.topic = topic;
|
||||||
|
this.title = title;
|
||||||
|
this.message = message;
|
||||||
|
this.priority = 3;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,94 +0,0 @@
|
|||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace Tranga;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Contains information on a Publication (Manga)
|
|
||||||
/// </summary>
|
|
||||||
public readonly struct Publication
|
|
||||||
{
|
|
||||||
public string sortName { get; }
|
|
||||||
// ReSharper disable UnusedAutoPropertyAccessor.Global we need it, trust
|
|
||||||
[JsonIgnore]public string[,] altTitles { get; }
|
|
||||||
// ReSharper disable trice MemberCanBePrivate.Global, trust
|
|
||||||
public string? description { get; }
|
|
||||||
public string[] tags { get; }
|
|
||||||
public string? posterUrl { get; }
|
|
||||||
[JsonIgnore]public string[,]? links { get; }
|
|
||||||
public int? year { get; }
|
|
||||||
public string? originalLanguage { get; }
|
|
||||||
public string status { get; }
|
|
||||||
public string folderName { get; }
|
|
||||||
public string downloadUrl { get; }
|
|
||||||
|
|
||||||
public Publication(string sortName, string? description, string[,] altTitles, string[] tags, string? posterUrl, string[,]? links, int? year, string? originalLanguage, string status, string downloadUrl)
|
|
||||||
{
|
|
||||||
this.sortName = sortName;
|
|
||||||
this.description = description;
|
|
||||||
this.altTitles = altTitles;
|
|
||||||
this.tags = tags;
|
|
||||||
this.posterUrl = posterUrl;
|
|
||||||
this.links = links;
|
|
||||||
this.year = year;
|
|
||||||
this.originalLanguage = originalLanguage;
|
|
||||||
this.status = status;
|
|
||||||
this.downloadUrl = downloadUrl;
|
|
||||||
this.folderName = string.Concat(sortName.Split(Path.GetInvalidPathChars().Concat(Path.GetInvalidFileNameChars()).ToArray()));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <returns>Serialized JSON String for series.json</returns>
|
|
||||||
public string GetSeriesInfoJson()
|
|
||||||
{
|
|
||||||
SeriesInfo si = new (new Metadata(this.sortName, this.year.ToString() ?? string.Empty, this.status, this.description ?? ""));
|
|
||||||
return System.Text.Json.JsonSerializer.Serialize(si);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Only for series.json
|
|
||||||
private struct SeriesInfo
|
|
||||||
{
|
|
||||||
// ReSharper disable once UnusedAutoPropertyAccessor.Local we need it, trust
|
|
||||||
[JsonRequired]public Metadata metadata { get; }
|
|
||||||
public SeriesInfo(Metadata metadata) => this.metadata = metadata;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Only for series.json what an abomination, why are all the fields not-null????
|
|
||||||
private struct Metadata
|
|
||||||
{
|
|
||||||
// ReSharper disable UnusedAutoPropertyAccessor.Local we need them all, trust me
|
|
||||||
[JsonRequired] public string type { get; }
|
|
||||||
[JsonRequired] public string publisher { get; }
|
|
||||||
// ReSharper disable twice IdentifierTypo
|
|
||||||
[JsonRequired] public int comicid { get; }
|
|
||||||
[JsonRequired] public string booktype { get; }
|
|
||||||
// ReSharper disable InconsistentNaming This one property is capitalized. Why?
|
|
||||||
[JsonRequired] public string ComicImage { get; }
|
|
||||||
[JsonRequired] public int total_issues { get; }
|
|
||||||
[JsonRequired] public string publication_run { get; }
|
|
||||||
[JsonRequired]public string name { get; }
|
|
||||||
[JsonRequired]public string year { get; }
|
|
||||||
[JsonRequired]public string status { get; }
|
|
||||||
[JsonRequired]public string description_text { get; }
|
|
||||||
|
|
||||||
public Metadata(string name, string year, string status, string description_text)
|
|
||||||
{
|
|
||||||
this.name = name;
|
|
||||||
this.year = year;
|
|
||||||
if(status == "ongoing" || status == "hiatus")
|
|
||||||
this.status = "Continuing";
|
|
||||||
else if (status == "completed" || status == "cancelled")
|
|
||||||
this.status = "Ended";
|
|
||||||
else
|
|
||||||
this.status = status;
|
|
||||||
this.description_text = description_text;
|
|
||||||
|
|
||||||
//kill it with fire, but otherwise Komga will not parse
|
|
||||||
type = "Manga";
|
|
||||||
publisher = "";
|
|
||||||
comicid = 0;
|
|
||||||
booktype = "";
|
|
||||||
ComicImage = "";
|
|
||||||
total_issues = 0;
|
|
||||||
publication_run = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
763
Tranga/Server.cs
Normal file
763
Tranga/Server.cs
Normal file
@ -0,0 +1,763 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using Tranga.Jobs;
|
||||||
|
using Tranga.LibraryConnectors;
|
||||||
|
using Tranga.MangaConnectors;
|
||||||
|
using Tranga.NotificationConnectors;
|
||||||
|
|
||||||
|
namespace Tranga;
|
||||||
|
|
||||||
|
public class Server : GlobalBase
|
||||||
|
{
|
||||||
|
private readonly HttpListener _listener = new ();
|
||||||
|
private readonly Tranga _parent;
|
||||||
|
|
||||||
|
public Server(Tranga parent) : base(parent)
|
||||||
|
{
|
||||||
|
this._parent = parent;
|
||||||
|
if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
|
this._listener.Prefixes.Add($"http://*:{TrangaSettings.apiPortNumber}/");
|
||||||
|
else
|
||||||
|
this._listener.Prefixes.Add($"http://localhost:{TrangaSettings.apiPortNumber}/");
|
||||||
|
Thread listenThread = new (Listen);
|
||||||
|
listenThread.Start();
|
||||||
|
Thread watchThread = new(WatchRunning);
|
||||||
|
watchThread.Start();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WatchRunning()
|
||||||
|
{
|
||||||
|
while(_parent.keepRunning)
|
||||||
|
Thread.Sleep(1000);
|
||||||
|
this._listener.Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Listen()
|
||||||
|
{
|
||||||
|
this._listener.Start();
|
||||||
|
foreach(string prefix in this._listener.Prefixes)
|
||||||
|
Log($"Listening on {prefix}");
|
||||||
|
while (this._listener.IsListening && _parent.keepRunning)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
HttpListenerContext context = this._listener.GetContext();
|
||||||
|
//Log($"{context.Request.HttpMethod} {context.Request.Url} {context.Request.UserAgent}");
|
||||||
|
Task t = new(() =>
|
||||||
|
{
|
||||||
|
HandleRequest(context);
|
||||||
|
});
|
||||||
|
t.Start();
|
||||||
|
}
|
||||||
|
catch (HttpListenerException)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void HandleRequest(HttpListenerContext context)
|
||||||
|
{
|
||||||
|
HttpListenerRequest request = context.Request;
|
||||||
|
HttpListenerResponse response = context.Response;
|
||||||
|
if (request.Url!.LocalPath.Contains("favicon"))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.NoContent, response);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (request.HttpMethod)
|
||||||
|
{
|
||||||
|
case "GET":
|
||||||
|
HandleGet(request, response);
|
||||||
|
break;
|
||||||
|
case "POST":
|
||||||
|
HandlePost(request, response);
|
||||||
|
break;
|
||||||
|
case "DELETE":
|
||||||
|
HandleDelete(request, response);
|
||||||
|
break;
|
||||||
|
case "OPTIONS":
|
||||||
|
SendResponse(HttpStatusCode.OK, context.Response);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Dictionary<string, string> GetRequestVariables(string query)
|
||||||
|
{
|
||||||
|
Dictionary<string, string> ret = new();
|
||||||
|
Regex queryRex = new (@"\?{1}&?([A-z0-9-=]+=[A-z0-9-=]+)+(&[A-z0-9-=]+=[A-z0-9-=]+)*");
|
||||||
|
if (!queryRex.IsMatch(query))
|
||||||
|
return ret;
|
||||||
|
query = query.Substring(1);
|
||||||
|
foreach (string keyValuePair in query.Split('&').Where(str => str.Length >= 3))
|
||||||
|
{
|
||||||
|
string var = keyValuePair.Split('=')[0];
|
||||||
|
string val = Regex.Replace(keyValuePair.Substring(var.Length + 1), "%20", " ");
|
||||||
|
val = Regex.Replace(val, "%[0-9]{2}", "");
|
||||||
|
ret.Add(var, val);
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void HandleGet(HttpListenerRequest request, HttpListenerResponse response)
|
||||||
|
{
|
||||||
|
Dictionary<string, string> requestVariables = GetRequestVariables(request.Url!.Query);
|
||||||
|
string? connectorName, jobId, internalId;
|
||||||
|
MangaConnector? connector;
|
||||||
|
Manga? manga;
|
||||||
|
string path = Regex.Match(request.Url!.LocalPath, @"[A-z0-9]+(\/[A-z0-9]+)*").Value;
|
||||||
|
switch (path)
|
||||||
|
{
|
||||||
|
case "Connectors":
|
||||||
|
SendResponse(HttpStatusCode.OK, response, _parent.GetConnectors().Select(con => con.name).ToArray());
|
||||||
|
break;
|
||||||
|
case "Manga/Cover":
|
||||||
|
if (!requestVariables.TryGetValue("internalId", out internalId) ||
|
||||||
|
!_parent.TryGetPublicationById(internalId, out manga))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
string filePath = manga?.coverFileNameInCache ?? "";
|
||||||
|
if (File.Exists(filePath))
|
||||||
|
{
|
||||||
|
FileStream coverStream = new(filePath, FileMode.Open);
|
||||||
|
SendResponse(HttpStatusCode.OK, response, coverStream);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.NotFound, response);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case "Manga/FromConnector":
|
||||||
|
requestVariables.TryGetValue("title", out string? title);
|
||||||
|
requestVariables.TryGetValue("url", out string? url);
|
||||||
|
if (!requestVariables.TryGetValue("connector", out connectorName) ||
|
||||||
|
!_parent.TryGetConnector(connectorName, out connector) ||
|
||||||
|
(title is null && url is null))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (url is not null)
|
||||||
|
{
|
||||||
|
HashSet<Manga> ret = new();
|
||||||
|
manga = connector!.GetMangaFromUrl(url);
|
||||||
|
if (manga is not null)
|
||||||
|
ret.Add((Manga)manga);
|
||||||
|
SendResponse(HttpStatusCode.OK, response, ret);
|
||||||
|
}else
|
||||||
|
SendResponse(HttpStatusCode.OK, response, connector!.GetManga(title!));
|
||||||
|
break;
|
||||||
|
case "Manga/Chapters":
|
||||||
|
if(!requestVariables.TryGetValue("connector", out connectorName) ||
|
||||||
|
!requestVariables.TryGetValue("internalId", out internalId) ||
|
||||||
|
!_parent.TryGetConnector(connectorName, out connector) ||
|
||||||
|
!_parent.TryGetPublicationById(internalId, out manga))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
requestVariables.TryGetValue("translatedLanguage", out string? translatedLanguage);
|
||||||
|
SendResponse(HttpStatusCode.OK, response, connector!.GetChapters((Manga)manga!, translatedLanguage??"en"));
|
||||||
|
break;
|
||||||
|
case "Jobs":
|
||||||
|
if (!requestVariables.TryGetValue("jobId", out jobId))
|
||||||
|
{
|
||||||
|
if(!_parent.jobBoss.jobs.Any(jjob => jjob.id == jobId))
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
else
|
||||||
|
SendResponse(HttpStatusCode.OK, response, _parent.jobBoss.jobs.First(jjob => jjob.id == jobId));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
SendResponse(HttpStatusCode.OK, response, _parent.jobBoss.jobs);
|
||||||
|
break;
|
||||||
|
case "Jobs/Progress":
|
||||||
|
if (requestVariables.TryGetValue("jobId", out jobId))
|
||||||
|
{
|
||||||
|
if(!_parent.jobBoss.jobs.Any(jjob => jjob.id == jobId))
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
else
|
||||||
|
SendResponse(HttpStatusCode.OK, response, _parent.jobBoss.jobs.First(jjob => jjob.id == jobId).progressToken);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
SendResponse(HttpStatusCode.OK, response, _parent.jobBoss.jobs.Select(jjob => jjob.progressToken));
|
||||||
|
break;
|
||||||
|
case "Jobs/Running":
|
||||||
|
SendResponse(HttpStatusCode.OK, response, _parent.jobBoss.jobs.Where(jjob => jjob.progressToken.state is ProgressToken.State.Running));
|
||||||
|
break;
|
||||||
|
case "Jobs/Waiting":
|
||||||
|
SendResponse(HttpStatusCode.OK, response, _parent.jobBoss.jobs.Where(jjob => jjob.progressToken.state is ProgressToken.State.Standby).OrderBy(jjob => jjob.nextExecution));
|
||||||
|
break;
|
||||||
|
case "Jobs/MonitorJobs":
|
||||||
|
SendResponse(HttpStatusCode.OK, response, _parent.jobBoss.jobs.Where(jjob => jjob is DownloadNewChapters).OrderBy(jjob => ((DownloadNewChapters)jjob).manga.sortName));
|
||||||
|
break;
|
||||||
|
case "Settings":
|
||||||
|
SendResponse(HttpStatusCode.OK, response, TrangaSettings.AsJObject());
|
||||||
|
break;
|
||||||
|
case "Settings/userAgent":
|
||||||
|
SendResponse(HttpStatusCode.OK, response, TrangaSettings.userAgent);
|
||||||
|
break;
|
||||||
|
case "Settings/customRequestLimit":
|
||||||
|
SendResponse(HttpStatusCode.OK, response, TrangaSettings.requestLimits);
|
||||||
|
break;
|
||||||
|
case "Settings/AprilFoolsMode":
|
||||||
|
SendResponse(HttpStatusCode.OK, response, TrangaSettings.aprilFoolsMode);
|
||||||
|
break;
|
||||||
|
case "NotificationConnectors":
|
||||||
|
SendResponse(HttpStatusCode.OK, response, notificationConnectors);
|
||||||
|
break;
|
||||||
|
case "NotificationConnectors/Types":
|
||||||
|
SendResponse(HttpStatusCode.OK, response,
|
||||||
|
Enum.GetValues<NotificationConnector.NotificationConnectorType>().Select(nc => new KeyValuePair<byte, string?>((byte)nc, Enum.GetName(nc))));
|
||||||
|
break;
|
||||||
|
case "LibraryConnectors":
|
||||||
|
SendResponse(HttpStatusCode.OK, response, libraryConnectors);
|
||||||
|
break;
|
||||||
|
case "LibraryConnectors/Types":
|
||||||
|
SendResponse(HttpStatusCode.OK, response,
|
||||||
|
Enum.GetValues<LibraryConnector.LibraryType>().Select(lc => new KeyValuePair<byte, string?>((byte)lc, Enum.GetName(lc))));
|
||||||
|
break;
|
||||||
|
case "Ping":
|
||||||
|
SendResponse(HttpStatusCode.OK, response, "Pong");
|
||||||
|
break;
|
||||||
|
case "LogMessages":
|
||||||
|
if (logger is null || !File.Exists(logger?.logFilePath))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.NotFound, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (requestVariables.TryGetValue("count", out string? count))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
uint messageCount = uint.Parse(count);
|
||||||
|
SendResponse(HttpStatusCode.OK, response, logger.Tail(messageCount));
|
||||||
|
}
|
||||||
|
catch (FormatException f)
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.InternalServerError, response, f);
|
||||||
|
}
|
||||||
|
}else
|
||||||
|
SendResponse(HttpStatusCode.OK, response, logger.GetLog());
|
||||||
|
break;
|
||||||
|
case "LogFile":
|
||||||
|
if (logger is null || !File.Exists(logger?.logFilePath))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.NotFound, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
string logDir = new FileInfo(logger.logFilePath).DirectoryName!;
|
||||||
|
string tmpFilePath = Path.Join(logDir, "Tranga.log");
|
||||||
|
File.Copy(logger.logFilePath, tmpFilePath);
|
||||||
|
SendResponse(HttpStatusCode.OK, response, new FileStream(tmpFilePath, FileMode.Open));
|
||||||
|
File.Delete(tmpFilePath);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void HandlePost(HttpListenerRequest request, HttpListenerResponse response)
|
||||||
|
{
|
||||||
|
Dictionary<string, string> requestVariables = GetRequestVariables(request.Url!.Query);
|
||||||
|
string? connectorName, internalId, jobId, chapterNumStr, customFolderName, translatedLanguage, notificationConnectorStr, libraryConnectorStr;
|
||||||
|
MangaConnector? connector;
|
||||||
|
Manga? tmpManga;
|
||||||
|
Manga manga;
|
||||||
|
Job? job;
|
||||||
|
NotificationConnector.NotificationConnectorType notificationConnectorType;
|
||||||
|
LibraryConnector.LibraryType libraryConnectorType;
|
||||||
|
string path = Regex.Match(request.Url!.LocalPath, @"[A-z0-9]+(\/[A-z0-9]+)*").Value;
|
||||||
|
switch (path)
|
||||||
|
{
|
||||||
|
case "Manga":
|
||||||
|
if(!requestVariables.TryGetValue("internalId", out internalId) ||
|
||||||
|
!_parent.TryGetPublicationById(internalId, out tmpManga))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
manga = (Manga)tmpManga!;
|
||||||
|
SendResponse(HttpStatusCode.OK, response, manga);
|
||||||
|
break;
|
||||||
|
case "Jobs/MonitorManga":
|
||||||
|
if(!requestVariables.TryGetValue("connector", out connectorName) ||
|
||||||
|
!requestVariables.TryGetValue("internalId", out internalId) ||
|
||||||
|
!requestVariables.TryGetValue("interval", out string? intervalStr) ||
|
||||||
|
!_parent.TryGetConnector(connectorName, out connector)||
|
||||||
|
!_parent.TryGetPublicationById(internalId, out tmpManga) ||
|
||||||
|
!TimeSpan.TryParse(intervalStr, out TimeSpan interval))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
manga = (Manga)tmpManga!;
|
||||||
|
|
||||||
|
if (requestVariables.TryGetValue("ignoreBelowChapterNum", out chapterNumStr))
|
||||||
|
{
|
||||||
|
if (!float.TryParse(chapterNumStr, numberFormatDecimalPoint, out float chapterNum))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
manga.ignoreChaptersBelow = chapterNum;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (requestVariables.TryGetValue("customFolderName", out customFolderName))
|
||||||
|
manga.MovePublicationFolder(TrangaSettings.downloadLocation, customFolderName);
|
||||||
|
requestVariables.TryGetValue("translatedLanguage", out translatedLanguage);
|
||||||
|
|
||||||
|
_parent.jobBoss.AddJob(new DownloadNewChapters(this, connector!, manga, true, interval, translatedLanguage: translatedLanguage??"en"));
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "Jobs/DownloadNewChapters":
|
||||||
|
if(!requestVariables.TryGetValue("connector", out connectorName) ||
|
||||||
|
!requestVariables.TryGetValue("internalId", out internalId) ||
|
||||||
|
!_parent.TryGetConnector(connectorName, out connector)||
|
||||||
|
!_parent.TryGetPublicationById(internalId, out tmpManga))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
manga = (Manga)tmpManga!;
|
||||||
|
|
||||||
|
if (requestVariables.TryGetValue("ignoreBelowChapterNum", out chapterNumStr))
|
||||||
|
{
|
||||||
|
if (!float.TryParse(chapterNumStr, numberFormatDecimalPoint, out float chapterNum))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
manga.ignoreChaptersBelow = chapterNum;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (requestVariables.TryGetValue("customFolderName", out customFolderName))
|
||||||
|
manga.MovePublicationFolder(TrangaSettings.downloadLocation, customFolderName);
|
||||||
|
requestVariables.TryGetValue("translatedLanguage", out translatedLanguage);
|
||||||
|
|
||||||
|
_parent.jobBoss.AddJob(new DownloadNewChapters(this, connector!, manga, false, translatedLanguage: translatedLanguage??"en"));
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "Jobs/UpdateMetadata":
|
||||||
|
if (!requestVariables.TryGetValue("internalId", out internalId))
|
||||||
|
{
|
||||||
|
foreach (Job pJob in _parent.jobBoss.jobs.Where(possibleDncJob =>
|
||||||
|
possibleDncJob.jobType is Job.JobType.DownloadNewChaptersJob).ToArray())//ToArray to avoid modyifying while adding new jobs
|
||||||
|
{
|
||||||
|
DownloadNewChapters dncJob = pJob as DownloadNewChapters ??
|
||||||
|
throw new Exception("Has to be DownloadNewChapters Job");
|
||||||
|
_parent.jobBoss.AddJob(new UpdateMetadata(this, dncJob.mangaConnector, dncJob.manga));
|
||||||
|
}
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Job[] possibleDncJobs = _parent.jobBoss.GetJobsLike(internalId: internalId).ToArray();
|
||||||
|
switch (possibleDncJobs.Length)
|
||||||
|
{
|
||||||
|
case <1: SendResponse(HttpStatusCode.BadRequest, response, "Could not find matching release"); break;
|
||||||
|
case >1: SendResponse(HttpStatusCode.BadRequest, response, "Multiple releases??"); break;
|
||||||
|
default:
|
||||||
|
DownloadNewChapters dncJob = possibleDncJobs[0] as DownloadNewChapters ??
|
||||||
|
throw new Exception("Has to be DownloadNewChapters Job");
|
||||||
|
_parent.jobBoss.AddJob(new UpdateMetadata(this, dncJob.mangaConnector, dncJob.manga));
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case "Jobs/StartNow":
|
||||||
|
if (!requestVariables.TryGetValue("jobId", out jobId) ||
|
||||||
|
!_parent.jobBoss.TryGetJobById(jobId, out job))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
_parent.jobBoss.AddJobToQueue(job!);
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "Jobs/Cancel":
|
||||||
|
if (!requestVariables.TryGetValue("jobId", out jobId) ||
|
||||||
|
!_parent.jobBoss.TryGetJobById(jobId, out job))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
job!.Cancel();
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "Settings/UpdateDownloadLocation":
|
||||||
|
if (!requestVariables.TryGetValue("downloadLocation", out string? downloadLocation) ||
|
||||||
|
!requestVariables.TryGetValue("moveFiles", out string? moveFilesStr) ||
|
||||||
|
!bool.TryParse(moveFilesStr, out bool moveFiles))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
TrangaSettings.UpdateDownloadLocation(downloadLocation, moveFiles);
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "Settings/AprilFoolsMode":
|
||||||
|
if (!requestVariables.TryGetValue("enabled", out string? aprilFoolsModeEnabledStr) ||
|
||||||
|
!bool.TryParse(aprilFoolsModeEnabledStr, out bool aprilFoolsModeEnabled))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
TrangaSettings.UpdateAprilFoolsMode(aprilFoolsModeEnabled);
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
/*case "Settings/UpdateWorkingDirectory":
|
||||||
|
if (!requestVariables.TryGetValue("workingDirectory", out string? workingDirectory))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
settings.UpdateWorkingDirectory(workingDirectory);
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;*/
|
||||||
|
case "Settings/userAgent":
|
||||||
|
if(!requestVariables.TryGetValue("userAgent", out string? customUserAgent))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
TrangaSettings.UpdateUserAgent(customUserAgent);
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "Settings/userAgent/Reset":
|
||||||
|
TrangaSettings.UpdateUserAgent(null);
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "Settings/customRequestLimit":
|
||||||
|
if (!requestVariables.TryGetValue("requestType", out string? requestTypeStr) ||
|
||||||
|
!requestVariables.TryGetValue("requestsPerMinute", out string? requestsPerMinuteStr) ||
|
||||||
|
!Enum.TryParse(requestTypeStr, out RequestType requestType) ||
|
||||||
|
!int.TryParse(requestsPerMinuteStr, out int requestsPerMinute))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
TrangaSettings.UpdateRateLimit(requestType, requestsPerMinute);
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "Settings/customRequestLimit/Reset":
|
||||||
|
TrangaSettings.ResetRateLimits();
|
||||||
|
break;
|
||||||
|
case "NotificationConnectors/Update":
|
||||||
|
if (!requestVariables.TryGetValue("notificationConnector", out notificationConnectorStr) ||
|
||||||
|
!Enum.TryParse(notificationConnectorStr, out notificationConnectorType))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (notificationConnectorType is NotificationConnector.NotificationConnectorType.Gotify)
|
||||||
|
{
|
||||||
|
if (!requestVariables.TryGetValue("gotifyUrl", out string? gotifyUrl) ||
|
||||||
|
!requestVariables.TryGetValue("gotifyAppToken", out string? gotifyAppToken))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
AddNotificationConnector(new Gotify(this, gotifyUrl, gotifyAppToken));
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
}else if (notificationConnectorType is NotificationConnector.NotificationConnectorType.LunaSea)
|
||||||
|
{
|
||||||
|
if (!requestVariables.TryGetValue("lunaseaWebhook", out string? lunaseaWebhook))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
AddNotificationConnector(new LunaSea(this, lunaseaWebhook));
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
}else if (notificationConnectorType is NotificationConnector.NotificationConnectorType.Ntfy)
|
||||||
|
{
|
||||||
|
if (!requestVariables.TryGetValue("ntfyUrl", out string? ntfyUrl) ||
|
||||||
|
!requestVariables.TryGetValue("ntfyUser", out string? ntfyUser)||
|
||||||
|
!requestVariables.TryGetValue("ntfyPass", out string? ntfyPass))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
AddNotificationConnector(new Ntfy(this, ntfyUrl, ntfyUser, ntfyPass, null));
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case "NotificationConnectors/Test":
|
||||||
|
NotificationConnector notificationConnector;
|
||||||
|
if (!requestVariables.TryGetValue("notificationConnector", out notificationConnectorStr) ||
|
||||||
|
!Enum.TryParse(notificationConnectorStr, out notificationConnectorType))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (notificationConnectorType is NotificationConnector.NotificationConnectorType.Gotify)
|
||||||
|
{
|
||||||
|
if (!requestVariables.TryGetValue("gotifyUrl", out string? gotifyUrl) ||
|
||||||
|
!requestVariables.TryGetValue("gotifyAppToken", out string? gotifyAppToken))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
notificationConnector = new Gotify(this, gotifyUrl, gotifyAppToken);
|
||||||
|
}else if (notificationConnectorType is NotificationConnector.NotificationConnectorType.LunaSea)
|
||||||
|
{
|
||||||
|
if (!requestVariables.TryGetValue("lunaseaWebhook", out string? lunaseaWebhook))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
notificationConnector = new LunaSea(this, lunaseaWebhook);
|
||||||
|
}else if (notificationConnectorType is NotificationConnector.NotificationConnectorType.Ntfy)
|
||||||
|
{
|
||||||
|
if (!requestVariables.TryGetValue("ntfyUrl", out string? ntfyUrl) ||
|
||||||
|
!requestVariables.TryGetValue("ntfyUser", out string? ntfyUser)||
|
||||||
|
!requestVariables.TryGetValue("ntfyPass", out string? ntfyPass))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
notificationConnector = new Ntfy(this, ntfyUrl, ntfyUser, ntfyPass, null);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
notificationConnector.SendNotification("Tranga Test", "This is Test-Notification.");
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "NotificationConnectors/Reset":
|
||||||
|
if (!requestVariables.TryGetValue("notificationConnector", out notificationConnectorStr) ||
|
||||||
|
!Enum.TryParse(notificationConnectorStr, out notificationConnectorType))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
DeleteNotificationConnector(notificationConnectorType);
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "LibraryConnectors/Update":
|
||||||
|
if (!requestVariables.TryGetValue("libraryConnector", out libraryConnectorStr) ||
|
||||||
|
!Enum.TryParse(libraryConnectorStr, out libraryConnectorType))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (libraryConnectorType is LibraryConnector.LibraryType.Kavita)
|
||||||
|
{
|
||||||
|
if (!requestVariables.TryGetValue("kavitaUrl", out string? kavitaUrl) ||
|
||||||
|
!requestVariables.TryGetValue("kavitaUsername", out string? kavitaUsername) ||
|
||||||
|
!requestVariables.TryGetValue("kavitaPassword", out string? kavitaPassword))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
AddLibraryConnector(new Kavita(this, kavitaUrl, kavitaUsername, kavitaPassword));
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
}else if (libraryConnectorType is LibraryConnector.LibraryType.Komga)
|
||||||
|
{
|
||||||
|
if (!requestVariables.TryGetValue("komgaUrl", out string? komgaUrl) ||
|
||||||
|
!requestVariables.TryGetValue("komgaAuth", out string? komgaAuth))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
AddLibraryConnector(new Komga(this, komgaUrl, komgaAuth));
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case "LibraryConnectors/Test":
|
||||||
|
LibraryConnector libraryConnector;
|
||||||
|
if (!requestVariables.TryGetValue("libraryConnector", out libraryConnectorStr) ||
|
||||||
|
!Enum.TryParse(libraryConnectorStr, out libraryConnectorType))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (libraryConnectorType is LibraryConnector.LibraryType.Kavita)
|
||||||
|
{
|
||||||
|
if (!requestVariables.TryGetValue("kavitaUrl", out string? kavitaUrl) ||
|
||||||
|
!requestVariables.TryGetValue("kavitaUsername", out string? kavitaUsername) ||
|
||||||
|
!requestVariables.TryGetValue("kavitaPassword", out string? kavitaPassword))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
libraryConnector = new Kavita(this, kavitaUrl, kavitaUsername, kavitaPassword);
|
||||||
|
}else if (libraryConnectorType is LibraryConnector.LibraryType.Komga)
|
||||||
|
{
|
||||||
|
if (!requestVariables.TryGetValue("komgaUrl", out string? komgaUrl) ||
|
||||||
|
!requestVariables.TryGetValue("komgaAuth", out string? komgaAuth))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
libraryConnector = new Komga(this, komgaUrl, komgaAuth);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
libraryConnector.UpdateLibrary();
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "LibraryConnectors/Reset":
|
||||||
|
if (!requestVariables.TryGetValue("libraryConnector", out libraryConnectorStr) ||
|
||||||
|
!Enum.TryParse(libraryConnectorStr, out libraryConnectorType))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
DeleteLibraryConnector(libraryConnectorType);
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void HandleDelete(HttpListenerRequest request, HttpListenerResponse response)
|
||||||
|
{
|
||||||
|
Dictionary<string, string> requestVariables = GetRequestVariables(request.Url!.Query);
|
||||||
|
string? connectorName, internalId;
|
||||||
|
MangaConnector connector;
|
||||||
|
Manga manga;
|
||||||
|
string path = Regex.Match(request.Url!.LocalPath, @"[A-z0-9]+(\/[A-z0-9]+)*").Value;
|
||||||
|
switch (path)
|
||||||
|
{
|
||||||
|
case "Jobs":
|
||||||
|
if (!requestVariables.TryGetValue("jobId", out string? jobId) ||
|
||||||
|
!_parent.jobBoss.TryGetJobById(jobId, out Job? job))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
_parent.jobBoss.RemoveJob(job!);
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "Jobs/DownloadNewChapters":
|
||||||
|
if(!requestVariables.TryGetValue("connector", out connectorName) ||
|
||||||
|
!requestVariables.TryGetValue("internalId", out internalId) ||
|
||||||
|
_parent.GetConnector(connectorName) is null ||
|
||||||
|
_parent.GetPublicationById(internalId) is null)
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
connector = _parent.GetConnector(connectorName)!;
|
||||||
|
manga = (Manga)_parent.GetPublicationById(internalId)!;
|
||||||
|
_parent.jobBoss.RemoveJobs(_parent.jobBoss.GetJobsLike(connector, manga));
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "NotificationConnectors":
|
||||||
|
if (!requestVariables.TryGetValue("notificationConnector", out string? notificationConnectorStr) ||
|
||||||
|
!Enum.TryParse(notificationConnectorStr, out NotificationConnector.NotificationConnectorType notificationConnectorType))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
DeleteNotificationConnector(notificationConnectorType);
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
case "LibraryConnectors":
|
||||||
|
if (!requestVariables.TryGetValue("libraryConnectors", out string? libraryConnectorStr) ||
|
||||||
|
!Enum.TryParse(libraryConnectorStr,
|
||||||
|
out LibraryConnector.LibraryType libraryConnectoryType))
|
||||||
|
{
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
DeleteLibraryConnector(libraryConnectoryType);
|
||||||
|
SendResponse(HttpStatusCode.Accepted, response);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
SendResponse(HttpStatusCode.BadRequest, response);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SendResponse(HttpStatusCode statusCode, HttpListenerResponse response, object? content = null)
|
||||||
|
{
|
||||||
|
//Log($"Response: {statusCode} {content}");
|
||||||
|
|
||||||
|
response.StatusCode = (int)statusCode;
|
||||||
|
response.AddHeader("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With");
|
||||||
|
response.AddHeader("Access-Control-Allow-Methods", "GET, POST, DELETE");
|
||||||
|
response.AddHeader("Access-Control-Max-Age", "1728000");
|
||||||
|
response.AppendHeader("Access-Control-Allow-Origin", "*");
|
||||||
|
try
|
||||||
|
{
|
||||||
|
|
||||||
|
if (content is not Stream)
|
||||||
|
{
|
||||||
|
response.ContentType = "application/json";
|
||||||
|
response.AddHeader("Cache-Control", "no-store");
|
||||||
|
response.OutputStream.Write(content is not null
|
||||||
|
? Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(content))
|
||||||
|
: Array.Empty<byte>());
|
||||||
|
response.OutputStream.Close();
|
||||||
|
}
|
||||||
|
else if (content is FileStream stream)
|
||||||
|
{
|
||||||
|
string contentType = stream.Name.Split('.')[^1];
|
||||||
|
response.AddHeader("Cache-Control", "max-age=600");
|
||||||
|
switch (contentType.ToLower())
|
||||||
|
{
|
||||||
|
case "gif":
|
||||||
|
response.ContentType = "image/gif";
|
||||||
|
break;
|
||||||
|
case "png":
|
||||||
|
response.ContentType = "image/png";
|
||||||
|
break;
|
||||||
|
case "jpg":
|
||||||
|
case "jpeg":
|
||||||
|
response.ContentType = "image/jpeg";
|
||||||
|
break;
|
||||||
|
case "log":
|
||||||
|
response.ContentType = "text/plain";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
stream.CopyTo(response.OutputStream);
|
||||||
|
response.OutputStream.Close();
|
||||||
|
stream.Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Log(e.ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,129 +0,0 @@
|
|||||||
using Logging;
|
|
||||||
|
|
||||||
namespace Tranga;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Executes TrangaTasks
|
|
||||||
/// Based on the TrangaTask.Task a method is called.
|
|
||||||
/// The chapterCollection is updated with new Publications/Chapters.
|
|
||||||
/// </summary>
|
|
||||||
public static class TaskExecutor
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Executes TrangaTask.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="taskManager">Parent</param>
|
|
||||||
/// <param name="trangaTask">Task to execute</param>
|
|
||||||
/// <param name="chapterCollection">Current chapterCollection to update</param>
|
|
||||||
/// <param name="logger"></param>
|
|
||||||
/// <exception cref="ArgumentException">Is thrown when there is no Connector available with the name of the TrangaTask.connectorName</exception>
|
|
||||||
public static void Execute(TaskManager taskManager, TrangaTask trangaTask, Dictionary<Publication, List<Chapter>> chapterCollection, Logger? logger)
|
|
||||||
{
|
|
||||||
//Only execute task if it is not already being executed.
|
|
||||||
if (trangaTask.state == TrangaTask.ExecutionState.Running)
|
|
||||||
{
|
|
||||||
logger?.WriteLine("TaskExecutor", $"Task already running {trangaTask}");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
trangaTask.state = TrangaTask.ExecutionState.Running;
|
|
||||||
logger?.WriteLine("TaskExecutor", $"Starting Task {trangaTask}");
|
|
||||||
|
|
||||||
//Connector is not needed for all tasks
|
|
||||||
Connector? connector = null;
|
|
||||||
if (trangaTask.task != TrangaTask.Task.UpdateKomgaLibrary)
|
|
||||||
connector = taskManager.GetConnector(trangaTask.connectorName!);
|
|
||||||
|
|
||||||
//Call appropriate Method based on TrangaTask.Task
|
|
||||||
switch (trangaTask.task)
|
|
||||||
{
|
|
||||||
case TrangaTask.Task.DownloadNewChapters:
|
|
||||||
DownloadNewChapters(connector!, (Publication)trangaTask.publication!, trangaTask.language, chapterCollection);
|
|
||||||
break;
|
|
||||||
case TrangaTask.Task.UpdateChapters:
|
|
||||||
UpdateChapters(connector!, (Publication)trangaTask.publication!, trangaTask.language, chapterCollection);
|
|
||||||
break;
|
|
||||||
case TrangaTask.Task.UpdatePublications:
|
|
||||||
UpdatePublications(connector!, chapterCollection);
|
|
||||||
break;
|
|
||||||
case TrangaTask.Task.UpdateKomgaLibrary:
|
|
||||||
UpdateKomgaLibrary(taskManager);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger?.WriteLine("TaskExecutor", $"Task finished! {trangaTask}");
|
|
||||||
trangaTask.lastExecuted = DateTime.Now;
|
|
||||||
trangaTask.state = TrangaTask.ExecutionState.Waiting;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Updates all Komga-Libraries
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="taskManager">Parent</param>
|
|
||||||
private static void UpdateKomgaLibrary(TaskManager taskManager)
|
|
||||||
{
|
|
||||||
if (taskManager.komga is null)
|
|
||||||
return;
|
|
||||||
Komga komga = taskManager.komga;
|
|
||||||
|
|
||||||
Komga.KomgaLibrary[] allLibraries = komga.GetLibraries();
|
|
||||||
foreach (Komga.KomgaLibrary lib in allLibraries)
|
|
||||||
komga.UpdateLibrary(lib.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Updates the available Publications from a Connector (all of them)
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="connector">Connector to receive Publications from</param>
|
|
||||||
/// <param name="chapterCollection"></param>
|
|
||||||
private static void UpdatePublications(Connector connector, Dictionary<Publication, List<Chapter>> chapterCollection)
|
|
||||||
{
|
|
||||||
Publication[] publications = connector.GetPublications();
|
|
||||||
foreach (Publication publication in publications)
|
|
||||||
chapterCollection.TryAdd(publication, new List<Chapter>());
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Checks for new Chapters and Downloads new ones.
|
|
||||||
/// If no Chapters had been downloaded previously, download also cover and create series.json
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="connector">Connector to use</param>
|
|
||||||
/// <param name="publication">Publication to check</param>
|
|
||||||
/// <param name="language">Language to receive chapters for</param>
|
|
||||||
/// <param name="chapterCollection"></param>
|
|
||||||
private static void DownloadNewChapters(Connector connector, Publication publication, string language, Dictionary<Publication, List<Chapter>> chapterCollection)
|
|
||||||
{
|
|
||||||
List<Chapter> newChapters = UpdateChapters(connector, publication, language, chapterCollection);
|
|
||||||
connector.DownloadCover(publication);
|
|
||||||
|
|
||||||
//Check if Publication already has a Folder and a series.json
|
|
||||||
string publicationFolder = Path.Join(connector.downloadLocation, publication.folderName);
|
|
||||||
if(!Directory.Exists(publicationFolder))
|
|
||||||
Directory.CreateDirectory(publicationFolder);
|
|
||||||
|
|
||||||
string seriesInfoPath = Path.Join(publicationFolder, "series.json");
|
|
||||||
if(!File.Exists(seriesInfoPath))
|
|
||||||
File.WriteAllText(seriesInfoPath,publication.GetSeriesInfoJson());
|
|
||||||
|
|
||||||
foreach(Chapter newChapter in newChapters)
|
|
||||||
connector.DownloadChapter(publication, newChapter);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Updates the available Chapters of a Publication
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="connector">Connector to use</param>
|
|
||||||
/// <param name="publication">Publication to check</param>
|
|
||||||
/// <param name="language">Language to receive chapters for</param>
|
|
||||||
/// <param name="chapterCollection"></param>
|
|
||||||
/// <returns>List of Chapters that were previously not in collection</returns>
|
|
||||||
private static List<Chapter> UpdateChapters(Connector connector, Publication publication, string language, Dictionary<Publication, List<Chapter>> chapterCollection)
|
|
||||||
{
|
|
||||||
List<Chapter> newChaptersList = new();
|
|
||||||
chapterCollection.TryAdd(publication, newChaptersList); //To ensure publication is actually in collection
|
|
||||||
|
|
||||||
Chapter[] newChapters = connector.GetChapters(publication, language);
|
|
||||||
newChaptersList = newChapters.Where(nChapter => !connector.ChapterIsDownloaded(publication, nChapter)).ToList();
|
|
||||||
|
|
||||||
return newChaptersList;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,289 +0,0 @@
|
|||||||
using Logging;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
using Tranga.Connectors;
|
|
||||||
|
|
||||||
namespace Tranga;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Manages all TrangaTasks.
|
|
||||||
/// Provides a Threaded environment to execute Tasks, and still manage the Task-Collection
|
|
||||||
/// </summary>
|
|
||||||
public class TaskManager
|
|
||||||
{
|
|
||||||
private readonly Dictionary<Publication, List<Chapter>> _chapterCollection = new();
|
|
||||||
private readonly HashSet<TrangaTask> _allTasks;
|
|
||||||
private bool _continueRunning = true;
|
|
||||||
private readonly Connector[] _connectors;
|
|
||||||
private Dictionary<Connector, List<TrangaTask>> tasksToExecute = new();
|
|
||||||
private string downloadLocation { get; }
|
|
||||||
private Logger? logger { get; }
|
|
||||||
|
|
||||||
public Komga? komga { get; }
|
|
||||||
|
|
||||||
/// <param name="folderPath">Local path to save data (Manga) to</param>
|
|
||||||
/// <param name="komgaBaseUrl">The Url of the Komga-instance that you want to update</param>
|
|
||||||
/// <param name="komgaUsername">The Komga username</param>
|
|
||||||
/// <param name="komgaPassword">The Komga password</param>
|
|
||||||
/// <param name="logger"></param>
|
|
||||||
public TaskManager(string folderPath, string? komgaBaseUrl = null, string? komgaUsername = null, string? komgaPassword = null, Logger? logger = null)
|
|
||||||
{
|
|
||||||
this.logger = logger;
|
|
||||||
this.downloadLocation = folderPath;
|
|
||||||
|
|
||||||
if (komgaBaseUrl != null && komgaUsername != null && komgaPassword != null)
|
|
||||||
this.komga = new Komga(komgaBaseUrl, komgaUsername, komgaPassword, logger);
|
|
||||||
this._connectors = new Connector[]{ new MangaDex(folderPath, logger) };
|
|
||||||
foreach(Connector cConnector in this._connectors)
|
|
||||||
tasksToExecute.Add(cConnector, new List<TrangaTask>());
|
|
||||||
_allTasks = new HashSet<TrangaTask>();
|
|
||||||
|
|
||||||
Thread taskChecker = new(TaskCheckerThread);
|
|
||||||
taskChecker.Start();
|
|
||||||
}
|
|
||||||
|
|
||||||
public TaskManager(SettingsData settings, Logger? logger = null)
|
|
||||||
{
|
|
||||||
this.logger = logger;
|
|
||||||
this._connectors = new Connector[]{ new MangaDex(settings.downloadLocation, logger) };
|
|
||||||
foreach(Connector cConnector in this._connectors)
|
|
||||||
tasksToExecute.Add(cConnector, new List<TrangaTask>());
|
|
||||||
this.downloadLocation = settings.downloadLocation;
|
|
||||||
this.komga = settings.komga;
|
|
||||||
_allTasks = settings.allTasks;
|
|
||||||
Thread taskChecker = new(TaskCheckerThread);
|
|
||||||
taskChecker.Start();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Runs continuously until shutdown.
|
|
||||||
/// Checks if tasks have to be executed (time elapsed)
|
|
||||||
/// </summary>
|
|
||||||
private void TaskCheckerThread()
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), "Starting TaskCheckerThread.");
|
|
||||||
while (_continueRunning)
|
|
||||||
{
|
|
||||||
//Check if previous tasks have finished and execute new tasks
|
|
||||||
foreach (KeyValuePair<Connector, List<TrangaTask>> connectorTaskQueue in tasksToExecute)
|
|
||||||
{
|
|
||||||
if(connectorTaskQueue.Value.RemoveAll(task => task.state == TrangaTask.ExecutionState.Waiting) > 0)
|
|
||||||
ExportData(Directory.GetCurrentDirectory());
|
|
||||||
|
|
||||||
if (connectorTaskQueue.Value.Count > 0 && connectorTaskQueue.Value.All(task => task.state is TrangaTask.ExecutionState.Enqueued))
|
|
||||||
ExecuteTaskNow(connectorTaskQueue.Value.First());
|
|
||||||
}
|
|
||||||
|
|
||||||
//Check if task should be executed
|
|
||||||
//Depending on type execute immediately or enqueue
|
|
||||||
foreach (TrangaTask task in _allTasks.Where(aTask => aTask.ShouldExecute()))
|
|
||||||
{
|
|
||||||
task.state = TrangaTask.ExecutionState.Enqueued;
|
|
||||||
if(task.connectorName is null)
|
|
||||||
ExecuteTaskNow(task);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Task due: {task}");
|
|
||||||
tasksToExecute[GetConnector(task.connectorName!)].Add(task);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Thread.Sleep(1000);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Forces the execution of a given task
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="task">Task to execute</param>
|
|
||||||
public void ExecuteTaskNow(TrangaTask task)
|
|
||||||
{
|
|
||||||
if (!this._allTasks.Contains(task))
|
|
||||||
return;
|
|
||||||
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Forcing Execution: {task}");
|
|
||||||
Task t = new Task(() =>
|
|
||||||
{
|
|
||||||
TaskExecutor.Execute(this, task, this._chapterCollection, logger);
|
|
||||||
});
|
|
||||||
t.Start();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creates and adds a new Task to the task-Collection
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="task">TrangaTask.Task to later execute</param>
|
|
||||||
/// <param name="connectorName">Name of the connector to use</param>
|
|
||||||
/// <param name="publication">Publication to execute Task on, can be null in case of unrelated Task</param>
|
|
||||||
/// <param name="reoccurrence">Time-Interval between Executions</param>
|
|
||||||
/// <param name="language">language, should Task require parameter. Can be empty</param>
|
|
||||||
/// <exception cref="ArgumentException">Is thrown when connectorName is not a available Connector</exception>
|
|
||||||
public TrangaTask AddTask(TrangaTask.Task task, string? connectorName, Publication? publication, TimeSpan reoccurrence,
|
|
||||||
string language = "")
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {task} {connectorName} {publication?.sortName}");
|
|
||||||
if (task != TrangaTask.Task.UpdateKomgaLibrary && connectorName is null)
|
|
||||||
throw new ArgumentException($"connectorName can not be null for task {task}");
|
|
||||||
|
|
||||||
TrangaTask newTask;
|
|
||||||
if (task == TrangaTask.Task.UpdateKomgaLibrary)
|
|
||||||
{
|
|
||||||
newTask = new TrangaTask(task, null, null, reoccurrence, language);
|
|
||||||
|
|
||||||
//Check if same task already exists
|
|
||||||
// ReSharper disable once SimplifyLinqExpressionUseAll readabilty
|
|
||||||
if (!_allTasks.Any(trangaTask => trangaTask.task == task))
|
|
||||||
{
|
|
||||||
_allTasks.Add(newTask);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//Get appropriate Connector from available Connectors for TrangaTask
|
|
||||||
Connector? connector = _connectors.FirstOrDefault(c => c.name == connectorName);
|
|
||||||
if (connector is null)
|
|
||||||
throw new ArgumentException($"Connector {connectorName} is not a known connector.");
|
|
||||||
|
|
||||||
newTask = new TrangaTask(task, connector.name, publication, reoccurrence, language);
|
|
||||||
|
|
||||||
//Check if same task already exists
|
|
||||||
if (!_allTasks.Any(trangaTask => trangaTask.task == task && trangaTask.connectorName == connector.name &&
|
|
||||||
trangaTask.publication?.downloadUrl == publication?.downloadUrl))
|
|
||||||
{
|
|
||||||
if(task != TrangaTask.Task.UpdatePublications)
|
|
||||||
_chapterCollection.Add((Publication)publication!, new List<Chapter>());
|
|
||||||
_allTasks.Add(newTask);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Added new Task {newTask.ToString()}");
|
|
||||||
ExportData(Directory.GetCurrentDirectory());
|
|
||||||
|
|
||||||
return newTask;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Removes Task from task-collection
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="task">TrangaTask.Task type</param>
|
|
||||||
/// <param name="connectorName">Name of Connector that was used</param>
|
|
||||||
/// <param name="publication">Publication that was used</param>
|
|
||||||
public void RemoveTask(TrangaTask.Task task, string? connectorName, Publication? publication)
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Removing Task {task} {publication?.sortName}");
|
|
||||||
if (task == TrangaTask.Task.UpdateKomgaLibrary)
|
|
||||||
{
|
|
||||||
_allTasks.RemoveWhere(uTask => uTask.task == TrangaTask.Task.UpdateKomgaLibrary);
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Removed Task {task}");
|
|
||||||
}
|
|
||||||
else if (connectorName is null)
|
|
||||||
throw new ArgumentException($"connectorName can not be null for Task {task}");
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if(_allTasks.RemoveWhere(trangaTask =>
|
|
||||||
trangaTask.task == task && trangaTask.connectorName == connectorName &&
|
|
||||||
trangaTask.publication?.downloadUrl == publication?.downloadUrl) > 0)
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Removed Task {task} {publication?.sortName} {publication?.downloadUrl}.");
|
|
||||||
else
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"No Task {task} {publication?.sortName} {publication?.downloadUrl} could be found.");
|
|
||||||
}
|
|
||||||
ExportData(Directory.GetCurrentDirectory());
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <returns>All available Connectors</returns>
|
|
||||||
public Dictionary<string, Connector> GetAvailableConnectors()
|
|
||||||
{
|
|
||||||
return this._connectors.ToDictionary(connector => connector.name, connector => connector);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <returns>All TrangaTasks in task-collection</returns>
|
|
||||||
public TrangaTask[] GetAllTasks()
|
|
||||||
{
|
|
||||||
TrangaTask[] ret = new TrangaTask[_allTasks.Count];
|
|
||||||
_allTasks.CopyTo(ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <returns>All added Publications</returns>
|
|
||||||
public Publication[] GetAllPublications()
|
|
||||||
{
|
|
||||||
return this._chapterCollection.Keys.ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Return Connector with given Name
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="connectorName">Connector-name (exact)</param>
|
|
||||||
/// <exception cref="Exception">If Connector is not available</exception>
|
|
||||||
public Connector GetConnector(string? connectorName)
|
|
||||||
{
|
|
||||||
if(connectorName is null)
|
|
||||||
throw new Exception($"connectorName can not be null");
|
|
||||||
Connector? ret = this._connectors.FirstOrDefault(connector => connector.name == connectorName);
|
|
||||||
if (ret is null)
|
|
||||||
throw new Exception($"Connector {connectorName} is not an available Connector.");
|
|
||||||
return (Connector)ret!;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Shuts down the taskManager.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="force">If force is true, tasks are aborted.</param>
|
|
||||||
public void Shutdown(bool force = false)
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Shutting down (forced={force})");
|
|
||||||
_continueRunning = false;
|
|
||||||
ExportData(Directory.GetCurrentDirectory());
|
|
||||||
|
|
||||||
if(force)
|
|
||||||
Environment.Exit(_allTasks.Count(task => task.state is TrangaTask.ExecutionState.Enqueued or TrangaTask.ExecutionState.Running));
|
|
||||||
|
|
||||||
//Wait for tasks to finish
|
|
||||||
while(_allTasks.Any(task => task.state is TrangaTask.ExecutionState.Running or TrangaTask.ExecutionState.Enqueued))
|
|
||||||
Thread.Sleep(10);
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), "Tasks finished. Bye!");
|
|
||||||
Environment.Exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Loads stored data (settings, tasks) from file
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="importFolderPath">working directory, filename has to be data.json</param>
|
|
||||||
public static SettingsData LoadData(string importFolderPath)
|
|
||||||
{
|
|
||||||
string importPath = Path.Join(importFolderPath, "data.json");
|
|
||||||
if (!File.Exists(importPath))
|
|
||||||
return new SettingsData("", null, new HashSet<TrangaTask>());
|
|
||||||
|
|
||||||
string toRead = File.ReadAllText(importPath);
|
|
||||||
SettingsData data = JsonConvert.DeserializeObject<SettingsData>(toRead)!;
|
|
||||||
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Exports data (settings, tasks) to file
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="exportFolderPath">Folder path, filename will be data.json</param>
|
|
||||||
private void ExportData(string exportFolderPath)
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Exporting data to data.json");
|
|
||||||
SettingsData data = new SettingsData(this.downloadLocation, this.komga, this._allTasks);
|
|
||||||
|
|
||||||
string exportPath = Path.Join(exportFolderPath, "data.json");
|
|
||||||
string serializedData = JsonConvert.SerializeObject(data);
|
|
||||||
File.Delete(exportPath);
|
|
||||||
File.WriteAllText(exportPath, serializedData);
|
|
||||||
}
|
|
||||||
|
|
||||||
public class SettingsData
|
|
||||||
{
|
|
||||||
public string downloadLocation { get; set; }
|
|
||||||
public Komga? komga { get; set; }
|
|
||||||
public HashSet<TrangaTask> allTasks { get; }
|
|
||||||
|
|
||||||
public SettingsData(string downloadLocation, Komga? komga, HashSet<TrangaTask> allTasks)
|
|
||||||
{
|
|
||||||
this.downloadLocation = downloadLocation;
|
|
||||||
this.komga = komga;
|
|
||||||
this.allTasks = allTasks;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
92
Tranga/Tranga.cs
Normal file
92
Tranga/Tranga.cs
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
using Logging;
|
||||||
|
using Tranga.Jobs;
|
||||||
|
using Tranga.MangaConnectors;
|
||||||
|
|
||||||
|
namespace Tranga;
|
||||||
|
|
||||||
|
public partial class Tranga : GlobalBase
|
||||||
|
{
|
||||||
|
public bool keepRunning;
|
||||||
|
public JobBoss jobBoss;
|
||||||
|
private Server _server;
|
||||||
|
private HashSet<MangaConnector> _connectors;
|
||||||
|
|
||||||
|
public Tranga(Logger? logger) : base(logger)
|
||||||
|
{
|
||||||
|
Log("\n\n _______ \n|_ _|.----..---.-..-----..-----..---.-.\n | | | _|| _ || || _ || _ |\n |___| |__| |___._||__|__||___ ||___._|\n |_____| \n\n");
|
||||||
|
keepRunning = true;
|
||||||
|
_connectors = new HashSet<MangaConnector>()
|
||||||
|
{
|
||||||
|
new Manganato(this),
|
||||||
|
new Mangasee(this),
|
||||||
|
new MangaDex(this),
|
||||||
|
new MangaKatana(this),
|
||||||
|
new Mangaworld(this),
|
||||||
|
new Bato(this),
|
||||||
|
new MangaLife(this),
|
||||||
|
new ManhuaPlus(this),
|
||||||
|
new MangaHere(this),
|
||||||
|
};
|
||||||
|
foreach(DirectoryInfo dir in new DirectoryInfo(Path.GetTempPath()).GetDirectories("trangatemp"))//Cleanup old temp folders
|
||||||
|
dir.Delete();
|
||||||
|
jobBoss = new(this, this._connectors);
|
||||||
|
StartJobBoss();
|
||||||
|
this._server = new Server(this);
|
||||||
|
string[] emojis = { "(•‿•)", "(づ \u25d5‿\u25d5 )づ", "( \u02d8\u25bd\u02d8)っ\u2668", "=\uff3e\u25cf \u22cf \u25cf\uff3e=", "(ΦωΦ)", "(\u272a\u3268\u272a)", "( ノ・o・ )ノ", "(〜^\u2207^ )〜", "~(\u2267ω\u2266)~","૮ \u00b4• ﻌ \u00b4• ა", "(\u02c3ᆺ\u02c2)", "(=\ud83d\udf66 \u0f1d \ud83d\udf66=)"};
|
||||||
|
SendNotifications("Tranga Started", emojis[Random.Shared.Next(0,emojis.Length-1)]);
|
||||||
|
Log(TrangaSettings.AsJObject().ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
public MangaConnector? GetConnector(string name)
|
||||||
|
{
|
||||||
|
foreach(MangaConnector mc in _connectors)
|
||||||
|
if (mc.name.Equals(name, StringComparison.InvariantCultureIgnoreCase))
|
||||||
|
return mc;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool TryGetConnector(string name, out MangaConnector? connector)
|
||||||
|
{
|
||||||
|
connector = GetConnector(name);
|
||||||
|
return connector is not null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<MangaConnector> GetConnectors()
|
||||||
|
{
|
||||||
|
return _connectors;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Manga? GetPublicationById(string internalId) => GetCachedManga(internalId);
|
||||||
|
|
||||||
|
public bool TryGetPublicationById(string internalId, out Manga? manga)
|
||||||
|
{
|
||||||
|
manga = GetPublicationById(internalId);
|
||||||
|
return manga is not null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void StartJobBoss()
|
||||||
|
{
|
||||||
|
Thread t = new (() =>
|
||||||
|
{
|
||||||
|
while (keepRunning)
|
||||||
|
{
|
||||||
|
if(!TrangaSettings.aprilFoolsMode || !IsAprilFirst())
|
||||||
|
jobBoss.CheckJobs();
|
||||||
|
else
|
||||||
|
Log("April Fools Mode in Effect");
|
||||||
|
Thread.Sleep(100);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
t.Start();
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool IsAprilFirst()
|
||||||
|
{
|
||||||
|
//UTC 01 Apr +-12hrs
|
||||||
|
DateTime start = new DateTime(DateTime.Now.Year, 03, 31, 12, 0, 0, DateTimeKind.Utc);
|
||||||
|
DateTime end = new DateTime(DateTime.Now.Year, 04, 02, 12, 0, 0, DateTimeKind.Utc);
|
||||||
|
if (DateTime.UtcNow > start && DateTime.UtcNow < end)
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
@ -1,17 +1,30 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<LangVersion>12</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="GlaxArguments" Version="1.1.0" />
|
||||||
|
<PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
|
<PackageReference Include="PuppeteerSharp" Version="10.0.0" />
|
||||||
|
<PackageReference Include="Soenneker.Utils.String.NeedlemanWunsch" Version="2.1.301" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Logging\Logging.csproj" />
|
<ProjectReference Include="..\Logging\Logging.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Content Include="..\.dockerignore">
|
||||||
|
<Link>.dockerignore</Link>
|
||||||
|
<DependentUpon>Dockerfile</DependentUpon>
|
||||||
|
</Content>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
51
Tranga/TrangaArgs.cs
Normal file
51
Tranga/TrangaArgs.cs
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
using Logging;
|
||||||
|
using GlaxArguments;
|
||||||
|
|
||||||
|
namespace Tranga;
|
||||||
|
|
||||||
|
public partial class Tranga : GlobalBase
|
||||||
|
{
|
||||||
|
|
||||||
|
public static void Main(string[] args)
|
||||||
|
{
|
||||||
|
Argument downloadLocation = new (new[] { "-d", "--downloadLocation" }, 1, "Directory to which downloaded Manga are saved");
|
||||||
|
Argument workingDirectory = new (new[] { "-w", "--workingDirectory" }, 1, "Directory in which application-data is saved");
|
||||||
|
Argument consoleLogger = new (new []{"-c", "--consoleLogger"}, 0, "Enables the consoleLogger");
|
||||||
|
Argument fileLogger = new (new []{"-f", "--fileLogger"}, 0, "Enables the fileLogger");
|
||||||
|
Argument fPath = new (new []{"-l", "--fPath"}, 1, "Log Folder Path");
|
||||||
|
|
||||||
|
Argument[] arguments = new[]
|
||||||
|
{
|
||||||
|
downloadLocation,
|
||||||
|
workingDirectory,
|
||||||
|
consoleLogger,
|
||||||
|
fileLogger,
|
||||||
|
fPath
|
||||||
|
};
|
||||||
|
ArgumentFetcher fetcher = new (arguments);
|
||||||
|
Dictionary<Argument, string[]> fetched = fetcher.Fetch(args);
|
||||||
|
|
||||||
|
string? directoryPath = fetched.TryGetValue(fPath, out string[]? path) ? path[0] : null;
|
||||||
|
if (directoryPath is not null && !Directory.Exists(directoryPath))
|
||||||
|
Directory.CreateDirectory(directoryPath);
|
||||||
|
|
||||||
|
List<Logger.LoggerType> enabledLoggers = new();
|
||||||
|
if(fetched.ContainsKey(consoleLogger))
|
||||||
|
enabledLoggers.Add(Logger.LoggerType.ConsoleLogger);
|
||||||
|
if (fetched.ContainsKey(fileLogger))
|
||||||
|
enabledLoggers.Add(Logger.LoggerType.FileLogger);
|
||||||
|
Logger logger = new(enabledLoggers.ToArray(), Console.Out, Console.OutputEncoding, directoryPath);
|
||||||
|
|
||||||
|
bool dlp = fetched.TryGetValue(downloadLocation, out string[]? downloadLocationPath);
|
||||||
|
bool wdp = fetched.TryGetValue(workingDirectory, out string[]? workingDirectoryPath);
|
||||||
|
|
||||||
|
if (wdp)
|
||||||
|
TrangaSettings.LoadFromWorkingDirectory(workingDirectoryPath![0]);
|
||||||
|
else
|
||||||
|
TrangaSettings.CreateOrUpdate();
|
||||||
|
if(dlp)
|
||||||
|
TrangaSettings.CreateOrUpdate(downloadDirectory: downloadLocationPath![0]);
|
||||||
|
|
||||||
|
Tranga _ = new (logger);
|
||||||
|
}
|
||||||
|
}
|
195
Tranga/TrangaSettings.cs
Normal file
195
Tranga/TrangaSettings.cs
Normal file
@ -0,0 +1,195 @@
|
|||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
using Tranga.LibraryConnectors;
|
||||||
|
using Tranga.MangaConnectors;
|
||||||
|
using Tranga.NotificationConnectors;
|
||||||
|
using static System.IO.UnixFileMode;
|
||||||
|
|
||||||
|
namespace Tranga;
|
||||||
|
|
||||||
|
public static class TrangaSettings
|
||||||
|
{
|
||||||
|
[JsonIgnore] internal static readonly string DefaultUserAgent = $"Tranga ({Enum.GetName(Environment.OSVersion.Platform)}; {(Environment.Is64BitOperatingSystem ? "x64" : "")}) / 1.0";
|
||||||
|
public static string downloadLocation { get; private set; } = (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/Manga" : Path.Join(Directory.GetCurrentDirectory(), "Downloads"));
|
||||||
|
public static string workingDirectory { get; private set; } = Path.Join(RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/usr/share" : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "tranga-api");
|
||||||
|
public static int apiPortNumber { get; private set; } = 6531;
|
||||||
|
public static string userAgent { get; private set; } = DefaultUserAgent;
|
||||||
|
public static bool bufferLibraryUpdates { get; private set; } = false;
|
||||||
|
public static bool bufferNotifications { get; private set; } = false;
|
||||||
|
[JsonIgnore] public static string settingsFilePath => Path.Join(workingDirectory, "settings.json");
|
||||||
|
[JsonIgnore] public static string libraryConnectorsFilePath => Path.Join(workingDirectory, "libraryConnectors.json");
|
||||||
|
[JsonIgnore] public static string notificationConnectorsFilePath => Path.Join(workingDirectory, "notificationConnectors.json");
|
||||||
|
[JsonIgnore] public static string jobsFolderPath => Path.Join(workingDirectory, "jobs");
|
||||||
|
[JsonIgnore] public static string coverImageCache => Path.Join(workingDirectory, "imageCache");
|
||||||
|
public static ushort? version { get; } = 2;
|
||||||
|
public static bool aprilFoolsMode { get; private set; } = true;
|
||||||
|
[JsonIgnore]internal static readonly Dictionary<RequestType, int> DefaultRequestLimits = new ()
|
||||||
|
{
|
||||||
|
{RequestType.MangaInfo, 250},
|
||||||
|
{RequestType.MangaDexFeed, 250},
|
||||||
|
{RequestType.MangaDexImage, 40},
|
||||||
|
{RequestType.MangaImage, 60},
|
||||||
|
{RequestType.MangaCover, 250},
|
||||||
|
{RequestType.Default, 60}
|
||||||
|
};
|
||||||
|
|
||||||
|
public static Dictionary<RequestType, int> requestLimits { get; set; } = DefaultRequestLimits;
|
||||||
|
|
||||||
|
public static void LoadFromWorkingDirectory(string directory)
|
||||||
|
{
|
||||||
|
TrangaSettings.workingDirectory = directory;
|
||||||
|
if(File.Exists(settingsFilePath))
|
||||||
|
Deserialize(File.ReadAllText(settingsFilePath));
|
||||||
|
else return;
|
||||||
|
|
||||||
|
Directory.CreateDirectory(downloadLocation);
|
||||||
|
Directory.CreateDirectory(workingDirectory);
|
||||||
|
ExportSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void CreateOrUpdate(string? downloadDirectory = null, string? pWorkingDirectory = null, int? pApiPortNumber = null, string? pUserAgent = null, bool? pAprilFoolsMode = null, bool? pBufferLibraryUpdates = null, bool? pBufferNotifications = null)
|
||||||
|
{
|
||||||
|
if(pWorkingDirectory is null && File.Exists(settingsFilePath))
|
||||||
|
LoadFromWorkingDirectory(workingDirectory);
|
||||||
|
downloadLocation = downloadDirectory ?? downloadLocation;
|
||||||
|
workingDirectory = pWorkingDirectory ?? workingDirectory;
|
||||||
|
apiPortNumber = pApiPortNumber ?? apiPortNumber;
|
||||||
|
userAgent = pUserAgent ?? userAgent;
|
||||||
|
aprilFoolsMode = pAprilFoolsMode ?? aprilFoolsMode;
|
||||||
|
bufferLibraryUpdates = pBufferLibraryUpdates ?? bufferLibraryUpdates;
|
||||||
|
bufferNotifications = pBufferNotifications ?? bufferNotifications;
|
||||||
|
Directory.CreateDirectory(downloadLocation);
|
||||||
|
Directory.CreateDirectory(workingDirectory);
|
||||||
|
ExportSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static HashSet<LibraryConnector> LoadLibraryConnectors(GlobalBase clone)
|
||||||
|
{
|
||||||
|
if (!File.Exists(libraryConnectorsFilePath))
|
||||||
|
return new HashSet<LibraryConnector>();
|
||||||
|
return JsonConvert.DeserializeObject<HashSet<LibraryConnector>>(File.ReadAllText(libraryConnectorsFilePath),
|
||||||
|
new JsonSerializerSettings()
|
||||||
|
{
|
||||||
|
Converters =
|
||||||
|
{
|
||||||
|
new LibraryManagerJsonConverter(clone)
|
||||||
|
}
|
||||||
|
})!;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static HashSet<NotificationConnector> LoadNotificationConnectors(GlobalBase clone)
|
||||||
|
{
|
||||||
|
if (!File.Exists(notificationConnectorsFilePath))
|
||||||
|
return new HashSet<NotificationConnector>();
|
||||||
|
return JsonConvert.DeserializeObject<HashSet<NotificationConnector>>(File.ReadAllText(notificationConnectorsFilePath),
|
||||||
|
new JsonSerializerSettings()
|
||||||
|
{
|
||||||
|
Converters =
|
||||||
|
{
|
||||||
|
new NotificationManagerJsonConverter(clone)
|
||||||
|
}
|
||||||
|
})!;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void UpdateAprilFoolsMode(bool enabled)
|
||||||
|
{
|
||||||
|
aprilFoolsMode = enabled;
|
||||||
|
ExportSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void UpdateDownloadLocation(string newPath, bool moveFiles = true)
|
||||||
|
{
|
||||||
|
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
|
Directory.CreateDirectory(newPath,
|
||||||
|
GroupRead | GroupWrite | None | OtherRead | OtherWrite | UserRead | UserWrite);
|
||||||
|
else
|
||||||
|
Directory.CreateDirectory(newPath);
|
||||||
|
|
||||||
|
if (moveFiles && Directory.Exists(downloadLocation))
|
||||||
|
Directory.Move(downloadLocation, newPath);
|
||||||
|
|
||||||
|
downloadLocation = newPath;
|
||||||
|
ExportSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void UpdateWorkingDirectory(string newPath)
|
||||||
|
{
|
||||||
|
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
|
Directory.CreateDirectory(newPath,
|
||||||
|
GroupRead | GroupWrite | None | OtherRead | OtherWrite | UserRead | UserWrite);
|
||||||
|
else
|
||||||
|
Directory.CreateDirectory(newPath);
|
||||||
|
Directory.Move(workingDirectory, newPath);
|
||||||
|
workingDirectory = newPath;
|
||||||
|
ExportSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void UpdateUserAgent(string? customUserAgent)
|
||||||
|
{
|
||||||
|
userAgent = customUserAgent ?? DefaultUserAgent;
|
||||||
|
ExportSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void UpdateRateLimit(RequestType requestType, int newLimit)
|
||||||
|
{
|
||||||
|
requestLimits[requestType] = newLimit;
|
||||||
|
ExportSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void ResetRateLimits()
|
||||||
|
{
|
||||||
|
requestLimits = DefaultRequestLimits;
|
||||||
|
ExportSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void ExportSettings()
|
||||||
|
{
|
||||||
|
if (File.Exists(settingsFilePath))
|
||||||
|
{
|
||||||
|
while(GlobalBase.IsFileInUse(settingsFilePath, null))
|
||||||
|
Thread.Sleep(100);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
Directory.CreateDirectory(new FileInfo(settingsFilePath).DirectoryName!);
|
||||||
|
File.WriteAllText(settingsFilePath, Serialize());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static JObject AsJObject()
|
||||||
|
{
|
||||||
|
JObject jobj = new JObject();
|
||||||
|
jobj.Add("downloadLocation", JToken.FromObject(downloadLocation));
|
||||||
|
jobj.Add("workingDirectory", JToken.FromObject(workingDirectory));
|
||||||
|
jobj.Add("apiPortNumber", JToken.FromObject(apiPortNumber));
|
||||||
|
jobj.Add("userAgent", JToken.FromObject(userAgent));
|
||||||
|
jobj.Add("aprilFoolsMode", JToken.FromObject(aprilFoolsMode));
|
||||||
|
jobj.Add("version", JToken.FromObject(version));
|
||||||
|
jobj.Add("requestLimits", JToken.FromObject(requestLimits));
|
||||||
|
jobj.Add("bufferLibraryUpdates", JToken.FromObject(bufferLibraryUpdates));
|
||||||
|
jobj.Add("bufferNotifications", JToken.FromObject(bufferNotifications));
|
||||||
|
return jobj;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string Serialize() => AsJObject().ToString();
|
||||||
|
|
||||||
|
public static void Deserialize(string serialized)
|
||||||
|
{
|
||||||
|
JObject jobj = JObject.Parse(serialized);
|
||||||
|
if (jobj.TryGetValue("downloadLocation", out JToken? dl))
|
||||||
|
downloadLocation = dl.Value<string>()!;
|
||||||
|
if (jobj.TryGetValue("workingDirectory", out JToken? wd))
|
||||||
|
workingDirectory = wd.Value<string>()!;
|
||||||
|
if (jobj.TryGetValue("apiPortNumber", out JToken? apn))
|
||||||
|
apiPortNumber = apn.Value<int>();
|
||||||
|
if (jobj.TryGetValue("userAgent", out JToken? ua))
|
||||||
|
userAgent = ua.Value<string>()!;
|
||||||
|
if (jobj.TryGetValue("aprilFoolsMode", out JToken? afm))
|
||||||
|
aprilFoolsMode = afm.Value<bool>()!;
|
||||||
|
if (jobj.TryGetValue("requestLimits", out JToken? rl))
|
||||||
|
requestLimits = rl.ToObject<Dictionary<RequestType, int>>()!;
|
||||||
|
if (jobj.TryGetValue("bufferLibraryUpdates", out JToken? blu))
|
||||||
|
bufferLibraryUpdates = blu.Value<bool>()!;
|
||||||
|
if (jobj.TryGetValue("bufferNotifications", out JToken? bn))
|
||||||
|
bufferNotifications = bn.Value<bool>()!;
|
||||||
|
}
|
||||||
|
}
|
@ -1,61 +0,0 @@
|
|||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace Tranga;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Stores information on Task
|
|
||||||
/// </summary>
|
|
||||||
public class TrangaTask
|
|
||||||
{
|
|
||||||
// ReSharper disable once CommentTypo ...Tell me why!
|
|
||||||
// ReSharper disable once MemberCanBePrivate.Global I want it thaaat way
|
|
||||||
public TimeSpan reoccurrence { get; }
|
|
||||||
public DateTime lastExecuted { get; set; }
|
|
||||||
public string? connectorName { get; }
|
|
||||||
public Task task { get; }
|
|
||||||
public Publication? publication { get; }
|
|
||||||
public string language { get; }
|
|
||||||
[JsonIgnore]public ExecutionState state { get; set; }
|
|
||||||
|
|
||||||
public enum ExecutionState
|
|
||||||
{
|
|
||||||
Waiting,
|
|
||||||
Enqueued,
|
|
||||||
Running
|
|
||||||
};
|
|
||||||
|
|
||||||
public TrangaTask(Task task, string? connectorName, Publication? publication, TimeSpan reoccurrence, string language = "")
|
|
||||||
{
|
|
||||||
if(task != Task.UpdateKomgaLibrary && connectorName is null)
|
|
||||||
throw new ArgumentException($"connectorName can not be null for task {task}");
|
|
||||||
|
|
||||||
if (publication is null && task != Task.UpdatePublications && task != Task.UpdateKomgaLibrary)
|
|
||||||
throw new ArgumentException($"Publication can not be null for task {task}");
|
|
||||||
|
|
||||||
this.publication = publication;
|
|
||||||
this.reoccurrence = reoccurrence;
|
|
||||||
this.lastExecuted = DateTime.Now.Subtract(reoccurrence);
|
|
||||||
this.connectorName = connectorName;
|
|
||||||
this.task = task;
|
|
||||||
this.language = language;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <returns>True if elapsed time since last execution is greater than set interval</returns>
|
|
||||||
public bool ShouldExecute()
|
|
||||||
{
|
|
||||||
return DateTime.Now.Subtract(this.lastExecuted) > reoccurrence && state is ExecutionState.Waiting;
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum Task
|
|
||||||
{
|
|
||||||
UpdatePublications,
|
|
||||||
UpdateChapters,
|
|
||||||
DownloadNewChapters,
|
|
||||||
UpdateKomgaLibrary
|
|
||||||
}
|
|
||||||
|
|
||||||
public override string ToString()
|
|
||||||
{
|
|
||||||
return $"{task,-20} | {lastExecuted,-20} | {reoccurrence,-12} | {state,-10} | {connectorName,-15} | {publication?.sortName}";
|
|
||||||
}
|
|
||||||
}
|
|
21
docker-compose.local.yaml
Normal file
21
docker-compose.local.yaml
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
version: '3'
|
||||||
|
services:
|
||||||
|
tranga-api:
|
||||||
|
build:
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
context: .
|
||||||
|
container_name: tranga-api
|
||||||
|
volumes:
|
||||||
|
- ./Manga:/Manga
|
||||||
|
- ./settings:/usr/share/tranga-api
|
||||||
|
ports:
|
||||||
|
- "6531:6531"
|
||||||
|
restart: unless-stopped
|
||||||
|
tranga-website:
|
||||||
|
image: glax/tranga-website:latest
|
||||||
|
container_name: tranga-website
|
||||||
|
ports:
|
||||||
|
- "9555:80"
|
||||||
|
depends_on:
|
||||||
|
- tranga-api
|
||||||
|
restart: unless-stopped
|
19
docker-compose.yaml
Normal file
19
docker-compose.yaml
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
version: '3'
|
||||||
|
services:
|
||||||
|
tranga-api:
|
||||||
|
image: glax/tranga-api:latest
|
||||||
|
container_name: tranga-api
|
||||||
|
volumes:
|
||||||
|
- ./Manga:/Manga
|
||||||
|
- ./settings:/usr/share/tranga-api
|
||||||
|
ports:
|
||||||
|
- "6531:6531"
|
||||||
|
restart: unless-stopped
|
||||||
|
tranga-website:
|
||||||
|
image: glax/tranga-website:latest
|
||||||
|
container_name: tranga-website
|
||||||
|
ports:
|
||||||
|
- "9555:80"
|
||||||
|
depends_on:
|
||||||
|
- tranga-api
|
||||||
|
restart: unless-stopped
|
Loading…
Reference in New Issue
Block a user