Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial web support #204

Merged
merged 21 commits into from
Feb 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: Use custom client on every http calls
  • Loading branch information
bdlukaa committed Jan 26, 2024
commit dfa12676c0db0961b15629c846709ceadfe6f366
3 changes: 1 addition & 2 deletions lib/api/api_helpers.dart
Original file line number Diff line number Diff line change
@@ -24,7 +24,6 @@ import 'package:bluecherry_client/models/server.dart';
import 'package:bluecherry_client/providers/server_provider.dart';
import 'package:device_info_plus/device_info_plus.dart';
import 'package:flutter/foundation.dart';
import 'package:http/http.dart';
import 'package:path_provider/path_provider.dart';

/// This file mainly contains helper functions for working with the API.
@@ -110,7 +109,7 @@ abstract class APIHelpers {
return 'file://$filePath';
// Download the event thumbnail only if it doesn't exist already.
} else {
final response = await get(uri);
final response = await API.client.get(uri);
debugPrint(response.statusCode.toString());
if (response.statusCode ~/ 100 == 2 /* OK */) {
await file.create(recursive: true);
3 changes: 1 addition & 2 deletions lib/api/events.dart
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@ import 'package:bluecherry_client/models/event.dart';
import 'package:bluecherry_client/models/server.dart';
import 'package:bluecherry_client/utils/methods.dart';
import 'package:flutter/foundation.dart';
import 'package:http/http.dart' as http;
import 'package:xml2json/xml2json.dart';

extension EventsExtension on API {
@@ -71,7 +70,7 @@ extension EventsExtension on API {
);

assert(server.serverUUID != null && server.hasCookies);
final response = await http.get(
final response = await API.client.get(
Uri.https(
'${Uri.encodeComponent(server.login)}:${Uri.encodeComponent(server.password)}@${server.ip}:${server.port}',
'/events/',
5 changes: 2 additions & 3 deletions lib/api/ptz.dart
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@ import 'package:bluecherry_client/api/api.dart';
import 'package:bluecherry_client/models/device.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:http/http.dart' as http;

enum PTZCommand {
move,
@@ -113,7 +112,7 @@ extension PtzApiExtension on API {

debugPrint(url.toString());

final response = await http.get(
final response = await API.client.get(
url,
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
@@ -156,7 +155,7 @@ extension PtzApiExtension on API {

debugPrint(url.toString());

final response = await http.get(
final response = await API.client.get(
url,
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
4 changes: 2 additions & 2 deletions lib/models/device.dart
Original file line number Diff line number Diff line change
@@ -19,14 +19,14 @@

import 'dart:convert';

import 'package:bluecherry_client/api/api.dart';
import 'package:bluecherry_client/models/server.dart';
import 'package:bluecherry_client/providers/server_provider.dart';
import 'package:bluecherry_client/providers/settings_provider.dart';
import 'package:bluecherry_client/utils/config.dart';
import 'package:bluecherry_client/utils/extensions.dart';
import 'package:bluecherry_client/widgets/device_grid/desktop/external_stream.dart';
import 'package:flutter/foundation.dart';
import 'package:http/http.dart' as http;

class ExternalDeviceData {
final String? rackName;
@@ -265,7 +265,7 @@ class Device {
queryParameters: data,
);

var response = await http.get(uri);
var response = await API.client.get(uri);

if (response.statusCode == 200) {
var ret = json.decode(response.body) as Map;
6 changes: 3 additions & 3 deletions lib/providers/update_provider.dart
Original file line number Diff line number Diff line change
@@ -19,14 +19,14 @@

import 'dart:io';

import 'package:bluecherry_client/api/api.dart';
import 'package:bluecherry_client/providers/app_provider_interface.dart';
import 'package:bluecherry_client/utils/constants.dart';
import 'package:bluecherry_client/utils/logging.dart';
import 'package:bluecherry_client/utils/methods.dart';
import 'package:bluecherry_client/utils/storage.dart';
import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
import 'package:http/http.dart' as http;
import 'package:package_info_plus/package_info_plus.dart';
import 'package:path/path.dart' as path;
import 'package:path_provider/path_provider.dart';
@@ -36,7 +36,7 @@ import 'package:window_manager/window_manager.dart';
import 'package:xml/xml.dart';

enum FailType {
executableNotFound,
executableNotFound;
}

class UpdateVersion {
@@ -421,7 +421,7 @@ class UpdateManager extends UnityProvider {
notifyListeners();

try {
final response = await http.get(Uri.parse(appCastUrl));
final response = await API.client.get(Uri.parse(appCastUrl));

if (response.statusCode != 200) {
debugPrint(
Loading
Oops, something went wrong.