Skip to content

Commit 2310e99

Browse files
mzurmzur
committed
Do not match files in metadata validation
When the metadata file is uploaded it is not clear which files the volume will have with the create volume v2 flow. Instead, metadata of files not in the volume will be ignored. Also, files without metadata will simply be not populated.
1 parent 08f73ef commit 2310e99

File tree

3 files changed

+22
-52
lines changed

3 files changed

+22
-52
lines changed

‎app/Rules/ImageMetadata.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ class ImageMetadata implements Rule
3131

3232
/**
3333
* Create a new instance.
34-
*
35-
* @param array $files
3634
*/
37-
public function __construct(public array $files)
35+
public function __construct()
3836
{
3937
$this->message = "The :attribute is invalid.";
4038
}
@@ -78,12 +76,6 @@ public function message()
7876

7977
protected function fileMetadataPasses(FileMetadata $file)
8078
{
81-
if (!in_array($file->name, $this->files)) {
82-
$this->message = "There is no file with filename {$file->name}.";
83-
84-
return false;
85-
}
86-
8779
if (!is_null($file->lng)) {
8880
if (!is_numeric($file->lng) || abs($file->lng) > 180) {
8981
$this->message = "'{$file->lng}' is no valid longitude for file {$file->name}.";

‎tests/php/Rules/ImageMetadataTest.php

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ImageMetadataTest extends TestCase
1111
{
1212
public function testMetadataOk()
1313
{
14-
$validator = new ImageMetadataRule(['abc.jpg']);
14+
$validator = new ImageMetadataRule();
1515

1616
$metadata = new VolumeMetadata;
1717
$metadata->addFile(new ImageMetadata(
@@ -27,20 +27,9 @@ public function testMetadataOk()
2727
$this->assertTrue($validator->passes(null, $metadata));
2828
}
2929

30-
public function testMetadataWrongFile()
31-
{
32-
$validator = new ImageMetadataRule(['abc.jpg']);
33-
$metadata = new VolumeMetadata;
34-
$metadata->addFile(new ImageMetadata(
35-
name: 'cba.jpg',
36-
takenAt: '2016-12-19 12:27:00'
37-
));
38-
$this->assertFalse($validator->passes(null, $metadata));
39-
}
40-
4130
public function testMetadataNoLat()
4231
{
43-
$validator = new ImageMetadataRule(['abc.jpg']);
32+
$validator = new ImageMetadataRule();
4433
$metadata = new VolumeMetadata;
4534
$metadata->addFile(new ImageMetadata(
4635
name: 'abc.jpg',
@@ -51,7 +40,7 @@ public function testMetadataNoLat()
5140

5241
public function testMetadataNoLng()
5342
{
54-
$validator = new ImageMetadataRule(['abc.jpg']);
43+
$validator = new ImageMetadataRule();
5544
$metadata = new VolumeMetadata;
5645
$metadata->addFile(new ImageMetadata(
5746
name: 'abc.jpg',
@@ -62,7 +51,7 @@ public function testMetadataNoLng()
6251

6352
public function testMetadataInvalidLat()
6453
{
65-
$validator = new ImageMetadataRule(['abc.jpg']);
54+
$validator = new ImageMetadataRule();
6655
$metadata = new VolumeMetadata;
6756
$metadata->addFile(new ImageMetadata(
6857
name: 'abc.jpg',
@@ -74,7 +63,7 @@ public function testMetadataInvalidLat()
7463

7564
public function testMetadataInvalidLng()
7665
{
77-
$validator = new ImageMetadataRule(['abc.jpg']);
66+
$validator = new ImageMetadataRule();
7867
$metadata = new VolumeMetadata;
7968
$metadata->addFile(new ImageMetadata(
8069
name: 'abc.jpg',
@@ -86,7 +75,7 @@ public function testMetadataInvalidLng()
8675

8776
public function testMetadataInvalidYaw()
8877
{
89-
$validator = new ImageMetadataRule(['abc.jpg']);
78+
$validator = new ImageMetadataRule();
9079
$metadata = new VolumeMetadata;
9180
$metadata->addFile(new ImageMetadata(
9281
name: 'abc.jpg',
@@ -97,15 +86,15 @@ public function testMetadataInvalidYaw()
9786

9887
public function testEmptyFilename()
9988
{
100-
$validator = new ImageMetadataRule(['abc.jpg']);
89+
$validator = new ImageMetadataRule();
10190
$metadata = new VolumeMetadata;
10291
$metadata->addFile(new ImageMetadata(name: ''));
10392
$this->assertFalse($validator->passes(null, $metadata));
10493
}
10594

10695
public function testEmpty()
10796
{
108-
$validator = new ImageMetadataRule(['abc.jpg']);
97+
$validator = new ImageMetadataRule();
10998
$metadata = new VolumeMetadata;
11099
$metadata->addFile(new ImageMetadata(name: 'abc.jpg'));
111100
$this->assertFalse($validator->passes(null, $metadata));

‎tests/php/Rules/VideoMetadataTest.php

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class VideoMetadataTest extends TestCase
1111
{
1212
public function testMetadataOk()
1313
{
14-
$validator = new VideoMetadataRule(['abc.mp4']);
14+
$validator = new VideoMetadataRule();
1515

1616
$metadata = new VolumeMetadata;
1717
$metadata->addFile(new VideoMetadata(
@@ -27,20 +27,9 @@ public function testMetadataOk()
2727
$this->assertTrue($validator->passes(null, $metadata));
2828
}
2929

30-
public function testMetadataWrongFile()
31-
{
32-
$validator = new VideoMetadataRule(['abc.mp4']);
33-
$metadata = new VolumeMetadata;
34-
$metadata->addFile(new VideoMetadata(
35-
name: 'cba.jpg',
36-
takenAt: '2016-12-19 12:27:00'
37-
));
38-
$this->assertFalse($validator->passes(null, $metadata));
39-
}
40-
4130
public function testMetadataNoLat()
4231
{
43-
$validator = new VideoMetadataRule(['abc.mp4']);
32+
$validator = new VideoMetadataRule();
4433
$metadata = new VolumeMetadata;
4534
$metadata->addFile(new VideoMetadata(
4635
name: 'abc.mp4',
@@ -51,7 +40,7 @@ public function testMetadataNoLat()
5140

5241
public function testMetadataNoLatFrame()
5342
{
54-
$validator = new VideoMetadataRule(['abc.mp4']);
43+
$validator = new VideoMetadataRule();
5544
$metadata = new VolumeMetadata;
5645
$fileMeta = new VideoMetadata(name: 'abc.mp4');
5746
$fileMeta->addFrame('2016-12-19 12:27:00', lng: 52.220);
@@ -61,7 +50,7 @@ public function testMetadataNoLatFrame()
6150

6251
public function testMetadataNoLng()
6352
{
64-
$validator = new VideoMetadataRule(['abc.mp4']);
53+
$validator = new VideoMetadataRule();
6554
$metadata = new VolumeMetadata;
6655
$metadata->addFile(new VideoMetadata(
6756
name: 'abc.mp4',
@@ -72,7 +61,7 @@ public function testMetadataNoLng()
7261

7362
public function testMetadataNoLngFrame()
7463
{
75-
$validator = new VideoMetadataRule(['abc.mp4']);
64+
$validator = new VideoMetadataRule();
7665
$metadata = new VolumeMetadata;
7766
$fileMeta = new VideoMetadata(name: 'abc.mp4');
7867
$fileMeta->addFrame('2016-12-19 12:27:00', lat: 28.123);
@@ -82,7 +71,7 @@ public function testMetadataNoLngFrame()
8271

8372
public function testMetadataInvalidLat()
8473
{
85-
$validator = new VideoMetadataRule(['abc.mp4']);
74+
$validator = new VideoMetadataRule();
8675
$metadata = new VolumeMetadata;
8776
$metadata->addFile(new VideoMetadata(
8877
name: 'abc.mp4',
@@ -94,7 +83,7 @@ public function testMetadataInvalidLat()
9483

9584
public function testMetadataInvalidLatFrame()
9685
{
97-
$validator = new VideoMetadataRule(['abc.mp4']);
86+
$validator = new VideoMetadataRule();
9887
$metadata = new VolumeMetadata;
9988
$fileMeta = new VideoMetadata(name: 'abc.mp4');
10089
$fileMeta->addFrame('2016-12-19 12:27:00', lng: 50, lat: 91);
@@ -104,7 +93,7 @@ public function testMetadataInvalidLatFrame()
10493

10594
public function testMetadataInvalidLng()
10695
{
107-
$validator = new VideoMetadataRule(['abc.mp4']);
96+
$validator = new VideoMetadataRule();
10897
$metadata = new VolumeMetadata;
10998
$metadata->addFile(new VideoMetadata(
11099
name: 'abc.mp4',
@@ -116,7 +105,7 @@ public function testMetadataInvalidLng()
116105

117106
public function testMetadataInvalidLngFrame()
118107
{
119-
$validator = new VideoMetadataRule(['abc.mp4']);
108+
$validator = new VideoMetadataRule();
120109
$metadata = new VolumeMetadata;
121110
$fileMeta = new VideoMetadata(name: 'abc.mp4');
122111
$fileMeta->addFrame('2016-12-19 12:27:00', lng: 181, lat: 50);
@@ -126,7 +115,7 @@ public function testMetadataInvalidLngFrame()
126115

127116
public function testMetadataInvalidYaw()
128117
{
129-
$validator = new VideoMetadataRule(['abc.mp4']);
118+
$validator = new VideoMetadataRule();
130119
$metadata = new VolumeMetadata;
131120
$metadata->addFile(new VideoMetadata(
132121
name: 'abc.mp4',
@@ -137,7 +126,7 @@ public function testMetadataInvalidYaw()
137126

138127
public function testMetadataInvalidYawFrame()
139128
{
140-
$validator = new VideoMetadataRule(['abc.mp4']);
129+
$validator = new VideoMetadataRule();
141130
$metadata = new VolumeMetadata;
142131
$fileMeta = new VideoMetadata(name: 'abc.mp4');
143132
$fileMeta->addFrame('2016-12-19 12:27:00', yaw: 361);
@@ -147,7 +136,7 @@ public function testMetadataInvalidYawFrame()
147136

148137
public function testEmptyFilename()
149138
{
150-
$validator = new VideoMetadataRule(['abc.mp4']);
139+
$validator = new VideoMetadataRule();
151140
$metadata = new VolumeMetadata;
152141
$metadata->addFile(new VideoMetadata(name: ''));
153142
$this->assertFalse($validator->passes(null, $metadata));
@@ -163,7 +152,7 @@ public function testEmpty()
163152

164153
public function testMultipleFrames()
165154
{
166-
$validator = new VideoMetadataRule(['abc.mp4']);
155+
$validator = new VideoMetadataRule();
167156

168157
$metadata = new VolumeMetadata;
169158
$fileMeta = new VideoMetadata(

0 commit comments

Comments
 (0)