add export:zip

app/Console/Commands/ExportOffline.php

@@ -87,73 +87,12 @@ class ExportOffline extends Command
         $this->call('export:sentence',['--type'=>'original']);
 
         $this->info('zip');
-        Log::debug('export offline: db写入完毕 开始压缩');
-        $exportPath = 'app/public/export/offline';
-        $exportFile = 'wikipali-offline-'.date("Y-m-d").'.db3';
-        Log::debug('export offline: zip file {filename} {format}',
-                    [
-                        'filename'=>$exportFile,
-                        'format'=>$this->argument('format')
-                    ]);
-        switch ($this->argument('format')) {
-            case '7z':
-                $zipFile = $exportFile . ".7z";
-                break;
-            case 'lzma':
-                $zipFile = $exportFile . ".lzma";
-                break;
-            default:
-                $zipFile = $exportFile . ".gz";
-                break;
-        }
-        //
-        $exportFullFileName = storage_path($exportPath.'/'.$exportFile);
-        $zipFullFileName = storage_path($exportPath.'/'.$zipFile);
+        Log::debug('export offline: db写入完毕');
 
-        shell_exec("cd ".storage_path($exportPath));
-        if($this->argument('format')==='7z'){
-            $command = "7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on {$zipFullFileName} {$exportFullFileName}";
-        }else if($this->argument('format')==='lzma'){
-            $command = "xz -k -9 --format=lzma {$exportFullFileName}";
-        }else{
-            $command = "gzip -k -q --best -c {$exportFullFileName} > {$zipFullFileName}";
-        }
-        $this->info($command);
-        Log::debug('export offline: zip command:'.$command);
-        shell_exec($command);
-        Log::debug('zip file {filename} in {format} saved.',
-                    [
-                        'filename'=>$exportFile,
-                        'format'=>$this->argument('format')
-                    ]);
-        $info = array();
-        $url = array();
-        foreach (config('mint.server.cdn_urls') as $key => $cdn) {
-            $url[] = [
-                    'link' => $cdn . '/' . $zipFile,
-                    'hostname' =>'cdn-' . $key,
-                ];
-        }
+        sleep(5);
+        $this->call('export:zip',['format'=>$this->argument('format')]);
 
-        //s3
-        Storage::put($zipFile, file_get_contents($zipFullFileName));
-        $s3Link = Storage::url($zipFile);
-        Log::info('export offline: link='.$s3Link);
-        $url[] = [
-            'link'=>$s3Link,
-            'hostname'=>'Amazon cloud storage(Hongkong)',
-        ];
-        $info[] = ['filename'=>$zipFile,
-                    'url' => $url,
-                   'create_at'=>date("Y-m-d H:i:s"),
-                   'chapter'=>RedisClusters::get("/export/chapter/count"),
-                   'filesize'=>filesize($zipFullFileName),
-                   'min_app_ver'=>'1.3',
-                    ];
-        RedisClusters::put('/offline/index',$info);
         unlink($exportStop);
-        unlink($exportFullFileName);
-
 
         return 0;
     }