diff --git a/assets/components/tags/tags.vue b/assets/components/tags/tags.vue index 607848e6..7627f2ac 100644 --- a/assets/components/tags/tags.vue +++ b/assets/components/tags/tags.vue @@ -65,30 +65,37 @@ async function mounted() { ], oral: [ 'blowjob', - 'deepthroat', - 'facefucking', - 'double-blowjob', - 'blowbang', 'pussy-eating', 'ass-eating', + '69', + 'double-blowjob', + 'deepthroat', + 'facefucking', + 'blowbang', 'atm', ], + manual: [ + 'handjob', + 'fingering', + 'anal-fingering', + 'titty-fucking', + ], cumshot: [ 'facial', - 'bukkake', + 'cum-on-boobs', + 'cum-on-butt', + 'cum-in-mouth', 'creampie', 'anal-creampie', - 'cum-in-mouth', 'oral-creampie', - 'cum-on-butt', + 'bukkake', ], - extreme: [ - 'airtight', - 'dap', - 'dvp', - 'da-tp', - 'dv-tp', - 'tap', + toys: [ + 'toy-anal', + 'toy-dp', + 'double-dildo', + 'double-dildo-blowjob', + 'double-dildo-anal', ], roleplay: [ 'family', @@ -99,13 +106,17 @@ async function mounted() { ], fetish: [ 'bdsm', - 'bondage', 'femdom', + 'bondage', + 'blindfold', ], - toys: [ - 'anal-toys', - 'double-dildo', - 'double-dildo-blowjob', + extreme: [ + 'airtight', + 'dap', + 'dvp', + 'da-tp', + 'dv-tp', + 'tap', ], misc: [ 'gaping', @@ -161,6 +172,12 @@ export default { .heading { text-transform: capitalize; + padding: 0 0 0 .5rem; + margin: 2rem 0 1rem 0; +} + +.category:first-child .heading { + margin: .5rem 0 1rem 0; } @media(max-width: $breakpoint3) { diff --git a/public/img/tags/69/2.jpeg b/public/img/tags/69/2.jpeg new file mode 100644 index 00000000..aedbf425 Binary files /dev/null and b/public/img/tags/69/2.jpeg differ diff --git a/public/img/tags/69/3.jpeg b/public/img/tags/69/3.jpeg new file mode 100644 index 00000000..628a8ffa Binary files /dev/null and b/public/img/tags/69/3.jpeg differ diff --git a/public/img/tags/69/lazy/2.jpeg b/public/img/tags/69/lazy/2.jpeg new file mode 100644 index 00000000..23f00c7c Binary files /dev/null and b/public/img/tags/69/lazy/2.jpeg differ diff --git a/public/img/tags/69/lazy/3.jpeg b/public/img/tags/69/lazy/3.jpeg new file mode 100644 index 00000000..13c08dff Binary files /dev/null and b/public/img/tags/69/lazy/3.jpeg differ diff --git a/public/img/tags/69/thumbs/2.jpeg b/public/img/tags/69/thumbs/2.jpeg new file mode 100644 index 00000000..38c09f0c Binary files /dev/null and b/public/img/tags/69/thumbs/2.jpeg differ diff --git a/public/img/tags/69/thumbs/3.jpeg b/public/img/tags/69/thumbs/3.jpeg new file mode 100644 index 00000000..942668ae Binary files /dev/null and b/public/img/tags/69/thumbs/3.jpeg differ diff --git a/public/img/tags/ass-eating/1.jpeg b/public/img/tags/ass-eating/1.jpeg new file mode 100644 index 00000000..2e294067 Binary files /dev/null and b/public/img/tags/ass-eating/1.jpeg differ diff --git a/public/img/tags/ass-eating/lazy/1.jpeg b/public/img/tags/ass-eating/lazy/1.jpeg new file mode 100644 index 00000000..aeba2ec5 Binary files /dev/null and b/public/img/tags/ass-eating/lazy/1.jpeg differ diff --git a/public/img/tags/ass-eating/lazy/1_original.jpeg b/public/img/tags/ass-eating/lazy/1_original.jpeg new file mode 100644 index 00000000..4ee446ee Binary files /dev/null and b/public/img/tags/ass-eating/lazy/1_original.jpeg differ diff --git a/public/img/tags/ass-eating/thumbs/0.jpeg b/public/img/tags/ass-eating/thumbs/0.jpeg index 49032275..023229b1 100644 Binary files a/public/img/tags/ass-eating/thumbs/0.jpeg and b/public/img/tags/ass-eating/thumbs/0.jpeg differ diff --git a/public/img/tags/ass-eating/thumbs/1.jpeg b/public/img/tags/ass-eating/thumbs/1.jpeg new file mode 100644 index 00000000..e69a095b Binary files /dev/null and b/public/img/tags/ass-eating/thumbs/1.jpeg differ diff --git a/public/img/tags/ass-eating/thumbs/1_original.jpeg b/public/img/tags/ass-eating/thumbs/1_original.jpeg new file mode 100644 index 00000000..942eb101 Binary files /dev/null and b/public/img/tags/ass-eating/thumbs/1_original.jpeg differ diff --git a/public/img/tags/blindfold/0.jpeg b/public/img/tags/blindfold/0.jpeg new file mode 100644 index 00000000..733f3853 Binary files /dev/null and b/public/img/tags/blindfold/0.jpeg differ diff --git a/public/img/tags/blindfold/0a.jpeg b/public/img/tags/blindfold/0a.jpeg new file mode 100644 index 00000000..ac16c97d Binary files /dev/null and b/public/img/tags/blindfold/0a.jpeg differ diff --git a/public/img/tags/blindfold/lazy/0.jpeg b/public/img/tags/blindfold/lazy/0.jpeg new file mode 100644 index 00000000..2b875311 Binary files /dev/null and b/public/img/tags/blindfold/lazy/0.jpeg differ diff --git a/public/img/tags/blindfold/lazy/0a.jpeg b/public/img/tags/blindfold/lazy/0a.jpeg new file mode 100644 index 00000000..bd215143 Binary files /dev/null and b/public/img/tags/blindfold/lazy/0a.jpeg differ diff --git a/public/img/tags/blindfold/thumbs/0.jpeg b/public/img/tags/blindfold/thumbs/0.jpeg new file mode 100644 index 00000000..dc9f7122 Binary files /dev/null and b/public/img/tags/blindfold/thumbs/0.jpeg differ diff --git a/public/img/tags/blindfold/thumbs/0a.jpeg b/public/img/tags/blindfold/thumbs/0a.jpeg new file mode 100644 index 00000000..9be654c4 Binary files /dev/null and b/public/img/tags/blindfold/thumbs/0a.jpeg differ diff --git a/public/img/tags/blonde/3.jpeg b/public/img/tags/blonde/3.jpeg new file mode 100644 index 00000000..2e8c74ba Binary files /dev/null and b/public/img/tags/blonde/3.jpeg differ diff --git a/public/img/tags/blonde/lazy/3.jpeg b/public/img/tags/blonde/lazy/3.jpeg new file mode 100644 index 00000000..3dc952d8 Binary files /dev/null and b/public/img/tags/blonde/lazy/3.jpeg differ diff --git a/public/img/tags/blonde/thumbs/3.jpeg b/public/img/tags/blonde/thumbs/3.jpeg new file mode 100644 index 00000000..a8ce1d69 Binary files /dev/null and b/public/img/tags/blonde/thumbs/3.jpeg differ diff --git a/public/img/tags/blowjob/1.jpeg b/public/img/tags/blowjob/1.jpeg new file mode 100644 index 00000000..ac329127 Binary files /dev/null and b/public/img/tags/blowjob/1.jpeg differ diff --git a/public/img/tags/blowjob/lazy/1.jpeg b/public/img/tags/blowjob/lazy/1.jpeg new file mode 100644 index 00000000..b3fbf471 Binary files /dev/null and b/public/img/tags/blowjob/lazy/1.jpeg differ diff --git a/public/img/tags/blowjob/thumbs/0.jpeg b/public/img/tags/blowjob/thumbs/0.jpeg index 4ecbc5e9..4e4a1a62 100644 Binary files a/public/img/tags/blowjob/thumbs/0.jpeg and b/public/img/tags/blowjob/thumbs/0.jpeg differ diff --git a/public/img/tags/blowjob/thumbs/1.jpeg b/public/img/tags/blowjob/thumbs/1.jpeg new file mode 100644 index 00000000..e09ed08c Binary files /dev/null and b/public/img/tags/blowjob/thumbs/1.jpeg differ diff --git a/public/img/tags/cum-on-boobs/0.jpeg b/public/img/tags/cum-on-boobs/0.jpeg new file mode 100644 index 00000000..f607ef57 Binary files /dev/null and b/public/img/tags/cum-on-boobs/0.jpeg differ diff --git a/public/img/tags/cum-on-boobs/1.jpeg b/public/img/tags/cum-on-boobs/1.jpeg new file mode 100644 index 00000000..319e8159 Binary files /dev/null and b/public/img/tags/cum-on-boobs/1.jpeg differ diff --git a/public/img/tags/cum-on-boobs/lazy/0.jpeg b/public/img/tags/cum-on-boobs/lazy/0.jpeg new file mode 100644 index 00000000..78306cc6 Binary files /dev/null and b/public/img/tags/cum-on-boobs/lazy/0.jpeg differ diff --git a/public/img/tags/cum-on-boobs/lazy/1.jpeg b/public/img/tags/cum-on-boobs/lazy/1.jpeg new file mode 100644 index 00000000..25e632a7 Binary files /dev/null and b/public/img/tags/cum-on-boobs/lazy/1.jpeg differ diff --git a/public/img/tags/cum-on-boobs/thumbs/0.jpeg b/public/img/tags/cum-on-boobs/thumbs/0.jpeg new file mode 100644 index 00000000..be30af6d Binary files /dev/null and b/public/img/tags/cum-on-boobs/thumbs/0.jpeg differ diff --git a/public/img/tags/cum-on-boobs/thumbs/1.jpeg b/public/img/tags/cum-on-boobs/thumbs/1.jpeg new file mode 100644 index 00000000..0efa106f Binary files /dev/null and b/public/img/tags/cum-on-boobs/thumbs/1.jpeg differ diff --git a/public/img/tags/double-dildo-anal/0.jpeg b/public/img/tags/double-dildo-anal/0.jpeg new file mode 100644 index 00000000..74d35031 Binary files /dev/null and b/public/img/tags/double-dildo-anal/0.jpeg differ diff --git a/public/img/tags/double-dildo-anal/1.jpeg b/public/img/tags/double-dildo-anal/1.jpeg new file mode 100644 index 00000000..03a0846d Binary files /dev/null and b/public/img/tags/double-dildo-anal/1.jpeg differ diff --git a/public/img/tags/double-dildo-anal/2.jpeg b/public/img/tags/double-dildo-anal/2.jpeg new file mode 100644 index 00000000..cf695641 Binary files /dev/null and b/public/img/tags/double-dildo-anal/2.jpeg differ diff --git a/public/img/tags/double-dildo-anal/lazy/0.jpeg b/public/img/tags/double-dildo-anal/lazy/0.jpeg new file mode 100644 index 00000000..422fa19b Binary files /dev/null and b/public/img/tags/double-dildo-anal/lazy/0.jpeg differ diff --git a/public/img/tags/double-dildo-anal/lazy/1.jpeg b/public/img/tags/double-dildo-anal/lazy/1.jpeg new file mode 100644 index 00000000..0d87ca0d Binary files /dev/null and b/public/img/tags/double-dildo-anal/lazy/1.jpeg differ diff --git a/public/img/tags/double-dildo-anal/lazy/2.jpeg b/public/img/tags/double-dildo-anal/lazy/2.jpeg new file mode 100644 index 00000000..93d6ba0d Binary files /dev/null and b/public/img/tags/double-dildo-anal/lazy/2.jpeg differ diff --git a/public/img/tags/double-dildo-anal/thumbs/0.jpeg b/public/img/tags/double-dildo-anal/thumbs/0.jpeg new file mode 100644 index 00000000..5ed7ae6b Binary files /dev/null and b/public/img/tags/double-dildo-anal/thumbs/0.jpeg differ diff --git a/public/img/tags/double-dildo-anal/thumbs/1.jpeg b/public/img/tags/double-dildo-anal/thumbs/1.jpeg new file mode 100644 index 00000000..d039276e Binary files /dev/null and b/public/img/tags/double-dildo-anal/thumbs/1.jpeg differ diff --git a/public/img/tags/double-dildo-anal/thumbs/2.jpeg b/public/img/tags/double-dildo-anal/thumbs/2.jpeg new file mode 100644 index 00000000..8a8d1290 Binary files /dev/null and b/public/img/tags/double-dildo-anal/thumbs/2.jpeg differ diff --git a/public/img/tags/fake-boobs/11.jpeg b/public/img/tags/fake-boobs/11.jpeg new file mode 100644 index 00000000..b0ea1fd3 Binary files /dev/null and b/public/img/tags/fake-boobs/11.jpeg differ diff --git a/public/img/tags/fake-boobs/3.jpeg b/public/img/tags/fake-boobs/3.jpeg index 787d2c64..76688fda 100644 Binary files a/public/img/tags/fake-boobs/3.jpeg and b/public/img/tags/fake-boobs/3.jpeg differ diff --git a/public/img/tags/fake-boobs/lazy/11.jpeg b/public/img/tags/fake-boobs/lazy/11.jpeg new file mode 100644 index 00000000..b8b159ab Binary files /dev/null and b/public/img/tags/fake-boobs/lazy/11.jpeg differ diff --git a/public/img/tags/fake-boobs/lazy/3.jpeg b/public/img/tags/fake-boobs/lazy/3.jpeg index 9867fc70..09bd3e97 100644 Binary files a/public/img/tags/fake-boobs/lazy/3.jpeg and b/public/img/tags/fake-boobs/lazy/3.jpeg differ diff --git a/public/img/tags/fake-boobs/thumbs/11.jpeg b/public/img/tags/fake-boobs/thumbs/11.jpeg new file mode 100644 index 00000000..55cfc971 Binary files /dev/null and b/public/img/tags/fake-boobs/thumbs/11.jpeg differ diff --git a/public/img/tags/fake-boobs/thumbs/3.jpeg b/public/img/tags/fake-boobs/thumbs/3.jpeg index de2a9720..c1ab9d6a 100644 Binary files a/public/img/tags/fake-boobs/thumbs/3.jpeg and b/public/img/tags/fake-boobs/thumbs/3.jpeg differ diff --git a/public/img/tags/gangbang/6.jpeg b/public/img/tags/gangbang/6.jpeg new file mode 100644 index 00000000..06628bc3 Binary files /dev/null and b/public/img/tags/gangbang/6.jpeg differ diff --git a/public/img/tags/gangbang/lazy/6.jpeg b/public/img/tags/gangbang/lazy/6.jpeg new file mode 100644 index 00000000..11462a52 Binary files /dev/null and b/public/img/tags/gangbang/lazy/6.jpeg differ diff --git a/public/img/tags/gangbang/thumbs/6.jpeg b/public/img/tags/gangbang/thumbs/6.jpeg new file mode 100644 index 00000000..8fb6e946 Binary files /dev/null and b/public/img/tags/gangbang/thumbs/6.jpeg differ diff --git a/public/img/tags/latina/3.jpeg b/public/img/tags/latina/3.jpeg new file mode 100644 index 00000000..754ed518 Binary files /dev/null and b/public/img/tags/latina/3.jpeg differ diff --git a/public/img/tags/latina/lazy/3.jpeg b/public/img/tags/latina/lazy/3.jpeg new file mode 100644 index 00000000..103bac7c Binary files /dev/null and b/public/img/tags/latina/lazy/3.jpeg differ diff --git a/public/img/tags/latina/thumbs/3.jpeg b/public/img/tags/latina/thumbs/3.jpeg new file mode 100644 index 00000000..c61778f3 Binary files /dev/null and b/public/img/tags/latina/thumbs/3.jpeg differ diff --git a/public/img/tags/lesbian/1.jpeg b/public/img/tags/lesbian/1.jpeg new file mode 100644 index 00000000..370f1790 Binary files /dev/null and b/public/img/tags/lesbian/1.jpeg differ diff --git a/public/img/tags/lesbian/lazy/1.jpeg b/public/img/tags/lesbian/lazy/1.jpeg new file mode 100644 index 00000000..58a49cd7 Binary files /dev/null and b/public/img/tags/lesbian/lazy/1.jpeg differ diff --git a/public/img/tags/lesbian/thumbs/0.jpeg b/public/img/tags/lesbian/thumbs/0.jpeg index 5d9f3563..016f01d7 100644 Binary files a/public/img/tags/lesbian/thumbs/0.jpeg and b/public/img/tags/lesbian/thumbs/0.jpeg differ diff --git a/public/img/tags/lesbian/thumbs/1.jpeg b/public/img/tags/lesbian/thumbs/1.jpeg new file mode 100644 index 00000000..21b78a90 Binary files /dev/null and b/public/img/tags/lesbian/thumbs/1.jpeg differ diff --git a/public/img/tags/lesbian/thumbs/poster.jpeg b/public/img/tags/lesbian/thumbs/poster.jpeg index 2c06f7f3..95aa56b5 100644 Binary files a/public/img/tags/lesbian/thumbs/poster.jpeg and b/public/img/tags/lesbian/thumbs/poster.jpeg differ diff --git a/public/img/tags/maid/1.jpeg b/public/img/tags/maid/1.jpeg new file mode 100644 index 00000000..06bce476 Binary files /dev/null and b/public/img/tags/maid/1.jpeg differ diff --git a/public/img/tags/maid/lazy/1.jpeg b/public/img/tags/maid/lazy/1.jpeg new file mode 100644 index 00000000..b04897ef Binary files /dev/null and b/public/img/tags/maid/lazy/1.jpeg differ diff --git a/public/img/tags/maid/thumbs/0.jpeg b/public/img/tags/maid/thumbs/0.jpeg index db9d9593..2a884c92 100644 Binary files a/public/img/tags/maid/thumbs/0.jpeg and b/public/img/tags/maid/thumbs/0.jpeg differ diff --git a/public/img/tags/maid/thumbs/1.jpeg b/public/img/tags/maid/thumbs/1.jpeg new file mode 100644 index 00000000..1e977970 Binary files /dev/null and b/public/img/tags/maid/thumbs/1.jpeg differ diff --git a/public/img/tags/natural-boobs/2.jpeg b/public/img/tags/natural-boobs/2.jpeg new file mode 100644 index 00000000..32cc4b79 Binary files /dev/null and b/public/img/tags/natural-boobs/2.jpeg differ diff --git a/public/img/tags/natural-boobs/3.jpeg b/public/img/tags/natural-boobs/3.jpeg new file mode 100644 index 00000000..dd838b90 Binary files /dev/null and b/public/img/tags/natural-boobs/3.jpeg differ diff --git a/public/img/tags/natural-boobs/lazy/2.jpeg b/public/img/tags/natural-boobs/lazy/2.jpeg new file mode 100644 index 00000000..4fe0e1d3 Binary files /dev/null and b/public/img/tags/natural-boobs/lazy/2.jpeg differ diff --git a/public/img/tags/natural-boobs/lazy/3.jpeg b/public/img/tags/natural-boobs/lazy/3.jpeg new file mode 100644 index 00000000..00cf8944 Binary files /dev/null and b/public/img/tags/natural-boobs/lazy/3.jpeg differ diff --git a/public/img/tags/natural-boobs/thumbs/2.jpeg b/public/img/tags/natural-boobs/thumbs/2.jpeg new file mode 100644 index 00000000..6145b9ca Binary files /dev/null and b/public/img/tags/natural-boobs/thumbs/2.jpeg differ diff --git a/public/img/tags/natural-boobs/thumbs/3.jpeg b/public/img/tags/natural-boobs/thumbs/3.jpeg new file mode 100644 index 00000000..81497def Binary files /dev/null and b/public/img/tags/natural-boobs/thumbs/3.jpeg differ diff --git a/public/img/tags/pussy-eating/2.jpeg b/public/img/tags/pussy-eating/2.jpeg new file mode 100644 index 00000000..d29769e1 Binary files /dev/null and b/public/img/tags/pussy-eating/2.jpeg differ diff --git a/public/img/tags/pussy-eating/3.jpeg b/public/img/tags/pussy-eating/3.jpeg new file mode 100644 index 00000000..b2e4ac55 Binary files /dev/null and b/public/img/tags/pussy-eating/3.jpeg differ diff --git a/public/img/tags/pussy-eating/lazy/2.jpeg b/public/img/tags/pussy-eating/lazy/2.jpeg new file mode 100644 index 00000000..3a0c8ed1 Binary files /dev/null and b/public/img/tags/pussy-eating/lazy/2.jpeg differ diff --git a/public/img/tags/pussy-eating/lazy/3.jpeg b/public/img/tags/pussy-eating/lazy/3.jpeg new file mode 100644 index 00000000..dbcf993e Binary files /dev/null and b/public/img/tags/pussy-eating/lazy/3.jpeg differ diff --git a/public/img/tags/pussy-eating/thumbs/0.jpeg b/public/img/tags/pussy-eating/thumbs/0.jpeg index 9ce333dc..7f78147f 100644 Binary files a/public/img/tags/pussy-eating/thumbs/0.jpeg and b/public/img/tags/pussy-eating/thumbs/0.jpeg differ diff --git a/public/img/tags/pussy-eating/thumbs/1.jpeg b/public/img/tags/pussy-eating/thumbs/1.jpeg index 63b8c52c..117ede1c 100644 Binary files a/public/img/tags/pussy-eating/thumbs/1.jpeg and b/public/img/tags/pussy-eating/thumbs/1.jpeg differ diff --git a/public/img/tags/pussy-eating/thumbs/2.jpeg b/public/img/tags/pussy-eating/thumbs/2.jpeg new file mode 100644 index 00000000..5ef68ac5 Binary files /dev/null and b/public/img/tags/pussy-eating/thumbs/2.jpeg differ diff --git a/public/img/tags/pussy-eating/thumbs/3.jpeg b/public/img/tags/pussy-eating/thumbs/3.jpeg new file mode 100644 index 00000000..c6ab3155 Binary files /dev/null and b/public/img/tags/pussy-eating/thumbs/3.jpeg differ diff --git a/public/img/tags/titty-fucking/0.jpeg b/public/img/tags/titty-fucking/0.jpeg new file mode 100644 index 00000000..cec83d63 Binary files /dev/null and b/public/img/tags/titty-fucking/0.jpeg differ diff --git a/public/img/tags/titty-fucking/lazy/0.jpeg b/public/img/tags/titty-fucking/lazy/0.jpeg new file mode 100644 index 00000000..2a42a591 Binary files /dev/null and b/public/img/tags/titty-fucking/lazy/0.jpeg differ diff --git a/public/img/tags/titty-fucking/thumbs/0.jpeg b/public/img/tags/titty-fucking/thumbs/0.jpeg new file mode 100644 index 00000000..7c6937f5 Binary files /dev/null and b/public/img/tags/titty-fucking/thumbs/0.jpeg differ diff --git a/public/img/tags/anal-toys/0.jpeg b/public/img/tags/toy-anal/0.jpeg similarity index 100% rename from public/img/tags/anal-toys/0.jpeg rename to public/img/tags/toy-anal/0.jpeg diff --git a/public/img/tags/toy-anal/1.jpeg b/public/img/tags/toy-anal/1.jpeg new file mode 100644 index 00000000..f3e5fec0 Binary files /dev/null and b/public/img/tags/toy-anal/1.jpeg differ diff --git a/public/img/tags/anal-toys/lazy/0.jpeg b/public/img/tags/toy-anal/lazy/0.jpeg similarity index 100% rename from public/img/tags/anal-toys/lazy/0.jpeg rename to public/img/tags/toy-anal/lazy/0.jpeg diff --git a/public/img/tags/toy-anal/lazy/1.jpeg b/public/img/tags/toy-anal/lazy/1.jpeg new file mode 100644 index 00000000..61675bf9 Binary files /dev/null and b/public/img/tags/toy-anal/lazy/1.jpeg differ diff --git a/public/img/tags/anal-toys/thumbs/0.jpeg b/public/img/tags/toy-anal/thumbs/0.jpeg similarity index 100% rename from public/img/tags/anal-toys/thumbs/0.jpeg rename to public/img/tags/toy-anal/thumbs/0.jpeg diff --git a/public/img/tags/toy-anal/thumbs/1.jpeg b/public/img/tags/toy-anal/thumbs/1.jpeg new file mode 100644 index 00000000..b3b99930 Binary files /dev/null and b/public/img/tags/toy-anal/thumbs/1.jpeg differ diff --git a/public/img/tags/toy-dp/0.jpeg b/public/img/tags/toy-dp/0.jpeg new file mode 100644 index 00000000..36688129 Binary files /dev/null and b/public/img/tags/toy-dp/0.jpeg differ diff --git a/public/img/tags/toy-dp/1.jpeg b/public/img/tags/toy-dp/1.jpeg new file mode 100644 index 00000000..769027a4 Binary files /dev/null and b/public/img/tags/toy-dp/1.jpeg differ diff --git a/public/img/tags/toy-dp/1a.jpeg b/public/img/tags/toy-dp/1a.jpeg new file mode 100644 index 00000000..8813a2bd Binary files /dev/null and b/public/img/tags/toy-dp/1a.jpeg differ diff --git a/public/img/tags/toy-dp/lazy/0.jpeg b/public/img/tags/toy-dp/lazy/0.jpeg new file mode 100644 index 00000000..3385091a Binary files /dev/null and b/public/img/tags/toy-dp/lazy/0.jpeg differ diff --git a/public/img/tags/toy-dp/lazy/1.jpeg b/public/img/tags/toy-dp/lazy/1.jpeg new file mode 100644 index 00000000..490bd800 Binary files /dev/null and b/public/img/tags/toy-dp/lazy/1.jpeg differ diff --git a/public/img/tags/toy-dp/lazy/1a.jpeg b/public/img/tags/toy-dp/lazy/1a.jpeg new file mode 100644 index 00000000..bf450717 Binary files /dev/null and b/public/img/tags/toy-dp/lazy/1a.jpeg differ diff --git a/public/img/tags/toy-dp/thumbs/0.jpeg b/public/img/tags/toy-dp/thumbs/0.jpeg new file mode 100644 index 00000000..863e39ad Binary files /dev/null and b/public/img/tags/toy-dp/thumbs/0.jpeg differ diff --git a/public/img/tags/toy-dp/thumbs/1.jpeg b/public/img/tags/toy-dp/thumbs/1.jpeg new file mode 100644 index 00000000..eecbb406 Binary files /dev/null and b/public/img/tags/toy-dp/thumbs/1.jpeg differ diff --git a/public/img/tags/toy-dp/thumbs/1a.jpeg b/public/img/tags/toy-dp/thumbs/1a.jpeg new file mode 100644 index 00000000..544f4b0c Binary files /dev/null and b/public/img/tags/toy-dp/thumbs/1a.jpeg differ diff --git a/seeds/00_tags.js b/seeds/00_tags.js index 085eb7eb..85e5c550 100644 --- a/seeds/00_tags.js +++ b/seeds/00_tags.js @@ -103,8 +103,8 @@ const tags = [ group: 'penetration', }, { - name: 'ass fingering', - slug: 'ass-fingering', + name: 'anal fingering', + slug: 'anal-fingering', description: 'Inserting one or multiple fingers into the asshole.', }, { @@ -116,12 +116,6 @@ const tags = [ name: 'anal prolapse', slug: 'anal-prolapse', }, - { - name: 'anal toys', - slug: 'anal-toys', - description: 'Stuffing a toy, such as a dildo or buttplug, into the ass', - priority: 7, - }, { name: 'animated', slug: 'animated', @@ -212,6 +206,11 @@ const tags = [ slug: 'black-hair', group: 'hair', }, + { + name: 'blindfold', + slug: 'blindfold', + group: 'clothing', + }, { name: 'blonde', slug: 'blonde', @@ -424,7 +423,7 @@ const tags = [ group: 'finish', }, { - name: 'family taboo', + name: 'family', slug: 'family', priority: 7, }, @@ -851,14 +850,26 @@ const tags = [ group: 'age', }, { - name: 'titty fuck', - slug: 'titty-fuck', + name: 'titty fucking', + slug: 'titty-fucking', }, { name: 'toys', slug: 'toys', priority: 7, }, + { + name: 'toy anal', + slug: 'toy-anal', + description: 'Stuffing a toy, such as a dildo or buttplug, into the ass', + priority: 7, + }, + { + name: 'toy DP', + slug: 'toy-dp', + description: 'Getting [double penetrated](/tag/dp) with dildos, strap-ons or buttplugs.', + priority: 4, + }, { name: 'transsexual', slug: 'transsexual', @@ -987,8 +998,12 @@ const aliases = [ for: 'asian', }, { - name: 'anal fingering', - for: 'ass-fingering', + name: 'ass fingering', + for: 'anal-fingering', + }, + { + name: 'anal toys', + for: 'toy-anal', }, { name: 'ass licking', @@ -1002,6 +1017,11 @@ const aliases = [ name: 'ass fucking', for: 'anal', }, + { + name: 'ass to ass', + for: 'double-dildo-anal', + secondary: true, + }, { name: 'ass to other girl\'s mouth', for: 'atogm', @@ -1050,13 +1070,18 @@ const aliases = [ }, { name: 'boob fucking', - for: 'titty-fuck', + for: 'titty-fucking', }, { name: 'behind the scenes', for: 'bts', secondary: true, }, + { + name: 'blindfolded', + for: 'blindfold', + secondary: true, + }, { name: 'making of', for: 'bts', @@ -1711,7 +1736,7 @@ const aliases = [ }, { name: 'tittyfuck', - for: 'titty-fuck', + for: 'titty-fucking', secondary: true, }, { diff --git a/seeds/02_sites.js b/seeds/02_sites.js index 72401365..c9df50be 100644 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -4246,7 +4246,7 @@ const sites = [ name: 'Operación Limpieza', slug: 'operacionlimpieza', url: 'https://mamacitaz.com/channels/operation-limpieza.en.html', - tags: ['latina', 'maid'], + tags: ['latina'], parent: 'mamacitaz', }, // METRO HD diff --git a/seeds/04_media.js b/seeds/04_media.js index 1c5ef822..a22c5884 100644 --- a/seeds/04_media.js +++ b/seeds/04_media.js @@ -586,17 +586,17 @@ const sfw = Object.entries({ .flat(); const tagPosters = [ - ['69', 1, 'Melody Petite for 21Sextury'], + ['69', 0, 'Abby Lee Brazil and Ramon Nomar for Wicked'], ['airtight', 6, 'Remy Lacroix in "Ass Worship 14" for Jules Jordan'], ['anal', 0, 'Adriana Chechik in "Manuel Creampies Their Asses 3" for Jules Jordan'], ['anal-creampie', 1, 'Aleska Diamond in "Aleska Wants More" for Asshole Fever'], - ['anal-toys', 0, 'Kira Noir in 1225 for InTheCrack'], - ['ass-eating', 0, 'Angelica Heart and Leanna Sweet in "ATM Bitches" for Asshole Fever'], + ['ass-eating', 1, 'Aidra Fox and Cassidy Klein in "Lesbian Anal Yoga" for LesbianX'], ['asian', 0, 'Vina Sky for Erotica X'], ['atm', 2, 'Jureka Del Mar in "Stretched Out" for Her Limit'], ['atogm', 0, 'Alysa Gap and Logan in "Anal Buffet 4" for Evil Angel'], ['bdsm', 0, 'Dani Daniels in "The Traning of Dani Daniels, Day 2" for The Training of O at Kink'], ['bts', 0, 'Janice Griffith in "Day With A Pornstar: Janice" for Brazzers'], + ['blindfold', 0, 'Kylie Page in "Natural Blindfolded Beauties" for Hustler'], ['blonde', 1, 'Marsha May in "Once You Go Black 7" for Jules Jordan'], ['blowbang', 0, 'Lacy Lennon in "Lacy Lennon\'s First Blowbang" for HardX'], ['blowjob', 0, 'Adriana Chechik in "The Dinner Party" for Real Wife Stories (Brazzers)'], @@ -607,11 +607,13 @@ const tagPosters = [ ['creampie', 'poster', 'ALina Lopez in "Making Yourself Unforgettable" for Blacked'], ['cum-in-mouth', 1, 'Sarah Vandella in "Blow Bang Vandella" for HardX'], ['cum-on-butt', 0, 'Jynx Maze in "Don\'t Make Me Beg 4" for Evil Angel'], + ['cum-on-boobs', 1, 'Kylie Page in "Melt In Your Mouth" for Twistys Hard'], ['da-tp', 5, 'Venera Maxima in LegalPorno GIO1287'], ['deepthroat', 2, 'Sarah Vandella for Throated'], ['dap', 7, 'Adriana Chechik in "DP Masters 6" for Jules Jordan'], ['double-blowjob', 1, 'Veronica Rodriguez and Penny Pax in "Fucking Older Guys 5" for Penthouse'], ['double-dildo', 0, 'Kali Roses in "Double Dildo Party" for KaliRoses.com'], + ['double-dildo-anal', 0, 'Vina Sky and Kenzie Reeves in "Vina Sky\'s 1st Lesbian Anal" for HardX'], ['double-dildo-blowjob', 0, 'Adriana Chechik and Vicki Chase in "Anal Savages 1" for Jules Jordan'], ['dp', 3, 'Hime Marie in LegalPorno AA047'], ['dvp', 'poster', 'Riley Reid in "Pizza That Ass" for Reid My Lips'], @@ -626,13 +628,13 @@ const tagPosters = [ ['gaping', 1, 'Vina Sky in "Vina Sky Does Anal" for HardX'], ['indian', 0, 'Resha in "Casting Resha" for Watch 4 Beauty'], ['interracial', 0, 'Jaye Summers and Prince Yahshua in "Platinum Pussy 3" for Jules Jordan'], - ['latina', 2, 'Veronica Leal for Her Limit'], + ['latina', 3, 'Gina Valentina and Veronica Rodriguez in "Squirting Latinas" for LesbianX'], ['lesbian', 0, 'Jenna Sativa and Alina Lopez in "Opposites Attract" for Girl Girl'], ['maid', 0, 'Whitney Wright in "Dredd Up Your Ass 2" for Jules Jordan'], ['milf', 1, 'Francesca Le for Evil Angel'], ['mff', 1, 'Anikka Albrite, Kelsi Monroe and Mick Blue for HardX'], ['mfm', 0, 'Vina Sky in "Jules Jordan\'s Three Ways" for Jules Jordan'], - ['natural-boobs', 1, 'Nia Nacci for First Class POV'], + ['natural-boobs', 3, 'Violet Starr in "Violet Starr 1st Lesbian Anal" for LesbianX'], ['nurse', 0, 'Sarah Vandella in "Cum For Nurse Sarah" for Brazzers'], ['oil', 2, 'Jade Kush for Passion HD'], ['oral-creampie', 1, 'Valentina Nappi for Her Limit'], @@ -640,13 +642,16 @@ const tagPosters = [ ['parody', 0, 'Capri Cavanni and Dani Daniels in "The Whore of Wall Street" for Brazzers'], ['piercings', 0, 'Kaegune in "When The Sun Goes Down" for Suicide Girls'], ['piss-drinking', 0, 'Scarlet Domingo in LegalPorno GL227'], - ['pussy-eating', 1, 'Anikka Albrite and Riley Reid for In The Crack'], + ['pussy-eating', 2, 'Anikka Albrite and Mia Malkova in "Big Anal Bombshells" for LesbianX'], ['redhead', 1, 'Lacy Lennon for Wicked'], ['squirting', 0, 'Veronica Rodriguez in "Hot Latina Squirting" for Jules Jordan'], ['schoolgirl', 1, 'Eliza Ibarra for Brazzers'], ['swallowing', 'poster'], - ['teen', 0, 'Alexa Flexy for Sensual Girl'], ['tattoos', 1, 'Joanna Angel for Joanna Angel'], + ['teen', 0, 'Alexa Flexy for Sensual Girl'], + ['titty-fucking', 0, 'Kylie Page in "Stepsis Gives Soapy Handjob In Shower" for Spy Fam'], + ['toy-anal', 1, 'Nina North and Cassidy Klein in "Nina\'s First Lesbian Anal" for LesbianX'], + ['toy-dp', 1, 'Krissy Lynn and London River in "Lesbian DP Workout" for LesbianX'], ['trainbang', 'poster', 'Kali Roses in "Passing Me Around" for Blacked'], ['tap', 'poster', 'Kristy Black in SZ1986 for LegalPorno'], ] @@ -662,7 +667,9 @@ const tagPosters = [ })); const tagPhotos = [ - ['69', 0, 'Abby Lee Brazil and Ramon Nomar for Wicked'], + ['69', 3, 'Anne Amari and Alina Lopez in "Hot Lesbian Seduction" for LesbianX'], + ['69', 1, 'Melody Petite for 21Sextury'], + ['69', 2, 'Abigail Mac and Kissa Sins in "Lesbian Anal Workout" for HardX'], ['airtight', 5, 'Chloe Amour in "DP Masters 4" for Jules Jordan'], ['airtight', 1, 'Jynx Maze in "Pump My Ass Full of Cum 3" for Jules Jordan'], ['airtight', 2, 'Dakota Skye in "Dakota Goes Nuts" for ArchAngel'], @@ -677,12 +684,18 @@ const tagPhotos = [ ['anal', 3, 'Dakota Skye for Brazzers'], // ['anal', 1, 'Veronica Leal and Tina Kay in "Agents On Anal Mission" for Asshole Fever'], // ['anal', 0, 'Veronica Leal'], + ['toy-anal', 0, 'Kira Noir in 1225 for InTheCrack'], + ['ass-eating', 0, 'Angelica Heart and Leanna Sweet in "ATM Bitches" for Asshole Fever'], ['bts', 1, 'Madison Ivy in "Day With A Pornstar" for Brazzers'], + ['blonde', 3, 'Kylie Page in "A Juicy Afternoon Delight" for New Sensations'], ['blonde', 2, 'Isabelle Deltore for Her Limit'], ['blowbang', 'poster', 'Marsha May in "Feeding Frenzy 12" for Jules Jordan'], + ['blowjob', 1, 'Kylie Page in "Stepsis Gives Soapy Handjob In Shower" for Spy Fam'], // ['bukkake', 'poster', 'Mia Malkova in "Facialized 2" for HardX'], ['caucasian', 0, 'Remy Lacroix for HardX'], ['caucasian', 1, 'Sheena Shaw for Brazzers'], + ['cum-in-mouth', 0, 'Vina Sky and Avi Love for HardX'], + ['cum-on-boobs', 0, 'Alessandra Jane for Private'], ['da-tp', 6, 'Adriana Chechik in "Gangbang Me" for HardX'], ['da-tp', 0, 'Natasha Teen in LegalPorno SZ2164'], ['da-tp', 1, 'Francys Belle in SZ1702 for LegalPorno'], @@ -697,6 +710,8 @@ const tagPhotos = [ ['deepthroat', 1, 'Jynx Maze in "Slutty and Sluttier 13" for Evil Angel'], ['deepthroat', 0, 'Chanel Grey in "Deepthroating Is Fun" for Throated'], ['double-blowjob', 0, 'Kira Noir and Kali Roses for Brazzers'], + ['double-dildo-anal', 2, 'Adria Rae and Megan Rain in "Best Friends Anal" for Holed'], + ['double-dildo-anal', 1, 'Sammie Rhodes and Ainsley Addision in "Tickle Me Pink" for We Live Together (Reality Kings)'], ['double-dildo-blowjob', 1, 'Aidra Fox and Reena Sky in "Reena\'s Got A Staring Problem" for Brazzers'], ['double-dildo-dp', 0, 'u/LacyCrow "Sometimes you have to do it yourself"'], ['dp', 2, 'Megan Rain in "DP Masters 4" for Jules Jordan'], @@ -713,39 +728,48 @@ const tagPhotos = [ ['facefucking', 4, 'Brooklyn Gray in "Throats Fucks 6" for Evil Angel'], ['facefucking', 3, 'Adriana Chechik in "Performing Magic Butt Tricks With Jules Jordan. What Will Disappear In Her Ass?" for Jules Jordan'], ['fake-boobs', 10, 'Tia Cyrus in "Titty-Fucked Yoga Goddess" for Latina Sex Tapes'], + ['fake-boobs', 11, 'Jessa Rhodes and Cali Carter in "Busty Anal Workout" for LesbianX'], ['fake-boobs', 9, 'Putri Cinta for StasyQ'], - ['fake-boobs', 8, 'Amber Alena for Score'], - ['fake-boobs', 1, 'Lela Star in "Thick" for Jules Jordan'], - // ['fake-boobs', 6, 'Cathy Heaven in "Heavenly Ass" for Big Wett Butts'], - ['fake-boobs', 7, 'Madison Ivy for Passion HD'], - ['fake-boobs', 4, 'Capri Cavanni for Big Tits in Sports'], ['fake-boobs', 3, 'Ashly Anderson for Passion HD'], + ['fake-boobs', 1, 'Lela Star in "Thick" for Jules Jordan'], + ['fake-boobs', 8, 'Amber Alena for Score'], + // ['fake-boobs', 6, 'Cathy Heaven in "Heavenly Ass" for Big Wett Butts'], + ['fake-boobs', 4, 'Capri Cavanni for Big Tits in Sports'], + ['fake-boobs', 7, 'Madison Ivy for Passion HD'], ['gangbang', 'poster', 'Kristen Scott in "Interracial Gangbang!" for Jules Jordan'], ['gangbang', 0, '"4 On 1 Gangbangs" for Doghouse Digital'], + ['gangbang', 6, 'Silvia Soprano in GIO1580 for LegalPorno'], ['gangbang', 4, 'Marley Brinx in "The Gangbang of Marley Brinx" for Jules Jordan'], ['gangbang', 1, 'Ginger Lynn in "Gangbang Mystique", a photoset shot by Suze Randall for Puritan No. 10, 1984. This photo pushed the boundaries of pornography at the time, as depicting a woman \'fully occupied\' was unheard of.'], ['gaping', 'poster', 'Zoey Monroe in "Manuel DPs Them All 5" for Jules Jordan'], ['gaping', 3, 'Jessyka Swan for 21Sextury'], ['gaping', 2, 'Alex Grey in "DP Masters 5" for Jules Jordan'], + ['latina', 2, 'Veronica Leal for Her Limit'], ['latina', 1, 'Jynx Maze in "Big Anal Asses 2" for HardX'], ['latina', 0, 'Vienna Black for Spizoo'], + ['lesbian', 1, 'Kylie Page and Hadley Viscara in "Busty Blonde Bombshells" for LesbianX'], + ['maid', 1, 'Alessandra Jane for Brazzers'], // ['milf', 0, 'Olivia Austin in "Dredd 3" for Jules Jordan'], ['mff', 0, 'Madison Ivy, Adriana Chechik and Keiran Lee in "Day With A Pornstar" for Brazzers'], ['mfm', 6, 'Honey Gold in "Slut Puppies 12" for Jules Jordan'], + ['natural-boobs', 1, 'Nia Nacci for First Class POV'], ['natural-boobs', 0, 'Valentina Nappi in "Hypnotic Curves" for LesbianX'], + ['natural-boobs', 2, 'Kylie Page for All Girl Massage'], ['oil', 1, 'Kissa Sins in "Oil Overload 14" for JulesJordan'], ['oil', 3, 'Vina Sky for Lubed'], ['oil', 0, 'Jada Stevens in "Jada Stevens Anal Ass Oiled Up For James Deen\'s Cock" for Jules Jordan'], ['oral-creampie', 0, 'Henessy in "B(ass)t Friends" for Asshole Fever'], ['orgy', 0, 'Vicky Sol and Jolee Love in LegalPorno GIO1550'], ['orgy', 'poster', 'Zoey Mornoe (DP), Jillian Janson (sex), Frida Sante, Katerina Kay and Natasha Starr in "Orgy Masters 6" for Jules Jordan'], + ['pussy-eating', 3, 'Kylie Page and Kalina Ryu in "Training My Masseuse" for All Girl Massage'], ['pussy-eating', 0, 'Kali Roses licking Emily Willis\' pussy in "Peeping On My Neighbor" for Girl Girl'], + ['pussy-eating', 1, 'Anikka Albrite and Riley Reid for In The Crack'], ['redhead', 0, 'Penny Pax in "The Submission of Emma Marx: Boundaries" for New Sensations'], ['tattoos', 0, 'Tigerlilly in "Wrapped In Blue" for Suicide Girls'], ['trainbang', 0, 'Nicole Black in GIO971 for LegalPorno'], ['tap', 1, 'Natasha Teen in SZ2098 for LegalPorno'], ['tap', 2, 'Kira Thorn in GIO1018 for LegalPorno'], - ['cum-in-mouth', 0, 'Vina Sky and Avi Love for HardX'], + ['toy-dp', 0, 'Marley Brinx, Ivy Lebelle and Lyra Law in "Marley Brinx First GGDP" for LesbianX'], ] .map(([slug, fileIndex, comment], index) => ({ id: `${slug}-${fileIndex}`, diff --git a/src/media.js b/src/media.js index cacd3088..378132fe 100644 --- a/src/media.js +++ b/src/media.js @@ -200,6 +200,8 @@ async function findSourceDuplicates(baseMedias) { knex('media').whereIn('source_page', extractUrls), ]); + console.log(sourceUrls, existingSourceMedia); + const existingSourceMediaByUrl = itemsByKey(existingSourceMedia, 'source'); const existingExtractMediaByUrl = itemsByKey(existingExtractMedia, 'source_page'); @@ -279,86 +281,94 @@ async function extractSource(baseSource, { existingExtractMediaByUrl }) { } async function storeImageFile(media, hashDir, hashSubDir, filename, filedir, filepath) { - const thumbdir = path.join(media.role, 'thumbs', hashDir, hashSubDir); - const thumbpath = path.join(thumbdir, filename); + try { + const thumbdir = path.join(media.role, 'thumbs', hashDir, hashSubDir); + const thumbpath = path.join(thumbdir, filename); - const lazydir = path.join(media.role, 'lazy', hashDir, hashSubDir); - const lazypath = path.join(lazydir, filename); + const lazydir = path.join(media.role, 'lazy', hashDir, hashSubDir); + const lazypath = path.join(lazydir, filename); - await Promise.all([ - fsPromises.mkdir(path.join(config.media.path, filedir), { recursive: true }), - fsPromises.mkdir(path.join(config.media.path, thumbdir), { recursive: true }), - fsPromises.mkdir(path.join(config.media.path, lazydir), { recursive: true }), - ]); + await Promise.all([ + fsPromises.mkdir(path.join(config.media.path, filedir), { recursive: true }), + fsPromises.mkdir(path.join(config.media.path, thumbdir), { recursive: true }), + fsPromises.mkdir(path.join(config.media.path, lazydir), { recursive: true }), + ]); - const image = sharp(media.file.path); - const info = await image.metadata(); - const isProcessed = media.meta.subtype !== 'jpeg' || media.process; + const image = sharp(media.file.path); + const info = await image.metadata(); + const isProcessed = media.meta.subtype !== 'jpeg' || media.process; - if (media.process) { - Object.entries(media.process).forEach(([operation, options]) => { - if (image[operation]) { - image[operation](...(Array.isArray(options) ? options : [options])); - return; - } + if (media.process) { + Object.entries(media.process).forEach(([operation, options]) => { + if (image[operation]) { + image[operation](...(Array.isArray(options) ? options : [options])); + return; + } - if (operation === 'crop') { - image.extract(...(Array.isArray(options) ? options : [options])); - return; - } + if (operation === 'crop') { + image.extract(...(Array.isArray(options) ? options : [options])); + return; + } - logger.warn(`Unknown image operation on ${media.id} (${media.src}): ${operation}`); - }); - } + logger.warn(`Unknown image operation on ${media.id} (${media.src}): ${operation}`); + }); + } - if (isProcessed) { - // convert to JPEG and write to permanent location - await image - .jpeg() - .toFile(path.join(config.media.path, filepath)); - } + if (isProcessed) { + // convert to JPEG and write to permanent location + await image + .jpeg() + .toFile(path.join(config.media.path, filepath)); + } - // generate thumbnail and lazy - await Promise.all([ - image - .resize({ - height: config.media.thumbnailSize, - withoutEnlargement: true, - }) - .jpeg({ quality: config.media.thumbnailQuality }) - .toFile(path.join(config.media.path, thumbpath)), - image - .resize({ - height: config.media.lazySize, - withoutEnlargement: true, - }) - .jpeg({ quality: config.media.lazyQuality }) - .toFile(path.join(config.media.path, lazypath)), - ]); + // generate thumbnail and lazy + await Promise.all([ + image + .resize({ + height: config.media.thumbnailSize, + withoutEnlargement: true, + }) + .jpeg({ quality: config.media.thumbnailQuality }) + .toFile(path.join(config.media.path, thumbpath)), + image + .resize({ + height: config.media.lazySize, + withoutEnlargement: true, + }) + .jpeg({ quality: config.media.lazyQuality }) + .toFile(path.join(config.media.path, lazypath)), + ]); + + if (isProcessed) { + // remove temp file + await fsPromises.unlink(media.file.path); + } else { + // move temp file to permanent location + await fsPromises.rename(media.file.path, path.join(config.media.path, filepath)); + } + + logger.silly(`Stored thumbnail, lazy and permanent media file for ${media.id} from ${media.src} at ${filepath}`); + + return { + ...media, + file: { + path: filepath, + thumbnail: thumbpath, + lazy: lazypath, + }, + meta: { + ...media.meta, + width: info.width, + height: info.height, + }, + }; + } catch (error) { + logger.error(`Failed to store ${media.id} from ${media.src} at ${filepath}: ${error.message}`); - if (isProcessed) { - // remove temp file await fsPromises.unlink(media.file.path); - } else { - // move temp file to permanent location - await fsPromises.rename(media.file.path, path.join(config.media.path, filepath)); + + return null; } - - logger.silly(`Stored thumbnail, lazy and permanent media file for ${media.id} from ${media.src} at ${filepath}`); - - return { - ...media, - file: { - path: filepath, - thumbnail: thumbpath, - lazy: lazypath, - }, - meta: { - ...media.meta, - width: info.width, - height: info.height, - }, - }; } async function storeFile(media) { @@ -374,6 +384,15 @@ async function storeFile(media) { const filedir = path.join(media.role, hashDir, hashSubDir); const filepath = path.join(filedir, filename); + if (argv.force) { + try { + // remove old file to in case rename() does not overwrite (possibly on NFS setups) + await fsPromises.unlink(path.join(config.media.path, filepath)); + } catch (error) { + // file probably didn't exist + } + } + if (media.meta.type === 'image') { return storeImageFile(media, hashDir, hashSubDir, filename, filedir, filepath); } @@ -383,6 +402,7 @@ async function storeFile(media) { fsPromises.mkdir(path.join(config.media.path, filedir), { recursive: true }), ]); + // move temp file to permanent location await fsPromises.rename(media.file.path, path.join(config.media.path, filepath)); logger.silly(`Stored permanent media file for ${media.id} from ${media.src} at ${filepath}`); diff --git a/src/updates.js b/src/updates.js index 060d6f58..3005f712 100644 --- a/src/updates.js +++ b/src/updates.js @@ -13,6 +13,16 @@ const { fetchIncludedEntities } = require('./entities'); const emptyReleases = { uniqueReleases: [], duplicateReleases: [] }; +function mapReleasesToSiteIdAndEntryId(acc, release) { + const entityId = release.entityId || release.entity.id; + const entryId = release.entryId || release.entryId; + + if (!acc[entityId]) acc[entityId] = {}; + acc[entityId][entryId] = true; + + return acc; +} + async function filterUniqueReleases(latestReleases, accReleases) { const latestReleaseIdentifiers = latestReleases .map(release => [release.entity.id, release.entryId]); @@ -26,52 +36,54 @@ async function filterUniqueReleases(latestReleases, accReleases) { // add entry IDs of accumulated releases to prevent an infinite scrape loop // when one page contains the same release as the previous - const duplicateReleasesSiteIdAndEntryIds = duplicateReleases + const duplicateReleasesBySiteIdAndEntryId = duplicateReleases .concat(accReleases) - .reduce((acc, release) => { - const entityId = release.entityId || release.entity.id; - const entryId = release.entryId || release.entryId; + .reduce(mapReleasesToSiteIdAndEntryId, {}); - if (!acc[entityId]) acc[entityId] = {}; - acc[entityId][entryId] = true; + const localDuplicateReleasesBySiteIdAndEntryId = accReleases.reduce(mapReleasesToSiteIdAndEntryId, {}); - return acc; - }, {}); + const uniqueReleases = latestReleases.filter(release => !duplicateReleasesBySiteIdAndEntryId[release.entity.id]?.[release.entryId]); + const localUniqueReleases = latestReleases.filter(release => !localDuplicateReleasesBySiteIdAndEntryId[release.entity.id]?.[release.entryId]); - const uniqueReleases = latestReleases.filter(release => !duplicateReleasesSiteIdAndEntryIds[release.entity.id]?.[release.entryId]); - - return { uniqueReleases, duplicateReleases }; + return { + uniqueReleases, + localUniqueReleases, + duplicateReleases, + }; } -function needNextPage(releasesOnPage, uniqueReleases, totalReleases, hasDates, upcoming) { +function needNextPage(releasesOnPage, uniqueReleasesOnPage, localUniqueReleasesOnPage, totalReleases, hasDates, upcoming) { if (releasesOnPage.length === 0) { return false; } if (upcoming) { - return uniqueReleases.length > 0 && argv.paginateUpcoming; + return uniqueReleasesOnPage.length > 0 && argv.paginateUpcoming; } - if (argv.last) { - // this will keep paginating until the second condition is met on sites that will keep serving the last page if you exceed the last page number (e.g. HardX as of september 2020) - // checking unqiueReleases > 0 could prevent that, but this would stop pagination prematurely if we already scraped a full page of data earlier - return releasesOnPage.length > 0 && totalReleases + releasesOnPage.length < argv.last; - } + // no longer works when there are no unique releases, need to keep track of /all/ releases regardless uniqueness + console.log(localUniqueReleasesOnPage.length); - if (!hasDates) { - return totalReleases + releasesOnPage.length < argv.nullDateLimit; - } + if (localUniqueReleasesOnPage.length > 0) { + if (argv.last) { + return totalReleases + releasesOnPage.length < argv.last; + } - if (argv.after) { - // this will keep paginating infinitely on sites that will keep serving the last page if you exceed the last page number (e.g. HardX as of september 2020) - // checking unqiueReleases > 0 could prevent that, but this would stop pagination prematurely if we already scraped a full page of data earlier - const oldestReleaseOnPage = releasesOnPage - .sort((releaseA, releaseB) => releaseB.date - releaseA.date) - .slice(-1)[0]; + if (!hasDates) { + return totalReleases + releasesOnPage.length < argv.nullDateLimit; + } - if (moment(oldestReleaseOnPage.date).isAfter(argv.after)) { - // oldest release on page is newer than the specified date cut-off - return true; + if (argv.after) { + // this will keep paginating infinitely on sites that will keep serving the last page if you exceed the last page number (e.g. HardX as of september 2020) + // checking unqiueReleases > 0 could prevent that, but this would stop pagination prematurely if we already scraped a full page of data earlier + const oldestReleaseOnPage = releasesOnPage + .sort((releaseA, releaseB) => releaseB.date - releaseA.date) + .slice(-1)[0]; + + if (moment(oldestReleaseOnPage.date).isAfter(argv.after)) { + // oldest release on page is newer than the specified date cut-off + return true; + } } } @@ -100,8 +112,8 @@ async function scrapeReleases(scraper, entity, preData, upcoming = false, page = || (hasDates && releasesWithEntity.filter(release => moment(release.date).isAfter(argv.after))) || releasesWithEntity.slice(0, Math.max(argv.nullDateLimit - totalReleases, 0)); - const { uniqueReleases, duplicateReleases } = argv.force - ? { uniqueReleases: limitedReleases, duplicateReleases: [] } + const { uniqueReleases, localUniqueReleases, duplicateReleases } = argv.force + ? { uniqueReleases: limitedReleases, localUniqueReleases: limitedReleases, duplicateReleases: [] } : await filterUniqueReleases(limitedReleases, acc.uniqueReleases); const accReleases = { @@ -109,7 +121,7 @@ async function scrapeReleases(scraper, entity, preData, upcoming = false, page = duplicateReleases: acc.duplicateReleases.concat(duplicateReleases), }; - if (needNextPage(releases, uniqueReleases, totalReleases, hasDates, upcoming)) { + if (needNextPage(releases, uniqueReleases, localUniqueReleases, totalReleases, hasDates, upcoming)) { return scrapeReleases(scraper, entity, preData, upcoming, page + 1, accReleases, totalReleases + releases.length); }