pyhw 0.1.0b0__py3-none-any.whl → 0.1.2b0__py3-none-any.whl

pyhw/__main__.py

@@ -10,7 +10,7 @@ from .backend.cpu import CPUDetect
 from .backend.gpu import GPUDetect
 from .backend.memory import MemoryDetect
 from .pyhwUtil import createDataString
-from .pyhwUtil import getOS
+from .pyhwUtil import getOS, selectOSLogo
 
 
 def main():
@@ -30,7 +30,7 @@ def main():
         data.GPU = GPUDetect(os="linux").getGPUInfo().gpus
     data.Memory = MemoryDetect(os="linux").getMemoryInfo().memory
 
-    Printer(logo_os=OSDetect(os="linux").getOSInfo().id, data=createDataString(data)).cPrint()
+    Printer(logo_os=selectOSLogo(OSDetect(os="linux").getOSInfo().id), data=createDataString(data)).cPrint()
 
 
 if __name__ == "__main__":

pyhw/frontend/color/colorConfig.py

@@ -15,8 +15,12 @@ class ColorConfigSet:
             return ColorConfigSetL.linux
         elif self.__os_name == "fedora":
             return ColorConfigSetF.fedora
+        elif self.__os_name == "fedora_small":
+            return ColorConfigSetF.fedora_small
         elif self.__os_name == "ubuntu":
             return ColorConfigSetU.ubuntu
+        elif self.__os_name == "ubuntu_small":
+            return ColorConfigSetU.ubuntu_small
         else:
             return ColorConfigSetL.linux  # default to Linux
 
@@ -48,6 +52,14 @@ class ColorConfigSetF:
         "colorKeys": ColorSet.COLOR_FG_BLUE,
         "colorTitle":  ColorSet.COLOR_FG_BLUE
     }
+    fedora_small = {
+        "colors": [
+            ColorSet.COLOR_FG_BLUE,
+            ColorSet.COLOR_FG_WHITE
+        ],
+        "colorKeys": ColorSet.COLOR_FG_BLUE,
+        "colorTitle": ColorSet.COLOR_FG_BLUE
+    }
 
 
 @dataclass
@@ -88,3 +100,10 @@ class ColorConfigSetU:
         "colorKeys": ColorSet.COLOR_FG_RED,
         "colorTitle":  ColorSet.COLOR_FG_RED
     }
+    ubuntu_small = {
+        "colors": [
+            ColorSet.COLOR_FG_RED
+        ],
+        "colorKeys": ColorSet.COLOR_FG_RED,
+        "colorTitle": ColorSet.COLOR_FG_RED
+    }

pyhw/frontend/logo/ascii/fedora_small.pyhw

@@ -0,0 +1,17 @@
+          /:-------------:\
+       :-------------------::
+     :-----------$2/shhOHbmp$1---:\
+   /-----------$2omMMMNNNMMD$1  ---:
+  :-----------$2sMMMMNMNMP$1.    ---:
+ :-----------$2:MMMdP$1-------    ---\
+,------------$2:MMMd$1--------    ---:
+:------------$2:MMMd$1-------    .---:
+:----    $2oNMMMMMMMMMNho$1     .----:
+:--     .$2+shhhMMMmhhy++$1   .------/
+:-    -------$2:MMMd$1--------------:
+:-   --------$2/MMMd$1-------------;
+:-    ------$2/hMMMy$1------------:
+:--$2 :dMNdhhdNMMNo$1------------;
+:---$2:sdNMMMMNds:$1------------:
+:------$2:://:$1-------------::
+:---------------------://

pyhw/frontend/logo/ascii/ubuntu_small.pyhw

