Skip to content

Commit b4838a3

Browse files
zgldhzgldh
committed
Migrate getDriver to getAdapter
1 parent d026896 commit b4838a3

File tree

3 files changed

+38
-53
lines changed

3 files changed

+38
-53
lines changed

‎README.md

+23-23
Original file line numberDiff line numberDiff line change
@@ -102,42 +102,42 @@
102102
$disk->url('a.png'); //返回文件的URL
103103
$disk->url(['path' => 'a.png', 'domainType' => 'default']); //返回文件的URL
104104

105-
$disk->getDriver()->uploadToken(); //获取上传Token
106-
$disk->getDriver()->uploadToken('file.jpg'); //获取上传Token
105+
$disk->getAdapter()->uploadToken(); //获取上传Token
106+
$disk->getAdapter()->uploadToken('file.jpg'); //获取上传Token
107107

108-
$disk->getDriver()->withUploadToken($token); // 使用自定义的 uploadToken 进行上传，
108+
$disk->getAdapter()->withUploadToken($token); // 使用自定义的 uploadToken 进行上传，
109109
$disk->put('file.jpg',$content); // 则本次的 put 操作，将使用上述的 $token 进行上传。
110110
// 常用于自动触发持久化处理 https://github.com/qiniu/php-sdk/blob/master/examples/upload_and_pfop.php
111111

