Added expand request

.build.yml

@@ -2,7 +2,7 @@ image: alpine/edge
 packages:
   - go
 sources:
-  - https://github.com/emersion/go-webdav
+  - https://github.com/jonyTF/go-webdav
 tasks:
   - test: |
       cd go-webdav

README.md

@@ -1,6 +1,6 @@
 # go-webdav
 
-[![Go Reference](https://pkg.go.dev/badge/github.com/emersion/go-webdav.svg)](https://pkg.go.dev/github.com/emersion/go-webdav)
+[![Go Reference](https://pkg.go.dev/badge/github.com/jonyTF/go-webdav.svg)](https://pkg.go.dev/github.com/jonyTF/go-webdav)
 
 A Go library for [WebDAV], [CalDAV] and [CardDAV].
 

caldav/caldav.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/emersion/go-ical"
-	"github.com/emersion/go-webdav"
-	"github.com/emersion/go-webdav/internal"
+	"github.com/jonyTF/go-webdav"
+	"github.com/jonyTF/go-webdav/internal"
 )
 
 var CapabilityCalendar = webdav.Capability("calendar-access")
@@ -79,6 +79,12 @@ type CalendarCompRequest struct {
 
 	AllComps bool
 	Comps    []CalendarCompRequest
+
+	Expand *CalendarExpandRequest
+}
+
+type CalendarExpandRequest struct {
+	Start, End time.Time
 }
 
 type CompFilter struct {

caldav/client.go

@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/emersion/go-ical"
-	"github.com/emersion/go-webdav"
-	"github.com/emersion/go-webdav/internal"
+	"github.com/jonyTF/go-webdav"
+	"github.com/jonyTF/go-webdav/internal"
 )
 
 // DiscoverContextURL performs a DNS-based CardDAV service discovery as
@@ -154,7 +154,9 @@ func encodeCalendarReq(c *CalendarCompRequest) (*internal.Prop, error) {
 		return nil, err
 	}
 
-	calDataReq := calendarDataReq{Comp: compReq}
+	expandReq := encodeExpandRequest(c.Expand)
+
+	calDataReq := calendarDataReq{Comp: compReq, Expand: expandReq}
 
 	getLastModReq := internal.NewRawXMLElement(internal.GetLastModifiedName, nil, nil)
 	getETagReq := internal.NewRawXMLElement(internal.GetETagName, nil, nil)
@@ -175,6 +177,17 @@ func encodeCompFilter(filter *CompFilter) *compFilter {
 	return &encoded
 }
 
+func encodeExpandRequest(e *CalendarExpandRequest) *expand {
+	if e == nil {
+		return nil
+	}
+	encoded := expand{
+		Start: dateWithUTCTime(e.Start),
+		End:   dateWithUTCTime(e.End),
+	}
+	return &encoded
+}
+
 func decodeCalendarObjectList(ms *internal.MultiStatus) ([]CalendarObject, error) {
 	addrs := make([]CalendarObject, 0, len(ms.Responses))
 	for _, resp := range ms.Responses {

caldav/elements.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/emersion/go-webdav/internal"
+	"github.com/jonyTF/go-webdav/internal"
 )
 
 const namespace = "urn:ietf:params:xml:ns:caldav"
@@ -179,7 +179,8 @@ func (t *dateWithUTCTime) MarshalText() ([]byte, error) {
 type calendarDataReq struct {
 	XMLName xml.Name `xml:"urn:ietf:params:xml:ns:caldav calendar-data"`
 	Comp    *comp    `xml:"comp,omitempty"`
-	// TODO: expand, limit-recurrence-set, limit-freebusy-set
+	Expand  *expand  `xml:"expand,omitempty"`
+	// TODO: limit-recurrence-set, limit-freebusy-set
 }
 
 // https://tools.ietf.org/html/rfc4791#section-9.6.1
@@ -194,6 +195,12 @@ type comp struct {
 	Comp    []comp    `xml:"comp,omitempty"`
 }
 
+type expand struct {
+	XMLName xml.Name        `xml:"urn:ietf:params:xml:ns:caldav expand"`
+	Start   dateWithUTCTime `xml:"start,attr"`
+	End     dateWithUTCTime `xml:"end,attr"`
+}
+
 // https://tools.ietf.org/html/rfc4791#section-9.6.4
 type prop struct {
 	XMLName xml.Name `xml:"urn:ietf:params:xml:ns:caldav prop"`

caldav/server.go

@@ -13,8 +13,8 @@ import (
 	"time"
 
 	"github.com/emersion/go-ical"
-	"github.com/emersion/go-webdav"
-	"github.com/emersion/go-webdav/internal"
+	"github.com/jonyTF/go-webdav"
+	"github.com/jonyTF/go-webdav/internal"
 )
 
 // TODO if nothing more Caldav-specific needs to be added this should be merged with carddav.PutAddressObjectOptions

carddav/carddav.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/emersion/go-vcard"
-	"github.com/emersion/go-webdav"
-	"github.com/emersion/go-webdav/internal"
+	"github.com/jonyTF/go-webdav"
+	"github.com/jonyTF/go-webdav/internal"
 )
 
 var CapabilityAddressBook = webdav.Capability("addressbook")

carddav/carddav_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/emersion/go-vcard"
-	"github.com/emersion/go-webdav"
+	"github.com/jonyTF/go-webdav"
 )
 
 type testBackend struct {

carddav/client.go

@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/emersion/go-vcard"
-	"github.com/emersion/go-webdav"
-	"github.com/emersion/go-webdav/internal"
+	"github.com/jonyTF/go-webdav"
+	"github.com/jonyTF/go-webdav/internal"
 )
 
 // DiscoverContextURL performs a DNS-based CardDAV service discovery as

carddav/elements.go

@@ -4,7 +4,7 @@ import (
 	"encoding/xml"
 	"fmt"
 
-	"github.com/emersion/go-webdav/internal"
+	"github.com/jonyTF/go-webdav/internal"
 )
 
 const namespace = "urn:ietf:params:xml:ns:carddav"

carddav/server.go

@@ -12,8 +12,8 @@ import (
 	"strings"
 
 	"github.com/emersion/go-vcard"
-	"github.com/emersion/go-webdav"
-	"github.com/emersion/go-webdav/internal"
+	"github.com/jonyTF/go-webdav"
+	"github.com/jonyTF/go-webdav/internal"
 )
 
 type PutAddressObjectOptions struct {

client.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/emersion/go-webdav/internal"
+	"github.com/jonyTF/go-webdav/internal"
 )
 
 // HTTPClient performs HTTP requests. It's implemented by *http.Client.

cmd/webdav-server/main.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/emersion/go-webdav"
+	"github.com/jonyTF/go-webdav"
 )
 
 func main() {

elements.go

@@ -3,7 +3,7 @@ package webdav
 import (
 	"encoding/xml"
 
-	"github.com/emersion/go-webdav/internal"
+	"github.com/jonyTF/go-webdav/internal"
 )
 
 var (

fs_local.go

@@ -11,7 +11,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/emersion/go-webdav/internal"
+	"github.com/jonyTF/go-webdav/internal"
 )
 
 // LocalFileSystem implements FileSystem for a local directory.

go.mod

@@ -1,4 +1,4 @@
-module github.com/emersion/go-webdav
+module github.com/jonyTF/go-webdav
 
 go 1.13
 

server.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/emersion/go-webdav/internal"
+	"github.com/jonyTF/go-webdav/internal"
 )
 
 // FileSystem is a WebDAV server backend.

webdav.go

@@ -6,7 +6,7 @@ package webdav
 import (
 	"time"
 
-	"github.com/emersion/go-webdav/internal"
+	"github.com/jonyTF/go-webdav/internal"
 )
 
 // FileInfo holds information about a WebDAV file.