Resolve GraphQL schema updates based on current stash submodule

app/src/main/java/com/github/damontecres/stashapp/PerformerDetailsFragment.kt

@@ -8,7 +8,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import com.github.damontecres.stashapp.api.fragment.PerformerData
-import com.github.damontecres.stashapp.api.type.CircumisedEnum
+import com.github.damontecres.stashapp.api.type.CircumcisedEnum
 import com.github.damontecres.stashapp.presenters.StashPresenter
 import com.github.damontecres.stashapp.util.StashCoroutineExceptionHandler
 import com.github.damontecres.stashapp.util.StashGlide
@@ -111,9 +111,9 @@ class PerformerDetailsFragment : DetailsFragment() {
         }
         val circString =
             when (perf.circumcised) {
-                CircumisedEnum.CUT -> getString(R.string.stashapp_circumcised_types_CUT)
-                CircumisedEnum.UNCUT -> getString(R.string.stashapp_circumcised_types_UNCUT)
-                CircumisedEnum.UNKNOWN__, null -> null
+                CircumcisedEnum.CUT -> getString(R.string.stashapp_circumcised_types_CUT)
+                CircumcisedEnum.UNCUT -> getString(R.string.stashapp_circumcised_types_UNCUT)
+                CircumcisedEnum.UNKNOWN__, null -> null
             }
         addRow(R.string.stashapp_circumcised, circString)
 

app/src/main/java/com/github/damontecres/stashapp/filter/DescriptionExtractors.kt

@@ -15,7 +15,7 @@ import com.github.damontecres.stashapp.api.fragment.StashData
 import com.github.damontecres.stashapp.api.fragment.StudioData
 import com.github.damontecres.stashapp.api.fragment.TagData
 import com.github.damontecres.stashapp.api.type.CircumcisionCriterionInput
-import com.github.damontecres.stashapp.api.type.CircumisedEnum
+import com.github.damontecres.stashapp.api.type.CircumcisedEnum
 import com.github.damontecres.stashapp.api.type.CriterionModifier
 import com.github.damontecres.stashapp.api.type.DateCriterionInput
 import com.github.damontecres.stashapp.api.type.FloatCriterionInput
@@ -26,7 +26,7 @@ import com.github.damontecres.stashapp.api.type.IntCriterionInput
 import com.github.damontecres.stashapp.api.type.MultiCriterionInput
 import com.github.damontecres.stashapp.api.type.OrientationCriterionInput
 import com.github.damontecres.stashapp.api.type.OrientationEnum
-import com.github.damontecres.stashapp.api.type.PHashDuplicationCriterionInput
+import com.github.damontecres.stashapp.api.type.DuplicationCriterionInput
 import com.github.damontecres.stashapp.api.type.PhashDistanceCriterionInput
 import com.github.damontecres.stashapp.api.type.ResolutionCriterionInput
 import com.github.damontecres.stashapp.api.type.ResolutionEnum
@@ -368,7 +368,7 @@ fun filterSummary(f: PhashDistanceCriterionInput): String {
     }
 }
 
