From 1810d757856093726e37b9f4eee8eb50ebfb5934 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 25 Aug 2022 16:23:53 +0200
Subject: [PATCH 1/4] implemented photoshop addon

---
 openpype/hosts/photoshop/__init__.py | 19 ++++++++++---------
 openpype/hosts/photoshop/addon.py    | 26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 openpype/hosts/photoshop/addon.py

diff --git a/openpype/hosts/photoshop/__init__.py b/openpype/hosts/photoshop/__init__.py
index a91e0a65ff..b3f66ea35c 100644
--- a/openpype/hosts/photoshop/__init__.py
+++ b/openpype/hosts/photoshop/__init__.py
@@ -1,9 +1,10 @@
-def add_implementation_envs(env, _app):
-    """Modify environments to contain all required for implementation."""
-    defaults = {
-        "OPENPYPE_LOG_NO_COLORS": "True",
-        "WEBSOCKET_URL": "ws://localhost:8099/ws/"
-    }
-    for key, value in defaults.items():
-        if not env.get(key):
-            env[key] = value
+from .module import (
+    PhotoshopAddon,
+    PHOTOSHOP_HOST_DIR,
+)
+
+
+__all__ = (
+    "PhotoshopAddon",
+    "PHOTOSHOP_HOST_DIR",
+)
diff --git a/openpype/hosts/photoshop/addon.py b/openpype/hosts/photoshop/addon.py
new file mode 100644
index 0000000000..18899d4de8
--- /dev/null
+++ b/openpype/hosts/photoshop/addon.py
@@ -0,0 +1,26 @@
+import os
+from openpype.modules import OpenPypeModule
+from openpype.modules.interfaces import IHostModule
+
+PHOTOSHOP_HOST_DIR = os.path.dirname(os.path.abspath(__file__))
+
+
+class PhotoshopAddon(OpenPypeModule, IHostModule):
+    name = "photoshop"
+    host_name = "photoshop"
+
+    def initialize(self, module_settings):
+        self.enabled = True
+
+    def add_implementation_envs(self, env, _app):
+        """Modify environments to contain all required for implementation."""
+        defaults = {
+            "OPENPYPE_LOG_NO_COLORS": "True",
+            "WEBSOCKET_URL": "ws://localhost:8099/ws/"
+        }
+        for key, value in defaults.items():
+            if not env.get(key):
+                env[key] = value
+
+    def get_workfile_extensions(self):
+        return [".psd", ".psb"]

From 355edb24f55cc9dc9ff9cc9c7d9c6aaf612efadb Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 25 Aug 2022 16:24:04 +0200
Subject: [PATCH 2/4] reuse PHOTOSHOP_HOST_DIR from public api

---
 openpype/hosts/photoshop/api/pipeline.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/photoshop/api/pipeline.py b/openpype/hosts/photoshop/api/pipeline.py
index ee150d1808..f660096630 100644
--- a/openpype/hosts/photoshop/api/pipeline.py
+++ b/openpype/hosts/photoshop/api/pipeline.py
@@ -14,14 +14,13 @@ from openpype.pipeline import (
     AVALON_CONTAINER_ID,
 )
 from openpype.pipeline.load import any_outdated_containers
-import openpype.hosts.photoshop
+from openpype.hosts.photoshop import PHOTOSHOP_HOST_DIR
 
 from . import lib
 
 log = Logger.get_logger(__name__)
 
-HOST_DIR = os.path.dirname(os.path.abspath(openpype.hosts.photoshop.__file__))
-PLUGINS_DIR = os.path.join(HOST_DIR, "plugins")
+PLUGINS_DIR = os.path.join(PHOTOSHOP_HOST_DIR, "plugins")
 PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish")
 LOAD_PATH = os.path.join(PLUGINS_DIR, "load")
 CREATE_PATH = os.path.join(PLUGINS_DIR, "create")

From f0af027faaa4a1c015ee91de0cb98a5c22152e05 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 25 Aug 2022 16:24:12 +0200
Subject: [PATCH 3/4] removed usage of HOST_WORKFILE_EXTENSIONS

---
 openpype/hosts/photoshop/api/workio.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openpype/hosts/photoshop/api/workio.py b/openpype/hosts/photoshop/api/workio.py
index 951c5dbfff..35b44d6070 100644
--- a/openpype/hosts/photoshop/api/workio.py
+++ b/openpype/hosts/photoshop/api/workio.py
@@ -1,7 +1,6 @@
 """Host API required Work Files tool"""
 import os
 
-from openpype.pipeline import HOST_WORKFILE_EXTENSIONS
 from . import lib
 
 
@@ -14,7 +13,7 @@ def _active_document():
 
 
 def file_extensions():
-    return HOST_WORKFILE_EXTENSIONS["photoshop"]
+    return [".psd", ".psb"]
 
 
 def has_unsaved_changes():

From bad5b9b194f498903900ee283ed5a4b14e25a198 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 26 Aug 2022 10:04:17 +0200
Subject: [PATCH 4/4] fix import

---
 openpype/hosts/photoshop/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/photoshop/__init__.py b/openpype/hosts/photoshop/__init__.py
index b3f66ea35c..773f73d624 100644
--- a/openpype/hosts/photoshop/__init__.py
+++ b/openpype/hosts/photoshop/__init__.py
@@ -1,4 +1,4 @@
-from .module import (
+from .addon import (
     PhotoshopAddon,
     PHOTOSHOP_HOST_DIR,
 )