pyhw 0.1.1b0__tar.gz → 0.1.3b0__tar.gz

{pyhw-0.1.1b0/src/pyhw.egg-info → pyhw-0.1.3b0}/PKG-INFO

@@ -1,9 +1,7 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.1.1b0
+Version: 0.1.3b0
 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
 Author-email: Xiao Ran <xiaoran.007@icloud.com>
 License: BSD-3-Clause
 Project-URL: homepage, https://github.com/xiaoran007/pyhw

{pyhw-0.1.1b0 → pyhw-0.1.3b0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhw"
-version = "0.1.1b"
+version = "0.1.3b"
 description = "PyHw, a neofetch-like command line tool for fetching system information but written mostly in python."
 authors = [
     { name = "Xiao Ran", email = "xiaoran.007@icloud.com" }

{pyhw-0.1.1b0 → pyhw-0.1.3b0}/src/pyhw/__main__.py

@@ -10,11 +10,11 @@ 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():
-    print("This is a test version of PyHw. Currently, it only supports Linux.")
+    print("This is a test version of PyHw. Currently, it only supports Linux. Currently there are some display issues on small terminals.")
     if getOS() != "linux":
         print(f"Only Linux is supported for now. Current os: {getOS()}")
         return
@@ -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-0.1.1b0 → pyhw-0.1.3b0}/src/pyhw/backend/cpu/linux.py

@@ -17,6 +17,7 @@ class CPUDetectLinux:
 
     def getCPUInfo(self):
         self.__getCPUInfo()
+        self.__modelClean()
         if self.__cpuInfo.model != "":
             self.__cpuInfo.cpu = self.__cpuInfo.model
             if self.__cpuInfo.cores != "":
@@ -54,3 +55,7 @@ class CPUDetectLinux:
                     if line.startswith("cpu MHz") or line.startswith("clock"):
                         self.__cpuInfo.frequency = float(line.split(":")[1].strip()) / 1000  # Ghz
                         break
+
+    def __modelClean(self):
+        self.__cpuInfo.model = self.__cpuInfo.model.replace("(R)", "")
+        self.__cpuInfo.model = self.__cpuInfo.model.replace("(TM)", "")

{pyhw-0.1.1b0 → pyhw-0.1.3b0}/src/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-0.1.3b0/src/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-0.1.3b0/src/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-0.1.3b0/src/pyhw/pyhwUtil/__init__.py

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

{pyhw-0.1.1b0 → pyhw-0.1.3b0}/src/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.1b0 → pyhw-0.1.3b0/src/pyhw.egg-info}/PKG-INFO

@@ -1,9 +1,7 @@
 Metadata-Version: 2.1
 Name: pyhw
-Version: 0.1.1b0
+Version: 0.1.3b0
 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
 Author-email: Xiao Ran <xiaoran.007@icloud.com>
 License: BSD-3-Clause
 Project-URL: homepage, https://github.com/xiaoran007/pyhw

{pyhw-0.1.1b0 → pyhw-0.1.3b0}/src/pyhw.egg-info/SOURCES.txt

@@ -2,7 +2,6 @@ LICENSE
 MANIFEST.in
 README.md
 pyproject.toml
-setup.py
 src/pyhw/__init__.py
 src/pyhw/__main__.py
 src/pyhw/macos.py
@@ -56,9 +55,11 @@ src/pyhw/frontend/logo/__init__.py
 src/pyhw/frontend/logo/logoBase.py
 src/pyhw/frontend/logo/ascii/debian.pyhw
 src/pyhw/frontend/logo/ascii/fedora.pyhw
+src/pyhw/frontend/logo/ascii/fedora_small.pyhw
 src/pyhw/frontend/logo/ascii/linux.pyhw
 src/pyhw/frontend/logo/ascii/macOS.pyhw
 src/pyhw/frontend/logo/ascii/ubuntu.pyhw
+src/pyhw/frontend/logo/ascii/ubuntu_small.pyhw
 src/pyhw/pyhwException/__init__.py
 src/pyhw/pyhwException/pyhwException.py
 src/pyhw/pyhwUtil/__init__.py

pyhw-0.1.1b0/setup.py

@@ -1,28 +0,0 @@
-from setuptools import setup, find_packages
-
-setup(
-    name="pyhw",
-    version="0.1.0b",
-    author="Xiao Ran",
-    author_email="xiaoran.007@icloud.com",
-    description="PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.",
-    long_description=open('README.md').read(),
-    long_description_content_type="text/markdown",
-    url="https://github.com/xiaoran007/pyhw",
-    license="BSD-3-Clause",
-    packages=find_packages(where="src"),
-    package_dir={"": "src"},
-    include_package_data=True,
-    entry_points={
-        'console_scripts': [
-            'pyhw=pyhw.__main__:main',
-        ],
-    },
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: BSD-3-Clause License",
-        "Operating System :: OS Independent",
-    ],
-    python_requires='>=3.9',
-    install_requires=[],
-)

pyhw-0.1.1b0/src/pyhw/pyhwUtil/__init__.py

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