From a1bc8200dee134d3182d73dfc30029d49cb5fbad Mon Sep 17 00:00:00 2001
From: luckycat <yanghong502gmail.com>
Date: Wed, 6 Apr 2022 13:04:38 +0800
Subject: [PATCH] First ui version for pip

---
 .gitignore                |   3 +
 biliup/__init__.py        |  29 ++++++----
 biliup/__main__.py        |   5 +-
 biliup/engine/__init__.py |  16 ++++++
 biliup/public/config.yaml | 108 ++++++++++++++++++++++++++++++++++++
 public/favicon.png        | Bin 3127 -> 0 bytes
 public/global.css         |  31 -----------
 public/index.html         |  17 ------
 public/noface.jpg         | Bin 3719 -> 0 bytes
 requirements.txt          |   1 +
 rollup.config.js          |   2 +-
 setup.cfg                 |   2 +-
 setup.py                  |   4 +-
 src/Upload.svelte         |  57 +++++++++++++++----
 src/store.ts              | 114 +++++++++++++++++++++++++++++++++++++-
 15 files changed, 312 insertions(+), 77 deletions(-)
 create mode 100644 biliup/public/config.yaml
 delete mode 100644 public/favicon.png
 delete mode 100644 public/global.css
 delete mode 100644 public/index.html
 delete mode 100644 public/noface.jpg

diff --git a/.gitignore b/.gitignore
index 879546b..7088d36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ old/
 venv./
 debug.py
 config.yaml
+!biliup/public/config.yaml
 chromedriver.*
 /configlog.ini
 ds_update.log*
@@ -25,3 +26,5 @@ build/
 bili.cookie.json
 archive.txt
 /node_modules
+watch_process.pid
+package-lock.json
diff --git a/biliup/__init__.py b/biliup/__init__.py
index 9801c03..68f9e3e 100644
--- a/biliup/__init__.py
+++ b/biliup/__init__.py
@@ -3,6 +3,7 @@ from http import cookies
 from http.client import OK
 import json
 from multiprocessing.sharedctypes import Value
+import os
 
 from aiohttp import streamer
 
@@ -65,31 +66,37 @@ async def main(args):
             return web.json_response(config.data['streamers'])
         async def set_streamer_config(request):
             post_data =await request.json()
-            for i,j in post_data['streamers'].items():
-                if i not in config.data['streamers']:
-                    config.data['streamers'][i]={}
-                for key,Value in j.items():
-                    config.data['streamers'][i][key]=Value
-            for i in config.data['streamers']:
-                if i not in post_data['streamers']:
-                    del config.data['streamers'][i]
+            config.data['streamers']=post_data['streamers'] 
+            # for i,j in post_data['streamers'].items():
+            #     if i not in config.data['streamers']:
+            #         config.data['streamers'][i]={}
+            #     for key,Value in j.items():
+            #         config.data['streamers'][i][key]=Value
+            # for i in config.data['streamers']:
+            #     if i not in post_data['streamers']:
+            #         del config.data['streamers'][i]
                     
             print("sucess")
             return web.json_response({"status":200},status=200)
         async def save_config(reequest):
             config.save()
             return web.json_response({"status":200},status=200)
+        async def root_handler(request):
+            return web.HTTPFound('/index.html')
         app = web.Application()
     
-        
+        web_dir = os.path.dirname(__file__)
+        public_dir=(os.path.join(web_dir, 'public'))
+        build_dir =(os.path.join(public_dir, 'build'))
         app.add_routes([web.get('/url-status', url_status)])
         app.add_routes([web.get('/api/basic',get_basic_config)])
         app.add_routes([web.post('/api/setbasic',set_basic_config)])
         app.add_routes([web.get('/api/getconfig',get_streamer_config)])
         app.add_routes([web.post('/api/setconfig',set_streamer_config)])
         app.add_routes([web.get('/api/save',save_config)])
