diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-05-11 14:18:21 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-05-11 14:18:21 +0200 |
commit | dda6a6addc0fd54031514e81d2b55d5066b7157c (patch) | |
tree | 971a4b481adcf3ae7ec66b073649c4f218523c0b /src | |
parent | 7987816d1e83267199c170279213412c6086e665 (diff) | |
download | wallabag-dda6a6addc0fd54031514e81d2b55d5066b7157c.tar.gz wallabag-dda6a6addc0fd54031514e81d2b55d5066b7157c.tar.zst wallabag-dda6a6addc0fd54031514e81d2b55d5066b7157c.zip |
Added headers field in Entry
Diffstat (limited to 'src')
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Entry.php | 31 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/ContentProxy.php | 4 |
2 files changed, 34 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index b71c467c..f0983b1c 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php | |||
@@ -202,6 +202,15 @@ class Entry | |||
202 | private $httpStatus; | 202 | private $httpStatus; |
203 | 203 | ||
204 | /** | 204 | /** |
205 | * @var array | ||
206 | * | ||
207 | * @ORM\Column(name="headers", type="json_array", nullable=true) | ||
208 | * | ||
209 | * @Groups({"entries_for_user", "export_all"}) | ||
210 | */ | ||
211 | private $headers; | ||
212 | |||
213 | /** | ||
205 | * @Exclude | 214 | * @Exclude |
206 | * | 215 | * |
207 | * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="entries") | 216 | * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="entries") |
@@ -716,7 +725,7 @@ class Entry | |||
716 | } | 725 | } |
717 | 726 | ||
718 | /** | 727 | /** |
719 | * @return string | 728 | * @return array |
720 | */ | 729 | */ |
721 | public function getPublishedBy() | 730 | public function getPublishedBy() |
722 | { | 731 | { |
@@ -734,4 +743,24 @@ class Entry | |||
734 | 743 | ||
735 | return $this; | 744 | return $this; |
736 | } | 745 | } |
746 | |||
747 | /** | ||
748 | * @return array | ||
749 | */ | ||
750 | public function getHeaders() | ||
751 | { | ||
752 | return $this->headers; | ||
753 | } | ||
754 | |||
755 | /** | ||
756 | * @param string $headers | ||
757 | * | ||
758 | * @return Entry | ||
759 | */ | ||
760 | public function setHeaders($headers) | ||
761 | { | ||
762 | $this->headers = $headers; | ||
763 | |||
764 | return $this; | ||
765 | } | ||
737 | } | 766 | } |
diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php index d45aef88..9a08db3d 100644 --- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php +++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php | |||
@@ -87,6 +87,10 @@ class ContentProxy | |||
87 | $entry->setPublishedBy($content['authors']); | 87 | $entry->setPublishedBy($content['authors']); |
88 | } | 88 | } |
89 | 89 | ||
90 | if (!empty($content['all_headers'])) { | ||
91 | $entry->setHeaders($content['all_headers']); | ||
92 | } | ||
93 | |||
90 | $entry->setLanguage(isset($content['language']) ? $content['language'] : ''); | 94 | $entry->setLanguage(isset($content['language']) ? $content['language'] : ''); |
91 | $entry->setMimetype(isset($content['content_type']) ? $content['content_type'] : ''); | 95 | $entry->setMimetype(isset($content['content_type']) ? $content['content_type'] : ''); |
92 | $entry->setReadingTime(Utils::getReadingTime($html)); | 96 | $entry->setReadingTime(Utils::getReadingTime($html)); |