qtvcp -copy panel: update to check for the qtvcp/screens or panels path

In most cases the screen or panel files should be in the config folder
but in qtvcp/screens or qtvcp/panels

copying qt_vismach files will also look for obj file folder and copy it too.

Author: c-morley

share/qtvcp/panels/copy/copy_handler.py

@@ -68,12 +68,26 @@ def applyClicked(self):
         basename = self.w.lineEdit.text()
         if basename == '': basename = self.w.comboBox.currentText()
 
+        # VCP panel
         if self.w.radiobutton_vcp.isChecked():
             path = os.path.join(self.paths.PANELDIR, self.w.comboBox.currentText())
+
+        # vismach 
         elif self.w.radiobutton_vismach.isChecked():
-            self.copySingleFile(self.paths.VISMACHDIR, self.w.filemanager.textLine.text(),
+            self.copyVismachFiles(self.paths.VISMACHDIR, self.w.filemanager.textLine.text(),
                                  basename, self.w.comboBox.currentText() )
+
+            # check for vismach object directory
+            objname = self.w.comboBox.currentText().strip('.py')
+            objname = objname + '_obj'
+            objpath = os.path.join(self.paths.VISMACHDIR, objname)
+            objbasename = basename.strip('.py') + '_obj'
+            if os.path.exists(objpath):
+                self.copyVismachFiles(self.paths.VISMACHDIR, self.w.filemanager.textLine.text(),
+                                 objbasename, objname )
             return
+
+        # screen
         else:
             path = os.path.join(self.paths.SCREENDIR, self.w.comboBox.currentText())
 
@@ -106,46 +120,77 @@ def list_vcp_files(self):
     def list_vismach_files(self):
         self.w.comboBox.clear()
         for i in sorted(self.paths.find_vismach_files()):
-            self.w.comboBox.addItem(i)
+            if '.py' in i:
+                self.w.comboBox.addItem(i)
 
     def makedirs(self, dest):
         if not os.path.exists(dest):
             os.makedirs(dest)
 
-    def copySingleFile(self, src, dest, baseName, fileName):
+    def copyVismachFiles(self, src, dest, baseName, fileName):
         rtn = self.confirmDialog(dest, baseName)
         if not rtn: return
 
         fromPath = os.path.join(src, fileName)
         toPath = os.path.join(dest, baseName)
-
+        print(fromPath, toPath)
         # make any needed directory
         if not os.path.exists(os.path.dirname(toPath)):
             self.makedirs(os.path.dirname(toPath))
 
         if not os.path.exists(toPath):
-            shutil.copyfile(fromPath, toPath)
+            if os.path.isfile(fromPath):
+                shutil.copy(fromPath, toPath)
+            # probably vismach object folder
+            elif os.path.isdir(fromPath):
+                shutil.copytree(fromPath, toPath)
 
     def copyFilesWithCheck(self, src, dest, baseName, srcDirName):
-        # combine the user pick destination path and base name directory
-        dest = os.path.join(dest, baseName)
 
-        # confirm the changes
-        rtn = self.confirmDialog(dest,baseName)
+        # make a copy of the user pick destination path
+        ndest = os.path.join(dest)
+
+        # check for lack of standard folders in path
+        folder = ''
+        if self.w.radiobutton_vcp.isChecked():
+            folder = 'panels' 
+        elif self.w.radiobutton_screen.isChecked():
+            folder = 'screens' 
+        if not folder in dest:
+            r = self.confirmPathDialog('qtvcp/' + folder)
+            if r:
+                if not 'qtvcp' in dest:
+                    dest = os.path.join(dest, 'qtvcp')
+                if not folder in dest:
+                    dest = os.path.join(dest, folder)
+                # overwrite with the new path
+                ndest = dest
+                if os.path.exists(dest):
+                    self.w.filemanager.updateDirectoryView(dest)
+
+        # confirm user wants to copy
+        rtn = self.confirmDialog(ndest, baseName)
         if not rtn: return
 
+        # add in the basename
+        ndest = os.path.join(ndest, baseName)
+
         # make any needed initial directory
-        if not os.path.exists(os.path.dirname(dest)):
-            self.makedirs(os.path.dirname(dest))
+        if not os.path.exists(os.path.dirname(ndest)):
+            self.makedirs(os.path.dirname(ndest))
+
+        # update the file manager path
+        if os.path.exists(dest):
+            self.w.filemanager.updateDirectoryView(dest)
 
         # walk the folder and copy everything
         for path, dirs, filenames in os.walk(src):
             if dirs == []:
-                destDir = path.replace(src,dest)
+                destDir = path.replace(src,ndest)
                 self.makedirs(destDir)
             else:
                 for directory in dirs:
-                    destDir = path.replace(src,dest)
+                    destDir = path.replace(src,ndest)
                     self.makedirs(os.path.join(destDir, directory))
 
             for sfile in filenames:
@@ -158,19 +203,40 @@ def copyFilesWithCheck(self, src, dest, baseName, srcDirName):
                     dfile = sfile
 
                 srcFile = os.path.join(path, sfile)
-                destFile = os.path.join(path.replace(src, dest), dfile)
+                destFile = os.path.join(path.replace(src, ndest), dfile)
 
                 shutil.copy(srcFile, destFile)
 
+    # last confirm before copying -check for file overwriting
     def confirmDialog(self, srcPath, name):
         dest = os.path.join(srcPath, name)
-
+        info = 'Copy {} Code?'.format(name)
         if os.path.exists(dest):
-            info = "Will Overwrite Existing Directory / Files!"
+            title = "Confirm: Will Overwrite Existing Files!"
         else:
-            info = None
+            title = 'Please Confirm:'
+        rtn = self.w.messageDialog_.showdialog(
+                    title,
+                    more_info=info,
+                    details=' To Folder:\n {}'.format(dest),
+                    display_type='YESNO',
+                    icon=QMessageBox.Information, pinname=None,
+                    focus_text=None,
+                    focus_color=None,
+                    play_alert=None,
+                    nblock=False,
+                    use_exec =True)
+        if not rtn:
+            return False
+        return True
+
+    # confirm that qyvc/screens or panels is not needed in path
+    def confirmPathDialog(self, srcPath):
+        dest = os.path.join(srcPath)
+        info = "Destination does not have {} folders in path. This is the usual way for qtvcp to find them. Do you wish to add the folders".format(srcPath)
+        title = 'Add {} to Path?'.format(srcPath)
         rtn = self.w.messageDialog_.showdialog(
-                    'Copy {} Code?'.format(name),
+                    title,
                     more_info=info,
                     details=' To Folder:\n {}'.format(dest),
                     display_type='YESNO',