Commit ce5729b2 authored by John's avatar John
Browse files

Added sync button to fetch source and removed auto-download upon clicking Run

parent b8bed90e

ballontranslator/dl/pagesources/__init__.py

+3 −3
Original line number Diff line number Diff line
@@ -21,19 +21,19 @@ class SourceDownload: 
        if 'https://' not in self.url:

            self.url = 'https://' + self.url



    def FetchImageUrls(self):

    def FetchImages(self):

        config.load()

        job = DownloadJob(self.url)

        job.run()

        self.path = job.pathfmt.directory



    def download_source(self):

    def SyncSourceDownload(self):

        self.url = self.config_pnl.src_link_flag

        if self.url:

            LOGGER.info(f'Url set to {self.url}')



            self.ValidateUrl()

            self.FetchImageUrls()

            self.FetchImages()



            proj_path = self.ReturnFullPathToProject()

            LOGGER.info(f'Project path set to {proj_path}')

ballontranslator/ui/dl_manager.py

+6 −4
Original line number Diff line number Diff line
@@ -571,10 +571,7 @@ class DLManager(QObject): 
        if self.translate_thread.isRunning():

            self.translate_thread.terminate()



    def runImgtransPipeline(self, menu):

        from dl.pagesources import SourceDownload

        source = SourceDownload(self.config, self.imgtrans_proj, menu)

        source.download_source()

    def runImgtransPipeline(self):

        if self.imgtrans_proj.is_empty:

            LOGGER.info('proj file is empty, nothing to do')

            self.progress_msgbox.hide()
@@ -609,6 +606,11 @@ class DLManager(QObject): 
        self.progress_msgbox.show()

        self.imgtrans_thread.runBlktransPipeline(blk_list, tgt_img, mode)



    def runSourceDownload(self, menu):

        from dl.pagesources import SourceDownload

        source = SourceDownload(self.config, self.imgtrans_proj, menu)

        source.SyncSourceDownload()



    def on_finish_blktrans_stage(self, stage: str, progress: int):

        if stage == 'ocr':

            self.progress_msgbox.updateOCRProgress(progress)

ballontranslator/ui/mainwindow.py

+5 −1
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ class MainWindow(FramelessWindow): 
        dl_manager.imgtrans_thread.post_process_mask = self.drawingPanel.rectPanel.post_process_mask



        self.leftBar.run_imgtrans.connect(self.on_run_imgtrans)

        self.leftBar.run_sync_source.connect(self.on_run_sync_source)

        self.bottomBar.ocrcheck_statechanged.connect(dl_manager.setOCRMode)

        self.bottomBar.transcheck_statechanged.connect(dl_manager.setTransMode)

        self.bottomBar.inpaint_btn_clicked.connect(self.inpaintBtnClicked)
@@ -907,7 +908,10 @@ class MainWindow(FramelessWindow): 
        if self.bottomBar.textblockChecker.isChecked():

            self.bottomBar.textblockChecker.click()

        self.postprocess_mt_toggle = False

        self.dl_manager.runImgtransPipeline(self)

        self.dl_manager.runImgtransPipeline()



    def on_run_sync_source(self):

        self.dl_manager.runSourceDownload(self)



    def on_transpanel_changed(self):

        self.canvas.editor_index = self.rightComicTransStackPanel.currentIndex()

ballontranslator/ui/mainwindowbars.py

+11 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ class RunBtn(QPushButton): 
        super().__init__(*args, **kwargs)

        self.setText('Run')



class SyncSourceBtn(QPushButton):

    def __init__(self, *args, **kwargs) -> None:

        super().__init__(*args, **kwargs)

        self.setText('Sync')





class StatusButton(QPushButton):

    pass
@@ -131,6 +136,7 @@ class LeftBar(Widget): 
    save_proj = Signal()

    save_config = Signal()

    run_imgtrans = Signal()

    run_sync_source = Signal()

    export_doc = Signal()

    import_doc = Signal()

    def __init__(self, mainwindow, *args, **kwargs) -> None:
@@ -193,6 +199,10 @@ class LeftBar(Widget): 
        self.runImgtransBtn.setFixedSize(LEFTBTN_WIDTH, LEFTBTN_WIDTH)

        self.runImgtransBtn.clicked.connect(self.run_imgtrans)



        self.syncSourceBtn = SyncSourceBtn()

        self.runImgtransBtn.setFixedSize(LEFTBTN_WIDTH, LEFTBTN_WIDTH)

        self.syncSourceBtn.clicked.connect(self.run_sync_source)



        vlayout = QVBoxLayout(self)

        vlayout.addWidget(openBtnToolBar)

        vlayout.addWidget(self.showPageListLabel)
@@ -201,6 +211,7 @@ class LeftBar(Widget): 
        vlayout.addItem(QSpacerItem(0, 0, QSizePolicy.Minimum, QSizePolicy.Expanding))

        vlayout.addWidget(self.configChecker)

        vlayout.addWidget(self.runImgtransBtn)

        vlayout.addWidget(self.syncSourceBtn)

        vlayout.setContentsMargins(padding, 0, padding, int(LEFTBTN_WIDTH / 2))

        vlayout.setAlignment(Qt.AlignmentFlag.AlignCenter)

        vlayout.setSpacing(int(LEFTBTN_WIDTH / 2))