From ba09bfa64a3b731e9d6f856dc0d1e6da97f13eab Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 23 Apr 2020 09:14:58 +1000
Subject: [PATCH] Include scene o-counter in import/export (#488)

* Include o-counter in import/export
* Fix scene card o-counter display
---
 pkg/manager/jsonschema/scene.go             | 1 +
 pkg/manager/task_export.go                  | 3 +++
 pkg/manager/task_import.go                  | 2 ++
 pkg/models/querybuilder_scene.go            | 4 ++--
 ui/v2.5/src/components/Scenes/SceneCard.tsx | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkg/manager/jsonschema/scene.go b/pkg/manager/jsonschema/scene.go
index 8f3c581e6..ee3f26333 100644
--- a/pkg/manager/jsonschema/scene.go
+++ b/pkg/manager/jsonschema/scene.go
@@ -40,6 +40,7 @@ type Scene struct {
 	URL        string          `json:"url,omitempty"`
 	Date       string          `json:"date,omitempty"`
 	Rating     int             `json:"rating,omitempty"`
+	OCounter   int             `json:"o_counter,omitempty"`
 	Details    string          `json:"details,omitempty"`
 	Gallery    string          `json:"gallery,omitempty"`
 	Performers []string        `json:"performers,omitempty"`
diff --git a/pkg/manager/task_export.go b/pkg/manager/task_export.go
index cdc15e1b1..45ae26d36 100644
--- a/pkg/manager/task_export.go
+++ b/pkg/manager/task_export.go
@@ -103,6 +103,9 @@ func (t *ExportTask) ExportScenes(ctx context.Context) {
 		if scene.Rating.Valid {
 			newSceneJSON.Rating = int(scene.Rating.Int64)
 		}
+
+		newSceneJSON.OCounter = scene.OCounter
+
 		if scene.Details.Valid {
 			newSceneJSON.Details = scene.Details.String
 		}
diff --git a/pkg/manager/task_import.go b/pkg/manager/task_import.go
index 9d483f59e..89522f788 100644
--- a/pkg/manager/task_import.go
+++ b/pkg/manager/task_import.go
@@ -489,6 +489,8 @@ func (t *ImportTask) ImportScenes(ctx context.Context) {
 			if sceneJSON.Rating != 0 {
 				newScene.Rating = sql.NullInt64{Int64: int64(sceneJSON.Rating), Valid: true}
 			}
+
+			newScene.OCounter = sceneJSON.OCounter
 			newScene.CreatedAt = models.SQLiteTimestamp{Timestamp: t.getTimeFromJSONTime(sceneJSON.CreatedAt)}
 			newScene.UpdatedAt = models.SQLiteTimestamp{Timestamp: t.getTimeFromJSONTime(sceneJSON.UpdatedAt)}
 
diff --git a/pkg/models/querybuilder_scene.go b/pkg/models/querybuilder_scene.go
index aece66d76..0532869c5 100644
--- a/pkg/models/querybuilder_scene.go
+++ b/pkg/models/querybuilder_scene.go
@@ -49,10 +49,10 @@ func NewSceneQueryBuilder() SceneQueryBuilder {
 func (qb *SceneQueryBuilder) Create(newScene Scene, tx *sqlx.Tx) (*Scene, error) {
 	ensureTx(tx)
 	result, err := tx.NamedExec(
-		`INSERT INTO scenes (checksum, path, title, details, url, date, rating, size, duration, video_codec,
+		`INSERT INTO scenes (checksum, path, title, details, url, date, rating, o_counter, size, duration, video_codec,
                     			    audio_codec, format, width, height, framerate, bitrate, studio_id, cover,
                     				created_at, updated_at)
-				VALUES (:checksum, :path, :title, :details, :url, :date, :rating, :size, :duration, :video_codec,
+				VALUES (:checksum, :path, :title, :details, :url, :date, :rating, :o_counter, :size, :duration, :video_codec,
 					:audio_codec, :format, :width, :height, :framerate, :bitrate, :studio_id, :cover,
 				        :created_at, :updated_at)
 		`,
diff --git a/ui/v2.5/src/components/Scenes/SceneCard.tsx b/ui/v2.5/src/components/Scenes/SceneCard.tsx
index e88adc5c6..c59f020dd 100644
--- a/ui/v2.5/src/components/Scenes/SceneCard.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneCard.tsx
@@ -182,7 +182,7 @@ export const SceneCard: React.FC<ISceneCardProps> = (
       return (
         <div>
           <Button className="minimal">
-            <SweatDrops />
+            <span className="fa-icon"><SweatDrops /></span>
             <span>{props.scene.o_counter}</span>
           </Button>
         </div>