112-
$disk->getDriver()->downloadUrl('file.jpg'); //获取下载地址
113-
$disk->getDriver()->downloadUrl('file.jpg')
112+
$disk->getAdapter()->downloadUrl('file.jpg'); //获取下载地址
113+
$disk->getAdapter()->downloadUrl('file.jpg')
114114
->setDownload('foo.jpg'); //获取下载地址，文件名为 foo.jpg
115-
$disk->getDriver()->downloadUrl('file.jpg', 'https'); //获取HTTPS下载地址
116-
$disk->getDriver()->privateDownloadUrl('file.jpg'); //获取私有bucket下载地址
117-
$disk->getDriver()->privateDownloadUrl('file.jpg?attname=foo.jpg');
115+
$disk->getAdapter()->downloadUrl('file.jpg', 'https'); //获取HTTPS下载地址
116+
$disk->getAdapter()->privateDownloadUrl('file.jpg'); //获取私有bucket下载地址
117+
$disk->getAdapter()->privateDownloadUrl('file.jpg?attname=foo.jpg');
118118
//获取私有bucket下载地址，文件名为 foo.jpg
119-
$disk->getDriver()->privateDownloadUrl('file.jpg', 'https');//获取私有bucket的HTTPS下载地址
120-
$disk->getDriver()->privateDownloadUrl('file.jpg',
119+
$disk->getAdapter()->privateDownloadUrl('file.jpg', 'https');//获取私有bucket的HTTPS下载地址
120+
$disk->getAdapter()->privateDownloadUrl('file.jpg',
121121
[
122122
'domain'=>'https',
123123
'expires'=>3600
124124
]); //获取私有bucket的HTTPS下载地址。超时 3600 秒。
125-
$disk->getDriver()->avInfo('file.mp3'); //获取多媒体文件信息
126-
$disk->getDriver()->imageInfo('file.jpg'); //获取图片信息
127-
$disk->getDriver()->imageExif('file.jpg'); //获取图片EXIF信息
128-
$disk->getDriver()->imagePreviewUrl('file.jpg','imageView2/0/w/100/h/200'); //获取图片预览URL
129-
$disk->getDriver()->privateImagePreviewUrl('file.jpg','imageView2/0/w/100/h/200'); //获取私有bucket图片预览URL
130-
$disk->getDriver()->verifyCallback('application/x-www-form-urlencoded', $request->header('Authorization'), 'callback url', $request->getContent());//验证回调内容是否合法
131-
$disk->getDriver()->persistentFop('file.flv','avthumb/m3u8/segtime/40/vcodec/libx264/s/320x240'); //执行持久化数据处理
132-
$disk->getDriver()->persistentFop('file.flv','fop','队列名'); //使用私有队列执行持久化数据处理
133-
$disk->getDriver()->persistentStatus($persistent_fop_id); //查看持久化数据处理的状态。
134-
$disk->getDriver()->fetch('http://abc.com/foo.jpg', 'bar.jpg'); //调用fetch将 foo.jpg 数据以 bar.jpg 的名字储存起来。
135-
$disk->getDriver()->qetag(); //得到最后一次执行 put, copy, append 等写入操作后，得到的hash值。详见 https://github.com/qiniu/qetag
136-
$disk->getDriver()->lastReturn(); //得到最后一次执行 put, copy, append 等写入操作后，得到的返回值。
125+
$disk->getAdapter()->avInfo('file.mp3'); //获取多媒体文件信息
126+
$disk->getAdapter()->imageInfo('file.jpg'); //获取图片信息
127+
$disk->getAdapter()->imageExif('file.jpg'); //获取图片EXIF信息
128+
$disk->getAdapter()->imagePreviewUrl('file.jpg','imageView2/0/w/100/h/200'); //获取图片预览URL
129+
$disk->getAdapter()->privateImagePreviewUrl('file.jpg','imageView2/0/w/100/h/200'); //获取私有bucket图片预览URL
130+
$disk->getAdapter()->verifyCallback('application/x-www-form-urlencoded', $request->header('Authorization'), 'callback url', $request->getContent());//验证回调内容是否合法
131+
$disk->getAdapter()->persistentFop('file.flv','avthumb/m3u8/segtime/40/vcodec/libx264/s/320x240'); //执行持久化数据处理
132+
$disk->getAdapter()->persistentFop('file.flv','fop','队列名'); //使用私有队列执行持久化数据处理
133+
$disk->getAdapter()->persistentStatus($persistent_fop_id); //查看持久化数据处理的状态。
134+
$disk->getAdapter()->fetch('http://abc.com/foo.jpg', 'bar.jpg'); //调用fetch将 foo.jpg 数据以 bar.jpg 的名字储存起来。
135+
$disk->getAdapter()->qetag(); //得到最后一次执行 put, copy, append 等写入操作后，得到的hash值。详见 https://github.com/qiniu/qetag
136+
$disk->getAdapter()->lastReturn(); //得到最后一次执行 put, copy, append 等写入操作后，得到的返回值。
137137

138138
```
139139

140-
第二种用法 （就是省略了一个getDriver）
140+
第二种用法 （就是省略了一个getAdapter）
141141

142142
```php
143143

‎src/QiniuFilesystemServiceProvider.php

-15
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,6 @@ function ($app, $config) {
4747
isset($config['hotlink_prevention_key']) ? $config['hotlink_prevention_key'] : null
4848
);
4949
$file_system = new Filesystem($qiniu_adapter);
50-
$file_system->addPlugin(new PrivateDownloadUrl());
51-
$file_system->addPlugin(new DownloadUrl());
52-
$file_system->addPlugin(new AvInfo());
53-
$file_system->addPlugin(new ImageInfo());
54-
$file_system->addPlugin(new ImageExif());
55-
$file_system->addPlugin(new ImagePreviewUrl());
56-
$file_system->addPlugin(new PersistentFop());
57-
$file_system->addPlugin(new PersistentStatus());
58-
$file_system->addPlugin(new UploadToken());
59-
$file_system->addPlugin(new PrivateImagePreviewUrl());
60-
$file_system->addPlugin(new VerifyCallback());
61-
$file_system->addPlugin(new Fetch());
62-
$file_system->addPlugin(new Qetag());
63-
$file_system->addPlugin(new WithUploadToken());
64-
$file_system->addPlugin(new LastReturn());
6550

6651
return new FilesystemAdapter($file_system, $qiniu_adapter, $config);
6752
}

‎src/QiniuStorage.php

+15-15
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public function deleteDirectory($key)
160160
*/
161161
public function uploadToken($key = null, $expires = 3600, $policy = null, $strictPolicy = true)
162162
{
163-
return $this->storage->getDriver()->uploadToken($key, $expires, $policy, $strictPolicy);
163+
return $this->storage->getAdapter()->uploadToken($key, $expires, $policy, $strictPolicy);
164164
}
165165

166166
/**
@@ -170,7 +170,7 @@ public function uploadToken($key = null, $expires = 3600, $policy = null, $stric
170170
*/
171171
public function withUploadToken($token)
172172
{
173-
$this->storage->getDriver()->withUploadToken($token);
173+
$this->storage->getAdapter()->withUploadToken($token);
174174
}
175175

176176
/**
@@ -180,7 +180,7 @@ public function withUploadToken($token)
180180
*/
181181
public function downloadUrl($key, $domainType = 'default')
182182
{
183-
return $this->storage->getDriver()->downloadUrl($key, $domainType);
183+
return $this->storage->getAdapter()->downloadUrl($key, $domainType);
184184
}
185185

