Merge 1b3348a into 3e496b7

JayBizzle · Feb 16, 2020 · f7c0dfb · f7c0dfb
2 parents 3e496b7 + 1b3348a
commit f7c0dfb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 21 deletions.
diff --git a/raw/Crawlers.json b/raw/Crawlers.json
diff --git a/raw/Crawlers.txt b/raw/Crawlers.txt
@@ -89,7 +89,6 @@ AportWorm\/
 AppBeat\/
 AppEngine-Google
 AppleSyndication
-AppStoreScraperZ
 Aprc\/[0-9]
 Arachmo
 arachnode
@@ -382,6 +381,7 @@ GigablastOpenSource
 GIS-LABS
 github-camo
 github\.com
+Goldfire Server
 Go [\d\.]* package http
 Go http package
 Go-Ahead-Got-It
@@ -421,7 +421,6 @@ GoogleProducer
 GoogleSites
 Google-Transparency-Report
 Gookey
-GoScraper
 GoSpotCheck
 gosquared-thumbnailer
 Gotit
@@ -688,6 +687,7 @@ Morfeus Fucking Scanner
 Morning Paper
 MovableType
 mowser
+Mr\.4x3 Powered
 Mrcgiguy
 MS Web Services Client Protocol
 MSFrontPage
@@ -757,7 +757,6 @@ oegp
 Offline Explorer
 Offline Navigator
 OgScrper
-og-scraper
 okhttp
 omgili
 OMSC
@@ -772,7 +771,6 @@ Optimizer
 Orbiter
 OrgProbe\/
 orion-semantics
-OSPScraper
 Outlook-Express
 Outlook-iOS
 ow\.ly
@@ -783,6 +781,7 @@ Page Valet
 page_verifier
 page scorer
 page2rss
+PageFreezer
 PageGrabber
 PagePeeker
 PageScorer
@@ -836,6 +835,7 @@ PostmanRuntime
 PostPost
 postrank
 PowerPoint\/
+Prebid
 Priceonomics Analysis Engine
 PrintFriendly
 PritTorrent
@@ -850,7 +850,6 @@ PRTG Network Monitor
 pshtt, https scanning
 PTST 
 PTST\/[0-9]+
-Pulsepoint XT3 web scraper
 Pump
 python-httpx
 Python-httplib2
@@ -910,7 +909,6 @@ scooter
 ScoutJet
 ScoutURLMonitor
 ScrapeBox Page Scanner
-SimpleScraper
 Scrapy
 Screaming
 ScreenShotService
@@ -1030,7 +1028,6 @@ summify
 SuperHTTP
 Surphace Scout
 Suzuran
-SwiteScraper
 Symfony BrowserKit
 Symfony2 BrowserKit
 SynHttpClient-Built
@@ -1119,7 +1116,6 @@ VB Project
 vBSEO
 VCI
 via ggpht\.com GoogleImageProxy
-VidibleScraper
 Virusdie
 visionutils
 vkShare
@@ -1272,4 +1268,4 @@ ZnHTTP
 Zombie\.js
 Zoom\.Mac
 ZyBorg
-[a-z0-9\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer)
+[a-z0-9\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer|scraper)
diff --git a/src/Fixtures/Crawlers.php b/src/Fixtures/Crawlers.php
@@ -110,7 +110,6 @@ class Crawlers extends AbstractProvider
         'AppBeat\/',
         'AppEngine-Google',
         'AppleSyndication',
-        'AppStoreScraperZ',
         'Aprc\/[0-9]',
         'Arachmo',
         'arachnode',
@@ -403,6 +402,7 @@ class Crawlers extends AbstractProvider
         'GIS-LABS',
         'github-camo',
         'github\.com',
+        'Goldfire Server',
         'Go [\d\.]* package http',
         'Go http package',
         'Go-Ahead-Got-It',
@@ -442,7 +442,6 @@ class Crawlers extends AbstractProvider
         'GoogleSites',
         'Google-Transparency-Report',
         'Gookey',
-        'GoScraper',
         'GoSpotCheck',
         'gosquared-thumbnailer',
         'Gotit',
@@ -709,6 +708,7 @@ class Crawlers extends AbstractProvider
         'Morning Paper',
         'MovableType',
         'mowser',
+        'Mr\.4x3 Powered',
         'Mrcgiguy',
         'MS Web Services Client Protocol',
         'MSFrontPage',
@@ -778,7 +778,6 @@ class Crawlers extends AbstractProvider
         'Offline Explorer',
         'Offline Navigator',
         'OgScrper',
-        'og-scraper',
         'okhttp',
         'omgili',
         'OMSC',
@@ -793,7 +792,6 @@ class Crawlers extends AbstractProvider
         'Orbiter',
         'OrgProbe\/',
         'orion-semantics',
-        'OSPScraper',
         'Outlook-Express',
         'Outlook-iOS',
         'ow\.ly',
@@ -804,6 +802,7 @@ class Crawlers extends AbstractProvider
         'page_verifier',
         'page scorer',
         'page2rss',
+        'PageFreezer',
         'PageGrabber',
         'PagePeeker',
         'PageScorer',
