From 23a5e9df4cb03ccb59a65239147648a459f1fa31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 20 May 2022 15:36:05 +0200 Subject: [PATCH] Manager: cleanup, reorder some imports --- internal/manager/api_impl/jobs.go | 3 ++- internal/manager/api_impl/jobs_query.go | 3 ++- internal/manager/webupdates/sio_rooms.go | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/manager/api_impl/jobs.go b/internal/manager/api_impl/jobs.go index 1ecd503e..e74eb766 100644 --- a/internal/manager/api_impl/jobs.go +++ b/internal/manager/api_impl/jobs.go @@ -7,11 +7,12 @@ import ( "fmt" "net/http" + "github.com/labstack/echo/v4" + "git.blender.org/flamenco/internal/manager/job_compilers" "git.blender.org/flamenco/internal/manager/persistence" "git.blender.org/flamenco/internal/manager/webupdates" "git.blender.org/flamenco/pkg/api" - "github.com/labstack/echo/v4" ) func (f *Flamenco) GetJobTypes(e echo.Context) error { diff --git a/internal/manager/api_impl/jobs_query.go b/internal/manager/api_impl/jobs_query.go index ebcfc419..c1cc368c 100644 --- a/internal/manager/api_impl/jobs_query.go +++ b/internal/manager/api_impl/jobs_query.go @@ -5,10 +5,11 @@ import ( "fmt" "net/http" + "github.com/labstack/echo/v4" + "git.blender.org/flamenco/internal/manager/persistence" "git.blender.org/flamenco/internal/uuid" "git.blender.org/flamenco/pkg/api" - "github.com/labstack/echo/v4" ) func (f *Flamenco) FetchJob(e echo.Context, jobID string) error { diff --git a/internal/manager/webupdates/sio_rooms.go b/internal/manager/webupdates/sio_rooms.go index 5b75493a..6dc4610f 100644 --- a/internal/manager/webupdates/sio_rooms.go +++ b/internal/manager/webupdates/sio_rooms.go @@ -4,10 +4,10 @@ package webupdates import ( "fmt" - "git.blender.org/flamenco/pkg/api" gosocketio "github.com/graarh/golang-socketio" "git.blender.org/flamenco/internal/uuid" + "git.blender.org/flamenco/pkg/api" ) // Separate type aliases for room names and event types; it's otherwise too easy