Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Trim preview upload tests and comments

Neeraj Gupta124369b82d03
diff --git a/mobile/apps/photos/test/services/filedata/preview_upload_test.dart b/mobile/apps/photos/test/services/filedata/preview_upload_test.dart
deleted file mode 100644
index 17b0433ddf..0000000000
--- a/mobile/apps/photos/test/services/filedata/preview_upload_test.dart
+++ /dev/null
@@ -1,145 +0,0 @@
-import "dart:convert";
-import "dart:io";
-import "dart:typed_data";
-
-import "package:dio/dio.dart";
-import "package:ente_feature_flag/ente_feature_flag.dart";
-import "package:flutter_test/flutter_test.dart";
-import "package:photos/gateways/files/file_data_gateway.dart";
-import "package:photos/services/filedata/preview_upload.dart";
-import "package:shared_preferences/shared_preferences.dart";
-
-const _payload = [1, 2, 3, 4];
-const _checksum = "CNbAWiFRKnmh3+udKo8mLw==";
-const _uploadURL = "https://storage.example.com/preview";
-
-void main() {
- TestWidgetsFlutterBinding.ensureInitialized();
-
- late Directory directory;
- late File preview;
- late Dio dio;
- late _StorageAdapter adapter;
-
- setUp(() async {
- directory = await Directory.systemTemp.createTemp("preview_upload_test_");
- preview = await File("${directory.path}/preview.ts").writeAsBytes(_payload);
- adapter = _StorageAdapter();
- dio = Dio(BaseOptions(baseUrl: "https://api.example.com"))
- ..httpClientAdapter = adapter;
- });
-
- tearDown(() async {
- dio.close();
- await directory.delete(recursive: true);
- });
-
- for (final scenario in [
- (name: "supported server", flags: {"serverApiFlag": 264}, useV2: true),
- (
- name: "older server, including internal users",
- flags: {"serverApiFlag": 8, "internalUser": true},
- useV2: false,
- ),
- ]) {
- test("uploads preview on ${scenario.name}", () async {
- SharedPreferences.setMockInitialValues({
- "remote_flags": jsonEncode(scenario.flags),
- });
- final prefs = await SharedPreferences.getInstance();
- final flags = FlagService(prefs, dio);
- expect(flags.previewUploadV2, scenario.useV2);
-
- final result = await uploadVideoPreview(
- preview,
- fileID: 42,
- gateway: FileDataGateway(dio),
- dio: dio,
- useUploadV2: flags.previewUploadV2,
- );
-
- expect(result, ("preview-id", _payload.length));
- expect(adapter.requests, hasLength(2));
- final urlRequest = adapter.requests.first;
- expect(urlRequest.path, "/files/data/preview-upload-url");
- expect(urlRequest.method, scenario.useV2 ? "POST" : "GET");
- if (scenario.useV2) {
- expect(jsonDecode(utf8.decode(adapter.bodies.first)), {
- "fileID": 42,
- "type": "vid_preview",
- "contentLength": _payload.length,
- "contentMD5": _checksum,
- });
- } else {
- expect(urlRequest.queryParameters, {
- "fileID": 42,
- "type": "vid_preview",
- });
- }
- final uploadRequest = adapter.requests.last;
- expect(uploadRequest.uri.toString(), _uploadURL);
- expect(uploadRequest.method, "PUT");
- final headers = uploadRequest.headers.map(
- (key, value) => MapEntry(key.toLowerCase(), value),
- );
- expect(headers[Headers.contentLengthHeader], _payload.length);
- expect(headers["content-md5"], scenario.useV2 ? _checksum : isNull);
- expect(adapter.bodies.last, _payload);
- });
- }
-
- test("honors cancellation between URL acquisition and upload", () async {
- final cancelToken = CancelToken();
- dio.interceptors.add(
- InterceptorsWrapper(
- onResponse: (response, handler) {
- cancelToken.cancel("stopped");
- handler.next(response);
- },
- ),
- );
-
- await expectLater(
- uploadVideoPreview(
- preview,
- fileID: 42,
- gateway: FileDataGateway(dio),
- dio: dio,
- useUploadV2: true,
- cancelToken: cancelToken,
- ),
- throwsA(
- isA<DioException>().having(CancelToken.isCancel, "cancelled", isTrue),
- ),
- );
- expect(adapter.requests, hasLength(1));
- });
-}
-
-class _StorageAdapter implements HttpClientAdapter {
- final requests = <RequestOptions>[];
- final bodies = <List<int>>[];
-
- @override
- Future<ResponseBody> fetch(
- RequestOptions options,
- Stream<Uint8List>? requestStream,
- Future<void>? cancelFuture,
- ) async {
- requests.add(options);
- bodies.add(await requestStream?.expand((chunk) => chunk).toList() ?? []);
- if (options.uri.host == "api.example.com") {
- return ResponseBody.fromString(
- jsonEncode({"objectID": "preview-id", "url": _uploadURL}),
- 200,
- headers: {
- Headers.contentTypeHeader: [Headers.jsonContentType],
- },
- );
- }
- return ResponseBody.fromString("", 200);
- }
-
- @override
- void close({bool force = false}) {}
-}
diff --git a/server/ente/filedata/preview_upload_test.go b/server/ente/filedata/preview_upload_test.go
deleted file mode 100644
index 31187cb203..0000000000
--- a/server/ente/filedata/preview_upload_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package filedata
-
-import (
- "testing"
-
- "github.com/ente/museum/ente"
- "github.com/stretchr/testify/require"
-)
-
-func TestPreviewUploadSizeBoundaries(t *testing.T) {
- const checksum = "XUFAKrxLKna5cZ2REBfFkg=="
- for _, size := range []int64{1, ente.MaxMultipartPartSize} {
- require.NoError(t, (PreviewUploadRequest{
- FileID: 1, Type: ente.PreviewImage, ContentLength: size, ContentMD5: checksum,
- }).Validate())
- }
- for _, tc := range []struct {
- name string
- size int64
- partLength int64
- partCount int
- }{
- {"small single part", 1, 1, 1},
- {"part length exceeds object", 1, ente.MinMultipartPartSize, 1},
- {"exact multiple", ente.MinMultipartPartSize * 2, ente.MinMultipartPartSize, 2},
- {"maximum size", maxPreviewUploadSize, ente.MaxMultipartPartSize, 2},
- } {
- t.Run(tc.name, func(t *testing.T) {
- checksums := make([]string, tc.partCount)
- for i := range checksums {
- checksums[i] = checksum
- }
- require.NoError(t, (MultipartPreviewUploadRequest{
- FileID: 1, Type: ente.PreviewVideo, ContentLength: tc.size,
- PartLength: tc.partLength, PartMD5s: checksums,
- }).Validate())
- })
- }
-}
diff --git a/server/ente/remotestore.go b/server/ente/remotestore.go
index 3ae6c92053..c2d4b5ea86 100644
--- a/server/ente/remotestore.go
+++ b/server/ente/remotestore.go
@@ -58,8 +58,7 @@ const (
CastSessionsV2 int64 = 1 << 5
DeferredMultipartChecksums int64 = 1 << 6
LibrarySharing int64 = 1 << 7
- // PreviewUploadV2 supports single and multipart preview uploads with required size and MD5 metadata.
- PreviewUploadV2 int64 = 1 << 8
+ PreviewUploadV2 int64 = 1 << 8
)
type FlagKey string
diff --git a/server/pkg/api/preview_upload_test.go b/server/pkg/api/preview_upload_test.go
index b529b2573e..e743e1c4d6 100644
--- a/server/pkg/api/preview_upload_test.go
+++ b/server/pkg/api/preview_upload_test.go
@@ -10,7 +10,6 @@ import (
"net/http/httptest"
"net/url"
"strconv"
- "strings"
"testing"
"time"
@@ -89,13 +88,6 @@ func TestPreviewUploadRejectsInvalidMetadata(t *testing.T) {
require.Equal(t, http.StatusBadRequest, rec.Code, rec.Body.String())
})
}
- for _, path := range []string{previewUploadPath, multipartPreviewUploadPath} {
- rec := httptest.NewRecorder()
- req := httptest.NewRequest(http.MethodPost, path, strings.NewReader(`{"fileID":`))
- req.Header.Set("Content-Type", "application/json")
- router.ServeHTTP(rec, req)
- require.Equal(t, http.StatusBadRequest, rec.Code, rec.Body.String())
- }
}
func TestPreviewUploadMetadataAndLegacyCompatibility(t *testing.T) {
diff --git a/server/pkg/controller/file.go b/server/pkg/controller/file.go
index 28333d136e..5d24aa5089 100644
--- a/server/pkg/controller/file.go
+++ b/server/pkg/controller/file.go
@@ -1171,7 +1171,6 @@ func (c *FileController) GetMultipartUploadURLWithMetadata(ctx context.Context,
return ente.MultipartUploadURLs{}, stacktrace.Propagate(ente.ErrBadRequest, "partMd5s must not be empty")
}
if err := ente.ValidateMultipartPartLength(req.ContentLength, req.PartLength); err != nil {
- // Preserve the regular upload API's generic bad-request response.
return ente.MultipartUploadURLs{}, stacktrace.Propagate(ente.ErrBadRequest, "%v", err)
}
partCount := calculateMultipartPartCount(req.ContentLength, req.PartLength)