shadowshell 0.0.19__tar.gz → 0.0.24__tar.gz

{shadowshell-0.0.19 → shadowshell-0.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: shadowshell
-Version: 0.0.19
+Version: 0.0.24
 Summary: shadowshell.xyz
 Author-email: shadowshell <shadowshell@foxmail.com>
 License: MIT
@@ -41,4 +41,3 @@ Requires-Dist: requests
 
 - [Test PYPI](https://test.pypi.org/project/shadowshell/#history)
 
-

{shadowshell-0.0.19 → shadowshell-0.0.24}/README.md

@@ -29,4 +29,3 @@
 
 - [Test PYPI](https://test.pypi.org/project/shadowshell/#history)
 
-

{shadowshell-0.0.19 → shadowshell-0.0.24}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "shadowshell"   # 全局唯一名称（检查PyPI是否被占用）
-# version = "0.0.16"          # 版本号（每次更新需递增）
-version = "0.0.19"          # 版本号（每次更新需递增）
+version = "0.0.24"          # 版本号（每次更新需递增）
+#version = "0.0.25"          # 版本号（每次更新需递增）
 authors = [{ name = "shadowshell", email = "shadowshell@foxmail.com" }]
 description = "shadowshell.xyz"
 readme = "README.md"

shadowshell-0.0.24/src/shadowshell/__init__.py

@@ -0,0 +1,13 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+"""
+@author: shadow shell
+"""
+
+from shadowshell.logger import Logger
+from shadowshell.logger_factory import LoggerFactory
+from shadowshell.bootstrap import ShadowShell, hello, shadowshell, invoke_with_tmpl, TestTemplate, testserver, cnnserver
+from shadowshell.git_shell import GitShell
+
+__all__ = ['ShadowShell', 'hello', 'shadowshell', 'invoke_with_tmpl', 'TestTemplate', 'Logger', 'LoggerFactory', 'GitShell', 'testserver', 'cnnserver']

shadowshell-0.0.24/src/shadowshell/bootstrap.py

@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import os
+# import requests
+from datetime import datetime
+from shadowshell.logger_factory import LoggerFactory
+
+"""
+ShadowShell
+
+@author: shadow shell
+"""
+class ShadowShell:
+
+    def __init__(self):
+        pass
+
+    def hello(self):
+        print("Hi, i am shadow shell." )
+        current_time = datetime.now()
+        formatted_current_time = current_time.strftime("%Y-%m-%d %H:%M:%S")
+        print("Now is " + formatted_current_time)
+
+    def test(self):
+        self.hello()
+    
+    # def request(self):
+    #     print(requests.get("https://wwww.baidu.com"))
+
+
+class TestTemplate:
+
+    def __init__(self):
+        return
+
+    def test(self):
+
+        try:
+            self.console('-->> Ready')
+            
+            self.test0()
+
+            self.console('-->> Do something')
+
+        except Exception as e:
+            self.console(e)
+        except:
+            self.console(sys.exc_info()[0])
+        finally:
+            self.console('-->> Done')
+            return
+
+    def test0(self):
+        self.console('Nothing')
+        return
+
+    def console(self, content):
+        print('[CONSOLE] %s' % (content))
+
+logger = LoggerFactory().get_logger()
+
+def testserver():
+    os.system("ping shadowshell.xyz")
+    
+def cnnserver():
+    os.system("ssh admin@shadowshell.xyz")
+
+def hello(**args):
+    logger.info(f"Hello {args}")
+
+def shadowshell(**args):
+    logger.info(f"shadow shell : {args}")
+
+def invoke_with_tmpl(func, **args):
+    try:
+        logger.info('-->> Ready')
+        func(**args)
+        logger.info('-->> Do something')
+    except Exception as e:
+        logger.error(e)
+    except:
+        logger.error(sys.exc_info()[0])
+    finally:
+        logger.info('-->> Done')
+    return
+
+if __name__ == "__main__":
+    #ShadowShell().test()
+    invoke_with_tmpl(shadowshell)
+    invoke_with_tmpl(shadowshell, a='1')
+    invoke_with_tmpl(shadowshell, a='1', b='2')
+    invoke_with_tmpl(hello, a='shell', b='shadow')

{shadowshell-0.0.19/src/shadowshell/logutil → shadowshell-0.0.24/src/shadowshell}/console_logger.py

@@ -7,7 +7,7 @@ ConsoleLogger
 author: shadow shell
 """
 
-from .logger import Logger
+from shadowshell.logger import Logger
 
 class ConsoleLogger(Logger):
 

{shadowshell-0.0.19/src/shadowshell/logutil → shadowshell-0.0.24/src/shadowshell}/logger_factory.py

@@ -7,7 +7,7 @@ LoggerFactory
 @author: shadow shell
 """
 
-from .console_logger import ConsoleLogger
+from shadowshell.console_logger import ConsoleLogger
 
 class LoggerFactory:
         
@@ -18,3 +18,7 @@ class LoggerFactory:
 
     def get_logger(self, name = "default"):
         return self.logger
+
+if __name__ == "__main__":
+    LoggerFactory().get_logger().info("test")
+    

shadowshell-0.0.24/src/shadowshell/stock_trader.py

@@ -0,0 +1,16 @@
+# #!/usr/bin/env python3
+# # -*- coding: utf-8 -*-
+
+# import akshare as ak
+# import pandas as pd
+
+# # 获取美股中概股实时行情
+# df_us = ak.stock_us_spot_em()
+
+# target_names = ["哔哩哔哩", "爱奇艺", "京东", "阿里巴巴", "蔚来", "小鹏汽车", "理想汽车"] 
+# stocks = df_us[df_us["名称"].isin(target_names)]
+
+# print(stocks[["代码", "名称","最新价","涨跌幅","涨跌额","开盘价","最高价","最低价","昨收价","总市值","市盈率","成交量","成交额","振幅","换手率"]])
+
+# # df_us.to_csv("/Users/shadowwalker/Desktop/selected_stocks.csv", index=False, encoding="utf_8_sig")
+

{shadowshell-0.0.19 → shadowshell-0.0.24}/src/shadowshell.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: shadowshell
-Version: 0.0.19
+Version: 0.0.24
 Summary: shadowshell.xyz
 Author-email: shadowshell <shadowshell@foxmail.com>
 License: MIT
@@ -41,4 +41,3 @@ Requires-Dist: requests
 
 - [Test PYPI](https://test.pypi.org/project/shadowshell/#history)
 
-

{shadowshell-0.0.19 → shadowshell-0.0.24}/src/shadowshell.egg-info/SOURCES.txt

@@ -1,16 +1,15 @@
 README.md
 pyproject.toml
 src/shadowshell/__init__.py
+src/shadowshell/bootstrap.py
+src/shadowshell/console_logger.py
 src/shadowshell/git_shell.py
-src/shadowshell/shadowshell.py
+src/shadowshell/logger.py
+src/shadowshell/logger_factory.py
 src/shadowshell/stock_trader.py
 src/shadowshell.egg-info/PKG-INFO
 src/shadowshell.egg-info/SOURCES.txt
 src/shadowshell.egg-info/dependency_links.txt
 src/shadowshell.egg-info/requires.txt
 src/shadowshell.egg-info/top_level.txt
-src/shadowshell/logutil/__init__.py
-src/shadowshell/logutil/console_logger.py
-src/shadowshell/logutil/logger.py
-src/shadowshell/logutil/logger_factory.py
 tests/tests.py

shadowshell-0.0.24/tests/tests.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+"""
+tests
+
+@author: shadow shell
+"""
+
+from shadowshell import *
+
+class Test(TestTemplate):
+    
+    def test0(self):
+        LoggerFactory().get_logger().info("Run test0")
+        return
+
+def hello_world(content):
+    LoggerFactory().get_logger().info(f"Hello {content}")
+
+Test().test()
+ShadowShell().hello()
+# hello()
+# shadowshell()
+
+testserver()
+
+# invoke_with_tmpl(hello_world, "World")

shadowshell-0.0.19/src/shadowshell/__init__.py

@@ -1,14 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
-@author: shadow shell
-"""
-
-from .shadowshell import ShadowShell, testserver, cnnserver
-from .logutil.logger import Logger
-from .logutil.logger_factory import LoggerFactory
-
-from .git_shell import GitShell
-
-__all__ = ['ShadowShell', 'Logger', 'LoggerFactory', 'GitShell', 'testserver', 'cnnserver']

shadowshell-0.0.19/src/shadowshell/logutil/__init__.py

@@ -1,12 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
-@author: shadow shell
-"""
-
-from .console_logger import ConsoleLogger
-from .logger import Logger
-from .logger_factory import LoggerFactory
-
-__all__ = ['ConsoleLogger', 'Logger', 'LoggerFactory']

shadowshell-0.0.19/src/shadowshell/shadowshell.py

@@ -1,37 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-import os
-import requests
-from datetime import datetime
-
-"""
-ShadowShell
-
-@author: shadow shell
-"""
-class ShadowShell:
-
-    def __init__(self):
-        pass
-
-    def hello(self):
-        print("Hi, i am shadow shell." )
-        current_time = datetime.now()
-        formatted_current_time = current_time.strftime("%Y-%m-%d %H:%M:%S")
-        print("Now is " + formatted_current_time)
-
-    def test(self):
-        self.hello()
-    
-    def request(self):
-        print(requests.get("https://wwww.baidu.com"))
-
-def testserver():
-    os.system("ping shadowshell.xyz")
-    
-def cnnserver():
-    os.system("ssh admin@shadowshell.xyz")
-
-if __name__ == "__main__":
-    ShadowShell().test()

shadowshell-0.0.19/src/shadowshell/stock_trader.py

@@ -1,16 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-import akshare as ak
-import pandas as pd
-
-# 获取美股中概股实时行情
-df_us = ak.stock_us_spot_em()
-
-target_names = ["哔哩哔哩", "爱奇艺", "京东", "阿里巴巴", "蔚来", "小鹏汽车", "理想汽车"] 
-stocks = df_us[df_us["名称"].isin(target_names)]
-
-print(stocks[["代码", "名称","最新价","涨跌幅","涨跌额","开盘价","最高价","最低价","昨收价","总市值","市盈率","成交量","成交额","振幅","换手率"]])
-
-# df_us.to_csv("/Users/shadowwalker/Desktop/selected_stocks.csv", index=False, encoding="utf_8_sig")
-

shadowshell-0.0.19/tests/tests.py

@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
-tests
-
-@author: shadow shell
-"""
-
-from shadowshell import *
-
-ShadowShell().hello()
-
-cnnserver()
-