@@ -0,0 +1,11 @@
+       ..;,; .,;,.
+    .,lool: .ooooo,
+   ;oo;:    .coool.
+ ....         ''' ,l;
+:oooo,            'oo.
+looooc            :oo'
+ '::'             ,oo:
+   ,.,       .... co,
+    lo:;.   :oooo; .
+     ':ooo; cooooc
+        '''  ''''

pyhw/pyhwUtil/__init__.py

@@ -1,3 +1,3 @@
-from .pyhwUtil import getOS, getArch, createDataString
+from .pyhwUtil import getOS, getArch, createDataString, selectOSLogo
 
-__all__ = ["getOS", "getArch", "createDataString"]
+__all__ = ["getOS", "getArch", "createDataString", "selectOSLogo"]

pyhw/pyhwUtil/pyhwUtil.py

@@ -1,5 +1,6 @@
 import platform
 from ..backend import Data
+import os
 
 def getOS():
     """
@@ -48,3 +49,22 @@ def createDataString(data: Data):
     Memory: {data.Memory}
     """
     return data_string
+
+
+def selectOSLogo(os_id: str):
+    """
+    Select the logo based on the os id and terminal size.
+    :param os_id: str, os id.
+    :return: str, logo id.
+    """
+    rows_str, columns_str = os.popen('stty size', 'r').read().split()
+    rows = int(rows_str)
+    columns = int(columns_str)
+    if columns <= 80:
+        if os_id in ["fedora", "ubuntu"]:
+            return f"{os_id}_small"
+        else:
+            return os_id
+    else:
+        return os_id
+

{pyhw-0.1.0b0.dist-info → pyhw-0.1.2b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.1.0b0
+Version: 0.1.2b0
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Home-page: https://github.com/xiaoran007/pyhw
 Author: Xiao Ran
@@ -15,27 +15,32 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 
 # PyHw
-PyHw, a neofetch-like command line tool for fetching system information but written mostly in python. Currently, Linux and macOS are supported.
+PyHw, a neofetch-like command line tool for fetching system information but written mostly in Python. Currently, this project is still in the initial stage, only part of the linux systems are supported. macOS support will be added soon.
 
-This project is a python reimplementation of [neofetch](https://github.com/dylanaraps/neofetch) and references the [fastfetch](https://github.com/fastfetch-cli/fastfetch) project for logo style settings. Since this project is implemented in python, it will be faster than neofetch's shell implementation and easier to maintain and extend than fastfetch's c implementation. Also, this project only relies on the python standard library, so you can run it on any device that has a python environment (I hope so 🤔)
+This project is a Python reimplementation of [neofetch](https://github.com/dylanaraps/neofetch) and references the [fastfetch](https://github.com/fastfetch-cli/fastfetch) project for logo style settings. Since this project is implemented in Python, it will be easier to maintain and extend than bash and c implementation. Also, this project only relies on the Python standard library, so you can run it on any device that has a Python environment (I hope so 🤔)
 
-There are already a lot of similar tools, so you can choose any one of them; they're all essentially no different. If you want to try this tool, just install it directly by pip.
+There are already a lot of similar tools so you can choose any of them; they're all essentially no different. If you want to try this tool, just install it directly by pip.
 ```shell
 pip install pyhw
 ```
+You can then use this tool directly from the command line with the following command, just like neofetch.
+```shell
+pyhw
+```
 
 ## Build from source
 ### Build tools
-Make sure the following python build tools already installed.
+Make sure the following Python build tools are already installed.
 * setuptools
 * build
+* twine
 
 ### Build package
 clone the project, and run:
 ```shell
 python -m build
 ```
-or you can use old setup.py style command:
+or you can use the old setup.py style command:
 ```shell
 python setup.py sdist bdist_wheel
 ```

{pyhw-0.1.0b0.dist-info → pyhw-0.1.2b0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pyhw/__init__.py,sha256=IMjkMO3twhQzluVTo8Z6rE7Eg-9U79_LGKMcsWLKBkY,22
-pyhw/__main__.py,sha256=fuDbD4OHHIsps6lUcCoQNKLPIiicOctbC3VRqKrwluE,1424
+pyhw/__main__.py,sha256=HH17lyJ0KJVmlES4pOanM-hWcK1qi03Cwb-s0jxT3PA,1452
 pyhw/macos.py,sha256=kF973QvtEFky4m8RnYTJ-HWPuJi3625tvnWqJAT_DHM,4598
 pyhw/backend/__init__.py,sha256=knn_3Yroow1h0dqdrozk3zyy3vz-kQyNBRjR6OLmVoY,50
 pyhw/backend/backendBase.py,sha256=t9FKQPdK7yFZF0vrsXpjIUJNKrB-cXYeL5MDohlgguA,450
@@ -39,23 +39,25 @@ pyhw/backend/uptime/uptimeBase.py,sha256=_sloK7fKJB3qwKT-1jBJXJPkKB-eBDKqkn4ZbEv
 pyhw/frontend/__init__.py,sha256=xgv_iVv9w4cLXklbdtFWXu7J7KJxBCUw-ZcUQb_abFc,57
 pyhw/frontend/frontendBase.py,sha256=I3jSBeoVAp22XEiK1qOkVLN3Okx-kroU0Rn7fO7bVkw,3711
 pyhw/frontend/color/__init__.py,sha256=xk511qWwdYWEVjk_zOaC4fs81HtwR4ELr3wi1tTL824,191
-pyhw/frontend/color/colorConfig.py,sha256=30cKkT9DyiPY2teaEpLkwgMu3zIPrDWrb47GGdcioYk,2128
+pyhw/frontend/color/colorConfig.py,sha256=jPjLzv67haEr6rNC2hoNLJLWHO5LQx4zBbLTy3FHA0E,2718
 pyhw/frontend/color/colorSet.py,sha256=spH8PlRu7capouf-yUgDHgoPCnM5aJ_ncascISZfz2g,1421
 pyhw/frontend/color/colorUtil.py,sha256=VhcPmAJmXGIiRBfVZE2jg_iy-SfbxqwOSvkRz-nbUOQ,94
 pyhw/frontend/logo/__init__.py,sha256=mozEarHueBUgtDHKSd-RDaFysMLUiW3VQ8KcBtlKGCI,47
 pyhw/frontend/logo/logoBase.py,sha256=NjRCg0CXjmW4_7UZp2ZBgy2PZOAqaR6SYHg9zd90kRo,634
 pyhw/frontend/logo/ascii/debian.pyhw,sha256=ZmO1fg3Uc_ofF-CZSOP0Qo298luDASh2Zt50UmY6DBQ,437
 pyhw/frontend/logo/ascii/fedora.pyhw,sha256=IuFE6BByaNfVgn1pn7rKH7QVlIJyEmgGopCAOpXa6oM,742
+pyhw/frontend/logo/ascii/fedora_small.pyhw,sha256=_LSBzuCJjMa8pzmiJ3KN7Ndi-TryYPmtEfKqxxPAFfE,601
 pyhw/frontend/logo/ascii/linux.pyhw,sha256=IMe6YNElwCjLtv6kgSkERbATyyJAK531vcrT-otaLWE,300
 pyhw/frontend/logo/ascii/macOS.pyhw,sha256=HBGROtBb7wrNtRqAQ9ND7zxK0l17BRsmpgc2dMo_m6s,474
 pyhw/frontend/logo/ascii/ubuntu.pyhw,sha256=l-Q0PfutxXYMwTojqeiM88063x4V0RBkZUHmi6YdsNc,833
+pyhw/frontend/logo/ascii/ubuntu_small.pyhw,sha256=Xf8LSZdZUu9aEG3efhb1FUlUEuJ-3UztcIOJISpKhPw,229
 pyhw/pyhwException/__init__.py,sha256=8JsFvtF13g0Y5t4z9fRndDXtfCzuBM59jDf6PhWSFSk,220
 pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1GVTFVa0,197
-pyhw/pyhwUtil/__init__.py,sha256=fwte3EqHROgcgxFKpf0XgMjpEIhXs7EvCQlC76YJ448,107
-pyhw/pyhwUtil/pyhwUtil.py,sha256=hRWYjTzU_Hyuz8TDHD9Tr2wd0v-j2je6FKYR6gNfrF0,1141
-pyhw-0.1.0b0.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.1.0b0.dist-info/METADATA,sha256=FgOIJkTHxBZlufWm6yTDSCNaL1HjpmgoAUEIZWtfoFk,1851
-pyhw-0.1.0b0.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-pyhw-0.1.0b0.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.1.0b0.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.1.0b0.dist-info/RECORD,,
+pyhw/pyhwUtil/__init__.py,sha256=T87U8jEL-Z0jBZOYAzZpqu_8jBYRkqIONG6ZCARl8nc,137
+pyhw/pyhwUtil/pyhwUtil.py,sha256=MNAePrn17jNugorg8WLPhl_aFjfQxEpJQ8pBWLhd9gA,1611
+pyhw-0.1.2b0.dist-info/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.1.2b0.dist-info/METADATA,sha256=XODZ4iRBefEfj47us4NDEPSXZX3HKmk1_8b7mHJmCEQ,2028
+pyhw-0.1.2b0.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+pyhw-0.1.2b0.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.1.2b0.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.1.2b0.dist-info/RECORD,,