Browse Source

尝试修复 reload browser 卡住的问题

Signed-off-by: allan716 <[email protected]>
allan716 3 years ago
parent
commit
a90e3d12c4
2 changed files with 9 additions and 2 deletions
  1. 2 2
      internal/pkg/my_util/folder.go
  2. 7 0
      internal/pkg/rod_helper/rodHelper.go

+ 2 - 2
internal/pkg/my_util/folder.go

@@ -388,10 +388,10 @@ func ClearIdleSubFixCacheFolder(rootSubFixCacheFolder string, outOfDate time.Dur
 // 缓存文件的位置信息,都是在程序的根目录下的 cache 中
 const (
 	cacheRootFolderName = "cache"           // 缓存文件夹总名称
+	TmpFolder           = "tmp"             // 临时缓存的文件夹
+	RodCacheFolder      = "rod"             // rod 的缓存目录
 	DebugFolder         = "CSF-DebugThings" // 调试相关的文件夹
-	TmpFolder           = "CSF-TmpThings"   // 临时缓存的文件夹
 	SubFixCacheFolder   = "CSF-SubFixCache" // 字幕时间校正的缓存文件夹,一般可以不清理
-	RodCacheFolder      = "CSF-Rod"         // rod 的缓存目录
 )
 
 // 配置文件的位置信息,这个会根据系统版本做区分

+ 7 - 0
internal/pkg/rod_helper/rodHelper.go

@@ -32,6 +32,7 @@ func NewBrowser(httpProxyURL string, loadAdblock bool) (*rod.Browser, error) {
 		adblockSavePath, err = releaseAdblock()
 		if err != nil {
 			log_helper.GetLogger().Errorln("releaseAdblock", err)
+			log_helper.GetLogger().Panicln("releaseAdblock", err)
 		}
 	})
 	var browser *rod.Browser
@@ -180,6 +181,12 @@ func newPage(browser *rod.Browser) (*rod.Page, error) {
 // releaseAdblock 从程序中释放 adblock 插件出来到本地路径
 func releaseAdblock() (string, error) {
 
+	defer func() {
+		log_helper.GetLogger().Infoln("releaseAdblock end")
+	}()
+
+	log_helper.GetLogger().Infoln("releaseAdblock start")
+
 	adblockFolderPath := filepath.Join(global_value.DefTmpFolder, "chinesesubfinder")
 	err := os.MkdirAll(filepath.Join(adblockFolderPath), os.ModePerm)
 	if err != nil {