Cleanup fixes (#1422)

* cleanup: remove dead code

removing some code that does nothing

* cleanup: fixing usage of deprecated gqlgen/graphql api in api/changeset_translator

* cleanup: changing to recommended comparison methods

Changing byte and case-insensitive string comparison to the recommended methods.

* cleanup: making staticcheck happy

pkg/api/changeset_translator.go

@@ -12,8 +12,8 @@ import (
 const updateInputField = "input"
 
 func getArgumentMap(ctx context.Context) map[string]interface{} {
-	rctx := graphql.GetResolverContext(ctx)
-	reqCtx := graphql.GetRequestContext(ctx)
+	rctx := graphql.GetFieldContext(ctx)
+	reqCtx := graphql.GetOperationContext(ctx)
 	return rctx.Field.ArgumentMap(reqCtx.Variables)
 }
 

pkg/api/resolver.go

@@ -208,13 +208,10 @@ func (r *queryResolver) SceneMarkerTags(ctx context.Context, scene_id string) ([
 				return err
 			}
 			_, hasKey := tags[markerPrimaryTag.ID]
-			var sceneMarkerTag *models.SceneMarkerTag
 			if !hasKey {
-				sceneMarkerTag = &models.SceneMarkerTag{Tag: markerPrimaryTag}
+				sceneMarkerTag := &models.SceneMarkerTag{Tag: markerPrimaryTag}
 				tags[markerPrimaryTag.ID] = sceneMarkerTag
 				keys = append(keys, markerPrimaryTag.ID)
-			} else {
-				sceneMarkerTag = tags[markerPrimaryTag.ID]
 			}
 			tags[markerPrimaryTag.ID].SceneMarkers = append(tags[markerPrimaryTag.ID].SceneMarkers, sceneMarker)
 		}

pkg/api/resolver_model_scene.go

@@ -161,8 +161,7 @@ func (r *sceneResolver) Movies(ctx context.Context, obj *models.Scene) (ret []*m
 			}
 
 			if sceneIdx.Valid {
-				var idx int
-				idx = int(sceneIdx.Int64)
+				idx := int(sceneIdx.Int64)
 				sceneMovie.SceneIndex = &idx
 			}
 

pkg/manager/exclude_files.go

@@ -90,7 +90,7 @@ func matchFileSimple(file string, regExps []*regexp.Regexp) bool {
 func matchExtension(path string, extensions []string) bool {
 	ext := filepath.Ext(path)
 	for _, e := range extensions {
-		if strings.ToLower(ext) == strings.ToLower("."+e) {
+		if strings.EqualFold(ext, "."+e) {
 			return true
 		}
 	}

pkg/manager/jsonschema/utils.go

@@ -14,7 +14,7 @@ var nilTime = (time.Time{}).UnixNano()
 func CompareJSON(a interface{}, b interface{}) bool {
 	aBuf, _ := encode(a)
 	bBuf, _ := encode(b)
-	return bytes.Compare(aBuf, bBuf) == 0
+	return bytes.Equal(aBuf, bBuf)
 }
 
 func marshalToFile(filePath string, j interface{}) error {

pkg/manager/task_transcode.go

@@ -85,7 +85,6 @@ func (t *GenerateTranscodeTask) Start(wg *sizedwaitgroup.SizedWaitGroup) {
 	}
 
 	logger.Debugf("[transcode] <%s> created transcode: %s", sceneHash, outputPath)
-	return
 }
 
 // return true if transcode is needed

pkg/scraper/cookies.go

@@ -20,7 +20,6 @@ import (
 func setCookies(jar *cookiejar.Jar, scraperConfig config) {
 	driverOptions := scraperConfig.DriverOptions
 	if driverOptions != nil && !driverOptions.UseCDP {
-		var foundURLs []*url.URL
 
 		for _, ckURL := range driverOptions.Cookies { // go through all cookies
 			url, err := url.Parse(ckURL.CookieURL) // CookieURL must be valid, include schema
@@ -44,12 +43,8 @@ func setCookies(jar *cookiejar.Jar, scraperConfig config) {
 
 				if jar.Cookies(url) == nil {
 					logger.Warnf("Setting jar cookies for %s failed", url.String())
-				} else {
-
-					foundURLs = append(foundURLs, url)
 				}
 			}
-
 		}
 	}
 }

pkg/scraper/mapped.go

@@ -659,13 +659,7 @@ func (c mappedScraperAttrConfig) hasSplit() bool {
 
 func (c mappedScraperAttrConfig) concatenateResults(nodes []string) string {
 	separator := c.Concat
-	result := []string{}
-
-	for _, text := range nodes {
-		result = append(result, text)
-	}
-
-	return strings.Join(result, separator)
+	return strings.Join(nodes, separator)
 }
 
 func (c mappedScraperAttrConfig) cleanResults(nodes []string) []string {

pkg/scraper/stashbox/stash_box.go

@@ -573,7 +573,7 @@ func (c Client) FindStashBoxPerformerByName(name string) (*models.ScrapedScenePe
 
 	var ret *models.ScrapedScenePerformer
 	for _, performer := range performers.SearchPerformer {
-		if strings.ToLower(performer.Name) == strings.ToLower(name) {
+		if strings.EqualFold(performer.Name, name) {
 			ret = performerFragmentToScrapedScenePerformer(*performer)
 		}
 	}