🚧fix build error;#17 迁移日志操作到logs目录;重构service中

Author: webbery

README.md

@@ -1,6 +1,5 @@
 <div align="center">
-<img src="https://raw.fastgit.org/webbery/civet/master/src/main/asset/icon/icon.png" alt=""/>
-<h1>Civet</h1>
+<h1><img src="src/main/asset/icon.png" alt="" height="35" width="35"/>Civet</h1>
 <blockquote>资源管理新体验</blockquote>
 <a href="https://github.com/webbery/civet/actions">
 <img src="https://github.com/webbery/civet/workflows/win-build/badge.svg" alt="">
@@ -32,7 +31,7 @@
 当前windows环境下因为没有签名的原因，所以需要在安装文件的右键“属性”->“常规”中关闭掉安全选项  
 由于版本更新比较慢，所以也可以自行编译。  
 编译安装方式：
-  - 确保自己平台的node版本是node 14及以上，C++编译器支持C++17。如果使用的是Ubuntu16，可以使用`update-alternatives`命令安装并切换高版本的gcc
+  - 确保自己平台的node版本是**node 14**，C++编译器支持C++17。如果使用的是Ubuntu16，可以使用`update-alternatives`命令安装并切换高版本的gcc
   - 在下载的源代码目录下，运行`npm install`安装相关的依赖包
   - 执行`npm run build`打包安装包；执行该命令会安装插件的依赖项
   - 如果是在Mac环境下，请确保自己的环境能够进行签名打包
@@ -53,11 +52,11 @@
 | PicSee  | ObjectC | ObjectC | Realm | 私有 | Mac
 
 #### RoadMap
-:white_square_button: 自定义界面扩展，增加数据源插件功能，以支持多种格式(本地及网页等)的数据读取和展示
++ :white_square_button: 自定义界面扩展，增加数据源插件功能，以支持多种格式(本地及网页等)的数据读取和展示  
 + [ ] 增加存储插件功能，以支持多种数据存储方式(如本地复制、云存储等)  
-:white_square_button: 增加信息提取插件功能，以增强不同文件类型的信息存储与检索
-+ [ ] 引入HTML5批注规范，为各种类型的文件增加批注功能
-+ [ ] 升级数据库，增强搜索功能
++ :white_square_button: 增加信息提取插件功能，以增强不同文件类型的信息存储与检索  
++ [ ] 引入HTML5批注规范，为各种类型的文件增加批注功能  
++ [ ] 升级数据库，增强搜索功能  
 
 #### 技术细节
 开发过程踩过许多坑，在填坑的同时记录下这些过程，以便其他开发者在做类似功能的时候能避免踩坑：  

extension.js

