refactor artist to use coverArt

fix cover art image caching

lib/database/database.dart

@@ -438,8 +438,6 @@ extension ArtistToDb on models.Artist {
     name: name,
     starred: Value(starred),
     coverArt: Value(coverArt),
-    smallImage: Value(smallImage),
-    largeImage: Value(largeImage),
   );
 }
 

lib/database/database.g.dart

@@ -719,34 +719,8 @@ class Artists extends Table with TableInfo<Artists, models.Artist> {
     requiredDuringInsert: false,
     $customConstraints: '',
   );
-  late final GeneratedColumnWithTypeConverter<Uri?, String> smallImage =
-      GeneratedColumn<String>(
-        'small_image',
-        aliasedName,
-        true,
-        type: DriftSqlType.string,
-        requiredDuringInsert: false,
-        $customConstraints: '',
-      ).withConverter<Uri?>(Artists.$convertersmallImagen);
-  late final GeneratedColumnWithTypeConverter<Uri?, String> largeImage =
-      GeneratedColumn<String>(
-        'large_image',
-        aliasedName,
-        true,
-        type: DriftSqlType.string,
-        requiredDuringInsert: false,
-        $customConstraints: '',
-      ).withConverter<Uri?>(Artists.$converterlargeImagen);
   @override
-  List<GeneratedColumn> get $columns => [
-    sourceId,
-    id,
-    name,
-    starred,
-    coverArt,
-    smallImage,
-    largeImage,
-  ];
+  List<GeneratedColumn> get $columns => [sourceId, id, name, starred, coverArt];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -817,18 +791,6 @@ class Artists extends Table with TableInfo<Artists, models.Artist> {
         DriftSqlType.string,
         data['${effectivePrefix}cover_art'],
       ),
-      smallImage: Artists.$convertersmallImagen.fromSql(
-        attachedDatabase.typeMapping.read(
-          DriftSqlType.string,
-          data['${effectivePrefix}small_image'],
-        ),
-      ),
-      largeImage: Artists.$converterlargeImagen.fromSql(
-        attachedDatabase.typeMapping.read(
-          DriftSqlType.string,
-          data['${effectivePrefix}large_image'],
-        ),
-      ),
     );
   }
 
@@ -837,12 +799,6 @@ class Artists extends Table with TableInfo<Artists, models.Artist> {
     return Artists(attachedDatabase, alias);
   }
 
-  static TypeConverter<Uri, String> $convertersmallImage = const UriConverter();
-  static TypeConverter<Uri?, String?> $convertersmallImagen =
-      NullAwareTypeConverter.wrap($convertersmallImage);
-  static TypeConverter<Uri, String> $converterlargeImage = const UriConverter();
-  static TypeConverter<Uri?, String?> $converterlargeImagen =
-      NullAwareTypeConverter.wrap($converterlargeImage);
   @override
   List<String> get customConstraints => const [
     'PRIMARY KEY(source_id, id)',
@@ -858,8 +814,6 @@ class ArtistsCompanion extends UpdateCompanion<models.Artist> {
   final Value<String> name;
   final Value<DateTime?> starred;
   final Value<String?> coverArt;
-  final Value<Uri?> smallImage;
-  final Value<Uri?> largeImage;
   final Value<int> rowid;
   const ArtistsCompanion({
     this.sourceId = const Value.absent(),
@@ -867,8 +821,6 @@ class ArtistsCompanion extends UpdateCompanion<models.Artist> {
     this.name = const Value.absent(),
     this.starred = const Value.absent(),
     this.coverArt = const Value.absent(),
-    this.smallImage = const Value.absent(),
-    this.largeImage = const Value.absent(),
     this.rowid = const Value.absent(),
   });
   ArtistsCompanion.insert({
@@ -877,8 +829,6 @@ class ArtistsCompanion extends UpdateCompanion<models.Artist> {
     required String name,
     this.starred = const Value.absent(),
     this.coverArt = const Value.absent(),
-    this.smallImage = const Value.absent(),
-    this.largeImage = const Value.absent(),
     this.rowid = const Value.absent(),
   }) : sourceId = Value(sourceId),
        id = Value(id),
@@ -889,8 +839,6 @@ class ArtistsCompanion extends UpdateCompanion<models.Artist> {
     Expression<String>? name,
     Expression<DateTime>? starred,
     Expression<String>? coverArt,
-    Expression<String>? smallImage,
-    Expression<String>? largeImage,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -899,8 +847,6 @@ class ArtistsCompanion extends UpdateCompanion<models.Artist> {
       if (name != null) 'name': name,
       if (starred != null) 'starred': starred,
       if (coverArt != null) 'cover_art': coverArt,
-      if (smallImage != null) 'small_image': smallImage,
-      if (largeImage != null) 'large_image': largeImage,
       if (rowid != null) 'rowid': rowid,
     });
   }
@@ -911,8 +857,6 @@ class ArtistsCompanion extends UpdateCompanion<models.Artist> {
     Value<String>? name,
     Value<DateTime?>? starred,
     Value<String?>? coverArt,
-    Value<Uri?>? smallImage,
-    Value<Uri?>? largeImage,
     Value<int>? rowid,
   }) {
     return ArtistsCompanion(
@@ -921,8 +865,6 @@ class ArtistsCompanion extends UpdateCompanion<models.Artist> {
       name: name ?? this.name,
       starred: starred ?? this.starred,
       coverArt: coverArt ?? this.coverArt,
-      smallImage: smallImage ?? this.smallImage,
-      largeImage: largeImage ?? this.largeImage,
       rowid: rowid ?? this.rowid,
     );
   }
@@ -945,16 +887,6 @@ class ArtistsCompanion extends UpdateCompanion<models.Artist> {
     if (coverArt.present) {
       map['cover_art'] = Variable<String>(coverArt.value);
     }
-    if (smallImage.present) {
-      map['small_image'] = Variable<String>(
-        Artists.$convertersmallImagen.toSql(smallImage.value),
-      );
-    }
-    if (largeImage.present) {
-      map['large_image'] = Variable<String>(
-        Artists.$converterlargeImagen.toSql(largeImage.value),
-      );
-    }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
     }
@@ -969,8 +901,6 @@ class ArtistsCompanion extends UpdateCompanion<models.Artist> {
           ..write('name: $name, ')
           ..write('starred: $starred, ')
           ..write('coverArt: $coverArt, ')
-          ..write('smallImage: $smallImage, ')
-          ..write('largeImage: $largeImage, ')
           ..write('rowid: $rowid')
           ..write(')'))
         .toString();
@@ -2967,8 +2897,6 @@ typedef $ArtistsCreateCompanionBuilder =
       required String name,
       Value<DateTime?> starred,
       Value<String?> coverArt,
-      Value<Uri?> smallImage,
-      Value<Uri?> largeImage,
       Value<int> rowid,
     });
 typedef $ArtistsUpdateCompanionBuilder =
@@ -2978,8 +2906,6 @@ typedef $ArtistsUpdateCompanionBuilder =
       Value<String> name,
       Value<DateTime?> starred,
       Value<String?> coverArt,
-      Value<Uri?> smallImage,
-      Value<Uri?> largeImage,
       Value<int> rowid,
     });
 