186186
/**
@@ -190,7 +190,7 @@ public function downloadUrl($key, $domainType = 'default')
190190
*/
191191
public function privateDownloadUrl($key, $domainType = 'default')
192192
{
193-
return $this->storage->getDriver()->privateDownloadUrl($key, $domainType);
193+
return $this->storage->getAdapter()->privateDownloadUrl($key, $domainType);
194194
}
195195

196196
/**
@@ -200,7 +200,7 @@ public function privateDownloadUrl($key, $domainType = 'default')
200200
*/
201201
public function avInfo($key)
202202
{
203-
return $this->storage->getDriver()->avInfo($key);
203+
return $this->storage->getAdapter()->avInfo($key);
204204
}
205205

206206
/**
@@ -210,7 +210,7 @@ public function avInfo($key)
210210
*/
211211
public function imageInfo($key)
212212
{
213-
return $this->storage->getDriver()->imageInfo($key);
213+
return $this->storage->getAdapter()->imageInfo($key);
214214
}
215215

216216
/**
@@ -220,7 +220,7 @@ public function imageInfo($key)
220220
*/
221221
public function imageExif($key)
222222
{
223-
return $this->storage->getDriver()->imageExif($key);
223+
return $this->storage->getAdapter()->imageExif($key);
224224
}
225225

226226
/**
@@ -231,7 +231,7 @@ public function imageExif($key)
231231
*/
232232
public function imagePreviewUrl($key, $opts)
233233
{
234-
return $this->storage->getDriver()->imagePreviewUrl($key, $opts);
234+
return $this->storage->getAdapter()->imagePreviewUrl($key, $opts);
235235
}
236236

237237
/**
@@ -242,7 +242,7 @@ public function imagePreviewUrl($key, $opts)
242242
*/
243243
public function privateImagePreviewUrl($key, $opts)
244244
{
245-
return $this->storage->getDriver()->privateImagePreviewUrl($key, $opts);
245+
return $this->storage->getAdapter()->privateImagePreviewUrl($key, $opts);
246246
}
247247

248248
/**
@@ -256,7 +256,7 @@ public function privateImagePreviewUrl($key, $opts)
256256
*/
257257
public function persistentFop($key, $opts, $pipline = null, $force = false, $notify_url = null)
258258
{
259-
return $this->storage->getDriver()->persistentFop($key, $opts, $pipline, $force, $notify_url);
259+
return $this->storage->getAdapter()->persistentFop($key, $opts, $pipline, $force, $notify_url);
260260
}
261261

262262
/**
@@ -266,7 +266,7 @@ public function persistentFop($key, $opts, $pipline = null, $force = false, $not
266266
*/
267267
public function persistentStatus($id)
268268
{
269-
return $this->storage->getDriver()->persistentStatus($id);
269+
return $this->storage->getAdapter()->persistentStatus($id);
270270
}
271271

272272
/**
@@ -276,7 +276,7 @@ public function persistentStatus($id)
276276
*/
277277
public function verifyCallback($contentType, $originAuthorization, $url, $body)
278278
{
279-
return $this->storage->getDriver()->verifyCallback($contentType, $originAuthorization, $url, $body);
279+
return $this->storage->getAdapter()->verifyCallback($contentType, $originAuthorization, $url, $body);
280280
}
281281

282282
/**
@@ -287,7 +287,7 @@ public function verifyCallback($contentType, $originAuthorization, $url, $body)
287287
*/
288288
public function fetch($url, $key)
289289
{
290-
return $this->storage->getDriver()->fetch($url, $key);
290+
return $this->storage->getAdapter()->fetch($url, $key);
291291
}
292292

293293
/**
@@ -296,7 +296,7 @@ public function fetch($url, $key)
296296
*/
297297
public function qetag()
298298
{
299-
return $this->storage->getDriver()->qetag();
299+
return $this->storage->getAdapter()->qetag();
300300
}
301301

302302
/**
@@ -305,6 +305,6 @@ public function qetag()
305305
*/
306306
public function lastReturn()
307307
{
308-
return $this->storage->getDriver()->getLastReturn();
308+
return $this->storage->getAdapter()->getLastReturn();
309309
}
310310
}

0 commit comments

Comments
 (0)