@@ -96,21 +96,24 @@ function isExclude(extension) {
 
 function getBuildLog() {
   if (fs.existsSync(logfile)) {
-    return JSON.parse(fs.readFileSync(logfile))
+    const str = fs.readFileSync(logfile).toString('utf-8')
+    return JSON.parse(str)
   }
   fs.writeFileSync(logfile, '{}')
   return {}
 }
 
-function shouldUpdate(package, lasttime) {
+function shouldUpdate(extension, package, lasttime) {
   let buildHistory = getBuildLog()
-  if (!buildHistory[package]) {
-    buildHistory[package] = lasttime
+  if (!buildHistory[extension]) {
+    buildHistory[extension] = lasttime
     fs.writeFileSync(logfile, JSON.stringify(buildHistory))
+    console.info('scan', package)
     return true
   }
-  if (buildHistory[package] === lasttime) return false
-  buildHistory[package] = lasttime
+  if (buildHistory[extension] === lasttime) return false
+  buildHistory[extension] = lasttime
+  console.info(package, 'will be update')
   fs.writeFileSync(logfile, JSON.stringify(buildHistory))
   return true
 }
@@ -122,7 +125,7 @@ function parseExtensions() {
     if (isExclude(extension) || !stat || stat.isFile()) continue
     const packagePath = path.join(__dirname, './extensions/'  + extension + '/package.json')
     const stime = stat.mtime / 1000
-    if (shouldUpdate(packagePath, stime)) {
+    if (shouldUpdate(extension, packagePath, stime)) {
       const pack = fs.readFileSync(packagePath, 'utf-8')
       const jsn = JSON.parse(pack)
       for (let name in jsn['dependencies']) {
@@ -143,9 +146,13 @@ function parseExtensions() {
 
 function installDependencies() {
   for (let name in installPackages) {
-    if (fs.existsSync(path.resolve(__dirname, './extensions/node_modules/' + name))) {
-      const stat = fs.statSync(path.resolve(__dirname, './extensions/node_modules/' + name))
-      if (stat.isFile() || stat.isDirectory()) continue
+    const filepath = path.resolve(__dirname, './extensions/node_modules/' + name)
+    if (fs.existsSync(filepath)) {
+      const stat = fs.statSync(filepath)
+      if (stat.isFile() || stat.isDirectory()) {
+        console.info('file', filepath, 'exist')
+        continue
+      }
     }
     console.info(`install ${name}@${installPackages[name]}`)
     runCommand('npm install --prefix extensions ' + name + '@' + installPackages[name])

extensions/datetime_filter/package.json

@@ -9,7 +9,6 @@
   "main": "./index.js",
   "civet": {
     "activeEvents": [
-      "onContentType:img/jpeg,jpg,jpeg,bmp,tif,tiff,png",
       "onView:Search",
       "onSave:"
     ]

extensions/grid_view/package.json

@@ -9,7 +9,6 @@
   "main": "./index.js",
   "civet": {
     "activeEvents": [
-      "onContentType:img/jpeg,jpg,jpeg,bmp,tif,tiff,png",
       "onView:Overview",
       "onSave:"
     ],

extensions/imagedata/index.ts

@@ -17,6 +17,7 @@ class DataParser{
       const image = Sharp(filepath)
       let scale = 1
       const w = this.getNumberProperty(file, 'width')
+      console.debug('image:', w, file)
       if (w > 200) {
         scale = 200.0 / w
       }

extensions/img_content_view/package.json

@@ -9,7 +9,6 @@
   "main": "./index.js",
   "civet": {
     "activeEvents": [
-      "onContentType: jpeg,jpg,jpeg,bmp,tif,tiff,png",
       "onView: ContentView",
       "onSave:"
     ]

extensions/map_view/package.json

@@ -9,7 +9,6 @@
   "main": "./index.js",
   "civet": {
     "activeEvents": [
-      "onContentType:img/jpeg,jpg,jpeg,bmp,tif,tiff,png",
       "onView:Overview",
       "onSave:"
     ],

extensions/map_view/view.html

@@ -65,7 +65,7 @@
 <script type="text/javascript">
 MapLayout = (function() {
     let markers = []
-    let map = new AMap.Map('container', {
+    let map = new AMap.Map('__cv_map_container', {
         resizeEnable: true,
         center: [116.397428, 39.90923],
         zoom: 10

extensions/meta3d/package.json

@@ -9,12 +9,10 @@
   "main": "./index.js",
   "civet": {
     "activeEvents": [
-      "onContentType: glb,gltf",
       "onView: ContentView",
       "onSave:"
     ]
   },
   "dependencies": {
-    "vue-3d-model": "^1.4.0"
   }
 }

extensions/storage/index.ts

@@ -0,0 +1,39 @@
+import { IResource, ResourceProperty, PropertyType, window, utility } from 'civet'
+
+function convert2ValidDate(str: string): string {
+  if (str.match(/[0-9]{4}:[0-9]{2}:[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/g)) {
+    // YYYY:MM:DD hh:mm:ss
+    const year = str.substr(0, 4)
+    const month = str.substr(5, 2)
+    const day = str.substr(8, 2)
+    return year + '/' + month + '/' + day + str.substr(10, 9)
+  }
+  return str
+}
+
+let contentView = window.createContentView('3dContentView',
+  ['glb', 'gltf']);
+contentView.onViewInitialize(():string => {
+  const fs = require('fs')
+  const html = fs.readFileSync(utility.extensionPath + '/meta3d/content.html', 'utf-8')
+  return html
+});
+
+class MetaParser {
+  constructor() {}
+
+  parse(filepath: string, file: IResource) {
+    console.info('3D model:', filepath)
+  }
+
+}
+
+export function activate() {
+  const metaParser = new MetaParser()
+  return {
+    read: (filepath: string, resource: IResource) => {
+      metaParser.parse(filepath, resource)
+      return true
+    }
+  }
+}