@@ -3015,18 +2941,6 @@ class $ArtistsFilterComposer extends Composer<_$SubtracksDatabase, Artists> {
     column: $table.coverArt,
     builder: (column) => ColumnFilters(column),
   );
-
-  ColumnWithTypeConverterFilters<Uri?, Uri, String> get smallImage =>
-      $composableBuilder(
-        column: $table.smallImage,
-        builder: (column) => ColumnWithTypeConverterFilters(column),
-      );
-
-  ColumnWithTypeConverterFilters<Uri?, Uri, String> get largeImage =>
-      $composableBuilder(
-        column: $table.largeImage,
-        builder: (column) => ColumnWithTypeConverterFilters(column),
-      );
 }
 
 class $ArtistsOrderingComposer extends Composer<_$SubtracksDatabase, Artists> {
@@ -3061,16 +2975,6 @@ class $ArtistsOrderingComposer extends Composer<_$SubtracksDatabase, Artists> {
     column: $table.coverArt,
     builder: (column) => ColumnOrderings(column),
   );
-
-  ColumnOrderings<String> get smallImage => $composableBuilder(
-    column: $table.smallImage,
-    builder: (column) => ColumnOrderings(column),
-  );
-
-  ColumnOrderings<String> get largeImage => $composableBuilder(
-    column: $table.largeImage,
-    builder: (column) => ColumnOrderings(column),
-  );
 }
 
 class $ArtistsAnnotationComposer
@@ -3096,18 +3000,6 @@ class $ArtistsAnnotationComposer
 
   GeneratedColumn<String> get coverArt =>
       $composableBuilder(column: $table.coverArt, builder: (column) => column);
-
-  GeneratedColumnWithTypeConverter<Uri?, String> get smallImage =>
-      $composableBuilder(
-        column: $table.smallImage,
-        builder: (column) => column,
-      );
-
-  GeneratedColumnWithTypeConverter<Uri?, String> get largeImage =>
-      $composableBuilder(
-        column: $table.largeImage,
-        builder: (column) => column,
-      );
 }
 
 class $ArtistsTableManager
@@ -3146,8 +3038,6 @@ class $ArtistsTableManager
                 Value<String> name = const Value.absent(),
                 Value<DateTime?> starred = const Value.absent(),
                 Value<String?> coverArt = const Value.absent(),
-                Value<Uri?> smallImage = const Value.absent(),
-                Value<Uri?> largeImage = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
               }) => ArtistsCompanion(
                 sourceId: sourceId,
@@ -3155,8 +3045,6 @@ class $ArtistsTableManager
                 name: name,
                 starred: starred,
                 coverArt: coverArt,
-                smallImage: smallImage,
-                largeImage: largeImage,
                 rowid: rowid,
               ),
           createCompanionCallback:
@@ -3166,8 +3054,6 @@ class $ArtistsTableManager
                 required String name,
                 Value<DateTime?> starred = const Value.absent(),
                 Value<String?> coverArt = const Value.absent(),
-                Value<Uri?> smallImage = const Value.absent(),
-                Value<Uri?> largeImage = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
               }) => ArtistsCompanion.insert(
                 sourceId: sourceId,
@@ -3175,8 +3061,6 @@ class $ArtistsTableManager
                 name: name,
                 starred: starred,
                 coverArt: coverArt,
-                smallImage: smallImage,
-                largeImage: largeImage,
                 rowid: rowid,
               ),
           withReferenceMapper: (p0) => p0

lib/database/tables.drift

@@ -66,8 +66,6 @@ CREATE TABLE artists(
   name TEXT NOT NULL COLLATE NOCASE,
   starred DATETIME,
   cover_art TEXT,
-  small_image TEXT MAPPED BY `const UriConverter()`,
-  large_image TEXT MAPPED BY `const UriConverter()`,
   PRIMARY KEY (source_id, id),
   FOREIGN KEY (source_id) REFERENCES sources (id) ON DELETE CASCADE
 ) WITH Artist;