jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Squashed commit of the following:

Browse source 
commit 6186d13cae259221f1948207acfdc109d3f71b11
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 13 17:01:48 2017 +0000

    Fixed borwsershot so run whole test suite again

commit fe8241368e514de7c28e6aaebe45757cea7f3fa0
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 13 16:56:51 2017 +0000

    Use nvm to install node

commit 391f4d3fa08906b3d0d905ae98448ce30e9cbc89
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 13 16:47:19 2017 +0000

    specify node version 8

commit 5e4df05b3985e069d605c9287f392f3370f27c13
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 13 14:59:00 2017 +0000

    Why didn’t filter work

commit 9fd5f2f6b29c77ad5d9a2c2dc03dbf05702e24fa
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 13 14:53:25 2017 +0000

    Move npm install to before_script and only test browsershot

commit bd04bcb835f436b080c02098c68042f71511ec4f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 13 14:43:04 2017 +0000

    Remove a var_dump statement

commit 3904dcced167512868817fbe530b0de017ea1bc4
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 13 14:36:21 2017 +0000

    Install pupeteer on Travis

commit f01389fbfece436522597457c8a303756925a3d6
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 13 13:52:56 2017 +0000

    Allow failures on php 7.2

commit 4eafee0b47ebe428d2471bfe3ba71d7446e35092
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 13 13:52:37 2017 +0000

    Update chagelog

commit fabe8793f50edcc8b20a2cea5b0e76be9794eb25
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 13 13:50:49 2017 +0000

    Add a test for taking screenshots

commit 888b9546ecf5c000aa96099b009c4b7cd00f08ad
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 13 13:50:27 2017 +0000

    Move logic for taking screenshots and getting archive links to the BookmarkService class, this cleans up with acutal job

commit 7650fd3eda229b1a1e1e17f0667d203294384551
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Nov 13 13:49:33 2017 +0000

    Update browsershot to v3
This commit is contained in:
Jonny Barnes 2017-11-13 17:26:38 +00:00
parent a5fc87a135
commit b2c112eb91
8 changed files with 1538 additions and 1526 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/Jobs/ProcessBookmark.php
View file

@ -3,14 +3,12 @@
namespace App\Jobs;
use App\Bookmark;
use Ramsey\Uuid\Uuid;
use GuzzleHttp\Client;
use Illuminate\Bus\Queueable;
use Spatie\Browsershot\Browsershot;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use App\Exceptions\InternetArchiveErrorSavingException;
class ProcessBookmark implements ShouldQueue
{
@ -33,24 +31,18 @@ class ProcessBookmark implements ShouldQueue
*
* @return void
*/
public function handle(Browsershot $browsershot, Client $client)
public function handle()
{
//save a local screenshot
$uuid = Uuid::uuid4();
$browsershot->url($this->bookmark->url)
->windowSize(960, 640)
->save(public_path() . '/assets/img/bookmarks/' . $uuid . '.png');
$uuid = (new BookmarkService())->saveScreenshot($this->bookmark->url);
$this->bookmark->screenshot = $uuid;
//get an internet archive link
$response = $client->request('GET', 'https://web.archive.org/save/' . $this->bookmark->url);
if ($response->hasHeader('Content-Location')) {
if (starts_with($response->getHeader('Content-Location')[0], '/web')) {
$this->bookmark->archive = $response->getHeader('Content-Location')[0];
}
try {
$archiveLink = (new BookmarkService())->getArchiveLink($this->bookmark->url);
} catch (InternetArchiveErrorSavingException $e) {
$archiveLink = null;
}
$this->bookmark->archive = $archiveLink;
//save
$this->bookmark->save();
}
}