jason/atom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

Added Delete methods for slice elements to common attributes, entry, feed, person and source

Browse Source
This commit is contained in:
Jason Streifling
2024-10-20 10:49:29 +02:00
parent e2986e70b1
commit e0384904b4
5 changed files with 292 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
entry.go
View File

@@ -39,16 +39,16 @@ func (e *Entry) checkAuthors(authorInFeed bool) error {
if e.Authors == nil {
if !authorInFeed {
if e.Source == nil {
return fmt.Errorf("no authors set in entry %v", e)
return fmt.Errorf("no authors set in entry %v", e.ID.URI)
}
if e.Source.Authors == nil {
return fmt.Errorf("no authors set in entry %v", e)
return fmt.Errorf("no authors set in entry %v", e.ID.URI)
}
}
} else {
for i, a := range e.Authors {
if err := a.Check(); err != nil {
return fmt.Errorf("author element %v of entry %v: %v", i, e, err)
return fmt.Errorf("author element %v of entry %v: %v", i, e.ID.URI, err)
}
}
}
@@ -75,7 +75,19 @@ func (e *Entry) AddAuthor(p *Person) {
e.Authors = append(e.Authors, p)
}
e.Updated.DateTime = DateTime(time.Now())
e.Updated = NewDate(time.Now())
}
// DeleteAuthor deletes the Person from the Entry. It return an error.
func (e *Entry) DeleteAuthor(id int) error {
length := len(e.Authors)
if id > length {
return fmt.Errorf("error deleting author from entry %v: id %v out of range %v", e.ID.URI, id, length)
}
e.Authors = append(e.Authors[:id], e.Authors[id+1:]...)
e.Updated = NewDate(time.Now())
return nil
}
// AddCategory adds the Category to the Entry.
@@ -87,7 +99,19 @@ func (e *Entry) AddCategory(c *Category) {
e.Categories = append(e.Categories, c)
}
e.Updated.DateTime = DateTime(time.Now())
e.Updated = NewDate(time.Now())
}
// DeleteCategory deletes the Category from the Entry. It return an error.
func (e *Entry) DeleteCategory(id int) error {
length := len(e.Categories)
if id > length {
return fmt.Errorf("error deleting category from entry %v: id %v out of range %v", e.ID.URI, id, length)
}
e.Categories = append(e.Categories[:id], e.Categories[id+1:]...)
e.Updated = NewDate(time.Now())
return nil
}
// AddContributor adds the Person as a contributor to the Entry.
@@ -99,7 +123,19 @@ func (e *Entry) AddContributor(c *Person) {
e.Contributors = append(e.Contributors, c)
}
e.Updated.DateTime = DateTime(time.Now())
e.Updated = NewDate(time.Now())
}
// DeleteContributor deletes the Person from the Entry. It return an error.
func (e *Entry) DeleteContributor(id int) error {
length := len(e.Contributors)
if id > length {
return fmt.Errorf("error deleting contributor from entry %v: id %v out of range %v", e.ID.URI, id, length)
}
e.Contributors = append(e.Contributors[:id], e.Contributors[id+1:]...)
e.Updated = NewDate(time.Now())
return nil
}
// AddLink adds the Link to the Entry.
@@ -111,7 +147,19 @@ func (e *Entry) AddLink(l *Link) {
e.Links = append(e.Links, l)
}
e.Updated.DateTime = DateTime(time.Now())
e.Updated = NewDate(time.Now())
}
// DeleteLink deletes the Link from the Entry. It return an error.
func (e *Entry) DeleteLink(id int) error {
length := len(e.Links)
if id > length {
return fmt.Errorf("error deleting link from entry %v: id %v out of range %v", e.ID.URI, id, length)
}
e.Links = append(e.Links[:id], e.Links[id+1:]...)
e.Updated = NewDate(time.Now())
return nil
}
// AddExtension adds the ExtensionElement to the Entry.
@@ -123,7 +171,19 @@ func (e *Entry) AddExtension(x *ExtensionElement) {
e.Extensions = append(e.Extensions, x)
}
e.Updated.DateTime = DateTime(time.Now())
e.Updated = NewDate(time.Now())
}
// DeleteExtension deletes the Extension from the Entry. It return an error.
func (e *Entry) DeleteExtension(id int) error {
length := len(e.Extensions)
if id > length {
return fmt.Errorf("error deleting extension from entry %v: id %v out of range %v", e.ID.URI, id, length)
}
e.Extensions = append(e.Extensions[:id], e.Extensions[id+1:]...)
e.Updated = NewDate(time.Now())
return nil
}
// Check checks the Entry for incompatibilities with RFC4287. It returns an
@@ -138,64 +198,64 @@ func (e *Entry) Check() error {
}
if err := e.checkAuthors(true); err != nil {
return fmt.Errorf("entry %v: %v", e, err)
return fmt.Errorf("entry %v: %v", e.ID.URI, err)
}
for i, c := range e.Categories {
if err := c.Check(); err != nil {
return fmt.Errorf("category element %v of entry %v: %v", i, e, err)
return fmt.Errorf("category element %v of entry %v: %v", i, e.ID.URI, err)
}
}
if e.Content != nil {
if err := e.Content.Check(); err != nil {
return fmt.Errorf("content element of entry %v: %v", e, err)
return fmt.Errorf("content element of entry %v: %v", e.ID.URI, err)
}
} else {
// atom:entry elements that contain no child atom:content element MUST
// contain at least one atom:link element with a rel attribute value of
// "alternate".
if !alternateRelExists(e.Links) {
return fmt.Errorf("no content element of entry %v and no link element with rel \"alternate\"", e)
return fmt.Errorf("no content element of entry %v and no link element with rel \"alternate\"", e.ID.URI)
}
}
for i, c := range e.Contributors {
if err := c.Check(); err != nil {
return fmt.Errorf("contributor element %v of entry %v: %v", i, e, err)
return fmt.Errorf("contributor element %v of entry %v: %v", i, e.ID.URI, err)
}
}
for i, l := range e.Links {
if err := l.Check(); err != nil {
return fmt.Errorf("link element %v of entry %v: %v", i, e, err)
return fmt.Errorf("link element %v of entry %v: %v", i, e.ID.URI, err)
}
}
if hasAlternateDuplicateLinks(e.Links) {
return fmt.Errorf("links with a rel attribute value of \"alternate\" and duplicate type and hreflang attribute values found in entry %v", e)
return fmt.Errorf("links with a rel attribute value of \"alternate\" and duplicate type and hreflang attribute values found in entry %v", e.ID.URI)
}
if e.Published != nil {
if err := e.Published.Check(); err != nil {
return fmt.Errorf("published element of entry %v: %v", e, err)
return fmt.Errorf("published element of entry %v: %v", e.ID.URI, err)
}
}
if e.Rights != nil {
if err := e.Rights.Check(); err != nil {
return fmt.Errorf("rights element of entry %v: %v", e, err)
return fmt.Errorf("rights element of entry %v: %v", e.ID.URI, err)
}
}
if e.Source != nil {
if err := e.Source.Check(); err != nil {
return fmt.Errorf("source element of entry %v: %v", e, err)
return fmt.Errorf("source element of entry %v: %v", e.ID.URI, err)
}
}
if e.Summary != nil {
if err := e.Summary.Check(); err != nil {
return fmt.Errorf("summary element of entry %v: %v", e, err)
return fmt.Errorf("summary element of entry %v: %v", e.ID.URI, err)
}
} else {
// atom:entry elements MUST contain an atom:summary element in either
@@ -203,7 +263,7 @@ func (e *Entry) Check() error {
// the atom:entry contains an atom:content that has a "src" attribute
// (and is thus empty).
if e.Content.hasSRC() {
return fmt.Errorf("no summary element of entry %v but content of type out of line content", e)
return fmt.Errorf("no summary element of entry %v but content of type out of line content", e.ID.URI)
}
// the atom:entry contains content that is encoded in Base64; i.e., the
// "type" attribute of atom:content is a MIME media type [MIMEREG], but
@@ -211,29 +271,29 @@ func (e *Entry) Check() error {
// does not end with "/xml" or "+xml".
mediaType := e.Content.getType()
if isValidMediaType(mediaType) && !isXMLMediaType(mediaType) && !strings.HasPrefix(mediaType, "text/") {
return fmt.Errorf("no summary element of entry %v but media type not xml", e)
return fmt.Errorf("no summary element of entry %v but media type not xml", e.ID.URI)
}
}
if e.Title == nil {
return fmt.Errorf("no title element of entry %v", e)
return fmt.Errorf("no title element of entry %v", e.ID.URI)
} else {
if err := e.Title.Check(); err != nil {
return fmt.Errorf("title element of entry %v: %v", e, err)
return fmt.Errorf("title element of entry %v: %v", e.ID.URI, err)
}
}
if e.Updated == nil {
return fmt.Errorf("no updated element of entry %v", e)
return fmt.Errorf("no updated element of entry %v", e.ID.URI)
} else {
if err := e.Updated.Check(); err != nil {
return fmt.Errorf("updated element of entry %v: %v", e, err)
return fmt.Errorf("updated element of entry %v: %v", e.ID.URI, err)
}
}
for i, x := range e.Extensions {
if err := x.Check(); err != nil {
return fmt.Errorf("extension element %v of entry %v: %v", i, e, err)
return fmt.Errorf("extension element %v of entry %v: %v", i, e.ID.URI, err)
}
}
@@ -244,7 +304,7 @@ func (e *Entry) Check() error {
func (e *Entry) ToXML(encoding string) (string, error) {
xml, err := xml.MarshalIndent(e, "", " ")
if err != nil {
return "", fmt.Errorf("error xml encoding entry: %v", err)
return "", fmt.Errorf("error xml encoding entry %v: %v", e.ID.URI, err)
}
return fmt.Sprintln(`<?xml version="1.0" encoding="`+encoding+`"?>`) + string(xml), nil