Skip to content

Commit

Permalink
fix:path有-判斷錯誤
Browse files Browse the repository at this point in the history
  • Loading branch information
Lumos committed Aug 27, 2023
1 parent 855beb3 commit 00b96de
Show file tree
Hide file tree
Showing 7 changed files with 661 additions and 661 deletions.
402 changes: 201 additions & 201 deletions RenameTool.py
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mac_run.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python3 odvrt.py
python3 odvrt.py
18 changes: 9 additions & 9 deletions odvrt.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import sys
import os

from PyQt5 import QtWidgets, QtCore, QtGui
from PyQt5.QtCore import Qt
from PyQt5.QtWidgets import QTableWidgetItem, QFileDialog, QDialog, QPushButton, QLabel, QProgressBar
from PyQt6 import QtWidgets, QtCore, QtGui
from PyQt6.QtCore import Qt
from PyQt6.QtWidgets import QTableWidgetItem, QFileDialog, QDialog, QPushButton, QLabel, QProgressBar

from RenameTool import RenameTool
from qt_view import Ui_MainWindow
Expand Down Expand Up @@ -105,8 +105,8 @@ def processDrop(self, obj, filePath):

def openBtnClicked(self):
dialog = QFileDialog()
dialog.setFileMode(QFileDialog.ExistingFiles)
dialog.setOption(QFileDialog.ShowDirsOnly, False)
dialog.setFileMode(QFileDialog.FileMode.ExistingFile)
dialog.setOption(QFileDialog.Option.ReadOnly)
if dialog.exec():
self.fileNames = dialog.selectedFiles() + self.fileNames
self.fileNames = list(dict.fromkeys(self.fileNames))
Expand All @@ -130,8 +130,8 @@ def runBtnClicked(self):
btn.setText("取消")
btn.move(300, 70)
btn.clicked.connect(lambda: self.confirmDialog.close())
self.confirmDialog.setWindowModality(Qt.ApplicationModal)
self.confirmDialog.exec_()
self.confirmDialog.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
self.confirmDialog.exec()

def showProgressAndRun(self):
try:
Expand Down Expand Up @@ -203,7 +203,7 @@ def updateFileList(self):
i = 0
while i < len(self.fileNames):
item = QTableWidgetItem()
item.setFlags(item.flags() ^ 2)
# item.setFlags(item.flags() ^ 2)
item.setText(self.fileNames[i])
self.ui.tableWidget.setItem(i, 0, item)
i = i + 1
Expand All @@ -224,4 +224,4 @@ def closeEvent(self, a0: QtGui.QCloseEvent):
app = QtWidgets.QApplication([])
window = MainWindow()
window.show()
sys.exit(app.exec_())
sys.exit(app.exec())
280 changes: 140 additions & 140 deletions qt_view.py
View file
Original file line number Diff line number Diff line change
@@ -1,140 +1,140 @@
# -*- coding: utf-8 -*-

# Form implementation generated from reading ui file 'qt_view.ui'
#
# Created by: PyQt5 UI code generator 5.15.2
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.


from PyQt5 import QtCore, QtGui, QtWidgets


