clean up services

odinapp · Nov 15, 2021 · 027f8c8 · 027f8c8
1 parent 8f9ea68
commit 027f8c8
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 72 deletions.
diff --git a/lib/services/http_service.dart b/lib/services/http_service.dart
diff --git a/lib/services/shortner_service.dart b/lib/services/shortner_service.dart
@@ -6,26 +6,66 @@ import 'package:odin/services/logger.dart';
 class ShortnerService {
   final _dio = Dio(BaseOptions(
     baseUrl: 'https://api.shrtco.de/v2/',
-    connectTimeout: 5000,
-    receiveTimeout: 3000,
   ));
 
-  Future<String?> shortUrl({required String url}) async {
+  Future<Response?> get({
+    required uri,
+    Map<String, String>? headers,
+    Map<String, String>? body,
+  }) async {
     final String time = DateTime.now().toString();
-    logger.d("GET:: $time : ${url.toString()}");
+    logger.d("GET:: $time : ${uri.toString()}");
     try {
       final Stopwatch stopwatch = Stopwatch()..start();
-      final Response response = await _dio.post('shorten?url=$url');
+      final Map<String, dynamic> query = {};
+      query.addAll(body ?? {});
+      final Response response = await _dio.get(uri,
+          queryParameters: query, options: Options(headers: headers));
       stopwatch.stop();
       logger.d("Last request took : ${stopwatch.elapsedMilliseconds} ms.");
       logger.d("Request : ${response.realUri}");
-      if (response.statusCode != 201) {
+      if (response.statusCode != 200) {
         throw HttpException(response.statusCode.toString());
       }
-      return response.data["result"]["full_short_link"];
+      return response;
     } catch (e, st) {
       logger.e("Get Request Failed.", e, st);
       return null;
     }
   }
+
+  Future<Response?> post({
+    required uri,
+    Map<String, String>? headers,
+    Map<String, String>? body,
+  }) async {
+    final String time = DateTime.now().toString();
+    logger.d("POST:: $time : ${uri.toString()}");
+    try {
+      final Stopwatch stopwatch = Stopwatch()..start();
+      final Map<String, dynamic> query = {};
+      query.addAll(body ?? {});
+      final Response response = await _dio.post(uri,
+          queryParameters: query, options: Options(headers: headers));
+      stopwatch.stop();
+      logger.d("Last request took : ${stopwatch.elapsedMilliseconds} ms.");
+      logger.d("Request : ${response.realUri}");
+      if (response.statusCode != 200) {
+        throw HttpException(response.statusCode.toString());
+      }
+      return response;
+    } catch (e, st) {
+      logger.e("Post Request Failed.", e, st);
+      return null;
+    }
+  }
+
+  Future<String?> getShortUrl({required String url}) async {
+    final Response? response = await post(uri: 'shorten?url=$url');
+    if (response != null) {
+      return response.data["result"]["full_short_link"];
+    } else {
+      return null;
+    }
+  }
 }
diff --git a/lib/services/zip_service.dart b/lib/services/zip_service.dart
@@ -1,6 +1,8 @@
 import 'dart:io';
+
 import 'package:archive/archive_io.dart';
 import 'package:odin/services/locator.dart';
+import 'package:odin/services/logger.dart';
 import 'package:odin/services/random_service.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
@@ -11,6 +13,7 @@ class ZipService {
   Future<File> zipFile({
     required List<File> fileToZips,
   }) async {
+    logger.d('Started Zipping Files');
     final ZipFileEncoder encoder = ZipFileEncoder();
     final Directory zipFileSaveDirectory = await getTemporaryDirectory();
     final zipFileSavePath = zipFileSaveDirectory.path;
@@ -23,6 +26,7 @@ class ZipService {
       encoder.addFile(fileToZip);
     }
     encoder.close();
+    logger.d('Finished Zipping Files');
     return File(zipFilePath);
   }
 }