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.

Sign up for GitHub

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

Jump to bottom

fix download image link get empty info bug and fix image download twice bug #62

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix download image link get empty info bug and fix image download twice bug #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions lib/src/utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import 'dart:async';
import 'dart:convert';
import 'dart:typed_data';

import 'package:flutter/material.dart' hide Element;
import 'package:flutter_chat_types/flutter_chat_types.dart'
show PreviewData, PreviewDataImage;
import 'package:html/dom.dart' show Document, Element;
import 'package:html/parser.dart' as parser show parse;
import 'package:http/http.dart' as http show get;
import 'dart:ui' as ui;

import 'types.dart';

Expand Down Expand Up @@ -133,6 +135,14 @@ Future<Size> _getImageSize(String url) {
return completer.future;
}

Future<Size> _getImageSizeFromBytes(Uint8List bytes) async {
var image = await decodeImageFromList(bytes);
return Size(
height: image.height.toDouble(),
width: image.width.toDouble(),
);
}

Future<String> _getBiggestImageUrl(
List<String> imageUrls,
String? proxy,
Expand Down Expand Up @@ -197,12 +207,12 @@ Future<PreviewData> getPreviewData(
final response = await http.get(uri, headers: {
'User-Agent': userAgent ?? 'WhatsApp/2',
}).timeout(requestTimeout ?? const Duration(seconds: 5));
final document = parser.parse(utf8.decode(response.bodyBytes));

final imageRegexp = RegExp(regexImageContentType);

if (imageRegexp.hasMatch(response.headers['content-type'] ?? '')) {
final imageSize = await _getImageSize(previewDataUrl);
final imageSize = await _getImageSizeFromBytes(response.bodyBytes);

previewDataImage = PreviewDataImage(
height: imageSize.height,
url: previewDataUrl,
Expand All @@ -214,6 +224,7 @@ Future<PreviewData> getPreviewData(
);
}

final document = parser.parse(utf8.decode(response.bodyBytes));
if (!_hasUTF8Charset(document)) {
return previewData;
}
Expand Down