TNG: Guide & Video Providers, Update & Delete API routes (#254)

* packr clean - these files shouldn't be included in the git repo

packr should be run before release builds, but then packr clean should be called to not dirty the repo with these files.

* remove make dep since dependencies rely on go modules now

* replace deprecated gometalinter with golangci-lint

gometalinter is fully deprecated and no longer works, preconfigured .golangci.yml with almost equal linters

* backport Makefile & circleci changes from dev branch

* Provide API endpoints for updating and deleting video and guide sources

* Update frontend submodule to use the new HTTP API methods for editing/deleting

internal/api/guide_source.go

@@ -42,7 +42,7 @@ func addGuide(cc *context.CContext, c *gin.Context) {
 			return
 		}
 
-		if updateErr := cc.API.GuideSource.UpdateGuideSource(newGuide.ID, lineupMetadata); updateErr != nil {
+		if updateErr := cc.API.GuideSource.UpdateProviderData(newGuide.ID, lineupMetadata); updateErr != nil {
 			c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("error while updating guide source with provider state: %s", updateErr))
 			return
 		}
@@ -68,6 +68,45 @@ func addGuide(cc *context.CContext, c *gin.Context) {
 	}
 }
 
+func saveGuideSource(cc *context.CContext, c *gin.Context) {
+	guideSourceID := c.Param("sourceId")
+
+	iGuideSourceID, err := strconv.ParseInt(guideSourceID, 0, 32)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	var payload models.GuideSource
+	if c.BindJSON(&payload) == nil {
+		provider, providerErr := cc.API.GuideSource.UpdateGuideSource(int(iGuideSourceID), payload)
+		if providerErr != nil {
+			c.AbortWithError(http.StatusInternalServerError, providerErr)
+			return
+		}
+
+		c.JSON(http.StatusOK, provider)
+	}
+}
+
+func deleteGuideSource(cc *context.CContext, c *gin.Context) {
+	guideSourceID := c.Param("sourceId")
+
+	iGuideSourceID, err := strconv.ParseInt(guideSourceID, 0, 32)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	err = cc.API.GuideSource.DeleteGuideSource(int(iGuideSourceID))
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	c.Status(http.StatusNoContent)
+}
+
 func getGuideSources(cc *context.CContext, c *gin.Context) {
 	sources, sourcesErr := cc.API.GuideSource.GetAllGuideSources(true)
 	if sourcesErr != nil {
@@ -149,7 +188,7 @@ func subscribeToLineup(guideSource *models.GuideSource, provider guideproviders.
 		return
 	}
 
-	if updateErr := cc.API.GuideSource.UpdateGuideSource(guideSource.ID, lineupMetadata); updateErr != nil {
+	if updateErr := cc.API.GuideSource.UpdateProviderData(guideSource.ID, lineupMetadata); updateErr != nil {
 		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("error while updating guide source with provider state: %s", updateErr))
 		return
 	}

internal/api/main.go

@@ -40,6 +40,8 @@ func ServeAPI(cc *context.CContext) {
 
 	apiGroup.GET("/guide_sources", wrapContext(cc, getGuideSources))
 	apiGroup.POST("/guide_sources", wrapContext(cc, addGuide))
+	apiGroup.PUT("/guide_sources/:sourceId", wrapContext(cc, saveGuideSource))
+	apiGroup.DELETE("/guide_sources/:sourceId", wrapContext(cc, deleteGuideSource))
 	apiGroup.GET("/guide_sources/channels", wrapContext(cc, getAllChannels))
 	apiGroup.GET("/guide_sources/programmes", wrapContext(cc, getAllProgrammes))
 
@@ -52,6 +54,8 @@ func ServeAPI(cc *context.CContext) {
 
 	apiGroup.GET("/video_sources", wrapContext(cc, getVideoSources))
 	apiGroup.POST("/video_sources", wrapContext(cc, addVideoSource))
+	apiGroup.PUT("/video_sources/:sourceId", wrapContext(cc, saveVideoSource))
+	apiGroup.DELETE("/video_sources/:sourceId", wrapContext(cc, deleteVideoSource))
 	apiGroup.GET("/video_sources/tracks", wrapContext(cc, getAllTracks))
 
 	apiGroup.GET("/streams", func(c *gin.Context) {

internal/api/video_source.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"net/http"
+	"strconv"
 
 	"github.com/gin-gonic/gin"
 	"github.com/tellytv/telly/internal/context"
@@ -63,10 +64,49 @@ func addVideoSource(cc *context.CContext, c *gin.Context) {
 			}
 			newProvider.Tracks = append(newProvider.Tracks, *newTrack)
 		}
-		c.JSON(http.StatusOK, newProvider)
+		c.JSON(http.StatusCreated, newProvider)
 	}
 }
 
+func saveVideoSource(cc *context.CContext, c *gin.Context) {
+	videoSourceID := c.Param("sourceId")
+
+	iVideoSourceID, err := strconv.ParseInt(videoSourceID, 0, 32)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	var payload models.VideoSource
+	if c.BindJSON(&payload) == nil {
+		provider, providerErr := cc.API.VideoSource.UpdateVideoSource(int(iVideoSourceID), payload)
+		if providerErr != nil {
+			c.AbortWithError(http.StatusInternalServerError, providerErr)
+			return
+		}
+
+		c.JSON(http.StatusOK, provider)
+	}
+}
+
+func deleteVideoSource(cc *context.CContext, c *gin.Context) {
+	videoSourceID := c.Param("sourceId")
+
+	iVideoSourceID, err := strconv.ParseInt(videoSourceID, 0, 32)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	err = cc.API.VideoSource.DeleteVideoSource(int(iVideoSourceID))
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	c.Status(http.StatusNoContent)
+}
+
 func getAllTracks(cc *context.CContext, c *gin.Context) {
 	sources, sourcesErr := cc.API.VideoSource.GetAllVideoSources(true)
 	if sourcesErr != nil {

internal/commands/guide_updates.go

@@ -49,7 +49,7 @@ func fireGuideUpdates(cc *context.CContext, provider *models.GuideSource) error
 		return fmt.Errorf("error when refreshing for provider %s (%s): %s", provider.Name, provider.Provider, reloadErr)
 	}
 
-	if updateErr := cc.API.GuideSource.UpdateGuideSource(provider.ID, lineupMetadata); updateErr != nil {
+	if updateErr := cc.API.GuideSource.UpdateProviderData(provider.ID, lineupMetadata); updateErr != nil {
 		return fmt.Errorf("error when updating guide source provider metadata: %s", updateErr)
 	}
 

internal/models/guide_source.go

@@ -60,8 +60,9 @@ func (g *GuideSource) ProviderConfiguration() *guideproviders.Configuration {
 // GuideSourceAPI contains all methods for the User struct
 type GuideSourceAPI interface {
 	InsertGuideSource(guideSourceStruct GuideSource, providerData interface{}) (*GuideSource, error)
-	DeleteGuideSource(guideSourceID int) (*GuideSource, error)
-	UpdateGuideSource(guideSourceID int, providerData interface{}) error
+	DeleteGuideSource(guideSourceID int) error
+	UpdateGuideSource(guideSourceID int, guideSourceStruct GuideSource) (*GuideSource, error)
+	UpdateProviderData(guideSourceID int, providerData interface{}) error
 	GetGuideSourceByID(id int) (*GuideSource, error)
 	GetAllGuideSources(includeChannels bool) ([]GuideSource, error)
 	GetGuideSourcesForLineup(lineupID int) ([]GuideSource, error)
@@ -123,14 +124,29 @@ func (db *GuideSourceDB) GetGuideSourceByID(id int) (*GuideSource, error) {
 }
 
 // DeleteGuideSource marks a guideSource with the given ID as deleted.
-func (db *GuideSourceDB) DeleteGuideSource(guideSourceID int) (*GuideSource, error) {
-	guideSource := GuideSource{}
-	err := db.SQL.Get(&guideSource, `DELETE FROM guide_source WHERE id = $1`, guideSourceID)
-	return &guideSource, err
+func (db *GuideSourceDB) DeleteGuideSource(guideSourceID int) error {
+	_, err := db.SQL.Exec(`DELETE FROM guide_source WHERE id = $1`, guideSourceID)
+	return err
 }
 
 // UpdateGuideSource updates a guideSource.
-func (db *GuideSourceDB) UpdateGuideSource(guideSourceID int, providerData interface{}) error {
+func (db *GuideSourceDB) UpdateGuideSource(guideSourceID int, guideSourceStruct GuideSource) (*GuideSource, error) {
+	guideSourceStruct.ID = guideSourceID
+
+	_, err := db.SQL.NamedQuery(`
+		UPDATE guide_source
+		SET name = :name, provider = :provider, username = :username, password = :password,
+		xmltv_url = :xmltv_url, update_frequency = :update_frequency
+		WHERE id = :id`, guideSourceStruct)
+	if err != nil {
+		return nil, err
+	}
+
+	return &guideSourceStruct, nil
+}
+
+// UpdateProviderData updates provider_data.
+func (db *GuideSourceDB) UpdateProviderData(guideSourceID int, providerData interface{}) error {
 	_, err := db.SQL.Exec(`UPDATE guide_source SET provider_data = ? WHERE id = ?`, providerData, guideSourceID)
 	return err
 }

internal/models/video_source.go

@@ -60,8 +60,8 @@ func (v *VideoSource) ProviderConfiguration() *videoproviders.Configuration {
 // VideoSourceAPI contains all methods for the User struct
 type VideoSourceAPI interface {
 	InsertVideoSource(videoSourceStruct VideoSource) (*VideoSource, error)
-	DeleteVideoSource(videoSourceID int) (*VideoSource, error)
-	UpdateVideoSource(videoSourceID int, description string) (*VideoSource, error)
+	DeleteVideoSource(videoSourceID int) error
+	UpdateVideoSource(videoSourceID int, videoSourceStruct VideoSource) (*VideoSource, error)
 	GetVideoSourceByID(id int) (*VideoSource, error)
 	GetAllVideoSources(includeTracks bool) ([]VideoSource, error)
 }
@@ -116,17 +116,25 @@ func (db *VideoSourceDB) GetVideoSourceByID(id int) (*VideoSource, error) {
 }
 
 // DeleteVideoSource marks a videoSource with the given ID as deleted.
-func (db *VideoSourceDB) DeleteVideoSource(videoSourceID int) (*VideoSource, error) {
-	videoSource := VideoSource{}
-	err := db.SQL.Get(&videoSource, `DELETE FROM video_source WHERE id = $1`, videoSourceID)
-	return &videoSource, err
+func (db *VideoSourceDB) DeleteVideoSource(videoSourceID int) error {
+	_, err := db.SQL.Exec(`DELETE FROM video_source WHERE id = $1`, videoSourceID)
+	return err
 }
 
 // UpdateVideoSource updates a videoSource.
-func (db *VideoSourceDB) UpdateVideoSource(videoSourceID int, description string) (*VideoSource, error) {
-	videoSource := VideoSource{}
-	err := db.SQL.Get(&videoSource, `UPDATE video_source SET description = $2 WHERE id = $1 RETURNING *`, videoSourceID, description)
-	return &videoSource, err
+func (db *VideoSourceDB) UpdateVideoSource(videoSourceID int, videoSourceStruct VideoSource) (*VideoSource, error) {
+	videoSourceStruct.ID = videoSourceID
+
+	_, err := db.SQL.NamedQuery(`
+		UPDATE video_source
+		SET name = :name, provider = :provider, username = :username, password = :password,
+		base_url = :base_url, m3u_url = :m3u_url, max_streams = :max_streams, update_frequency = :update_frequency
+		WHERE id = :id`, videoSourceStruct)
+	if err != nil {
+		return nil, err
+	}
+
+	return &videoSourceStruct, nil
 }
 
 // GetAllVideoSources returns all video sources in the database.