Merge pull request #7 from lifegpc/dev

v1.1.0 devlopment

Author: lifegpc

HTMLParser.py

@@ -1,3 +1,18 @@
+# (C) 2019-2020 lifegpc
+# This file is part of bili.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from html.parser import HTMLParser
 class Myparser(HTMLParser) :
     "解析B站HTML"

JSONParser.py

@@ -1,3 +1,18 @@
+# (C) 2019-2020 lifegpc
+# This file is part of bili.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from json import loads,dumps
 from os.path import exists
 from os import remove
@@ -150,8 +165,8 @@ def getplinfo(d:dict) :
     r['mtime']=t['mtime']
     r['count']=t['media_count']
     return r
-def getpli(r,f,i):
-    uri='https://api.bilibili.com/x/v3/fav/resource/list?media_id=%s&pn=%s&ps=20&keyword=&order=mtime&type=0&tid=0&jsonp=jsonp'%(f,i)
+def getpli(r,f,i,d:dict):
+    uri='https://api.bilibili.com/x/v3/fav/resource/list?media_id=%s&pn=%s&ps=20&keyword=%s&order=mtime&type=%s&tid=0&jsonp=jsonp'%(f,i,d['k'],d['t'])
     bs=True
     while bs :
         try :

PrintInfo.py

@@ -1,3 +1,18 @@
+# (C) 2019-2020 lifegpc
+# This file is part of bili.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from time import localtime,strftime
 from biliTime import tostr2
 def printInfo(data) :
@@ -117,4 +132,25 @@ def printcho(cho) :
 	print('你选中了',end='')
 	for i in cho :
 		print('%s,' %(i['titleFormat']),end='')
-	print()
+	print()
+def pr() :
+	print("""    bili  版权所有 (C) 2019-2020  lifegpc
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    本程序不负任何担保责任，欲知详情请键入'show w'。
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+    这是一个自由软件，欢迎您在特定条件下再发布本程序；欲知详情请键入'show c'。
+    You can find the source code on <https://github.com/lifegpc/bili>.
+    你可以在<https://github.com/lifegpc/bili>上找到源代码。
+""")
+def prc() :
+	try :
+		f=open("LICENSE","r",encoding="utf8")
+		t=f.readline()
+		while t :
+			print(t)
+			t=f.readline()
+		f.close()
+	except :
+		print("Can't find GNU GPL3 LICENSE file, please see <http://www.gnu.org/licenses/>.")
+		print("找不到GNU GPL3 LICENSE文件，请看<http://www.gnu.org/licenses/>。")

README.md

@@ -6,7 +6,6 @@
 ## 依赖库
 [requests](https://pypi.org/project/requests/)   
 [selenium](https://pypi.org/project/selenium/)  
-[goto-statement](https://github.com/snoack/python-goto)    
 自己写的file库   
 如需自动合成视频，需要当前目录内或者环境变量PATH目录内有ffmpeg。   
 如需使用aria2下载视频，需要当前目录内或者环境变量PATH目录内有aria2c。

biliBv.py

@@ -1,3 +1,18 @@
+# (C) 2019-2020 lifegpc
+# This file is part of bili.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 table='fZodR9XQDSUm21yCkr6zBqiveYah8bt4xsWpHnJE7jL5VG3guMTKNPAwcF'
 tr={}
 for i in range(58):

biliDanmu.py

@@ -1,3 +1,18 @@
+# (C) 2019-2020 lifegpc
+# This file is part of bili.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import biliDanmuDown
 from os.path import exists
 from os import mkdir,remove
@@ -10,6 +25,7 @@
 import biliLogin
 import biliDanmuAuto
 import file
+from JSONParser import getset
 def downloadh(filen,r,pos,da) :
     d=biliDanmuDown.downloadh(pos,r,biliTime.tostr(biliTime.getDate(da)))
     if d==-1 :
@@ -227,7 +243,7 @@ def DanmuGetn(c,data,r,t,xml,xmlc,ip) :
                 print('保存文件失败'+filen)
                 return -2
             return 0
-def DanmuGeta(c,data,r,t,xml,xmlc,ip) :
+def DanmuGeta(c,data,r,t,xml,xmlc,ip:dict,se:dict) :
     "全弹幕处理"
     try :
         if not exists('Download') :
@@ -244,8 +260,18 @@ def DanmuGeta(c,data,r,t,xml,xmlc,ip) :
     if t=='av' :
         bs=True
         at2=False
+        fi=True
+        jt=False
+        if getset(se,'jt')==True :
+            jt=True
         while bs :
-            at=input('请输入两次抓取之间的天数（1-365)，输入a启动自动模式（可能有点傻）')
+            if fi and 'jt' in ip:
+                fi=False
+                at=ip['jt']
+            elif jt :
+                at='a'
+            else:
+                at=input('请输入两次抓取之间的天数（1-365)，输入a启动自动模式（可能有点傻）')
             if at.isnumeric() and int(at)<=365 and int(at)>=1 :
                 at=int(at)
                 bs=False
@@ -563,8 +589,20 @@ def DanmuGeta(c,data,r,t,xml,xmlc,ip) :
         bs=True
         at2=False
         pubt=data['mediaInfo']['time'][0:10]
+        fi=True
+        jt=False
+        if getset(se,'jt')==True :
+            jt=True
+        if 'jts' in ip :
+            pubt=ip['jts']
         while bs :
-            at=input('请输入两次抓取之间的天数（1-365)，输入a启动自动模式（可能有点傻），输入b手动输入日期(当前日期：%s)' % (pubt))
+            if fi and 'jt' in ip:
+                fi=False
+                at=ip['jt']
+            elif jt :
+                at='a'
+            else:
+                at=input('请输入两次抓取之间的天数（1-365)，输入a启动自动模式（可能有点傻），输入b手动输入日期(当前日期：%s)' % (pubt))
             if at.isnumeric() and int(at)<=365 and int(at)>=1 :
                 at=int(at)
                 bs=False

biliDanmuAuto.py

@@ -1,3 +1,18 @@
+# (C) 2019-2020 lifegpc
+# This file is part of bili.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import biliDanmu
 import json
 import biliLogin

biliDanmuCreate.py

@@ -1,3 +1,18 @@
+# (C) 2019-2020 lifegpc
+# This file is part of bili.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import cgi
 def objtoxml(s) :
     try :

biliDanmuDown.py

@@ -1,3 +1,18 @@
+# (C) 2019-2020 lifegpc
+# This file is part of bili.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 def downloadn(cid,r) :
     "下载当前弹幕"
     try :

biliDanmuXmlFilter.py

@@ -1,3 +1,18 @@
+# (C) 2019-2020 lifegpc
+# This file is part of bili.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from re import search
 def Filter(s,l) :
 	"过滤弹幕"