aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2017-05-11 17:39:21 +0200
committerGitHub <noreply@github.com>2017-05-11 17:39:21 +0200
commit06568b15bb9e9116fa4d4a42246e1b0e497bbf25 (patch)
tree66bac04bfd2ea2bf7571502dee4f14623c9d996e /src/Wallabag
parent7987816d1e83267199c170279213412c6086e665 (diff)
parent1517d5772db05ce86b9958dc6545471d8702bf60 (diff)
downloadwallabag-06568b15bb9e9116fa4d4a42246e1b0e497bbf25.tar.gz
wallabag-06568b15bb9e9116fa4d4a42246e1b0e497bbf25.tar.zst
wallabag-06568b15bb9e9116fa4d4a42246e1b0e497bbf25.zip
Merge pull request #3108 from wallabag/store-headers
Added headers field in Entry
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php35
-rw-r--r--src/Wallabag/CoreBundle/Helper/ContentProxy.php4
2 files changed, 36 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index b71c467c..08a67c34 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -133,7 +133,7 @@ class Entry
133 /** 133 /**
134 * @var array 134 * @var array
135 * 135 *
136 * @ORM\Column(name="published_by", type="json_array", nullable=true) 136 * @ORM\Column(name="published_by", type="array", nullable=true)
137 * 137 *
138 * @Groups({"entries_for_user", "export_all"}) 138 * @Groups({"entries_for_user", "export_all"})
139 */ 139 */
@@ -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="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 {
@@ -724,7 +733,7 @@ class Entry
724 } 733 }
725 734
726 /** 735 /**
727 * @param string $publishedBy 736 * @param array $publishedBy
728 * 737 *
729 * @return Entry 738 * @return Entry
730 */ 739 */
@@ -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 array $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));