-fun filterSummary(f: PHashDuplicationCriterionInput): String {
+fun filterSummary(f: DuplicationCriterionInput): String {
     val duplicated = f.duplicated.getOrNull()
     val distance = f.distance.getOrNull()
     return if (distance != null) {
@@ -429,9 +429,9 @@ fun filterSummary(f: CircumcisionCriterionInput): String {
     val strings =
         f.value.getOrNull().orEmpty().map {
             when (it) {
-                CircumisedEnum.CUT -> context.getString(R.string.stashapp_circumcised_types_CUT)
-                CircumisedEnum.UNCUT -> context.getString(R.string.stashapp_circumcised_types_UNCUT)
-                CircumisedEnum.UNKNOWN__ -> "Unknown"
+                CircumcisedEnum.CUT -> context.getString(R.string.stashapp_circumcised_types_CUT)
+                CircumcisedEnum.UNCUT -> context.getString(R.string.stashapp_circumcised_types_UNCUT)
+                CircumcisedEnum.UNKNOWN__ -> "Unknown"
             }
         }
     return when (f.modifier) {
@@ -553,7 +553,7 @@ fun filterSummary(
                 filterSummary(value)
             }
 
-            is PHashDuplicationCriterionInput -> {
+            is DuplicationCriterionInput -> {
                 filterSummary(value)
             }
 

app/src/main/java/com/github/damontecres/stashapp/filter/output/FilterOutputs.kt

@@ -1,7 +1,7 @@
 package com.github.damontecres.stashapp.filter.output
 
 import com.github.damontecres.stashapp.api.type.CircumcisionCriterionInput
-import com.github.damontecres.stashapp.api.type.CircumisedEnum
+import com.github.damontecres.stashapp.api.type.CircumcisedEnum
 import com.github.damontecres.stashapp.api.type.CriterionModifier
 import com.github.damontecres.stashapp.api.type.CustomFieldCriterionInput
 import com.github.damontecres.stashapp.api.type.DateCriterionInput
@@ -13,7 +13,7 @@ import com.github.damontecres.stashapp.api.type.IntCriterionInput
 import com.github.damontecres.stashapp.api.type.MultiCriterionInput
 import com.github.damontecres.stashapp.api.type.OrientationCriterionInput
 import com.github.damontecres.stashapp.api.type.OrientationEnum
-import com.github.damontecres.stashapp.api.type.PHashDuplicationCriterionInput
+import com.github.damontecres.stashapp.api.type.DuplicationCriterionInput
 import com.github.damontecres.stashapp.api.type.PhashDistanceCriterionInput
 import com.github.damontecres.stashapp.api.type.ResolutionCriterionInput
 import com.github.damontecres.stashapp.api.type.ResolutionEnum
@@ -143,7 +143,7 @@ fun PhashDistanceCriterionInput.toMap(): Map<String, Any> =
         )
     }
 
-fun PHashDuplicationCriterionInput.toMap(): Map<String, Any> =
+fun DuplicationCriterionInput.toMap(): Map<String, Any> =
     buildMap {
         put("modifier", CriterionModifier.EQUALS.rawValue)
         if (duplicated.getOrNull() == false) {
@@ -261,9 +261,9 @@ fun CircumcisionCriterionInput.toMap(): Map<String, Any> =
                 .getOrNull()
                 ?.map {
                     when (it) {
-                        CircumisedEnum.CUT -> "Cut"
-                        CircumisedEnum.UNCUT -> "Uncut"
-                        CircumisedEnum.UNKNOWN__ -> "Unknown"
+                        CircumcisedEnum.CUT -> "Cut"
+                        CircumcisedEnum.UNCUT -> "Uncut"
+                        CircumcisedEnum.UNKNOWN__ -> "Unknown"
                     }
                 }.orEmpty()
         put("value", values)

app/src/main/java/com/github/damontecres/stashapp/filter/output/FilterWriter.kt

@@ -11,7 +11,7 @@ import com.github.damontecres.stashapp.api.type.HierarchicalMultiCriterionInput
 import com.github.damontecres.stashapp.api.type.IntCriterionInput
 import com.github.damontecres.stashapp.api.type.MultiCriterionInput
 import com.github.damontecres.stashapp.api.type.OrientationCriterionInput
-import com.github.damontecres.stashapp.api.type.PHashDuplicationCriterionInput
+import com.github.damontecres.stashapp.api.type.DuplicationCriterionInput
 import com.github.damontecres.stashapp.api.type.PhashDistanceCriterionInput
 import com.github.damontecres.stashapp.api.type.ResolutionCriterionInput
 import com.github.damontecres.stashapp.api.type.StashDataFilter
@@ -60,7 +60,7 @@ class FilterWriter(
                                         o.toMap()
                                     }
 
-                                    is PHashDuplicationCriterionInput -> {
+                                    is DuplicationCriterionInput -> {
                                         o.toMap()
                                     }
 

app/src/main/java/com/github/damontecres/stashapp/filter/picker/CircumcisionPickerFragment.kt

@@ -7,7 +7,7 @@ import androidx.leanback.widget.GuidedAction
 import com.apollographql.apollo.api.Optional
 import com.github.damontecres.stashapp.R
 import com.github.damontecres.stashapp.api.type.CircumcisionCriterionInput
-import com.github.damontecres.stashapp.api.type.CircumisedEnum
+import com.github.damontecres.stashapp.api.type.CircumcisedEnum
 import com.github.damontecres.stashapp.api.type.CriterionModifier
 import com.github.damontecres.stashapp.api.type.StashDataFilter
 import com.github.damontecres.stashapp.filter.CreateFilterGuidedStepFragment
@@ -56,14 +56,14 @@ class CircumcisionPickerFragment(
                 .build(),
         )
 
-        CircumisedEnum.entries
+        CircumcisedEnum.entries
             .mapIndexedNotNull { index, circ ->
-                if (circ != CircumisedEnum.UNKNOWN__) {
+                if (circ != CircumcisedEnum.UNKNOWN__) {
                     val name =
                         when (circ) {
-                            CircumisedEnum.CUT -> getString(R.string.stashapp_circumcised_types_CUT)
-                            CircumisedEnum.UNCUT -> getString(R.string.stashapp_circumcised_types_UNCUT)
-                            CircumisedEnum.UNKNOWN__ -> "Unknown"
+                            CircumcisedEnum.CUT -> getString(R.string.stashapp_circumcised_types_CUT)
+                            CircumcisedEnum.UNCUT -> getString(R.string.stashapp_circumcised_types_UNCUT)
+                            CircumcisedEnum.UNKNOWN__ -> "Unknown"
                         }
                     val action =
                         GuidedAction
@@ -111,10 +111,10 @@ class CircumcisionPickerFragment(
         }
     }
 
-    private fun getValues(): List<CircumisedEnum>? =
+    private fun getValues(): List<CircumcisedEnum>? =
         actions
             .filter { it.id >= CIRC_OFFSET && it.isChecked }
-            .map { CircumisedEnum.entries[(it.id - CIRC_OFFSET).toInt()] }
+            .map { CircumcisedEnum.entries[(it.id - CIRC_OFFSET).toInt()] }
             .ifEmpty { null }
 
     private fun setFinish() {

app/src/main/java/com/github/damontecres/stashapp/ui/components/filter/CreateObjectFilter.kt

@@ -22,7 +22,7 @@ import androidx.tv.material3.Icon
 import com.apollographql.apollo.api.Optional
 import com.github.damontecres.stashapp.R
 import com.github.damontecres.stashapp.api.type.CircumcisionCriterionInput
-import com.github.damontecres.stashapp.api.type.CircumisedEnum
+import com.github.damontecres.stashapp.api.type.CircumcisedEnum
 import com.github.damontecres.stashapp.api.type.CriterionModifier
 import com.github.damontecres.stashapp.api.type.DateCriterionInput
 import com.github.damontecres.stashapp.api.type.FloatCriterionInput
@@ -478,8 +478,8 @@ fun ObjectFilterPicker(
                                 SelectFromListAction(
                                     filterName = context.getString(filterOption.nameStringId),
                                     options =
-                                        CircumisedEnum.entries
-                                            .filter { it != CircumisedEnum.UNKNOWN__ }
+                                        CircumcisedEnum.entries
+                                            .filter { it != CircumcisedEnum.UNKNOWN__ }
                                             .map { context.getString(circNameId(it)) },
                                     currentOptions =
                                         (input.value.getOrNull() ?: listOf()).map {
@@ -488,7 +488,7 @@ fun ObjectFilterPicker(
                                     multiSelect = true,
                                     onSubmit = {
                                         value =
-                                            input.copy(value = Optional.present(it.map { CircumisedEnum.entries[it] }))
+                                            input.copy(value = Optional.present(it.map { CircumcisedEnum.entries[it] }))
                                     },
                                 ),
                             )

app/src/main/java/com/github/damontecres/stashapp/ui/pages/PerformerPage.kt

@@ -45,7 +45,7 @@ import com.github.damontecres.stashapp.StashApplication
 import com.github.damontecres.stashapp.api.fragment.PerformerData
 import com.github.damontecres.stashapp.api.fragment.StudioData
 import com.github.damontecres.stashapp.api.fragment.TagData
-import com.github.damontecres.stashapp.api.type.CircumisedEnum
+import com.github.damontecres.stashapp.api.type.CircumcisedEnum
 import com.github.damontecres.stashapp.api.type.CriterionModifier
 import com.github.damontecres.stashapp.api.type.GalleryFilterType
 import com.github.damontecres.stashapp.api.type.GroupFilterType
@@ -628,9 +628,9 @@ fun PerformerDetails(
                     }
                     val circString =
                         when (perf.circumcised) {
-                            CircumisedEnum.CUT -> context.getString(R.string.stashapp_circumcised_types_CUT)
-                            CircumisedEnum.UNCUT -> context.getString(R.string.stashapp_circumcised_types_UNCUT)
-                            CircumisedEnum.UNKNOWN__, null -> null
+                            CircumcisedEnum.CUT -> context.getString(R.string.stashapp_circumcised_types_CUT)
+                            CircumcisedEnum.UNCUT -> context.getString(R.string.stashapp_circumcised_types_UNCUT)
+                            CircumcisedEnum.UNKNOWN__, null -> null
                         }
                     add(TableRow.from(context, R.string.stashapp_circumcised, circString))
 

app/src/main/java/com/github/damontecres/stashapp/util/FilterParser.kt

@@ -2,7 +2,7 @@ package com.github.damontecres.stashapp.util
 
 import com.apollographql.apollo.api.Optional
 import com.github.damontecres.stashapp.api.type.CircumcisionCriterionInput
-import com.github.damontecres.stashapp.api.type.CircumisedEnum
+import com.github.damontecres.stashapp.api.type.CircumcisedEnum
 import com.github.damontecres.stashapp.api.type.CriterionModifier
 import com.github.damontecres.stashapp.api.type.CustomFieldCriterionInput
 import com.github.damontecres.stashapp.api.type.DateCriterionInput
@@ -14,7 +14,8 @@ import com.github.damontecres.stashapp.api.type.IntCriterionInput
 import com.github.damontecres.stashapp.api.type.MultiCriterionInput
 import com.github.damontecres.stashapp.api.type.OrientationCriterionInput
 import com.github.damontecres.stashapp.api.type.OrientationEnum
-import com.github.damontecres.stashapp.api.type.PHashDuplicationCriterionInput
+import com.github.damontecres.stashapp.api.type.DuplicationCriterionInput
+import com.github.damontecres.stashapp.api.type.FileDuplicationCriterionInput
 import com.github.damontecres.stashapp.api.type.PhashDistanceCriterionInput
 import com.github.damontecres.stashapp.api.type.ResolutionCriterionInput
 import com.github.damontecres.stashapp.api.type.ResolutionEnum
@@ -173,7 +174,7 @@ class FilterParser(
                 value =
                     Optional.presentIfNotNull(
                         valueList
-                            ?.map { CircumisedEnum.valueOf(it.uppercase()) }
+                            ?.map { CircumcisedEnum.valueOf(it.uppercase()) }
                             ?.toList(),
                     ),
                 modifier = CriterionModifier.valueOf(it["modifier"]!! as String),
@@ -245,9 +246,19 @@ class FilterParser(
             null
         }
 
-    fun convertPHashDuplicationCriterionInput(it: Map<String, *>?): PHashDuplicationCriterionInput? =
+    fun convertDuplicationCriterionInput(it: Map<String, *>?): DuplicationCriterionInput? =
         if (it != null) {
-            PHashDuplicationCriterionInput(
+            DuplicationCriterionInput(
+                duplicated = Optional.presentIfNotNull(it["value"]?.toString()?.toBoolean()),
+                distance = Optional.presentIfNotNull(it["distance"]?.toString()?.toInt()),
+            )
+        } else {
+            null
+        }
+
+    fun convertFileDuplicationCriterionInput(it: Map<String, *>?): FileDuplicationCriterionInput? =
+        if (it != null) {
+            FileDuplicationCriterionInput(
                 duplicated = Optional.presentIfNotNull(it["value"]?.toString()?.toBoolean()),
                 distance = Optional.presentIfNotNull(it["distance"]?.toString()?.toInt()),
             )

app/src/main/java/com/github/damontecres/stashapp/util/FilterParserExtensions.kt

@@ -98,7 +98,7 @@ fun FilterParser.convertSceneFilterType(f: Any?): SceneFilterType? =
             rating100 = Optional.presentIfNotNull(convertIntCriterionInput(filter["rating100"])),
             organized = Optional.presentIfNotNull(convertBoolean(filter["organized"])),
             o_counter = Optional.presentIfNotNull(convertIntCriterionInput(filter["o_counter"])),
-            duplicated = Optional.presentIfNotNull(convertPHashDuplicationCriterionInput(filter["duplicated"])),
+            duplicated = Optional.presentIfNotNull(convertDuplicationCriterionInput(filter["duplicated"])),
             resolution = Optional.presentIfNotNull(convertResolutionCriterionInput(filter["resolution"])),
             orientation = Optional.presentIfNotNull(convertOrientationCriterionInput(filter["orientation"])),
             framerate = Optional.presentIfNotNull(convertIntCriterionInput(filter["framerate"])),
@@ -415,7 +415,7 @@ fun FilterParser.convertFileFilterType(f: Any?): FileFilterType? =
             parent_folder = Optional.presentIfNotNull(convertHierarchicalMultiCriterionInput(filter["parent_folder"])),
             zip_file = Optional.presentIfNotNull(convertMultiCriterionInput(filter["zip_file"])),
             mod_time = Optional.presentIfNotNull(convertTimestampCriterionInput(filter["mod_time"])),
-            duplicated = Optional.presentIfNotNull(convertPHashDuplicationCriterionInput(filter["duplicated"])),
+            duplicated = Optional.presentIfNotNull(convertFileDuplicationCriterionInput(filter["duplicated"])),
             video_file_filter = Optional.presentIfNotNull(convertVideoFileFilterInput(filter["video_file_filter"])),
             image_file_filter = Optional.presentIfNotNull(convertImageFileFilterInput(filter["image_file_filter"])),
             scene_count = Optional.presentIfNotNull(convertIntCriterionInput(filter["scene_count"])),

app/src/main/java/com/github/damontecres/stashapp/views/Formatting.kt

@@ -6,7 +6,7 @@ import com.github.damontecres.stashapp.R
 import com.github.damontecres.stashapp.StashApplication
 import com.github.damontecres.stashapp.api.fragment.FullMarkerData
 import com.github.damontecres.stashapp.api.fragment.MarkerData
-import com.github.damontecres.stashapp.api.type.CircumisedEnum
+import com.github.damontecres.stashapp.api.type.CircumcisedEnum
 import com.github.damontecres.stashapp.api.type.CriterionModifier
 import com.github.damontecres.stashapp.util.StashServer
 import java.time.LocalDate
@@ -176,11 +176,11 @@ fun formatNumber(
             .format(number)
     }
 
-fun circNameId(circ: CircumisedEnum): Int =
+fun circNameId(circ: CircumcisedEnum): Int =
     when (circ) {
-        CircumisedEnum.CUT -> R.string.stashapp_circumcised_types_CUT
-        CircumisedEnum.UNCUT -> R.string.stashapp_circumcised_types_UNCUT
-        CircumisedEnum.UNKNOWN__ -> R.string.stashapp_display_mode_unknown
+        CircumcisedEnum.CUT -> R.string.stashapp_circumcised_types_CUT
+        CircumcisedEnum.UNCUT -> R.string.stashapp_circumcised_types_UNCUT
+        CircumcisedEnum.UNKNOWN__ -> R.string.stashapp_display_mode_unknown
     }
 
 val FullMarkerData.formatSeconds: String