From 8c1f1b69ff096356b3712fb164ba09720942b94e Mon Sep 17 00:00:00 2001 From: DebaucheryLibrarian Date: Wed, 2 Aug 2023 02:14:41 +0200 Subject: [PATCH] Splitting Han titles and actors in Model Media scraper. --- assets/components/releases/release.vue | 23 +++++++++- assets/js/fragments.js | 1 + config/default.js | 3 ++ migrations/20230801225038_scene_titles.js | 11 +++++ public/img/logos/jerkaoke/favicon.png | Bin 0 -> 1111 bytes public/img/logos/jerkaoke/favicon_dark.png | Bin 0 -> 1136 bytes public/img/logos/jerkaoke/favicon_light.png | Bin 0 -> 1111 bytes public/img/logos/jerkaoke/lazy/favicon.png | Bin 0 -> 2168 bytes .../img/logos/jerkaoke/lazy/favicon_dark.png | Bin 0 -> 2168 bytes .../img/logos/jerkaoke/lazy/favicon_light.png | Bin 0 -> 2168 bytes public/img/logos/jerkaoke/lazy/jerkaoke.png | Bin 4112 -> 4112 bytes public/img/logos/jerkaoke/lazy/network.png | Bin 4114 -> 4114 bytes public/img/logos/jerkaoke/misc/favicon.png | Bin 0 -> 2097 bytes public/img/logos/jerkaoke/thumbs/favicon.png | Bin 0 -> 2168 bytes .../logos/jerkaoke/thumbs/favicon_dark.png | Bin 0 -> 2168 bytes .../logos/jerkaoke/thumbs/favicon_light.png | Bin 0 -> 2168 bytes public/img/logos/jerkaoke/thumbs/jerkaoke.png | Bin 12364 -> 12364 bytes public/img/logos/jerkaoke/thumbs/network.png | Bin 12366 -> 12366 bytes src/scrapers/modelmedia.js | 41 ++++++++++++++---- src/scrapers/scrapers.js | 4 ++ src/store-releases.js | 3 ++ src/utils/resolve-place.js | 4 +- 22 files changed, 80 insertions(+), 10 deletions(-) create mode 100644 migrations/20230801225038_scene_titles.js create mode 100644 public/img/logos/jerkaoke/favicon.png create mode 100644 public/img/logos/jerkaoke/favicon_dark.png create mode 100644 public/img/logos/jerkaoke/favicon_light.png create mode 100644 public/img/logos/jerkaoke/lazy/favicon.png create mode 100644 public/img/logos/jerkaoke/lazy/favicon_dark.png create mode 100644 public/img/logos/jerkaoke/lazy/favicon_light.png create mode 100644 public/img/logos/jerkaoke/misc/favicon.png create mode 100644 public/img/logos/jerkaoke/thumbs/favicon.png create mode 100644 public/img/logos/jerkaoke/thumbs/favicon_dark.png create mode 100644 public/img/logos/jerkaoke/thumbs/favicon_light.png diff --git a/assets/components/releases/release.vue b/assets/components/releases/release.vue index 9a1c322e5..47da075d9 100755 --- a/assets/components/releases/release.vue +++ b/assets/components/releases/release.vue @@ -35,7 +35,10 @@ />
-
+

+
+

+ {{ altTitle }} +

