ソースを参照

add json dir for upload analysis

master
sp 4年前
コミット
c86fa2c4f2
4個のファイルの変更20行の追加7行の削除
  1. +5
    -0
      UploadsOnDisk.go
  2. +11
    -5
      config.go
  3. +2
    -1
      config.json
  4. +2
    -1
      deploy/config.prod.json

+ 5
- 0
UploadsOnDisk.go ファイルの表示

func (m *uploadsOnDisk) pdfPath() string { func (m *uploadsOnDisk) pdfPath() string {
return config.UploadsDir.PdfDir + strconv.Itoa(int(m.Upload.Id)) + ".pdf" return config.UploadsDir.PdfDir + strconv.Itoa(int(m.Upload.Id)) + ".pdf"
} }

func (m *uploadsOnDisk) jsonPath() string {
return config.UploadsDir.JsonDir + strconv.Itoa(int(m.Upload.Id)) + ".json"
}

func (m *uploadsOnDisk) convertExcelToPDF() (e error) { func (m *uploadsOnDisk) convertExcelToPDF() (e error) {
if fileExists(m.pdfPath()) { if fileExists(m.pdfPath()) {
log.Info("Skip conversion excel to PDF , already exists", m) log.Info("Skip conversion excel to PDF , already exists", m)

+ 11
- 5
config.go ファイルの表示

ThumbDefault string ThumbDefault string
PdfDir string PdfDir string
PdfDefault string PdfDefault string
JsonDir string
} }
TempDir string TempDir string
Session struct { //TODO: figure what is this intended for Session struct { //TODO: figure what is this intended for
//check dir //check dir
if !fileExists(m.UploadsDir.FileDir) { if !fileExists(m.UploadsDir.FileDir) {
valid = false valid = false
log.Fatal("UploadsDir.FileDir is missing ", &m.UploadsDir.PdfDefault)
log.Fatal("UploadsDir.FileDir is missing ", m.UploadsDir.FileDir)
} }


if !fileExists(m.UploadsDir.JpgDir) { if !fileExists(m.UploadsDir.JpgDir) {
valid = false valid = false
log.Fatal("UploadsDir.JpgDir is missing ", &m.UploadsDir.PdfDefault)
log.Fatal("UploadsDir.JpgDir is missing ", m.UploadsDir.JpgDir)
} }
if !fileExists(m.UploadsDir.ThumbDir) { if !fileExists(m.UploadsDir.ThumbDir) {
valid = false valid = false
log.Fatal("UploadsDir.ThumbDir is missing ", &m.UploadsDir.PdfDefault)
log.Fatal("UploadsDir.ThumbDir is missing ", m.UploadsDir.ThumbDir)
} }
if !fileExists(m.UploadsDir.PdfDir) { if !fileExists(m.UploadsDir.PdfDir) {
valid = false valid = false
log.Fatal("UploadsDir.PdfDir is missing ", &m.UploadsDir.PdfDefault)
log.Fatal("UploadsDir.PdfDir is missing ", m.UploadsDir.PdfDir)
}

if !fileExists(m.UploadsDir.JsonDir) {
valid = false
log.Fatal("UploadsDir.JsonDir is missing ", m.UploadsDir.JsonDir)
} }


if !fileExists(m.TempDir) { if !fileExists(m.TempDir) {
valid = false valid = false
log.Fatal("temp Dir is missing ", &m.UploadsDir.PdfDefault)
log.Fatal("temp Dir is missing ", m.TempDir)
} }


// convert to absolute path : fileDir // convert to absolute path : fileDir

+ 2
- 1
config.json ファイルの表示

"ThumbDir": "./uploads/thumb", "ThumbDir": "./uploads/thumb",
"ThumbDefault": "./assets/thumb_file_icon.webp", "ThumbDefault": "./assets/thumb_file_icon.webp",
"PdfDir": "./uploads/pdf", "PdfDir": "./uploads/pdf",
"PdfDefault": "./assets/no_preview.pdf"
"PdfDefault": "./assets/no_preview.pdf",
"JsonDir": "./uploads/json"
}, },
"TempDir": "./tmp/", "TempDir": "./tmp/",
"Static": [ "Static": [

+ 2
- 1
deploy/config.prod.json ファイルの表示

"ThumbDir": "/var/sfmapi/uploads/thumb", "ThumbDir": "/var/sfmapi/uploads/thumb",
"ThumbDefault": "./assets/thumb_file_icon.webp", "ThumbDefault": "./assets/thumb_file_icon.webp",
"PdfDir": "/var/sfmapi/uploads/pdf", "PdfDir": "/var/sfmapi/uploads/pdf",
"PdfDefault": "./assets/no_preview.pdf"
"PdfDefault": "./assets/no_preview.pdf",
"JsonDir": "/var/sfmapi/uploads/json"
}, },
"TempDir": "/var/sfmapi/tmp/", "TempDir": "/var/sfmapi/tmp/",
"Static": [ "Static": [

読み込み中…
キャンセル
保存