0.0.dev1

Commandcracker · Commandcracker · commit 8f9dcaf516ff · 2022-05-26T22:34:14.000+02:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# DSI (Display Server Interactions)
+# Display Server Interactions
 
 DSI allows you to perform basic interactions on your display server, like screenshotting a window or sending input to it.
 Currently, DSI only supports X11/Xorg (GNU/Linux) but it aims to be cross-platform.
@@ -7,12 +7,12 @@ Currently, DSI only supports X11/Xorg (GNU/Linux) but it aims to be cross-platfo
 
 ## Quick overview
 
-Look at the [documentation](https://python-dsi.readthedocs.io/en/latest/) for moor information's
+Look at the [documentation](https://display-server-interactions.readthedocs.io/en/latest/) for moor information's
 
 ### Get a window
 
 ```python
-from dsi import DSI
+from display_server_interactions import DSI
 window = DSI.get_active_window()
 ```
 
diff --git a/display_server_interactions/__init__.py b/display_server_interactions/__init__.py
@@ -3,7 +3,7 @@
 
 from platform import system as __system
 
-__version__ = "0.0.dev0"
+__version__ = "0.0.dev1"
 
 __os_name = __system().lower()
 
diff --git a/display_server_interactions/__main__.py b/display_server_interactions/__main__.py
diff --git a/display_server_interactions/base.py b/display_server_interactions/base.py
diff --git a/display_server_interactions/image.py b/display_server_interactions/image.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
+# TODO: add way to get pixel from image
 
 class Image(object):
     def __init__(self, data, width, height):
diff --git a/display_server_interactions/linux.py b/display_server_interactions/linux.py
diff --git a/display_server_interactions/window.py b/display_server_interactions/window.py
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -36,12 +36,12 @@ def get_version(rel_path: str) -> str:
     raise RuntimeError("Unable to find version string.")
 
 
-project = 'DSI'
+project = 'Display Server Interactions'
 copyright = '2022, Commandcracker'
 author = 'Commandcracker'
 
 # The full version, including alpha/beta/rc tags
-release = get_version("../../dsi/__init__.py")
+release = get_version("../../display_server_interactions/__init__.py")
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/docs/source/get_window.rst b/docs/source/get_window.rst
@@ -17,7 +17,7 @@ Get currently active window
 
 .. code-block:: python
 
-    from dsi import DSI
+    from display_server_interactions import DSI
 
     window = DSI.get_active_window()
 
@@ -26,7 +26,7 @@ Get a window by its name
 
 .. code-block:: python
 
-    from dsi import DSI
+    from display_server_interactions import DSI
 
     window = DSI.get_window_by_name("Funny Window Name")
 
@@ -35,6 +35,6 @@ Get window by PID
 
 .. code-block:: python
 
-    from dsi import DSI
+    from display_server_interactions import DSI
 
     window = DSI.get_window_by_pid(42)
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -1,5 +1,5 @@
-Welcome to DSI's documentation!
-===============================
+Welcome to Display Server Interactions documentation!
+=====================================================
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/source/os_specific_code.rst b/docs/source/os_specific_code.rst
@@ -9,7 +9,7 @@ Example OS check
 
 .. code-block:: python
 
-   from dsi import __os_name
+   from display_server_interactions import __os_name
 
    if __os_name == "linux":
       # Code for linux
@@ -37,8 +37,8 @@ Get Window xid
 
 .. code-block:: python
 
-    from dsi import DSI
-    from dsi.linux import Window
+    from display_server_interactions import DSI
+    from display_server_interactions.linux import Window
 
     window: Window = DSI.get_active_window()
     print("XID:", window.xid)
@@ -48,7 +48,7 @@ Get Active Window xid
 
 .. code-block:: python
 
-    from dsi.linux import get_active_window_xid
+    from display_server_interactions.linux import get_active_window_xid
 
     print("XID:", get_active_window_xid())
 
@@ -57,6 +57,6 @@ Get Window by xid
 
 .. code-block:: python
 
-   from dsi.linux import Window
+   from display_server_interactions.linux import Window
 
    window = Window(42)
diff --git a/docs/source/reference/base.rst b/docs/source/reference/base.rst
@@ -1,6 +1,5 @@
-dsi.base.DSIBase
-================
+display_server_interactions.base.DSIBase
+========================================
 
-
-.. autoclass:: dsi.base.DSIBase
+.. autoclass:: display_server_interactions.base.DSIBase
     :members:
diff --git a/docs/source/reference/image.rst b/docs/source/reference/image.rst
@@ -1,6 +1,6 @@
-dsi.image.Image
-===============
+display_server_interactions.image.Image
+=======================================
 
 
-.. autoclass:: dsi.image.Image
+.. autoclass:: display_server_interactions.image.Image
     :members:
diff --git a/docs/source/reference/linux.rst b/docs/source/reference/linux.rst
@@ -1,5 +1,5 @@
-dsi.linux
-=========
+display_server_interactions.linux
+=================================
 
-.. automodule:: dsi.linux
+.. automodule:: display_server_interactions.linux
     :members:
diff --git a/docs/source/reference/windowbase.rst b/docs/source/reference/windowbase.rst
@@ -1,6 +1,6 @@
-dsi.window.WindowBase
-=====================
+display_server_interactions.window.WindowBase
+=============================================
 
 
-.. autoclass:: dsi.window.WindowBase
+.. autoclass:: display_server_interactions.window.WindowBase
     :members:
diff --git a/releass.py b/releass.py
@@ -72,7 +72,7 @@ def main() -> None:
     check_requirements()
 
     printG("Getting version...")
-    version = get_version("dsi/__init__.py")
+    version = get_version("display_server_interactions/__init__.py")
     printB("Version: " + version)
 
     printG("Building DSI...")
@@ -87,7 +87,7 @@ def main() -> None:
 
     printG("Uploading DSI to PyPI...")
     # for testing add " -r pypitest"
-    exit_code = system(f"twine upload dist/dsi-{version}*")
+    exit_code = system(f"twine upload dist/*{version}*")
     if exit_code != 0:
         exitR("Failed to upload DSI to PyPI.")
 
@@ -103,13 +103,13 @@ def main() -> None:
 
     printG("Generating SUMS files...")
     gen_SUMS_files([
-        f"dist/dsi-{version}.tar.gz",
-        f"dist/dsi-{version}-py3-none-any.whl"
+        f"dist/display-server-interactions-{version}.tar.gz",
+        f"dist/display_server_interactions-{version}-py3-none-any.whl"
     ])
 
     printG("Creating GitHub Release...")
     exit_code = system(
-        f"gh release create {version} dist/dsi-{version}* dist/md5SUMS dist/sha256SUMS dist/BLAKE2_256SUMS --generate-notes")
+        f"gh release create {version} dist/*-{version}* dist/md5SUMS dist/sha256SUMS dist/BLAKE2_256SUMS --generate-notes")
     if exit_code != 0:
         exitR("Failed to create GitHub Release.")
 
diff --git a/setup.py b/setup.py
@@ -23,24 +23,24 @@ def get_version(rel_path: str) -> str:
 
 def main() -> None:
     setup(
-        name="dsi",
-        version=get_version("dsi/__init__.py"),
+        name="display-server-interactions",
+        version=get_version("display_server_interactions/__init__.py"),
 
         author="Commandcracker",
 
-        # url="https://github.com/Commandcracker/dsi",
+        # url="https://github.com/Commandcracker/display-server-interactions",
 
         project_urls={
-            "Documentation": "https://python-dsi.readthedocs.io/en/latest/",
-            "Source": "https://github.com/Commandcracker/dsi",
-            "Tracker": "https://github.com/Commandcracker/dsi/issues"
+            "Documentation": "https://display-server-interactions.readthedocs.io/en/latest/",
+            "Source": "https://github.com/Commandcracker/display-server-interactions",
+            "Tracker": "https://github.com/Commandcracker/display-server-interactions/issues"
         },
 
         description="DSI allows you to perform basic interactions on your display server, like screenshotting a window or sending input to it.",
         long_description_content_type="text/markdown",
         long_description=read("README.md"),
 
-        py_modules=["dsi"],
+        py_modules=["display_server_interactions"],
 
         keywords=[
             "screen",
diff --git a/tests/benchmark.py b/tests/benchmark.py
@@ -9,7 +9,7 @@
 import time
 
 
-from dsi import DSI
+from display_server_interactions import DSI
 _window = DSI.get_active_window()
 _geo = _window.geometry
 