class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
MainWindow.resize(800, 600)
MainWindow.setAcceptDrops(True)
self.centralwidget = QtWidgets.QWidget(MainWindow)
self.centralwidget.setObjectName("centralwidget")
self.delButton = QtWidgets.QPushButton(self.centralwidget)
self.delButton.setGeometry(QtCore.QRect(110, 10, 91, 71))
self.delButton.setMinimumSize(QtCore.QSize(91, 0))
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap("UI/cancel.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.delButton.setIcon(icon)
self.delButton.setIconSize(QtCore.QSize(32, 32))
self.delButton.setObjectName("delButton")
self.openButton = QtWidgets.QPushButton(self.centralwidget)
self.openButton.setGeometry(QtCore.QRect(10, 10, 91, 71))
self.openButton.setMinimumSize(QtCore.QSize(81, 0))
icon1 = QtGui.QIcon()
icon1.addPixmap(QtGui.QPixmap("UI/add.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.openButton.setIcon(icon1)
self.openButton.setIconSize(QtCore.QSize(32, 32))
self.openButton.setObjectName("openButton")
self.downloadImgCheckBox = QtWidgets.QCheckBox(self.centralwidget)
self.downloadImgCheckBox.setGeometry(QtCore.QRect(310, 20, 73, 16))
self.downloadImgCheckBox.setObjectName("downloadImgCheckBox")
self.tableWidget = QtWidgets.QTableWidget(self.centralwidget)
self.tableWidget.setGeometry(QtCore.QRect(20, 100, 781, 451))
self.tableWidget.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
self.tableWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
self.tableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
self.tableWidget.setShowGrid(True)
self.tableWidget.setGridStyle(QtCore.Qt.SolidLine)
self.tableWidget.setWordWrap(True)
self.tableWidget.setCornerButtonEnabled(True)
self.tableWidget.setRowCount(0)
self.tableWidget.setColumnCount(1)
self.tableWidget.setObjectName("tableWidget")
item = QtWidgets.QTableWidgetItem()
self.tableWidget.setHorizontalHeaderItem(0, item)
self.tableWidget.horizontalHeader().setHighlightSections(True)
self.tableWidget.horizontalHeader().setSortIndicatorShown(False)
self.tableWidget.horizontalHeader().setStretchLastSection(True)
self.tableWidget.verticalHeader().setStretchLastSection(False)
self.label = QtWidgets.QLabel(self.centralwidget)
self.label.setGeometry(QtCore.QRect(700, 80, 81, 21))
self.label.setObjectName("label")
self.runButton = QtWidgets.QPushButton(self.centralwidget)
self.runButton.setGeometry(QtCore.QRect(210, 10, 91, 71))
self.runButton.setMinimumSize(QtCore.QSize(91, 0))
icon2 = QtGui.QIcon()
icon2.addPixmap(QtGui.QPixmap("UI/play.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.runButton.setIcon(icon2)
self.runButton.setIconSize(QtCore.QSize(32, 32))
self.runButton.setObjectName("runButton")
self.formatStr = QtWidgets.QLineEdit(self.centralwidget)
self.formatStr.setGeometry(QtCore.QRect(360, 40, 341, 21))
self.formatStr.setObjectName("formatStr")
self.label_2 = QtWidgets.QLabel(self.centralwidget)
self.label_2.setGeometry(QtCore.QRect(310, 40, 47, 21))
self.label_2.setObjectName("label_2")
self.label_3 = QtWidgets.QLabel(self.centralwidget)
self.label_3.setGeometry(QtCore.QRect(310, 60, 461, 21))
self.label_3.setObjectName("label_3")
self.setDefaultBtn = QtWidgets.QPushButton(self.centralwidget)
self.setDefaultBtn.setGeometry(QtCore.QRect(710, 40, 75, 21))
self.setDefaultBtn.setObjectName("setDefaultBtn")
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 21))
self.menubar.setObjectName("menubar")
self.menu = QtWidgets.QMenu(self.menubar)
self.menu.setObjectName("menu")
self.menu_2 = QtWidgets.QMenu(self.menubar)
self.menu_2.setObjectName("menu_2")
self.menu_3 = QtWidgets.QMenu(self.menubar)
self.menu_3.setObjectName("menu_3")
MainWindow.setMenuBar(self.menubar)
self.statusbar = QtWidgets.QStatusBar(MainWindow)
self.statusbar.setObjectName("statusbar")
MainWindow.setStatusBar(self.statusbar)
self.action1 = QtWidgets.QAction(MainWindow)
self.action1.setObjectName("action1")
self.action3 = QtWidgets.QAction(MainWindow)
self.action3.setObjectName("action3")
self.action2 = QtWidgets.QAction(MainWindow)
self.action2.setObjectName("action2")
self.action4 = QtWidgets.QAction(MainWindow)
self.action4.setObjectName("action4")
self.action5 = QtWidgets.QAction(MainWindow)
self.action5.setObjectName("action5")
self.menu.addAction(self.action3)
self.menu.addAction(self.action4)
self.menu_2.addAction(self.action1)
self.menu_3.addAction(self.action2)
self.menu_3.addAction(self.action5)
self.menubar.addAction(self.menu_2.menuAction())
self.menubar.addAction(self.menu_3.menuAction())
self.menubar.addAction(self.menu.menuAction())

self.retranslateUi(MainWindow)
QtCore.QMetaObject.connectSlotsByName(MainWindow)

def retranslateUi(self, MainWindow):
_translate = QtCore.QCoreApplication.translate
MainWindow.setWindowTitle(_translate("MainWindow", "Odvrt"))
self.delButton.setText(_translate("MainWindow", "刪除全部"))
self.openButton.setText(_translate("MainWindow", "開啟"))
self.downloadImgCheckBox.setText(_translate("MainWindow", "下載縮圖"))
self.tableWidget.setSortingEnabled(False)
item = self.tableWidget.horizontalHeaderItem(0)
item.setText(_translate("MainWindow", "檔案路徑"))
self.label.setText(_translate("MainWindow", "共0個檔案"))
self.runButton.setText(_translate("MainWindow", "執行"))
self.formatStr.setText(_translate("MainWindow", "%code %title %actor"))
self.label_2.setText(_translate("MainWindow", "檔名格式"))
self.label_3.setText(_translate("MainWindow", "番號 code | 片名 title | 演員 actor | 發售日 release_date | 片長 volume | 評分 rating | 分類 genres"))
self.setDefaultBtn.setText(_translate("MainWindow", "使用預設值"))
self.menu.setTitle(_translate("MainWindow", "關於"))
self.menu_2.setTitle(_translate("MainWindow", "檔案"))
self.menu_3.setTitle(_translate("MainWindow", "選項"))
self.action1.setText(_translate("MainWindow", "開啟"))
self.action3.setText(_translate("MainWindow", "作者"))
self.action3.setToolTip(_translate("MainWindow", "作者"))
self.action2.setText(_translate("MainWindow", "執行"))
self.action4.setText(_translate("MainWindow", "關於此程式"))
self.action5.setText(_translate("MainWindow", "刪除全部"))
# -*- coding: utf-8 -*-

# Form implementation generated from reading ui file 'qt_view.ui'
#
# Created by: PyQt5 UI code generator 5.15.2
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.


from PyQt6 import QtCore, QtGui, QtWidgets


class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
MainWindow.resize(800, 600)
MainWindow.setAcceptDrops(True)
self.centralwidget = QtWidgets.QWidget(MainWindow)
self.centralwidget.setObjectName("centralwidget")
self.delButton = QtWidgets.QPushButton(self.centralwidget)
self.delButton.setGeometry(QtCore.QRect(110, 10, 91, 71))
self.delButton.setMinimumSize(QtCore.QSize(91, 0))
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap("UI/cancel.svg"), mode=QtGui.QIcon.Mode.Normal, state=QtGui.QIcon.State.Off)
self.delButton.setIcon(icon)
self.delButton.setIconSize(QtCore.QSize(32, 32))
self.delButton.setObjectName("delButton")
self.openButton = QtWidgets.QPushButton(self.centralwidget)
self.openButton.setGeometry(QtCore.QRect(10, 10, 91, 71))
self.openButton.setMinimumSize(QtCore.QSize(81, 0))
icon1 = QtGui.QIcon()
icon1.addPixmap(QtGui.QPixmap("UI/add.svg"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
self.openButton.setIcon(icon1)
self.openButton.setIconSize(QtCore.QSize(32, 32))
self.openButton.setObjectName("openButton")
self.downloadImgCheckBox = QtWidgets.QCheckBox(self.centralwidget)
self.downloadImgCheckBox.setGeometry(QtCore.QRect(310, 20, 73, 16))
self.downloadImgCheckBox.setObjectName("downloadImgCheckBox")
self.tableWidget = QtWidgets.QTableWidget(self.centralwidget)
self.tableWidget.setGeometry(QtCore.QRect(20, 100, 781, 451))
self.tableWidget.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOn)
self.tableWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOn)
self.tableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
self.tableWidget.setShowGrid(True)
self.tableWidget.setGridStyle(QtCore.Qt.PenStyle.SolidLine)
self.tableWidget.setWordWrap(True)
self.tableWidget.setCornerButtonEnabled(True)
self.tableWidget.setRowCount(0)
self.tableWidget.setColumnCount(1)
self.tableWidget.setObjectName("tableWidget")
item = QtWidgets.QTableWidgetItem()
self.tableWidget.setHorizontalHeaderItem(0, item)
self.tableWidget.horizontalHeader().setHighlightSections(True)
self.tableWidget.horizontalHeader().setSortIndicatorShown(False)
self.tableWidget.horizontalHeader().setStretchLastSection(True)
self.tableWidget.verticalHeader().setStretchLastSection(False)
self.label = QtWidgets.QLabel(self.centralwidget)
self.label.setGeometry(QtCore.QRect(700, 80, 81, 21))
self.label.setObjectName("label")
self.runButton = QtWidgets.QPushButton(self.centralwidget)
self.runButton.setGeometry(QtCore.QRect(210, 10, 91, 71))
self.runButton.setMinimumSize(QtCore.QSize(91, 0))
icon2 = QtGui.QIcon()
icon2.addPixmap(QtGui.QPixmap("UI/play.svg"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
self.runButton.setIcon(icon2)
self.runButton.setIconSize(QtCore.QSize(32, 32))
self.runButton.setObjectName("runButton")
self.formatStr = QtWidgets.QLineEdit(self.centralwidget)
self.formatStr.setGeometry(QtCore.QRect(360, 40, 341, 21))
self.formatStr.setObjectName("formatStr")
self.label_2 = QtWidgets.QLabel(self.centralwidget)
self.label_2.setGeometry(QtCore.QRect(310, 40, 47, 21))
self.label_2.setObjectName("label_2")
self.label_3 = QtWidgets.QLabel(self.centralwidget)
self.label_3.setGeometry(QtCore.QRect(310, 60, 461, 21))
self.label_3.setObjectName("label_3")
self.setDefaultBtn = QtWidgets.QPushButton(self.centralwidget)
self.setDefaultBtn.setGeometry(QtCore.QRect(710, 40, 75, 21))
self.setDefaultBtn.setObjectName("setDefaultBtn")
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 21))
self.menubar.setObjectName("menubar")
self.menu = QtWidgets.QMenu(self.menubar)
self.menu.setObjectName("menu")
self.menu_2 = QtWidgets.QMenu(self.menubar)
self.menu_2.setObjectName("menu_2")
self.menu_3 = QtWidgets.QMenu(self.menubar)
self.menu_3.setObjectName("menu_3")
MainWindow.setMenuBar(self.menubar)
self.statusbar = QtWidgets.QStatusBar(MainWindow)
self.statusbar.setObjectName("statusbar")
MainWindow.setStatusBar(self.statusbar)
self.action1 = QtGui.QAction(MainWindow)
self.action1.setObjectName("action1")
self.action3 = QtGui.QAction(MainWindow)
self.action3.setObjectName("action3")
self.action2 = QtGui.QAction(MainWindow)
self.action2.setObjectName("action2")
self.action4 = QtGui.QAction(MainWindow)
self.action4.setObjectName("action4")
self.action5 = QtGui.QAction(MainWindow)
self.action5.setObjectName("action5")
self.menu.addAction(self.action3)
self.menu.addAction(self.action4)
self.menu_2.addAction(self.action1)
self.menu_3.addAction(self.action2)
self.menu_3.addAction(self.action5)
self.menubar.addAction(self.menu_2.menuAction())
self.menubar.addAction(self.menu_3.menuAction())
self.menubar.addAction(self.menu.menuAction())

self.retranslateUi(MainWindow)
QtCore.QMetaObject.connectSlotsByName(MainWindow)

def retranslateUi(self, MainWindow):
_translate = QtCore.QCoreApplication.translate
MainWindow.setWindowTitle(_translate("MainWindow", "Odvrt"))
self.delButton.setText(_translate("MainWindow", "刪除全部"))
self.openButton.setText(_translate("MainWindow", "開啟"))
self.downloadImgCheckBox.setText(_translate("MainWindow", "下載縮圖"))
self.tableWidget.setSortingEnabled(False)
item = self.tableWidget.horizontalHeaderItem(0)
item.setText(_translate("MainWindow", "檔案路徑"))
self.label.setText(_translate("MainWindow", "共0個檔案"))
self.runButton.setText(_translate("MainWindow", "執行"))
self.formatStr.setText(_translate("MainWindow", "%code %title %actor"))
self.label_2.setText(_translate("MainWindow", "檔名格式"))
self.label_3.setText(_translate("MainWindow", "番號 code | 片名 title | 演員 actor | 發售日 release_date | 片長 volume | 評分 rating | 分類 genres"))
self.setDefaultBtn.setText(_translate("MainWindow", "使用預設值"))
self.menu.setTitle(_translate("MainWindow", "關於"))
self.menu_2.setTitle(_translate("MainWindow", "檔案"))
self.menu_3.setTitle(_translate("MainWindow", "選項"))
self.action1.setText(_translate("MainWindow", "開啟"))
self.action3.setText(_translate("MainWindow", "作者"))
self.action3.setToolTip(_translate("MainWindow", "作者"))
self.action2.setText(_translate("MainWindow", "執行"))
self.action4.setText(_translate("MainWindow", "關於此程式"))
self.action5.setText(_translate("MainWindow", "刪除全部"))

0 comments on commit 00b96de

Please sign in to comment.