프로그램 업로드 기능 수정

- 업로드 파일 및 폴더 목록 수정

프로그램 업로드 기능 수정
- 업로드 파일 및 폴더 목록 수정
고영탁
1 parent 79e2e0a28d
Showing 1 changed file with 19 additions and 12 deletions Show diff stats
app/gui/oven_control/fileprocessdlg.cpp
@@ -585,16 +585,19 @@ void FileProcessDlg::programUpload(){
     QString strSrcPath;
     if(FileProcessor::detectUSB(strSrcPath)){
-        worker.addSrcFile(QString("%1/prime/falinux/run.sh,/falinux").arg(strSrcPath));
-        worker.addSrcFile(QString("%1/prime/falinux/app-prime-modbus,/falinux").arg(strSrcPath));
-        worker.addSrcFile(QString("%1/prime/falinux/app-prime-gui,/falinux").arg(strSrcPath));
-        worker.addSrcFile(QString("%1/prime/falinux/service-web,/falinux").arg(strSrcPath));
-        worker.addSrcFile(QString("%1/prime/falinux/templates/main.tmpl,/falinux/templates").arg(strSrcPath));
-        worker.addSrcFile(QString("%1/prime/falinux/system.ini,/falinux").arg(strSrcPath));
-        //worker.addSrcFile(QString("%1/prime/falinux/superdaemon,/falinux").arg(strSrcPath));
-        //worker.addSrcFile(QString("%1/prime/falinux/superdaemon.ini,/falinux").arg(strSrcPath));
-       worker.setDestPath("/prime");
+        worker.addSrcFile(QString("%1/prime/superdaemon,/prime").arg(strSrcPath));
+        worker.addSrcFile(QString("%1/prime/superdaemon.ini,/prime").arg(strSrcPath));
+        worker.addSrcFile(QString("%1/prime/app-prime-gui,/prime").arg(strSrcPath));
+        worker.addSrcFile(QString("%1/prime/app-prime-modbus,/prime").arg(strSrcPath));
+        worker.addSrcFile(QString("%1/prime/service-web,/prime").arg(strSrcPath));
+        worker.addSrcFile(QString("%1/prime/app-prime-gui.md5,/prime").arg(strSrcPath));
+        worker.addSrcFile(QString("%1/prime/app-prime-modbus.md5,/prime").arg(strSrcPath));
+        worker.addSrcFile(QString("%1/prime/superdaemon.ini.md5,/prime").arg(strSrcPath));
+        worker.addSrcFile(QString("%1/prime/superdaemon.md5,/prime").arg(strSrcPath));
+        worker.setDestPath("/prime");
         worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/cookbook"));
+        worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/templates"));
+        worker.addSrcDir(QString("%1/%2").arg(strSrcPath,"prime/sounds"));
         worker.moveToThread(&programCopyThd);
         connect(&programCopyThd,SIGNAL(started()), &worker, SLOT(workerMain()));
@@ -721,9 +724,11 @@ void FileProcessDlg::standardInfoUpload()
     QString strUsbPath;
     QString strSrcPath;
     if(FileProcessor::detectUSB(strUsbPath)){
-        strSrcPath = QString("%1/%2").arg(strUsbPath).arg(MODEL_INFO_FILE_NAME);
+        strSrcPath = QString("%1%2").arg(strUsbPath).arg(MODEL_INFO_FILE_NAME);
+        qDebug() <<strSrcPath;
         QFile file(MODEL_INFO_FILE_NAME);
         file.remove();
+        sync();
         if(QFile::copy( strSrcPath ,MODEL_INFO_FILE_NAME)){
             sync();
             ui->ctrWjProcess->setValue(40);
@@ -737,7 +742,8 @@ void FileProcessDlg::standardInfoUpload()
         //QThread::msleep(800);
         file.setFileName(CHEF_INFO_FILE_NAME);
         file.remove();
-        strSrcPath = QString("%1/%2").arg(strUsbPath).arg(CHEF_INFO_FILE_NAME);
+        sync();
+        strSrcPath = QString("%1%2").arg(strUsbPath).arg(CHEF_INFO_FILE_NAME);
         qDebug() << strSrcPath;
         if(QFile::copy( strSrcPath ,CHEF_INFO_FILE_NAME)){
             sync();
@@ -752,7 +758,8 @@ void FileProcessDlg::standardInfoUpload()
         //QThread::msleep(800);
         file.setFileName(SERVICE_INFO_FILE_NAME);
         file.remove();
-        strSrcPath = QString("%1/%2").arg(strUsbPath).arg(SERVICE_INFO_FILE_NAME);
+        sync();
+        strSrcPath = QString("%1%2").arg(strUsbPath).arg(SERVICE_INFO_FILE_NAME);
         qDebug() << strSrcPath;
         if(QFile::copy( strSrcPath ,SERVICE_INFO_FILE_NAME)){
             sync();