inventree/inventree-app
2
0
Fork 0
mirror of https://github.com/inventree/inventree-app.git synced 2025-04-29 14:06:47 +00:00
Code

Add timeout funtionality to GET and LIST requests

Browse Source
This commit is contained in:
Oliver Walters 2020-04-15 09:28:35 +10:00
parent cd864abfbe
commit 5ed13e69aa
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/barcode.dart
View File

@ -30,8 +30,7 @@ Future<void> scanQrCode(BuildContext context) async {
*/ */
InvenTreeAPI().post("barcode/", body: {"barcode": barcode}).then((var response) { InvenTreeAPI().post("barcode/", body: {"barcode": barcode}).then((var response) {
// Close the progress dialog hideProgressDialog(context);
Navigator.pop(context);
if (response.statusCode != 200) { if (response.statusCode != 200) {
showDialog( showDialog(

43
lib/inventree/model.dart
View File

@ -1,3 +1,5 @@
import 'dart:async';
import 'package:InvenTree/api.dart'; import 'package:InvenTree/api.dart';
import 'package:InvenTree/widget/dialogs.dart'; import 'package:InvenTree/widget/dialogs.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -128,7 +130,23 @@ class InvenTreeModel {
showProgressDialog(context, "Requesting Data", "Requesting ${NAME} data from server"); showProgressDialog(context, "Requesting Data", "Requesting ${NAME} data from server");
var response = await api.get(addr, params: params); var response = await api.get(addr, params: params)
.timeout(Duration(seconds: 10))
.catchError((e) {
hideProgressDialog(context);
if (e is TimeoutException) {
showErrorDialog(context, "Timeout", "No response from server");
} else {
showErrorDialog(context, "Error", e.toString());
}
return null;
});
if (response == null) {
return null;
}
hideProgressDialog(context); hideProgressDialog(context);
@ -143,7 +161,7 @@ class InvenTreeModel {
} }
// Return list of objects from the database, with optional filters // Return list of objects from the database, with optional filters
Future<List<InvenTreeModel>> list({Map<String, String> filters}) async { Future<List<InvenTreeModel>> list(BuildContext context, {Map<String, String> filters}) async {
if (filters == null) { if (filters == null) {
filters = {}; filters = {};
@ -162,7 +180,26 @@ class InvenTreeModel {
// TODO - Add "timeout" // TODO - Add "timeout"
// TODO - Add error catching // TODO - Add error catching
var response = await api.get(URL, params:params); showProgressDialog(context, "Requesting Data", "Requesting ${NAME} data from server");
var response = await api.get(URL, params:params)
.timeout(Duration(seconds: 10))
.catchError((e) {
hideProgressDialog(context);
if (e is TimeoutException) {
showErrorDialog(context, "Timeout", "No response from server");
} else {
showErrorDialog(context, "Error", e.toString());
}
return null;
});
if (response == null) {
return null;
}
// A list of "InvenTreeModel" items // A list of "InvenTreeModel" items
List<InvenTreeModel> results = new List<InvenTreeModel>(); List<InvenTreeModel> results = new List<InvenTreeModel>();