@@ -857,6 +856,7 @@ class Crawlers extends AbstractProvider
         'PostPost',
         'postrank',
         'PowerPoint\/',
+        'Prebid',
         'Priceonomics Analysis Engine',
         'PrintFriendly',
         'PritTorrent',
@@ -871,7 +871,6 @@ class Crawlers extends AbstractProvider
         'pshtt, https scanning',
         'PTST ',
         'PTST\/[0-9]+',
-        'Pulsepoint XT3 web scraper',
         'Pump',
         'python-httpx',
         'Python-httplib2',
@@ -931,7 +930,6 @@ class Crawlers extends AbstractProvider
         'ScoutJet',
         'ScoutURLMonitor',
         'ScrapeBox Page Scanner',
-        'SimpleScraper',
         'Scrapy',
         'Screaming',
         'ScreenShotService',
@@ -1051,7 +1049,6 @@ class Crawlers extends AbstractProvider
         'SuperHTTP',
         'Surphace Scout',
         'Suzuran',
-        'SwiteScraper',
         'Symfony BrowserKit',
         'Symfony2 BrowserKit',
         'SynHttpClient-Built',
@@ -1140,7 +1137,6 @@ class Crawlers extends AbstractProvider
         'vBSEO',
         'VCI',
         'via ggpht\.com GoogleImageProxy',
-        'VidibleScraper',
         'Virusdie',
         'visionutils',
         'vkShare',
@@ -1293,6 +1289,6 @@ class Crawlers extends AbstractProvider
         'Zombie\.js',
         'Zoom\.Mac',
         'ZyBorg',
-        '[a-z0-9\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer)',
+        '[a-z0-9\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer|scraper)',
     );
 }
diff --git a/tests/crawlers.txt b/tests/crawlers.txt
@@ -3855,3 +3855,7 @@ Google-Ads-Overview Mozilla/5.0 (Linux; U; Android 2.3.4; generic) AppleWebKit/5
 adreview/1.0
 Google-speakr
 Google-speakr,gzip(gfe)
+PageFreezer
+Prebid.js Scraper
+Mr.4x3 Powered
+Goldfire Server
diff --git a/tests/devices.txt b/tests/devices.txt
@@ -45654,7 +45654,6 @@ Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; SLCC2; .NET CLR
 Mozilla/5.0 (Linux; Android 6.0.1; HTC One A9 Build/MMB29M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/54.0.2840.68 Mobile Safari/537.36
 Mozilla/5.0 (Linux; Android 5.1; MEDION E5004 Build/LRX21M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.81 Mobile Safari/537.36
 Opera/9.80 (J2ME/MIDP; Opera Mini/4.5.40312/37.8552; U; en) Presto/2.12.423 Version/12.16
-Goldfire Server
 Mozilla/5.0 (iPhone; CPU iPhone OS 10_2 like Mac OS X) AppleWebKit/602.3.12 (KHTML, like Gecko) Mobile/14C92 (4298171760)
 Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13G36 [FBAN/FBIOS;FBAV/63.0.0.37.140;FBBV/37606630;FBRV/37606630;FBDV/iPad4,2;FBMD/iPad;FBSN/iPhone OS;FBSV/9.3.5;FBSS/2;FBCR/MEO;FBID/tablet;FBLC/en_GB;FBOP/5]
 Mozilla/5.0 (iPhone; CPU iPhone OS 10_2 like Mac OS X) AppleWebKit/602.3.12 (KHTML, like Gecko) Mobile/14C92 (5668673232)
@@ -153723,7 +153722,6 @@ Mozilla/5.0 (iPhone; CPU iPhone OS 11_2_6 like Mac OS X) AppleWebKit/604.5.6 (KH
 Mozilla/5.0 (Linux; Android 8.0.0; F8331 Build/41.3.A.0.401) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.109 Mobile Safari/537.36
 Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Mobile/14E277 [FBAN/FBIOS;FBAV/154.0.0.34.386;FBBV/87041355;FBDV/iPhone7,1;FBMD/iPhone;FBSN/iOS;FBSV/10.3;FBSS/3;FBCR/Digi;FBID/phone;FBLC/en_GB;FBOP/5;FBRV/88069422]
 Mozilla/5.0 (iPad; CPU OS 11_1_2 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) GSA/47.1.192149458 Mobile/15B202 Safari/604.1
-Mr.4x3 Powered
 Mozilla/5.0 (iPhone; CPU iPhone OS 11_0_2 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Mobile/15A421 [FBAN/FBIOS;FBAV/141.0.0.51.91;FBBV/71695290;FBDV/iPhone7,2;FBMD/iPhone;FBSN/iOS;FBSV/11.0.2;FBSS/2;FBCR/EE;FBID/phone;FBLC/en_GB;FBOP/5;FBRV/72701227]
 Mozilla/5.0 (Linux; Android 7.1.1; MIX 2 Build/NMF26X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36
 Mozilla/5.0 (Linux; Android 7.1.1; Moto G (5S) Plus Build/NPSS26.116-61-8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.158 Mobile Safari/537.36