Merge branch 'hoothin:master' into rules_update

Author: Boxkun

.github/workflows/build-dist.yml

@@ -0,0 +1,33 @@
+name: Build Picviewer CE+ Dist
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'Picviewer CE*/Picviewer CE*.user.js'
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Replace require paths, add timestamp, and create dist file
+        run: |
+          sed -E \
+            -e "s#https://update.greasyfork.org/scripts/6158/([0-9]+)/GM_config%20CN.js#https://hoothin.github.io/UserScripts/Picviewer%20CE%2B/GM_config%20CN.js?v=\1#g" \
+            -e "s#https://update.greasyfork.org/scripts/438080/([0-9]+)/pvcep_rules.js#https://hoothin.github.io/UserScripts/Picviewer%20CE%2B/pvcep_rules.js?v=\1#g" \
+            -e "s#https://update.greasyfork.org/scripts/440698/([0-9]+)/pvcep_lang.js#https://hoothin.github.io/UserScripts/Picviewer%20CE%2B/pvcep_lang.js?v=\1#g" \
+            "Picviewer CE+/Picviewer CE+.user.js" > "Picviewer CE+/dist.user.js"
+
+      - name: Commit and push dist.user.js
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "hoothin-update"
+          git add "Picviewer CE+/dist.user.js"
+          git commit -m "chore(Picviewer CE+): Auto-generate dist.user.js"
+          git push https://${{ secrets.ACTION_SECRET }}@github.com/${{ github.repository }}

.github/workflows/jekyll-gh-pages.yml

@@ -8,6 +8,8 @@ on:
     paths-ignore:
       - 'Pagetual/items_all.json'
       - 'Pagetual/pagetualRules.json'
+      - '.github/*'
+      - '.github/*/*'
   workflow_run:
     workflows: ["Update Version on File Change"]
     types:

91wii/91wii.user.js

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[email protected].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

91wii/README.md

@@ -4,7 +4,7 @@
 // @name:zh-TW   怠惰小説下載器
 // @name:ja      怠惰小説ダウンローダー
 // @namespace    hoothin
-// @version      2.8.3.18
+// @version      2.8.3.19
 // @description  Lightweight web scraping script. Fetch and download main textual content from the current page, provide special support for novels
 // @description:zh-CN  通用网站内容爬虫抓取工具，可批量抓取任意站点的小说、论坛内容等并保存为TXT文档
 // @description:zh-TW  通用網站內容爬蟲抓取工具，可批量抓取任意站點的小說、論壇內容等並保存為TXT文檔
@@ -931,7 +931,7 @@ if (window.top != window.self) {
               height: 30px;line-height: 30px;display:block;color:#FFF;text-align:center;font-size: 12px;font-weight: bold;font-family: arial;background: initial; float: initial;
             }
             #txtDownQuit+div{
-              position:absolute;right:0px;bottom:2px;cursor: pointer;max-width:85px;
+              position:absolute;right:0px;bottom:2px;cursor: pointer;display: flex;
             }
             #txtDownQuit+div>button{
               background: #008aff;border: 0;padding: 5px;border-radius: 6px;color: white;float: right;margin: 1px;height: 25px;line-height: 16px;cursor: pointer;overflow: hidden;
@@ -1071,7 +1071,7 @@ if (window.top != window.self) {
                 console.warn(e);
             }
         }
-        function packLink(doc, item, curIndex) {
+        function packLink(doc, item) {
             if (customTitle) {
                 try {
                     let title = doc.querySelector(customTitle);
@@ -1082,9 +1082,6 @@ if (window.top != window.self) {
                     console.warn(e);
                 }
             }
-            if (prefix) {
-                item.innerText = prefix.replace(/\$i/g, ++curIndex) + item.innerText;
-            }
         }
         function getIframe() {
             if (iframePool && iframePool.length) return iframePool.shift();
@@ -1157,7 +1154,7 @@ if (window.top != window.self) {
                                 }
                             }
                             let base = doc.querySelector("base");
-                            let nextPages = !disableNextPage && !processFunc && await checkNextPage(doc, base ? base.href : aTag.href);
+                            let nextPages = !disableNextPage && (!processFunc || nextPageFunc) && await checkNextPage(doc, base ? base.href : aTag.href);
                             if (nextPages) {
                                 if (!nextPages.length) nextPages = [nextPages];
                                 nextPages.forEach(nextPage => {
@@ -1424,11 +1421,16 @@ if (window.top != window.self) {
                 }
             }
             rCats = rCats.filter(function(e){return e!=null});
+            if (prefix) {
+                for(i=0;i<rCats.length;i++){
+                    rCats[i]=prefix.replace(/\$i/g, i+1) + rCats[i];
+                }
+            }
         }
         var waitForComplete;
         function processDoc(i, aTag, doc, cause, check){
             let cbFunc=content=>{
-                packLink(doc, aTag, i);
+                packLink(doc, aTag);
                 let isHref = "";
                 let saveUrl = GM_getValue("saveUrl");
                 if (saveUrl){
@@ -1534,10 +1536,10 @@ if (window.top != window.self) {
 
     function getPageContent(doc, cb, url){
         if(!doc)return i18n.error;
-        if(doc.body && !doc.body.children.length)return doc.body.innerText;
         if(processFunc){
             return processFunc(doc, cb, url);
         }
+        if(doc.body && !doc.body.children.length)return doc.body.innerText;
         [].forEach.call(doc.querySelectorAll("span,div,ul"),function(item){
             var thisStyle=doc.defaultView?doc.defaultView.getComputedStyle(item):item.style;
             if(thisStyle && (thisStyle.display=="none" || (item.nodeName=="SPAN" && thisStyle.fontSize=="0px"))){