Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/openfish/entities/annotation.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ LICENSE
package entities

import (
"github.com/ausocean/cloud/datastore"
"github.com/ausocean/openfish/cmd/openfish/types/keypoint"
"github.com/ausocean/openfish/datastore"
)

// Kind of entity to store / fetch from the datastore.
Expand Down
2 changes: 1 addition & 1 deletion cmd/openfish/entities/capturesource.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ package entities
import (
googlestore "cloud.google.com/go/datastore"

"github.com/ausocean/openfish/datastore"
"github.com/ausocean/cloud/datastore"
)

// Kind of entity to store / fetch from the datastore.
Expand Down
2 changes: 1 addition & 1 deletion cmd/openfish/entities/species.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ LICENSE
package entities

import (
"github.com/ausocean/openfish/datastore"
"github.com/ausocean/cloud/datastore"
)

// Kind of entity to store / fetch from the datastore.
Expand Down
2 changes: 1 addition & 1 deletion cmd/openfish/entities/task.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ LICENSE
package entities

import (
"github.com/ausocean/openfish/datastore"
"github.com/ausocean/cloud/datastore"
)

// Kind of entity to store / fetch from the datastore.
Expand Down
2 changes: 1 addition & 1 deletion cmd/openfish/entities/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ LICENSE
package entities

import (
"github.com/ausocean/cloud/datastore"
"github.com/ausocean/openfish/cmd/openfish/types/role"
"github.com/ausocean/openfish/datastore"
)

// Kind of entity to store / fetch from the datastore.
Expand Down
2 changes: 1 addition & 1 deletion cmd/openfish/entities/videostream.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ package entities
import (
"time"

"github.com/ausocean/openfish/datastore"
"github.com/ausocean/cloud/datastore"
)

// Kind of entity to store / fetch from the datastore.
Expand Down
2 changes: 1 addition & 1 deletion cmd/openfish/globals/globals.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ package globals
import (
"context"

"github.com/ausocean/cloud/datastore"
"github.com/ausocean/openfish/cmd/openfish/entities"
"github.com/ausocean/openfish/datastore"
"github.com/ausocean/openfish/storage"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/openfish/services/annotations.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ import (
"errors"
"fmt"

"github.com/ausocean/cloud/datastore"
"github.com/ausocean/openfish/cmd/openfish/entities"
"github.com/ausocean/openfish/cmd/openfish/globals"
"github.com/ausocean/openfish/cmd/openfish/types/keypoint"
"github.com/ausocean/openfish/cmd/openfish/types/videotime"
"github.com/ausocean/openfish/datastore"
)

// Identification is a species suggestion made by users.
Expand Down
2 changes: 1 addition & 1 deletion cmd/openfish/services/capturesources.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ package services
import (
"context"

"github.com/ausocean/cloud/datastore"
"github.com/ausocean/openfish/cmd/openfish/entities"
"github.com/ausocean/openfish/cmd/openfish/globals"
"github.com/ausocean/openfish/cmd/openfish/types/latlong"
"github.com/ausocean/openfish/datastore"
)

// CaptureSource stores information about the camera that produces video streams.
Expand Down
2 changes: 1 addition & 1 deletion cmd/openfish/services/species.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ import (
"context"
"strings"

"github.com/ausocean/cloud/datastore"
"github.com/ausocean/openfish/cmd/openfish/entities"
"github.com/ausocean/openfish/cmd/openfish/globals"
"github.com/ausocean/openfish/cmd/openfish/sliceutils"
"github.com/ausocean/openfish/datastore"
)

// Species describes a species that can be chosen in identifications on a stream.
Expand Down
2 changes: 1 addition & 1 deletion cmd/openfish/services/tasks.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import (
"context"
"net/url"

"github.com/ausocean/cloud/datastore"
"github.com/ausocean/openfish/cmd/openfish/entities"
"github.com/ausocean/openfish/cmd/openfish/globals"
"github.com/ausocean/openfish/datastore"
)

// TaskStatus represents the status of a task.
Expand Down
2 changes: 1 addition & 1 deletion cmd/openfish/services/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ package services
import (
"context"

"github.com/ausocean/cloud/datastore"
"github.com/ausocean/openfish/cmd/openfish/entities"
"github.com/ausocean/openfish/cmd/openfish/globals"
"github.com/ausocean/openfish/cmd/openfish/types/role"
"github.com/ausocean/openfish/datastore"
)

// PublicUser is a user without private information, for public display, e.g. on annotations.
Expand Down
2 changes: 1 addition & 1 deletion cmd/openfish/services/videostreams.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ import (
"fmt"
"time"

"github.com/ausocean/cloud/datastore"
"github.com/ausocean/openfish/cmd/openfish/entities"
"github.com/ausocean/openfish/cmd/openfish/globals"
"github.com/ausocean/openfish/cmd/openfish/types/timespan"
"github.com/ausocean/openfish/cmd/openfish/types/timezone"
"github.com/ausocean/openfish/datastore"
)

// VideoStream is a video stream registered to OpenFish, for annotation and playback.
Expand Down
120 changes: 0 additions & 120 deletions datastore/cache.go

This file was deleted.

136 changes: 0 additions & 136 deletions datastore/cache_test.go

This file was deleted.

Loading