Fully updated to work with Derpibooru API V2

Atulin · Nov 5, 2020 · ad114c8 · ad114c8
1 parent 7441358
commit ad114c8
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -32,6 +32,9 @@ Derpibooru client made with Flutter
 
 ## Changelog
 
+* **05.11.2020**
+  * Updated to work with the new Derpibooru API
+
 * **17.12.2019**
   * Updated to use AndroidX
   * Updated Flutter to 1.12.13

diff --git a/lib/API/v1/ImageList.dart b/lib/API/v1/ImageList.dart
@@ -1,4 +1,4 @@
-import 'package:chryssibooru/API/v1/API.dart';
+import 'package:chryssibooru/API/v2/API.dart';
 import 'package:chryssibooru/Connect.dart';
 import 'package:flutter/foundation.dart';
 

diff --git a/lib/API/v2/API.dart b/lib/API/v2/API.dart
@@ -54,7 +54,7 @@ class Derpi {
   String viewUrl;
   String sourceUrl;
   DateTime updatedAt;
-  List<String> tags;
+  List<Tag> tags;
   int downvotes;
   int commentCount;
   Representations representations;
@@ -131,7 +131,7 @@ class Derpi {
     viewUrl: json["view_url"],
     sourceUrl: json["source_url"] == null ? null : json["source_url"],
     updatedAt: DateTime.parse(json["updated_at"]),
-    tags: List<String>.from(json["tags"].map((x) => x)),
+    tags: Tag.parse(List<String>.from(json["tags"])),
     downvotes: json["downvotes"],
     commentCount: json["comment_count"],
     representations: Representations.fromJson(json["representations"]),
@@ -233,7 +233,7 @@ class Intensities {
   };
 }
 
-enum MimeType { IMAGE_PNG, IMAGE_JPEG }
+enum MimeType { IMAGE_PNG, IMAGE_JPEG, VIDEO_WEBM, VIDEO_MP4 }
 
 final mimeTypeValues = EnumValues({
   "image/jpeg": MimeType.IMAGE_JPEG,
@@ -301,3 +301,32 @@ class EnumValues<T> {
     return reverseMap;
   }
 }
+
+enum TagType { ARTIST, SPOILER, OC }
+
+final tagTypeValues = new EnumValues({
+  "artist": TagType.ARTIST,
+  "spoiler": TagType.SPOILER,
+  "oc": TagType.OC
+});
+
+class Tag {
+  TagType type;
+  String label;
+
+  Tag(String tag) {
+    var splitTag = tag.split(':');
+    if (splitTag.length >= 2) {
+      this.type = tagTypeValues.map[splitTag[0]];
+      this.label = tag;
+    } else {
+      this.label = tag;
+    }
+  }
+
+  static List<Tag> parse(List<String> tags) {
+    List<Tag> outTags = new List<Tag>();
+    outTags = tags.map((x) => new Tag(x)).toList();
+    return outTags;
+  }
+}
diff --git a/lib/API/v2/ImageList.dart b/lib/API/v2/ImageList.dart
@@ -1,4 +1,4 @@
-import 'package:chryssibooru/API/v1/API.dart';
+import 'package:chryssibooru/API/v2/API.dart';
 import 'package:chryssibooru/Connect.dart';
 import 'package:flutter/foundation.dart';
 

diff --git a/lib/Connect.dart b/lib/Connect.dart
@@ -1,13 +1,13 @@
 import 'dart:convert';
 
-import 'package:chryssibooru/API/v1/API.dart';
+import 'package:chryssibooru/API/v2/API.dart';
 import 'package:http/http.dart' as http;
 
 Future<List<Derpi>> fetchDerpi(String url) async {
   final response = await http.get(url);
 
   if (response.statusCode == 200) {
-    Iterable i = json.decode(response.body)['search'];
+    Iterable i = json.decode(response.body)['images'];
     if (i.length > 0) {
       List<Derpi> derpis = i.map((dynamic) => Derpi.fromJson(dynamic)).toList();
       return derpis;

diff --git a/lib/DerpisRepo.dart b/lib/DerpisRepo.dart
@@ -1,5 +1,5 @@
-import 'package:chryssibooru/API/v1/API.dart';
-import 'package:chryssibooru/API/v1/ImageList.dart';
+import 'package:chryssibooru/API/v2/API.dart';
+import 'package:chryssibooru/API/v2/ImageList.dart';
 import 'package:flutter/material.dart';
 
 class DerpisRepo extends ChangeNotifier {

diff --git a/lib/Elements/FavouritesModal.dart b/lib/Elements/FavouritesModal.dart
@@ -1,4 +1,4 @@
-import 'package:chryssibooru/API/v1/API.dart';
+import 'package:chryssibooru/API/v2/API.dart';
 import 'package:chryssibooru/DerpisRepo.dart';
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';

diff --git a/lib/Elements/HistoryModal.dart b/lib/Elements/HistoryModal.dart
@@ -1,8 +1,7 @@
-import 'package:chryssibooru/API/v1/API.dart';
+import 'package:chryssibooru/API/v2/API.dart';
 import 'package:chryssibooru/DerpisRepo.dart';
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:flutter_slidable/flutter_slidable.dart';
 
 class HistoryModal extends StatefulWidget {
   HistoryModal({@required this.repo});

diff --git a/lib/Views/HomePage.dart b/lib/Views/HomePage.dart
@@ -1,4 +1,4 @@
-import 'package:chryssibooru/API/v1/API.dart';
+import 'package:chryssibooru/API/v2/API.dart';
 import 'package:chryssibooru/DerpisRepo.dart';
 import 'package:chryssibooru/Elements/FavouritesModal.dart';
 import 'package:chryssibooru/Elements/FilterSheet.dart';
@@ -196,7 +196,7 @@ class HomePageState extends State<HomePage> {
                               child: ClipRRect(
                                 borderRadius:new BorderRadius.all(Radius.circular(10.0)),
                                 child: (){
-                                  String url = "https:" + repo.derpis[index].representations.thumb;
+                                  String url = repo.derpis[index].representations.thumb;
                                   if(repo.derpis[index].mimeType == MimeType.VIDEO_WEBM){
                                     List<String> parts = url.split('.');
                                     parts[parts.length-1] = 'gif';

diff --git a/lib/Views/ImageViewer.dart b/lib/Views/ImageViewer.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/services.dart';
 import 'package:flutter_advanced_networkimage/provider.dart';
 import 'package:flutter_advanced_networkimage/transition.dart';
-import 'package:chryssibooru/API/v1/API.dart';
+import 'package:chryssibooru/API/v2/API.dart';
 import 'package:chryssibooru/DerpisRepo.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_advanced_networkimage/zoomable.dart';
@@ -62,7 +62,7 @@ class ImageViewerState extends State<ImageViewer> {
     repo = Provider.of<DerpisRepo>(context);
 
     _videoController?.dispose();
-    _videoController = VideoPlayerController.network('https:'+repo.derpis[_id].representations.medium)
+    _videoController = VideoPlayerController.network(repo.derpis[_id].representations.medium)
     ..addListener(() {
       setState(() {
         if (_videoController.value.duration != null)
@@ -97,7 +97,7 @@ class ImageViewerState extends State<ImageViewer> {
     if (_pageController.page.round() != _currentPage) {
       if (repo.derpis[_pageController.page.round()].mimeType == MimeType.VIDEO_WEBM) {
         _videoController?.dispose();
-        _videoController = VideoPlayerController.network('https:'+repo.derpis[_pageController.page.round()].representations.medium)
+        _videoController = VideoPlayerController.network(repo.derpis[_pageController.page.round()].representations.medium)
         ..addListener(() {
           setState(() {
             _videoProgressPercent = (_videoController.value.position.inMilliseconds / _videoController.value.duration.inMilliseconds).clamp(0.0, 1.0);
@@ -154,7 +154,7 @@ class ImageViewerState extends State<ImageViewer> {
                   child: Container(
                     child: TransitionToImage(
                       image: AdvancedNetworkImage(
-                          "https:" +  getImageOfQuality(_quality, repo, index),
+                          getImageOfQuality(_quality, repo, index),
                           useDiskCache: true,
                           cacheRule: CacheRule(maxAge: const Duration(days: 7))
                       ),

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -7,7 +7,7 @@ description: Derpibooru client made with Flutter
 # Both the version and the builder number may be overridden in flutter
 # build by specifying --build-name and --build-number, respectively.
 # Read more about versioning at semver.org.
-version: 1.5.2 #+1
+version: 1.6.0 #+1
 
 environment:
   sdk: ">=2.2.2 <3.0.0"