+
+ { + await knex.schema.alterTable('releases', (table) => { + table.specificType('alt_titles', 'text ARRAY'); + }); +}; + +exports.down = async (knex) => { + await knex.schema.alterTable('releases', (table) => { + table.dropColumn('alt_titles'); + }); +}; diff --git a/public/img/logos/jerkaoke/favicon.png b/public/img/logos/jerkaoke/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..1bcb019b03a8af9eaaab5203677e7ff1372bd03d GIT binary patch literal 1111 zcmV-d1gQIoP)EX>4Tx04R}tkv&MmP!xqvQ?*4Z4ptCx$WWc^q9Tr3g(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yV$x;QDiNQw6)g%&Yhc)XAE?m4`7A0RX;OtZRX0Zq5f zbTT1kbE{(L6=4K0h#rJwW*Kvml!9-4-BT~sU7Tn6_x)LYYTjZ%KqQ`JhG`RT5KnK~ z2Iqa^C@aY-@j3ChNf#u3)BVfh)c3uQq_0Ptxmc zEp`O-Zvz+CZB5w&E_Z;TCqp)6R|?V+3I*W(jJ_!c4BP^}Yu?;i=Qw=;GBm5y4RCM> zj1?(+-RIrm&bj^D)0*E82FY@Jq(S3`00006VoOIv03!e-04R0SsBHiM010qNS#tmY z7ZLyf7ZL$ypVCqQ000McNliru=Li862NVD=jvoL302y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00J*bL_t(o!_Ak^i;ZCv$3M?C3^OL0F&Cqu$W|tirm;|B zp;$~QWkHE-`~$WY7L>BElI%$tJBv}G!A>M$njIDrQ!~bl`>{E<-flDZ$K3bMb?WUs z=jlAp^L@_wKBw~}>J+sfxDRXsQh7N3i`ixUPfBTMsdYQ3Upj!@z-C}3vq3GHtF>sO z@)SbA`+>c5wIN*$X>m)(j?@6AYrOVL0dSG+Es|kr?y>% zXjuiR(83z9;s7>A1F{hI>gXMs2cYg(Ppj*zxb2Khr!oymPXo>ClACv_kJaDmm^!Sk zt?=2RPN;M0i5NSg&ZSWj@bv~oNQ4hwv9qK3bhq|vB0H-3XZ`Gn&PzTkM>Mix2dRM)m4#u2y>YV`f zpfX*J0(ck;eNiu}1L~?O{zdghfSywKHdQp#UBI=-{Tg5rcoFY|55V_u?E{8^QD6`7 z4Y&l1rIc*;7Idql>UiX|r2dUtF|Gazy%el}rjA5soL|{gyW@2{6c3bspcqX58aLt* d@T!q_<3FRfff{>_UylF)002ovPDHLkV1jg+?j-;K literal 0 HcmV?d00001 diff --git a/public/img/logos/jerkaoke/favicon_dark.png b/public/img/logos/jerkaoke/favicon_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..9a9c1441bf11e6edf569246d4497f98d1e592109 GIT binary patch literal 1136 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 literal 0 HcmV?d00001 diff --git a/public/img/logos/jerkaoke/lazy/favicon.png b/public/img/logos/jerkaoke/lazy/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..b0fa1cd62b5c4eddd21c5a4fdea2030e3f66399c GIT binary patch literal 2168 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0V64e>b`Ho)PG(@xm{>c}*5h!1 zNUMMFR#z>)FoD7o0dwChQtFFpRSMzQ>a?0qP5*DR8n0(p_u>ap1s~EkzIyOz&FbdW z3LO6$cI>jy+~v{vUA0xrFs@=x|L1p>d&=b%OtgG9?@D9z-F~*jNHMK=b7Y% zxt5eP$>K>!anz z9iHMUbx(FZ`Y8Q;(P^ghJ+o$hu_>Gqp;NZu(!n(;Sx1787=~Wfj6YGers&?IHKAE+ zO8x&G@`#I%d}g&)P-SC>s)xYB1#L!J8w8ifsvmWlbxzpsU*dKBiQbCgl07oqE1a6& z{5tsm!S|fChn}=d7x84ctKaw8kgKJvG3{>QzJA%|l}s%28@2boU2oPf)Bn=zT-`F3 zFZs;k*K>VuGV7H$EL3+kOAY6`B*ew~;BU`9O?I9;OnbBM-HCc`QOjUtvib^dK>?#m z+27BfUf;6P)p>fE|J|~Mi{?N4{p%aMi?>(!W1;JE6Y`h@ZUj@UH?2?in;fJ zf%57Fj(X>~gZCe{Nt}1`!VcFIBYsApGZ>S+-Cb%fZc~T{aySb-B8!2^L&+-&K`ZxZybzEOhb^R1g6vm<(=rYww^q4am1>0haZZJcfoIHRU+k!1Yb zvgKuJj>d^&9SZFtmVyWLK7Vnvb;J>&xi|bj3+l_ap>Lgya zzn;CRYogo29_}=cIs=0(89vvhDwuxeJ9zB0U`5*X>I!SIx^-a*zW2`EJm#_Gc$@g2 zRpoc)eb7De(eX%~v7)H)daei3c8~9`@poReaNCT_ejC0Y;@!~q;8k3~y&Z2C7Z&Z9 z_2Reg+u3WhsyaE|@@l_jx##rY(P7sUJGK@E$odr*uT;Mx-m8`z{aO1Ok2i-NQ;qn9 zf9n+H^Rpg4vRT4yV`R%Bj?KcE^8AO~>ogjUPp;^Cm{4K7q1vmHV?OW9g+*_slzkO! zF?t@h?9e?fpFd^Ke&(+h+G^FgYW0sL4%Ksd`s7+d?6h35%-#g~3U9WN^$vFS` zpXZA$7u?J(wtuE@Yp(m(8G93+pZjM_n1wpf=TMsA1ypDrM~>niNV?dz}PhQba4!^IGvo(!0e`$CMK4~ zk(QR0dVnG4jm(^wf&;z2jQslYG9Quy6%;g%H1KcW_##&y>lc|=EhzSJ@HaHa@Ve%)fH8dRlg&CM*UiNlKUq+3)@V#2rsq>wswP- zww-N@H9HKtdV>1hMyVE-SH~4IE51x=RbIzn$Y>DnmrBhQDSu1KsTQ#U3S2EYv zH#e|%IB=5d@O0Kz*LBlm%I3tBO*?l~_0jvWj7Op@ky)oIR+(y z!2BUu;u=xnoS&PUnpeW$T$GwvlA5AWo>`Ki;O^-g5Z=fq4pgKHQj`LevPuT4U@$T; zGS)S)&^0g&F*39=Ft;)?&^9ozGBDuNaqB|Skei>9nO2EgLw(^tGoS_yxD6$lxv9k^ ziMa)sdQ1!@G4blV5wpPjc1(ija=@}&q0i{VfnaK(+`MHUidD|u$Mgx^8 z!IY(>7AF^F7L;V>=P`ghr;t>dnNy;hnWs=3b`Ho)PG(@xm{>c}*5h!1 zNUMMFR#z>)FoD7o0dwChQtFFpRSMzQ>a?0qP5*DR8n0(p_u>ap1s~EkzIyOz&FbdW z3LO6$cI>jy+~v{vUA0xrFs@=x|L1p>d&=b%OtgG9?@D9z-F~*jNHMK=b7Y% zxt5eP$>K>!anz z9iHMUbx(FZ`Y8Q;(P^ghJ+o$hu_>Gqp;NZu(!n(;Sx1787=~Wfj6YGers&?IHKAE+ zO8x&G@`#I%d}g&)P-SC>s)xYB1#L!J8w8ifsvmWlbxzpsU*dKBiQbCgl07oqE1a6& z{5tsm!S|fChn}=d7x84ctKaw8kgKJvG3{>QzJA%|l}s%28@2boU2oPf)Bn=zT-`F3 zFZs;k*K>VuGV7H$EL3+kOAY6`B*ew~;BU`9O?I9;OnbBM-HCc`QOjUtvib^dK>O8&7|8CjBMe`s2{`HOB#oH_VvCwt733*I{H%z~5G1>gp%+vej&ax(FGLmv zGCX^Ur>`sfa}GvPcFhR)LwrCzhpIv%N`ey06$*;-(=u~X6-p`#QWd~ufJN`p;OIUX zMV>#;MJ$^>ZnpH}Hwk)I-zdTJ`PNO3*%7@_Qx?X|Q2M*h^sm&yHcqz(oKaJ^NHTtI z+43?qN8`k?4uy6ROThzrpT9g*{;i(8lHYsQ)E=H2hK%bz@L$}U#r3Si?Z&%PbrLVz zU(epuHPLNh4|keJoq@rY44-RL6-+<#9Xxhgup;exb%nK9-MX*@-+Sk79`o38yiNSi zs`5MYKIoqK=y;^gSW(n?J=X(iyT|v}_&cv!xNXK|zYX6H@owmQ@G7q0-j2763yXHl zdhuKL?d&yLRh=Afd9~lN+;e*H=&*pF`swl!lE}*%DxJ= z7(EYLcIY0L&!4hqKl4`$ZMEuLwfe^rhw3>!eR3@!c3Q4_wjy7X?;Z2iu2(sdWSoEe z&-2BW3vT8X+dosdHP`*?j6D@mCXT1>cqAHIJpJ})H^(iPf}q*bt%nn0UdKduS%$YN zybId@`EK5~+glIU7035{mv>q3=2Oq`QeXb(#9-|JU~C$Dx;TbdoK8+?V0KeW6BA40 zNJ~pgJ;0FjMrKY-!GT_1Mt*&HnGeZ<3JMxW8u&MGa&&h%HOyGC!a|HyXwsyh1ePOL zFU{aeNqPF@=~IOW$3Us|xjbH{DnwSSShX@c<5A#(rE3?jYw>T?^Jp|u6#k%nL3x40 z{08YQU%qyHU`_2)$zXMK7y6>6XfE+WI3OV-WldgE*Gh-eXJig-*buUH)3a@k)3;yU zc=_>Gb|V>?-Z>H}b7L=vo_Hx8xog+X>WZq!s^1Ymqkb(s$^Da^g>5EVgcn-`Tf0F^ z+s?MdnjHpRJwg3_ouZ=s-Dw^E8+^972Tw?uIcL%=wnX=((y1wntQEDRts2yiE1B!- zn;Y0W95~5!csgsV>$+(&WpiT6rky*g`sxPL3Wd#EeAe$-WVDUTvYUy)_@veP9D@=; zVE&LSag8W(&d<$F%`0JWE=o--Nlj5G&n(GMaQE~L2yf&Q2P#qpDM|rKStWy2Fc=va z8S5HY=o%P?7#Ug_m|Gc}Y8x0>85m61m$?~5LvDUbW?Cg~4G$k*c2YH@N=Wo8nRyDuLGDgI>5jrc)uJ%fxruqDX^F`trA4Vl mVC6pZCY%B);Dam3Pf5*T0BMa*@N@>sFnGH9xvXb`Ho)PG(@xm{>c}*5h!1 zNUMMFR#z>)FoD7o0dwChQtFFpRSMzQ>a?0qP5*DR8n0(p_u>ap1s~EkzIyOz&FbdW z3LO6$cI>jy+~v{vUA0xrFs@=x|L1p>d&=b%OtgG9?@D9z-F~*jNHMK=b7Y% zxt5eP$>K>!anz z9iHMUbx(FZ`Y8Q;(P^ghJ+o$hu_>Gqp;NZu(!n(;Sx1787=~Wfj6YGers&?IHKAE+ zO8x&G@`#I%d}g&)P-SC>s)xYB1#L!J8w8ifsvmWlbxzpsU*dKBiQbCgl07oqE1a6& z{5tsm!S|fChn}=d7x84ctKaw8kgKJvG3{>QzJA%|l}s%28@2boU2oPf)Bn=zT-`F3 zFZs;k*K>VuGV7H$EL3+kOAY6`B*ew~;BU`9O?I9;OnbBM-HCc`QOjUtvib^dK>?#m z+27BfUf;6P)p>fE|J|~Mi{?N4{p%aMi?>(!W1;JE6Y`h@ZUj@UH?2?in;fJ zf%57Fj(X>~gZCe{Nt}1`!VcFIBYsApGZ>S+-Cb%fZc~T{aySb-B8!2^L&+-&K`ZxZybzEOhb^R1g6vm<(=rYww^q4am1>0haZZJcfoIHRU+k!1Yb zvgKuJj>d^&9SZFtmVyWLK7Vnvb;J>&xi|bj3+l_ap>Lgya zzn;CRYogo29_}=cIs=0(89vvhDwuxeJ9zB0U`5*X>I!SIx^-a*zW2`EJm#_Gc$@g2 zRpoc)eb7De(eX%~v7)H)daei3c8~9`@poReaNCT_ejC0Y;@!~q;8k3~y&Z2C7Z&Z9 z_2Reg+u3WhsyaE|@@l_jx##rY(P7sUJGK@E$odr*uT;Mx-m8`z{aO1Ok2i-NQ;qn9 zf9n+H^Rpg4vRT4yV`R%Bj?KcE^8AO~>ogjUPp;^Cm{4K7q1vmHV?OW9g+*_slzkO! zF?t@h?9e?fpFd^Ke&(+h+G^FgYW0sL4%Ksd`s7+d?6h35%-#g~3U9WN^$vFS` zpXZA$7u?J(wtuE@Yp(m(8G93+pZjM_n1wpf=TMsA1ypDrM~>niNV?dz}PhQba4!^IGvo(!0e`$CMK4~ zk(QR0dVnG4jm(^wf&;z2jQslYG9Quy6%;g%H1KcW_##&y>lc|=EhzSJ@HaHa@Ve%)fH8dRlg&CM*UiNlKUq+3)@V#2rsq>wswP- zww-N@H9HKtdV>1hMyVE-SH~4IE51x=RbIzn$Y>DnmrBhQDSu1KsTQ#U3S2EYv zH#e|%IB=5d@O0Kz*LBlm%I3tBO*?l~_0jvWj7Op@ky)oIR+(y z!2BUu;u=xnoS&PUnpeW$T$GwvlA5AWo>`Ki;O^-g5Z=fq4pgKHQj`LevPuT4U@$T; zGS)S)&^0g&F*39=Ft;)?);2J(GBB_|5`(HCH$NpatrE8eznM=~18vZN+fb63n_66w zm|K9U$HWj~iAT-dTR=V1AU(irYn7Z|P+63jo>9UOP@0sJnXKTFpPQJOw{416IqA=CDiFu`IiOD6UMX5z# lWc)I$ztaD0e0stU6Sc3on literal 0 HcmV?d00001 diff --git a/public/img/logos/jerkaoke/lazy/jerkaoke.png b/public/img/logos/jerkaoke/lazy/jerkaoke.png index 1f80f974489b0733f24251e38f03b3d03bd81388..bbb0178e1dd9224d3b6d79f7f07ac151c64fb865 100644 GIT binary patch delta 51 zcmbQBFhOC%eilv+Mp1Un2=_yLn@_MT8yHv_7@Y3V(%Ia= HH-QlVWlas- diff --git a/public/img/logos/jerkaoke/lazy/network.png b/public/img/logos/jerkaoke/lazy/network.png index e94c6c44d6daf85adc54b2da71e6fedbe93919bb..a49cbbd7695baac3134ec31035f67a7ac305e644 100644 GIT binary patch delta 51 zcmbQFFiBy8yHv_7@Y3V(%Ia^ HH-QlVW?K#9 diff --git a/public/img/logos/jerkaoke/misc/favicon.png b/public/img/logos/jerkaoke/misc/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..42adef91364d060c0f624a123015e2f9e170bedd GIT binary patch literal 2097 zcmV-12+sG3P)EX>4Tx04R}tkv&MmP!xqvQ?*4Z4ptCx$WWc^q9Tr3g(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yV$x;QDiNQw6)g%&Yhc)XAE?m4`7A0RX;OtZRX0Zq5f zbTT1kbE{(L6=4K0h#rJwW*Kvml!9-4-BT~sU7Tn6_x)LYYTjZ%KqQ`JhG`RT5KnK~ z2Iqa^C@aY-@j3ChNf#u3)BVfh)c3uQq_0Ptxmc zEp`O-Zvz+CZB5w&E_Z;TCqp)6R|?V+3I*W(jJ_!c4BP^}Yu?;i=Qw=;GBm5y4RCM> zj1?(+-RIrm&bj^D)0*E82FY@Jq(S3`00006VoOIv03!e-04R0SsBHiM010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=Li862L|(&|5pG202y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00s$3L_t(|+U=a(Pg`Xi$3F$e>v(aLQ6}T1OB`F$4K_8@ z4P}l=wwS<{cr%Qm37Z#QOm5UW;?-_+`wJ8=*o8L(6B84QVB$s-w=mjd4h?O2Z7D^8 zQfMiqUObdCXrYA`89d*Fi{ClVIVb&`-y6wuehQ+|8!wl$y-FYrRXcKGZzj;6Kg2mZFc;l687tQ4-qm2;J<7T`k( zX+oJigrAzEFLX^e72R zf|8*2XEMLn-W4>CWX7jBy#DHo5322cSNyB!4ug`Rx7+%tXmtC_kAsFX4FKJs3Ekj; zIMzQYK>=vW*8iVwbWefTE{w5RS@mRlAVEn`QWBH|B|%A05|jibK}kta5|jibK}k>& zl#~P|K}k>&lmsO~Nl;P}lmsO~t(RJ_sIplHE z+;q@z%*7N`%rY*Um0_gNDbq zJ3Z=V!)5Wd(^9$d?%Uixd5-+dOyOB|uRvyUME5yWRvPm7xF_f#>O+S@uCcFLgVVG7 zK-E-LP`V~$G+9c%t++(dFk}4* z$+kl;BR!Rd`U_#tU(7qo#k`|*P7Kp?$V$)gT(J?%JSF~CL27Qg7V;h|-_QUV4iB13 zB_Y;0g2tGWSZmv$>T9(eR&G8sA^^M z3Ns!X&62k3O?9=}=&ngTfF?_cCM&WM-(fQaL&{*M=FLkX*Y*5s4I1XD-PIo4Y`8*3 zT58;S7xUb7(3>Xb(KwSsZd+WN!(!bUYztJl#0zj|pqI{x;cY|u{OJQ+i(Z(VhmL-3 zzE>M^t#0+R;9Cq;w+-N$ zbBi9#Fi!Iab?Yi?V12u7dAIO_4-DgR17+Dta~UcG0y$-+T8`nRxqH>w1z~iI2=~`It?Xa4J*DdF;ST~vh zDX3Ic15tfy@ZHzV8+u6R#4x{142hE6KMBt!w^Xw8l{tLYbS>;lG0#o&siAu%hw;PH z_#{h3!qp`7wr(m_QC(*mvTX<|&yTzam9R_7^E zD|0!Vx%r1icLsXVO$-U6%ObosKJL_q-dZj|Z6W*uxvIJ8YQ%{;R@ym80DOer)+&bB zjLcdnJa~a9XCT-eQ|Ny0#k;tOy10Pk1M&T0#O|5ni$5Rmc*-t3@yEYlXeN$NRP>>@ zeIk;1Kw_fC6Sg>`B_lnR`dTe@wc5Bep&d38Z6nV_g)`XU(OBFnT(HYbtl;73ljlJJ zXphw6U%J2D`)kjhKzrr{m1oPg1b`Ho)PG(@xm{>c}*5h!1 zNUMMFR#z>)FoD7o0dwChQtFFpRSMzQ>a?0qP5*DR8n0(p_u>ap1s~EkzIyOz&FbdW z3LO6$cI>jy+~v{vUA0xrFs@=x|L1p>d&=b%OtgG9?@D9z-F~*jNHMK=b7Y% zxt5eP$>K>!anz z9iHMUbx(FZ`Y8Q;(P^ghJ+o$hu_>Gqp;NZu(!n(;Sx1787=~Wfj6YGers&?IHKAE+ zO8x&G@`#I%d}g&)P-SC>s)xYB1#L!J8w8ifsvmWlbxzpsU*dKBiQbCgl07oqE1a6& z{5tsm!S|fChn}=d7x84ctKaw8kgKJvG3{>QzJA%|l}s%28@2boU2oPf)Bn=zT-`F3 zFZs;k*K>VuGV7H$EL3+kOAY6`B*ew~;BU`9O?I9;OnbBM-HCc`QOjUtvib^dK>?#m z+27BfUf;6P)p>fE|J|~Mi{?N4{p%aMi?>(!W1;JE6Y`h@ZUj@UH?2?in;fJ zf%57Fj(X>~gZCe{Nt}1`!VcFIBYsApGZ>S+-Cb%fZc~T{aySb-B8!2^L&+-&K`ZxZybzEOhb^R1g6vm<(=rYww^q4am1>0haZZJcfoIHRU+k!1Yb zvgKuJj>d^&9SZFtmVyWLK7Vnvb;J>&xi|bj3+l_ap>Lgya zzn;CRYogo29_}=cIs=0(89vvhDwuxeJ9zB0U`5*X>I!SIx^-a*zW2`EJm#_Gc$@g2 zRpoc)eb7De(eX%~v7)H)daei3c8~9`@poReaNCT_ejC0Y;@!~q;8k3~y&Z2C7Z&Z9 z_2Reg+u3WhsyaE|@@l_jx##rY(P7sUJGK@E$odr*uT;Mx-m8`z{aO1Ok2i-NQ;qn9 zf9n+H^Rpg4vRT4yV`R%Bj?KcE^8AO~>ogjUPp;^Cm{4K7q1vmHV?OW9g+*_slzkO! zF?t@h?9e?fpFd^Ke&(+h+G^FgYW0sL4%Ksd`s7+d?6h35%-#g~3U9WN^$vFS` zpXZA$7u?J(wtuE@Yp(m(8G93+pZjM_n1wpf=TMsA1ypDrM~>niNV?dz}PhQba4!^IGvo(!0e`$CMK4~ zk(QR0dVnG4jm(^wf&;z2jQslYG9Quy6%;g%H1KcW_##&y>lc|=EhzSJ@HaHa@Ve%)fH8dRlg&CM*UiNlKUq+3)@V#2rsq>wswP- zww-N@H9HKtdV>1hMyVE-SH~4IE51x=RbIzn$Y>DnmrBhQDSu1KsTQ#U3S2EYv zH#e|%IB=5d@O0Kz*LBlm%I3tBO*?l~_0jvWj7Op@ky)oIR+(y z!2BUu;u=xnoS&PUnpeW$T$GwvlA5AWo>`Ki;O^-g5Z=fq4pgKHQj`LevPuT4U@$T; zGS)S)&^0g&F*39=Ft;)?&^9ozGBDuNaqB|Skei>9nO2EgLw(^tGoS_yxD6$lxv9k^ ziMa)sdQ1!@G4blV5wpPjc1(ija=@}&q0i{VfnaK(+`MHUidD|u$Mgx^8 z!IY(>7AF^F7L;V>=P`ghr;t>dnNy;hnWs=3b`Ho)PG(@xm{>c}*5h!1 zNUMMFR#z>)FoD7o0dwChQtFFpRSMzQ>a?0qP5*DR8n0(p_u>ap1s~EkzIyOz&FbdW z3LO6$cI>jy+~v{vUA0xrFs@=x|L1p>d&=b%OtgG9?@D9z-F~*jNHMK=b7Y% zxt5eP$>K>!anz z9iHMUbx(FZ`Y8Q;(P^ghJ+o$hu_>Gqp;NZu(!n(;Sx1787=~Wfj6YGers&?IHKAE+ zO8x&G@`#I%d}g&)P-SC>s)xYB1#L!J8w8ifsvmWlbxzpsU*dKBiQbCgl07oqE1a6& z{5tsm!S|fChn}=d7x84ctKaw8kgKJvG3{>QzJA%|l}s%28@2boU2oPf)Bn=zT-`F3 zFZs;k*K>VuGV7H$EL3+kOAY6`B*ew~;BU`9O?I9;OnbBM-HCc`QOjUtvib^dK>O8&7|8CjBMe`s2{`HOB#oH_VvCwt733*I{H%z~5G1>gp%+vej&ax(FGLmv zGCX^Ur>`sfa}GvPcFhR)LwrCzhpIv%N`ey06$*;-(=u~X6-p`#QWd~ufJN`p;OIUX zMV>#;MJ$^>ZnpH}Hwk)I-zdTJ`PNO3*%7@_Qx?X|Q2M*h^sm&yHcqz(oKaJ^NHTtI z+43?qN8`k?4uy6ROThzrpT9g*{;i(8lHYsQ)E=H2hK%bz@L$}U#r3Si?Z&%PbrLVz zU(epuHPLNh4|keJoq@rY44-RL6-+<#9Xxhgup;exb%nK9-MX*@-+Sk79`o38yiNSi zs`5MYKIoqK=y;^gSW(n?J=X(iyT|v}_&cv!xNXK|zYX6H@owmQ@G7q0-j2763yXHl zdhuKL?d&yLRh=Afd9~lN+;e*H=&*pF`swl!lE}*%DxJ= z7(EYLcIY0L&!4hqKl4`$ZMEuLwfe^rhw3>!eR3@!c3Q4_wjy7X?;Z2iu2(sdWSoEe z&-2BW3vT8X+dosdHP`*?j6D@mCXT1>cqAHIJpJ})H^(iPf}q*bt%nn0UdKduS%$YN zybId@`EK5~+glIU7035{mv>q3=2Oq`QeXb(#9-|JU~C$Dx;TbdoK8+?V0KeW6BA40 zNJ~pgJ;0FjMrKY-!GT_1Mt*&HnGeZ<3JMxW8u&MGa&&h%HOyGC!a|HyXwsyh1ePOL zFU{aeNqPF@=~IOW$3Us|xjbH{DnwSSShX@c<5A#(rE3?jYw>T?^Jp|u6#k%nL3x40 z{08YQU%qyHU`_2)$zXMK7y6>6XfE+WI3OV-WldgE*Gh-eXJig-*buUH)3a@k)3;yU zc=_>Gb|V>?-Z>H}b7L=vo_Hx8xog+X>WZq!s^1Ymqkb(s$^Da^g>5EVgcn-`Tf0F^ z+s?MdnjHpRJwg3_ouZ=s-Dw^E8+^972Tw?uIcL%=wnX=((y1wntQEDRts2yiE1B!- zn;Y0W95~5!csgsV>$+(&WpiT6rky*g`sxPL3Wd#EeAe$-WVDUTvYUy)_@veP9D@=; zVE&LSag8W(&d<$F%`0JWE=o--Nlj5G&n(GMaQE~L2yf&Q2P#qpDM|rKStWy2Fc=va z8S5HY=o%P?7#Ug_m|Gc}Y8x0>85m61m$?~5LvDUbW?Cg~4G$k*c2YH@N=Wo8nRyDuLGDgI>5jrc)uJ%fxruqDX^F`trA4Vl mVC6pZCY%B);Dam3Pf5*T0BMa*@N@>sFnGH9xvXb`Ho)PG(@xm{>c}*5h!1 zNUMMFR#z>)FoD7o0dwChQtFFpRSMzQ>a?0qP5*DR8n0(p_u>ap1s~EkzIyOz&FbdW z3LO6$cI>jy+~v{vUA0xrFs@=x|L1p>d&=b%OtgG9?@D9z-F~*jNHMK=b7Y% zxt5eP$>K>!anz z9iHMUbx(FZ`Y8Q;(P^ghJ+o$hu_>Gqp;NZu(!n(;Sx1787=~Wfj6YGers&?IHKAE+ zO8x&G@`#I%d}g&)P-SC>s)xYB1#L!J8w8ifsvmWlbxzpsU*dKBiQbCgl07oqE1a6& z{5tsm!S|fChn}=d7x84ctKaw8kgKJvG3{>QzJA%|l}s%28@2boU2oPf)Bn=zT-`F3 zFZs;k*K>VuGV7H$EL3+kOAY6`B*ew~;BU`9O?I9;OnbBM-HCc`QOjUtvib^dK>?#m z+27BfUf;6P)p>fE|J|~Mi{?N4{p%aMi?>(!W1;JE6Y`h@ZUj@UH?2?in;fJ zf%57Fj(X>~gZCe{Nt}1`!VcFIBYsApGZ>S+-Cb%fZc~T{aySb-B8!2^L&+-&K`ZxZybzEOhb^R1g6vm<(=rYww^q4am1>0haZZJcfoIHRU+k!1Yb zvgKuJj>d^&9SZFtmVyWLK7Vnvb;J>&xi|bj3+l_ap>Lgya zzn;CRYogo29_}=cIs=0(89vvhDwuxeJ9zB0U`5*X>I!SIx^-a*zW2`EJm#_Gc$@g2 zRpoc)eb7De(eX%~v7)H)daei3c8~9`@poReaNCT_ejC0Y;@!~q;8k3~y&Z2C7Z&Z9 z_2Reg+u3WhsyaE|@@l_jx##rY(P7sUJGK@E$odr*uT;Mx-m8`z{aO1Ok2i-NQ;qn9 zf9n+H^Rpg4vRT4yV`R%Bj?KcE^8AO~>ogjUPp;^Cm{4K7q1vmHV?OW9g+*_slzkO! zF?t@h?9e?fpFd^Ke&(+h+G^FgYW0sL4%Ksd`s7+d?6h35%-#g~3U9WN^$vFS` zpXZA$7u?J(wtuE@Yp(m(8G93+pZjM_n1wpf=TMsA1ypDrM~>niNV?dz}PhQba4!^IGvo(!0e`$CMK4~ zk(QR0dVnG4jm(^wf&;z2jQslYG9Quy6%;g%H1KcW_##&y>lc|=EhzSJ@HaHa@Ve%)fH8dRlg&CM*UiNlKUq+3)@V#2rsq>wswP- zww-N@H9HKtdV>1hMyVE-SH~4IE51x=RbIzn$Y>DnmrBhQDSu1KsTQ#U3S2EYv zH#e|%IB=5d@O0Kz*LBlm%I3tBO*?l~_0jvWj7Op@ky)oIR+(y z!2BUu;u=xnoS&PUnpeW$T$GwvlA5AWo>`Ki;O^-g5Z=fq4pgKHQj`LevPuT4U@$T; zGS)S)&^0g&F*39=Ft;)?);2J(GBB_|5`(HCH$NpatrE8eznM=~18vZN+fb63n_66w zm|K9U$HWj~iAT-dTR=V1AU(irYn7Z|P+63jo>9UOP@0sJnXKTFpPQJOw{416IqA=CDiFu`IiOD6UMX5z# lWc)I$ztaD0e0stU6Sc3on literal 0 HcmV?d00001 diff --git a/public/img/logos/jerkaoke/thumbs/jerkaoke.png b/public/img/logos/jerkaoke/thumbs/jerkaoke.png index fcd276526fc07e86632e879bee9713dfc85cc8bb..1093c5f009516473b27c04ee5706eb2df94a542e 100644 GIT binary patch delta 51 zcmX?;a3)~`D-$ONqbR#(g!>`B&3sJLb;K=n4Gcq!46O{ztxOEH4GgRd3_NP?-rBrJ HZvrC#aGDPO delta 51 zcmX?;a3)~`D-$QXoTvaZPiTDDW`B&3sHVb;K=n4Gcq!46O{ztxOEH4GgRd3_NP?-rBrR HZvrC#ai|Xl delta 51 zcmX??a4um3D-$QXoTvaZPiTDDW { + const [han, english] = actor.split('/').map((name) => name.trim()); + + if (/amateur/i.test(english)) { + // not a name + return null; + } + + return { + name: english || han, + alias: english && han, + }; + }).filter(Boolean); + } + + const rawTitle = query.content('.video-title div')?.replace(release.shootId, ''); + + if (rawTitle) { + // find / closest to Han in case there are multiple, account for no / at all + const hanIndex = rawTitle.match(/\p{Script_Extensions=Han}/u)?.index; + const splitIndex = rawTitle.slice(0, hanIndex).lastIndexOf('/') || hanIndex; + + if (hanIndex && splitIndex > -1) { + release.title = rawTitle.slice(0, splitIndex).trim(); + release.altTitles = [rawTitle.slice(splitIndex + 1).trim()]; + } else { + release.title = rawTitle; + } } - release.title = query.content('.video-title div'); release.duration = query.duration('.timestamp'); const poster = query.img('img', { attribute: 'data-src' }); @@ -31,8 +59,6 @@ function scrapeAll(scenes) { release.teaser = query.video(null, { attribute: 'data-video-src' }); - console.log(release); - return release; }); } @@ -49,17 +75,16 @@ function scrapeProfile({ query }) { } profile.description = query.content('h2') || null; - profile.height = query.number('//span[text()="Measurements"]/following-sibling::span', { match: /(\d+) cm/, matchIndex: 1 }); + profile.height = query.number('//span[text()="Height"]/following-sibling::span', { match: /(\d+) cm/, matchIndex: 1 }); profile.weight = query.number('//span[text()="Weight"]/following-sibling::span', { match: /(\d+) kg/, matchIndex: 1 }); - profile.measurements = query.number('//span[text()="Birth Place"]/following-sibling::span', { match: /(\d+) cm/, matchIndex: 1 }); + // can't find a single profile wiht this information available, but add for good measure + profile.measurements = query.content('//span[text()="Measurements"]/following-sibling::span'); profile.birthPlace = query.number('//span[text()="Birth Place"]/following-sibling::span'); profile.banner = query.img('div[class*="banner"] > img'); profile.photos = query.imgs('#MusModelSwiper img'); - console.log(profile); - return profile; } diff --git a/src/scrapers/scrapers.js b/src/scrapers/scrapers.js index 555f11c07..3f17d06c2 100755 --- a/src/scrapers/scrapers.js +++ b/src/scrapers/scrapers.js @@ -82,6 +82,7 @@ const scrapers = { americanpornstar, amateureuro: porndoe, archangel, + asiam: modelmedia, assylum, aziani, badoink, @@ -115,6 +116,7 @@ const scrapers = { interracialpass: hush, inthecrack, jayrock, + jerkaoke: modelmedia, jesseloadsmonsterfacials, julesjordan, karups, @@ -178,6 +180,7 @@ const scrapers = { analviolation: fullpornnetwork, anilos: nubiles, archangel, + asiam: modelmedia, aziani, babes: mindgeek, babevr: badoink, @@ -234,6 +237,7 @@ const scrapers = { interracialpovs: hush, inthecrack, jamesdeen: fullpornnetwork, + jerkaoke: modelmedia, julesjordan, karups, kellymadison, diff --git a/src/store-releases.js b/src/store-releases.js index b3a5c6e24..5b4766bbb 100755 --- a/src/store-releases.js +++ b/src/store-releases.js @@ -32,6 +32,7 @@ async function curateReleaseEntry(release, batchId, existingRelease, type = 'sce const curatedRelease = { title: decode(release.title), + alt_titles: release.altTitles?.map((title) => decode(title)), entry_id: release.entryId || null, entity_id: release.entity.id, studio_id: release.studio?.id || null, @@ -46,6 +47,8 @@ async function curateReleaseEntry(release, batchId, existingRelease, type = 'sce updated_batch_id: batchId, }; + console.log(curatedRelease); + if (release.id) { // release is updated curatedRelease.id = release.id; diff --git a/src/utils/resolve-place.js b/src/utils/resolve-place.js index c829e863a..2e1bf9704 100755 --- a/src/utils/resolve-place.js +++ b/src/utils/resolve-place.js @@ -1,5 +1,7 @@ 'use strict'; +const config = require('config'); + const knex = require('../knex'); const logger = require('../logger')(__filename); const http = require('./http'); @@ -27,7 +29,7 @@ async function resolvePlace(query) { // https://operations.osmfoundation.org/policies/nominatim/ const res = await http.get(`https://nominatim.openstreetmap.org/search/${encodeURI(query)}?format=json&accept-language=en&addressdetails=1`, { headers: { - 'User-Agent': 'contact at moonloop.adult@protonmail.com', + 'User-Agent': config.location.userAgent, }, interval: 1000, concurrency: 1,