Merge pull request #1687 from visuddhinanda/laravel

add log upload start

app/Console/Commands/CopyUserBook.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Models\CustomBookSentence;
+use App\Models\Channel;
+use App\Models\Sentence;
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Log;
+
+class CopyUserBook extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'copy:user.book {--lang}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '复制用户自定书到sentence表';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        //获取全部语言列表
+        $lang = CustomBookSentence::select('lang')->groupBy('lang')->get();
+        foreach ($lang as $key => $value) {
+            $this->info('language:'.$value->lang);
+        }
+        if($this->option('lang')){
+            return 0;
+        }
+        $userBooks = CustomBookSentence::select('book')->groupBy('book')->get();
+        $this->info('book '. count($userBooks));
+        foreach ($userBooks as $key => $book) {
+            $this->info('doing book '. $book->book);
+            $bookInfo = CustomBookSentence::where('book',$book->book)->first();
+            $bookLang = $bookInfo->lang;
+            if(empty($bookLang) || $bookLang === 'false' || $bookLang === 'null'){
+                $this->error('language can not be empty book='.$book->book);
+                Log::error('copy:user.book language can not be empty , book='.$book->book);
+                continue;
+            }
+            $channelName = '_user_book_'.$bookInfo->lang;
+            $channel = Channel::where('owner_uid',$bookInfo->owner)
+                            ->where('name',$channelName)->first();
+            if($channel === null){
+                $channel = new Channel;
+                $channel->id = app('snowflake')->id();
+                $channel->owner_uid = $bookInfo->owner;
+                $channel->name = $channelName;
+                $channel->type = 'original';
+                $channel->lang = $bookInfo->lang;
+                $channel->editor_id = 0;
+                $channel->create_time = time()*1000;
+                $channel->modify_time = time()*1000;
+                $channel->status = $bookInfo->status;
+                $channel->save();
+            }
+
+            $bar = $this->output->createProgressBar(CustomBookSentence::where('book',$book->book)
+                                                    ->count());
+            $bookSentence = CustomBookSentence::where('book',$book->book)->cursor();
+            foreach ($bookSentence as $key => $sentence) {
+                $bar->advance();
+                $newRow = Sentence::firstOrNew(
+                    [
+                        "book_id" => $sentence->book,
+                        "paragraph" => $sentence->paragraph,
+                        "word_start" => $sentence->word_start,
+                        "word_end" => $sentence->word_end,
+                        "channel_uid" => $channel->uid,
+                    ],
+                    [
+                        'id' => app('snowflake')->id(),
+                        'uid' => Str::uuid(),
+                        'create_time' => $sentence->create_time,
+                        'modify_time' => $sentence->modify_time,
+                    ]
+                    );
+                $newRow->editor_uid = $sentence->owner;
+                $newRow->content = $sentence->content;
+                $newRow->strlen = mb_strlen($sentence->content,"UTF-8");
+                $newRow->status = $sentence->status;
+                $newRow->content_type = $sentence->content_type;
+                $newRow->language = $sentence->lang;
+                $newRow->save();
+            }
+            $bar->finish();
+            $this->info("book {$book->book} finished");
+        }
+        return 0;
+    }
+}

app/Console/Commands/ExportChapter.php

@@ -326,8 +326,7 @@ class ExportChapter extends Command
         }
 
         Log::debug('footnote finished');
-        Log::debug('upload start');
-        $this->setStatus(0.95,'export content done');
+        $this->setStatus(0.95,'export content done.');
 
         //upload
         $fileDate = '';
@@ -352,10 +351,12 @@ class ExportChapter extends Command
         $filename = $this->argument('filename');
         $bucket = config('mint.attachments.bucket_name.temporary');
         $tmpFile =  $bucket.'/'. $filename ;
+        Log::debug('upload start filename='.$tmpFile);
+        $this->setStatus(0.97,'upload start ');
         Storage::put($tmpFile, $fileDate);
 
-        $this->setStatus(1,'export done filename='.$filename);
-        Log::debug('task export offline chapter-table finished');
+        $this->setStatus(1,'export chapter done');
+        Log::debug('export chapter done, upload filename='.$tmpFile);
         return 0;
     }
 }