Add names of folders and files (#3)

* Add fileName field

* Add folderName field

* Update UI

Author: IZOBRETATEL777

Elements.py

@@ -5,20 +5,22 @@ def __init__(self, required, description):
 
 
 class File(Element):
-    def __init__(self, required, description, source, destination, usingHome):
+    def __init__(self, required, description, source, destination, usingHome, fileName):
         super().__init__(required, description)
         self.source = source
         self.destination = destination
         self.usingHome = usingHome
+        self.fileName = fileName
 
 
 class Folder(Element):
-    def __init__(self, required, description, source, destination, usingHome):
+    def __init__(self, required, description, source, destination, usingHome, folderName):
         self.source = source
         self.destination = destination
         self.required = required
         self.description = description
         self.usingHome = usingHome
+        self.folderName = folderName
 
 
 class Package(Element):

controllers/FileController.py

@@ -24,14 +24,15 @@ def openFile(self):
     def saveElement(self):
         src = self.ui.filePath.text()
         dest = self.ui.destinationPath.text().replace('~/', '/')
+        fileName = src[src.rfind('/') + 1:]
+        if not dest.endswith('/'):
+            dest += '/'
         if not os.path.isfile(src):
             QMessageBox().critical(self, "Error! File does not exist", "File " + src + " does not exist!")
-        elif dest.endswith('/'):
-            QMessageBox().critical(self, "Error! File does not exist", "Destination should not be a folder")
         else:
             if len(dest) > 0 and dest[0] != '/':
                 dest = '/' + dest
-            args = self.ui.isRequired.isChecked(), self.ui.description.text(), src, dest, self.ui.useHome.isChecked()
+            args = self.ui.isRequired.isChecked(), self.ui.description.text(), src, dest, self.ui.useHome.isChecked(), fileName
             self.ui.isRequired.setChecked(True)
             self.ui.description.clear()
             self.ui.filePath.clear()

controllers/FolderController.py

@@ -22,12 +22,17 @@ def openFolder(self):
     def saveElement(self):
         src = self.ui.folderPath.text()
         dest = self.ui.destinationPath.text().replace('~/', '/')
+        if src.endswith('/'):
+            src = src[:-1]
+        folderName = src[src.rfind('/') + 1:]
+        if not dest.endswith('/'):
+            dest += '/'
         if not os.path.isdir(src):
-            QMessageBox().critical(self, "Error! File does not exist", "Folder " + src + " does not exist!")
+            QMessageBox().critical(self, "Error! Folder does not exist", "Folder " + src + " does not exist!")
         else:
             if len(dest) > 0 and dest[0] != '/':
                 dest = '/' + dest
-            args = self.ui.isRequired.isChecked(), self.ui.description.text(), src, dest, self.ui.useHome.isChecked()
+            args = self.ui.isRequired.isChecked(), self.ui.description.text(), src, dest, self.ui.useHome.isChecked(), folderName
             self.ui.isRequired.setChecked(True)
             self.ui.description.clear()
             self.ui.folderPath.clear()

forms/file.py

@@ -1,4 +1,4 @@
-# Form implementation generated from reading ui file 'file.ui'
+# Form implementation generated from reading ui file 'forms/file.ui'
 #
 # Created by: PyQt6 UI code generator 6.1.1
 #
@@ -12,7 +12,7 @@
 class Ui_AddFileMenu(object):
     def setupUi(self, AddFileMenu):
         AddFileMenu.setObjectName("AddFileMenu")
-        AddFileMenu.resize(453, 216)
+        AddFileMenu.resize(453, 218)
         self.gridLayout = QtWidgets.QGridLayout(AddFileMenu)
         self.gridLayout.setObjectName("gridLayout")
         self.verticalLayout = QtWidgets.QVBoxLayout()
@@ -64,19 +64,9 @@ def retranslateUi(self, AddFileMenu):
         _translate = QtCore.QCoreApplication.translate
         AddFileMenu.setWindowTitle(_translate("AddFileMenu", "Add file"))
         self.chooseFileButton.setText(_translate("AddFileMenu", "Choose file"))
-        self.label_2.setText(_translate("AddFileMenu", "Destination file"))
+        self.label_2.setText(_translate("AddFileMenu", "Place to"))
         self.label_4.setText(_translate("AddFileMenu", "Description"))
         self.useHome.setText(_translate("AddFileMenu", "Use home folder as root"))
         self.isRequired.setText(_translate("AddFileMenu", "Required"))
         self.cancelButton.setText(_translate("AddFileMenu", "Cancel"))
         self.addFile.setText(_translate("AddFileMenu", "Add"))
-
-
-if __name__ == "__main__":
-    import sys
-    app = QtWidgets.QApplication(sys.argv)
-    AddFileMenu = QtWidgets.QWidget()
-    ui = Ui_AddFileMenu()
-    ui.setupUi(AddFileMenu)
-    AddFileMenu.show()
-    sys.exit(app.exec())

forms/file.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>453</width>
-    <height>216</height>
+    <height>218</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,7 +31,7 @@
        <item row="1" column="0">
         <widget class="QLabel" name="label_2">
          <property name="text">
-          <string>Destination file</string>
+          <string>Place to</string>
          </property>
         </widget>
        </item>

forms/folder.py

@@ -1,4 +1,4 @@
-# Form implementation generated from reading ui file 'folder.ui'
+# Form implementation generated from reading ui file 'forms/folder.ui'
 #
 # Created by: PyQt6 UI code generator 6.1.1
 #
@@ -12,7 +12,7 @@
 class Ui_AddFolderMenu(object):
     def setupUi(self, AddFolderMenu):
         AddFolderMenu.setObjectName("AddFolderMenu")
-        AddFolderMenu.resize(400, 216)
+        AddFolderMenu.resize(400, 218)
         self.gridLayout = QtWidgets.QGridLayout(AddFolderMenu)
         self.gridLayout.setObjectName("gridLayout")
         self.verticalLayout = QtWidgets.QVBoxLayout()
@@ -64,19 +64,9 @@ def retranslateUi(self, AddFolderMenu):
         _translate = QtCore.QCoreApplication.translate
         AddFolderMenu.setWindowTitle(_translate("AddFolderMenu", "Add folder"))
         self.chooseFolderButton.setText(_translate("AddFolderMenu", "Choose folder"))
-        self.label_2.setText(_translate("AddFolderMenu", "Install to:"))
+        self.label_2.setText(_translate("AddFolderMenu", "Place to:"))
         self.label_4.setText(_translate("AddFolderMenu", "Description"))
         self.useHome.setText(_translate("AddFolderMenu", "Use home folder as root"))
         self.isRequired.setText(_translate("AddFolderMenu", "Required"))
         self.cancelButton.setText(_translate("AddFolderMenu", "Cancel"))
         self.addFolder.setText(_translate("AddFolderMenu", "Add"))
-
-
-if __name__ == "__main__":
-    import sys
-    app = QtWidgets.QApplication(sys.argv)
-    AddFolderMenu = QtWidgets.QWidget()
-    ui = Ui_AddFolderMenu()
-    ui.setupUi(AddFolderMenu)
-    AddFolderMenu.show()
-    sys.exit(app.exec())

forms/folder.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>216</height>
+    <height>218</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,7 +31,7 @@
        <item row="1" column="0">
         <widget class="QLabel" name="label_2">
          <property name="text">
-          <string>Install to:</string>
+          <string>Place to:</string>
          </property>
         </widget>
        </item>