FPC 0.76__tar.gz → 0.78__tar.gz

{fpc-0.76 → fpc-0.78}/FPC/__init__.py

@@ -13,7 +13,7 @@ def now(x=None):#x='micro' return microsecond;x='str' return now time to string;
 	if not x:return int(datetime.datetime.now().timestamp())
 	elif x=='micro':return datetime.datetime.now().timestamp()
 	elif x=='str':return datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-	elif isinstance(x,(int,float)):return datetime.datetime.fromtimestamp(x).strftime('%Y-%m-%d %H:%M:%S')
+	elif isinstance(x,(int,float)):return datetime.datetime.fromtimestamp(x if x <1e11 else x/1000).strftime('%Y-%m-%d %H:%M:%S')
 	else:
 		try: import dateutil.parser;return int(dateutil.parser.parse(x).timestamp())
 		except Exception: return int(datetime.datetime.strptime(x, '%Y-%m-%d %H:%M:%S').timestamp())
@@ -54,11 +54,12 @@ def print(*a,func=None,time='%m/%d %H:%M:%S',pretty=False,**s):
 		for i,x in enumerate(a):
 			a[i]=func(x)
 	if time:
-		a.insert(0,datetime.datetime.now().strftime(time)+' :')
+		builtins.print(datetime.datetime.now().strftime(time)+' : ',end='',**s)
 	if pretty:
 		import pprint
+		if s.get('file'):s['stream']=s.pop('file')
 		for x in a:
-			pprint.pprint(x)
+			pprint.pprint(x,**s)
 	else:
 		builtins.print(*a,**s)
 def split_str(strs,num=1):
@@ -71,25 +72,30 @@ def diff(a,b):
 	for x in a:
 		if b.get(x)!=a[x]: diff[x]=[a[x],b.get(x)]
 	return diff
-def notice(x,c='default',silent=None,channel=None):
+def notice(x,c='default',silent=None,channel=None,is_async=False,_time=''):
+	if is_async:
+		process(notice,args=(x,c,silent,channel,False,_time))
+		return True
 	if silent:
 		red=redis()
 		if red.exists(x if not channel else channel):return
 		else:
 			red.set(x if not channel else channel,'1',silent)
-	try:request.urlopen(r'http://call.ff2.pw/?%s=%s&passwd=frank'%(c,urllib.parse.quote_plus(x)))
-	except:pass
+	try:
+		request.urlopen(f'http://call.ff2.pw/?{c}={urllib.parse.quote_plus(x)}&passwd=frank&time={urllib.parse.quote_plus(_time)}')
+		return True
+	except:return False
 def rand_sleep(i=0.4,a=0.8):import random;time.sleep(random.randint(int(i*1000),int(a*1000))/1000);
 def rand(i=9,a=None):import random;return random.randint(int(i),int(a)) if a else random.randint(0,int(i-1));
 def md5(x):hl = hashlib.md5();hl.update(x.encode('utf-8') if isinstance(x,str) else x);return hl.hexdigest();
 def bin2hex(x):import binascii;return binascii.hexlify(x.encode('utf-8') if isinstance(x,str) else x);
 def base64_encode(x):import base64;return base64.b64encode(x) if isinstance(x,bytes) else base64.b64encode(x.encode('utf-8'))
 def base64_decode(x):import base64;return base64.b64decode(x+(b'===' if isinstance(x,bytes) else '==='))
-def log(*x,path=None):#已经带有时间
+def log(*x,path=None,**s):#已经带有时间
 	if path is None:
-		path='/tmp/frank.log' if os.path.exists('/tmp') else './FPC.log'
+		path='/tmp/FPC.log' if os.path.exists('/tmp') else './FPC.log'
 	with open(path,'a',encoding='utf-8') as f:
-		print(*x,file=f)
+		print(*x,file=f,**s)
 def parse(o):#print class/obj's attr beatiful
 	method=[];attr=[]
 	for x in dir(o):
@@ -336,21 +342,50 @@ def process_arg_construct(urls:list,args):#args must be iterable
 	for i,url in enumerate(urls):
 		proc_args.append((url,args[i*every_proc_count:i*every_proc_count+every_proc_count]))
 	return proc_args
-def process(target,is_thread=True,join=False,num=1,sleep=None,daemon=False,**args):
+def process(target,is_thread=True,join=False,num:int=1,sleep=None,daemon=False,**args):
+	'''args:{
+				'sync':True,
+				'args':[('',),('',)]for mult proc,('','')for single proc the same parameter to multiple processes specified by num,
+				'kwargs':[{'':''}]for mult proc,{'':''}like args,
+			} or others that transfer to Thread or Process'''
 	if isinstance(target,(str,list)):#args:target,[sync=True]
 		import subprocess
 		proc=subprocess.Popen(target,stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE,shell=True if isinstance(target,str) else False);
 		return proc.communicate() if args.get('sync',True) else proc
 	pros=[]
-	if 'args' in args:#args can be list or tuple : [('',),('',)]
-		assert isinstance(args['args'],(tuple,list))
-		args_list=args['args']
-		num=len(args_list)
+	if 'args' in args and 'kwargs' in args and 'kwargs' in args:
+		_num=max(len(args['args'])if isinstance(args['args'],list)else 0,len(args['kwargs'])if isinstance(args['kwargs'],list)else 0)
+		if num!=1 and num!=_num:
+			raise ValueError(f'max args length is {_num} not equal to num:{num}')
+		num=_num
+	if 'args' in args:
+		if isinstance(args['args'],tuple):
+			args_list=[args['args']]*num 
+		elif isinstance(args['args'],list):
+			if num!=1 and num!=len(args['args']):
+				raise ValueError('args length must be equal to num')
+			args_list=args['args']
+			num=len(args_list)
+		else:
+			raise ValueError('args must be tuple or list')
+	if 'kwargs' in args:
+		if isinstance(args['kwargs'],dict):
+			kwargs_list=[args['kwargs']]*num 
+		elif isinstance(args['kwargs'],list):
+			if num!=1 and num!=len(args['kwargs']):
+				raise ValueError('kwargs length must be equal to num')
+			kwargs_list=args['kwargs']
+			num=len(kwargs_list)
+		else:
+			raise ValueError('kwargs must be tuple or list')
+	
 	if is_thread: from threading import Thread as proc
 	else: from multiprocessing import Process as proc
 	for x in range(num):
 		if 'args' in args:
-			args['args']=args_list[x] if isinstance(args_list[x],(tuple,list)) else [args_list[x]]
+			args['args']=args_list[x]
+		if 'kwargs' in args:
+			args['kwargs']=kwargs_list[x]
 		pros.append(proc(target=target,**args))
 		if daemon : pros[-1].daemon=True
 		pros[-1].start()

{fpc-0.76 → fpc-0.78}/FPC.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FPC
-Version: 0.76
+Version: 0.78
 Summary: Frank's Personal Conllection
 Home-page: http://ff2.pw
 Author: Frank

{fpc-0.76 → fpc-0.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FPC
-Version: 0.76
+Version: 0.78
 Summary: Frank's Personal Conllection
 Home-page: http://ff2.pw
 Author: Frank

{fpc-0.76 → fpc-0.78}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup
 import setuptools
 setup(
     name='FPC',
-    version='0.76',
+    version='0.78',
     description=(
         'Frank\'s Personal Conllection'
     ),