-        app.add_routes([web.static('/public','./public',show_index=False)])
-        app.add_routes([web.static('/build','./public/build',show_index=False)])
+        app.add_routes([web.get('/', root_handler)])
+        app.add_routes([web.static('/',public_dir,show_index=False)])
+        app.add_routes([web.static('/build',build_dir,show_index=False)])
         cors = aiohttp_cors.setup(app, defaults={
             "*": aiohttp_cors.ResourceOptions(
                     allow_credentials=True,
diff --git a/biliup/__main__.py b/biliup/__main__.py
index 094d55e..65de44b 100644
--- a/biliup/__main__.py
+++ b/biliup/__main__.py
@@ -72,7 +72,10 @@ def arg_parser():
     parser_restart.set_defaults(func=daemon.restart)
     parser.set_defaults(func=lambda: asyncio.run(main(args)))
     args = parser.parse_args()
-    config.load(args.config)
+    if(args.http):
+        config.create_without_config_input(args.config)
+    else:
+        config.load(args.config)
     LOG_CONF.update(config.get('LOGGING', {}))
     if args.verbose:
         LOG_CONF['loggers']['biliup']['level'] = args.verbose
diff --git a/biliup/engine/__init__.py b/biliup/engine/__init__.py
index 95c9fa9..8516743 100644
--- a/biliup/engine/__init__.py
+++ b/biliup/engine/__init__.py
@@ -1,4 +1,8 @@
 from collections import UserDict
+import os
+import shutil
+
+import biliup
 from .decorators import Plugin
 
 
@@ -9,6 +13,18 @@ class Config(UserDict):
             file = open('config.yaml', encoding='utf-8')
         with file as stream:
             self.data = yaml.load(stream, Loader=yaml.FullLoader)
+    def create_without_config_input(self, file):
+        import yaml
+        if file is None:
+            try:
+                file = open('config.yaml', encoding='utf-8')
+            except FileNotFoundError:
+                biliup_dir = os.path.dirname(biliup.__file__)
+                config_data = os.path.join(biliup_dir,"public/","config.yaml")
+                shutil.copy(config_data, os.getcwd())
+                file = open('config.yaml', encoding='utf-8')
+        with file as stream:
+            self.data = yaml.load(stream, Loader=yaml.FullLoader)
     def save(self):
         import yaml
         old_file = open('config.yaml',encoding='utf-8')
diff --git a/biliup/public/config.yaml b/biliup/public/config.yaml
new file mode 100644
index 0000000..7d8a696
--- /dev/null
+++ b/biliup/public/config.yaml
@@ -0,0 +1,108 @@
+user: # 在填了cookies的情况下优先使用cookies上传，如需使用用户名密码上传请注释掉cookies
+    cookies:
+       SESSDATA: your SESSDATA
+       bili_jct: your bili_jct
+       DedeUserID__ckMd5: your ckMd5
+       DedeUserID: your DedeUserID
+    access_token: your access_key
+    # account:
+    #     username: your usrname
+    #     password: your password
+#    app_key: bca7e84c2d947ac6 # 若账号密码方式无法登录可尝试更改此值
+#    appsec: 60698ba2f68e01ce44738920a0ffe768
+
+# 选择全局默认上传插件，Noop为不上传，但会执行后处理
+#uploader: Noop
+
+# b站上传线路选择，默认为自动模式，目前可手动切换为bda2, kodo, ws, qn, cos, cos-internal(支持腾讯云内网免流+提速)
+lines: AUTO
+# b站提交接口，默认自动选择，可选web，client
+submit_api: client
+# 单文件并发上传数，未达到带宽上限时增大此值可提高上传速度
+threads: 3
+# 录像单文件大小限制，单位Byte，超过此大小分段下载
+file_size: 2621440000
+# 录像单文件时间限制，格式'00:00:00'（时分秒），超过此大小分段下载，如需使用大小分段请注释此字段
+#segment_time: '00:50:00'
+filtering_threshold: 20 # 小于此大小的视频文件将会被过滤删除，单位MB
+# 如遇到斗鱼录制卡顿可以尝试切换线路，tct-h5（备用线路5），ali-h5（备用线路6），akm-h5（主线路1）
+#douyucdn: tct-h5
+# 如遇到虎牙录制卡顿可以尝试切换线路，AL（阿里），BD（百度），TX（腾讯）
+#huyacdn: AL
+# 如遇到哔哩哔哩录制跳帧可以尝试修改platform值，web（flv），h5（m3u8）
+#biliplatform: web
+# 如需要录制抖音请在此填入cookie需要__ac_nonce与__ac_signature的值
+#douyin_cookie: '__ac_nonce=123456; __ac_signature=123456;'
+# Netscape 格式的 Cookies 文本路径
+#youtube_cookie: 'cookiejar.txt'
+
+streamers:
+    星际2Stats拔本神族天梯第一视角: # 最小配置示例
+        url:
+            - https://www.twitch.tv/kimdaeyeob3
+    星际2INnoVation吕布卫星人族天梯第一视角: # 完整可选配置示例
+        url:
+            - https://www.twitch.tv/innovation_s2
+            - https://www.panda.tv/1160340
+        title: "{title}第一视角%Y-%m-%d" # 自定义标题的时间格式, {title}代表直播间标题
+        tid: 171 # 投稿分区码,171为电子竞技分区 
+        copyright: 2 # 1为自制
+        cover_path: /cover/up.jpg
+        description: "视频简介: {title} %Y-%m-%d %H:%M:%S" # 支持strftime, {title}占位符
+        dynamic: '#空间动态#'
+        dtime: 14400 # 设置延时发布时间，距离提交大于2小时，格式为时间戳
+        # 覆盖全局默认上传插件，Noop为不上传，但会执行后处理
+        uploader: bili_web
+        postprocessor: # 上传完成后，将按自定义顺序执行自定义操作
+            - run: echo hello! # 执行任意命令，等同于在shell中运行,视频文件路径作为标准输入传入
+            - mv: backup/ # 移动文件到backup目录下
+#            - rm # 删除文件，为默认操作
+        tags:
+            - 星际争霸2
+            - 电子竞技
+        format: mp4 # 视频保存格式
+        opt_args: # ffmpeg参数
+            - '-ss' # 跳过开始的16秒
+            - '00:00:16'
+
+# 检测间隔时间，单位：秒
+event_loop_interval: 40
+# 相同平台检测间隔，单位：秒。不同平台的链接是并发的，不受此参数影响
+checker_sleep: 15
+# 线程池1大小，负责download事件
+pool1_size: 3
+# 线程池2大小，处理除download事件外所有其他事件
+pool2_size: 3
+# 检测源码文件变化间隔，单位：秒，检测源码到变化后，程序会在空闲时自动重启
+check_sourcecode: 15
+# 日志输出配置
+LOGGING:
+    formatters:
+        verbose:
+            format: '%(asctime)s %(filename)s[line:%(lineno)d](Pid:%(process)d Tname:%(threadName)s) %(levelname)s %(message)s'
+            datefmt: '%Y-%m-%d %H:%M:%S'
+        simple:
+            format: '%(filename)s%(lineno)d[%(levelname)s]Tname:%(threadName)s %(message)s'
+    handlers:
+        console:
+            level: DEBUG
+            class: logging.StreamHandler
+            formatter: simple
+            stream: ext://sys.stdout
+        file:
+            level: DEBUG
+            class: biliup.common.log.SafeRotatingFileHandler
+            when: W0
+            interval: 1
+            backupCount: 1
+            filename: ds_update.log
+            formatter: verbose
+    root:
+        handlers: [ console ]
+        level: INFO
+    loggers:
+        biliup:
+            handlers: [ file ]
+            level: INFO
+# 默认通过网页接口上传,可选通过操作chrome上传,此时需要填写chromedriver路径
+#chromedriver_path: /usr/local/bin/chromedriver
diff --git a/public/favicon.png b/public/favicon.png
deleted file mode 100644
index 7e6f5eb5a2f1f1c882d265cf479de25caa925645..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3127
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
RDuVz3002ovPDHLkV1lTymTLe2

diff --git a/public/global.css b/public/global.css
deleted file mode 100644
index ce7905a..0000000
--- a/public/global.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* width */
-::-webkit-scrollbar {
-    width: 0.5rem;
-    /*height: 5px;*/
-}
-
-/* Track */
-::-webkit-scrollbar-track {
-    border-radius: 100vh;
-    background: #ffffff00;
-}
-
-/* Handle */
-::-webkit-scrollbar-thumb {
-    background: #cbd5e0;
-    border-radius: 100vh;
-    border: 1px solid #edf2f7;
-}
-
-/* Handle on hover */
-::-webkit-scrollbar-thumb:hover {
-    background: #a0aec0;
-}
-
-body {
-    overflow-x: hidden;
-}
-
-.tippy-content{
-    padding: 0 !important;
-}
diff --git a/public/index.html b/public/index.html
deleted file mode 100644
index 0d032c1..0000000
--- a/public/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset='utf-8'>
-	<meta name='viewport' content='width=device-width,initial-scale=1'>
-
-	<title>Svelte app</title>
-
-	<link rel='icon' type='image/png' href='/favicon.png'>
-	<link rel='stylesheet' href='/global.css'>
-	<link rel='stylesheet' href='/build/bundle.css'>
-	<script defer src='/build/bundle.js'></script>
-</head>
-
-<body>
-</body>
-</html>
diff --git a/public/noface.jpg b/public/noface.jpg
deleted file mode 100644
index 16639025550062031f37962882ee5e95570078f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3719
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
CsAuK?

diff --git a/requirements.txt b/requirements.txt
index 04b225a..dceec7a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,3 +8,4 @@ PyYAML>=4.2b1
 streamlink>=0.14.2
 ykdl>=1.8.0
 rsa>=4.6
+aiohttp_cors
diff --git a/rollup.config.js b/rollup.config.js
index 7fad607..babb272 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -37,7 +37,7 @@ export default {
 		sourcemap: true,
 		format: 'iife',
 		name: 'app',
-		file: 'public/build/bundle.js'
+		file: 'biliup/public/build/bundle.js'
 	},
 	plugins: [
 		svelte({
diff --git a/setup.cfg b/setup.cfg
index 8a12a88..ae56fba 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,7 +25,7 @@ install_requires =
   rsa >= 4.6
 
 [options.package_data]
-biliup = common/*.ini,public/*
+biliup = common/*.ini,public/*,public/build/*
 
 [options.packages.find]
 include = biliup*
diff --git a/setup.py b/setup.py
index 864b617..0d2d87e 100644
--- a/setup.py
+++ b/setup.py
@@ -1,2 +1,4 @@
 import setuptools
-setuptools.setup()
\ No newline at end of file
+setuptools.setup(
+    package_dir={'build':'biliup/'}
+)
\ No newline at end of file
diff --git a/src/Upload.svelte b/src/Upload.svelte
index b92b22c..e5a7aeb 100644
--- a/src/Upload.svelte
+++ b/src/Upload.svelte
@@ -63,6 +63,7 @@
 
     // console.log()
     let tags = selectedTemplate?.tags ? selectedTemplate?.tags : [];
+    let urls = selectedTemplate?.url ? selectedTemplate?.url : [];
     // $: tags = selectedTemplate?.tag.split(',');
 
     let parent = '请选择';
@@ -98,7 +99,7 @@
     }
 
     let tempTag;
-
+    let tempUrl;
 
 
     function handleKeypress() {
@@ -109,16 +110,32 @@
             return;
         }
         tags = [...tags, tempTag];
-        selectedTemplate.tag = tags.join(',');
+        selectedTemplate.tags = tags;
         tempTag = null;
         return false;
     }
-
+    function urlhandleKeypress(){
+        console.log(urls);
+        if(urls.includes(tempUrl)){
+            createPop("已有相同链接");
+            tempUrl = null;
+            return;
+        }
+        urls = [...urls, tempUrl];
+        selectedTemplate.url = urls;
+        tempUrl=null;
+        return false;
+    }
     function removeTag(tag) {
         tags = tags.filter(t => t !== tag);
-        selectedTemplate.tag = tags.join(',');
+        selectedTemplate.tags = tags;
         console.log(tag);
     }
+    function removeUrl(url) {
+        urls = urls.filter(u => u !== url);
+        selectedTemplate.url = urls;
+        console.log(url);
+    }
 
 
     function callback(detailTid, detailParent, detailChildren) {
@@ -181,13 +198,31 @@
                        placeholder="标题">
 
             </div>
-            <div class="flex flex-col">
-                <label class="label">
-                    <span class="text-sm font-bold text-gray-500 tracking-wide">直播间链接</span>
-                </label>
-                <input bind:value={selectedTemplate.url}
-                       class="text-base p-2 border border-gray-300 rounded-lg focus:outline-none focus:border-indigo-500"
-                       placeholder="www.douyu.com/3484">
+<!--            <div class="flex flex-col">-->
+<!--                <label class="label">-->
+<!--                    <span class="text-sm font-bold text-gray-500 tracking-wide">直播间链接</span>-->
+<!--                </label>-->
+<!--                <input bind:value={selectedTemplate.url}-->
+<!--                       class="text-base p-2 border border-gray-300 rounded-lg focus:outline-none focus:border-indigo-500"-->
+<!--                       placeholder="www.douyu.com/3484">-->
+<!--            </div>-->
+            <div class="flex flex-wrap rounded-lg border border-gray-300 focus:outline-none focus:ring-2 focus:ring-purple-600 focus:border-transparent">
+                {#each urls as url(url)}
+                    <span animate:flip="{{duration: 300}}" class="flex  ml-1 my-1.5 px-3 py-0.5 text-base rounded-full text-white  bg-indigo-500 ">
+                        {url}
+                        <button on:click={(e)=>{removeUrl(url)}} class="bg-transparent hover">
+                            <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="currentColor"
+                                 class="ml-2" viewBox="0 0 1792 1792">
+                                <path d="M1490 1322q0 40-28 68l-136 136q-28 28-68 28t-68-28l-294-294-294 294q-28 28-68 28t-68-28l-136-136q-28-28-28-68t28-68l294-294-294-294q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 294 294-294q28-28 68-28t68 28l136 136q28 28 28 68t-28 68l-294 294 294 294q28 28 28 68z">
+                                </path>
+                            </svg>
+                        </button>
+                    </span>
+                {/each}
+
+                <input bind:value={tempUrl} class="outline-none rounded-lg flex-1 appearance-none  w-full py-2 px-4 bg-white text-gray-700 placeholder-gray-400 shadow-sm text-base " on:keypress={e=>e.key==='Enter' && urlhandleKeypress()}
+                       placeholder="录制链接"
+                       type="text"/>
             </div>
 
 
diff --git a/src/store.ts b/src/store.ts
index a119295..ba3dd87 100644
--- a/src/store.ts
+++ b/src/store.ts
@@ -1,5 +1,9 @@
-import { writable } from "svelte/store";
-import { crossfade, fly } from "svelte/transition";
+import {writable} from "svelte/store";
+import {open} from "@tauri-apps/api/dialog";
+import {sep} from "@tauri-apps/api/path";
+import {invoke} from "@tauri-apps/api/tauri";
+import {crossfade, fly} from "svelte/transition";
+import {createPop} from "./common";
 
 
 export const isLogin = writable(true);
@@ -24,7 +28,111 @@ export const currentTemplate = writable({
 export const [send, receive] = crossfade({
     duration: 800,
     fallback: (node, params) => {
-        return fly(node, { x: 200, delay: 500 });
+        return fly(node, {x: 200, delay: 500});
     },
 });
+export const fileselect = () => {
+    let properties = {
+        // defaultPath: 'C:\\',
+        multiple: true,
+        // directory: false,
+        filters: [{
+            extensions: ['mp4', 'flv', 'avi', 'wmv', 'mov', 'webm', 'mpeg4', 'ts', 'mpg', 'rm', 'rmvb', 'mkv', 'm4v'],
+            name: ""
+        }]
+    };
+    open(properties).then((pathStr) => {
+        console.log(pathStr);
+        if (!pathStr) return;
+        attach(pathStr);
+    });
+};
 
+export function attach(files) {
+    currentTemplate.update(temp => {
+        function findFile(file) {
+            return temp.selectedTemplate['files'].find((existingFile) => existingFile.id === file);
+        }
+
+        for (const file of files) {
+            if (findFile(file)) {
+                createPop('请上传非重复视频！');
+                continue;
+            }
+            let split = file.split(sep);
+            let filename = split[split.length - 1];
+
+            // temp['files'] = [...temp['files'], ...event.target.files];
+            temp.selectedTemplate['files'].push({
+                filename: file,
+                id: file,
+                title: filename.substring(0, filename.lastIndexOf(".")),
+                desc: '',
+                progress: 0,
+                speed: 0,
+                totalSize: 0,
+                complete: false,
+                process: false,
+            });
+            // let objectURL = URL.createObjectURL(file);
+            // console.log(objectURL);
+        }
+        const res = allComplete(temp.selectedTemplate['files'], temp.selectedTemplate);
+        console.log(res);
+        return temp;
+    });
+}
+
+function allComplete(files, temp) {
+    // console.log(temp);
+    for (const file of files) {
+        if (!file.complete && !file.process && temp.atomicInt < 1) {
+            temp.atomicInt++;
+            file.process = true;
+            upload(file, temp);
+            console.log(temp);
+            return false;
+        }
+    }
+    return true;
+}
+
+function upload(video, temp) {
+    // const files = [];
+
+    invoke('upload', {
+        video: video
+    }).then((res) => {
+        // temp.atomicInt--;
+        video.filename = res[0].filename;
+        video.speed = res[1];
+        video.complete = true;
+        video.progress = 100;
+        currentTemplate.update(t => {
+            t.selectedTemplate.files.forEach(file => {
+                if (file.id === video.id) {
+                    file.filename = res[0].filename;
+                    file.speed = res[1];
+                    file.complete = true;
+                    file.progress = 100;
+                }
+            })
+            return t;
+        });
+        console.log(`Message:`, res);
+    }).catch((e) => {
+        createPop(`${video.filename}: ${e}`, 5000);
+        console.log(e);
+    }).finally(() => {
+        temp.atomicInt--;
+        if (allComplete(temp['files'], temp)) {
+            console.log(temp.submitCallback);
+            if (temp.submitCallback) {
+                temp.submitCallback();
+                temp.submitCallback=null;
+            }
+            console.log("allComplete");
+            return;
+        }
+    })
+}