Revert "Slightly change import structure"

This reverts commit d397681f7af26a5ed5623c7dd88402be77f106a4.

diff --git a/src/obs_ctl/app.py b/src/obs_ctl/app.py
index a588149c8b40c49367ce199918f1db81e761b47a..8f314693b625a9957f39b8cd2b7075369ae936c6 100644 (file)
--- a/src/obs_ctl/app.py
+++ b/src/obs_ctl/app.py
@@ -8,7 +8,7 @@ from textual.widgets import Footer, Header, Input
 
 # need to import log to initalize logging
 from . import data, log
-from .interface import RecordControls, StatsDisplay, SettingsBlock, obs, OBSCTLPane, OBSWebSocketPane, OBSSettingsPane
+from .interface import RecordControls, StatsDisplay, SettingsBlock, obs, settings_block
 
 logger = getLogger(__name__)
 
@@ -34,21 +34,13 @@ class OBSCtlApp(App):
                     yield SettingsBlock(id="settings_container", classes="section")
                 with HorizontalGroup(id="bottom_block", classes="block"):
                     yield StatsDisplay(id="stats_display", classes="section")
-    
-    def on_mount(self, message):
-        api: obs.API = self.query_exactly_one("#api")
-        obs_websocket_pane = self.query_exactly_one("#obs_websocket_pane")
-        host_setting = obs_websocket_pane.host
-        port_setting = obs_websocket_pane.port
-        password_setting = obs_websocket_pane.password
-        timeout_setting = obs_websocket_pane.timeout
-        api.connect(host=host_setting, port=port_setting, password=password_setting, timeout=timeout_setting)
+
 
     @on(obs.API.Report, "#api")
     def on_api_report(self, message: obs.API.Report):
         self.update_monitors(message.data)
     
-    # on_api_report = on(obs.API.Report, "#api")(on_api_report)
+    # @on(obs.API.Report, "#api")(on_api_report)
 
 
     @on(RecordControls.RecordStarted, "#record_controls")
@@ -84,7 +76,6 @@ class OBSCtlApp(App):
     @on(RecordControls.OBSWSConnected, "#record_controls")
     def on_obs_ws_connected(self, message: RecordControls.OBSWSConnected):
         self._query_api("connect")
-        self.query_exactly_one("#")
     
 
     @on(RecordControls.OBSWSDisconnected, "#record_controls")
@@ -96,7 +87,7 @@ class OBSCtlApp(App):
         api: obs.API = self.query_exactly_one("#api")
         getattr(api, query)(*args, **kwargs)
 
-    @on(OBSSettingsPane.RecordPathChanged, "#obs_settings_pane")
+    @on(settings_block.OBSSettingsPane.RecordPathChanged, "#settings-content")
     def on_settings_block_record_path_changed(self, message):
         api: obs.API = self.query_exactly_one("#api")
         api.set_record_path(message.value)

diff --git a/src/obs_ctl/interface/__init__.py b/src/obs_ctl/interface/__init__.py
index 6309dafe711f21e1e72e6cb5a01e42d74dffd5c1..fb735f21ec057a2c8bc70823fc02122f46066a7b 100644 (file)
--- a/src/obs_ctl/interface/__init__.py
+++ b/src/obs_ctl/interface/__init__.py
@@ -1,3 +1,4 @@
 """Provides RecordControls, OBSSettingsPane, StatsDisplay, and the obs module"""
-from .molecule import RecordControls, SettingsBlock, StatsDisplay, OBSWebSocketPane, OBSSettingsPane, OBSCTLPane
+from .molecule import RecordControls, SettingsBlock, StatsDisplay
+from .molecule import settings_block
 from . import obs
\ No newline at end of file

diff --git a/src/obs_ctl/interface/molecule/__init__.py b/src/obs_ctl/interface/molecule/__init__.py
index 564762fb1e5310650725f493b9f5f11c017b2914..a880ff201eb3934bc4213ee3bfb2217ad217933c 100644 (file)
--- a/src/obs_ctl/interface/molecule/__init__.py
+++ b/src/obs_ctl/interface/molecule/__init__.py
@@ -5,4 +5,4 @@ Uses obs_ctl.interface.element
 from .record_controls import RecordControls
 from .settings_block import SettingsBlock
 from .stats_display import StatsDisplay
-from .settings_block import SettingsBlock, OBSCTLPane, OBSSettingsPane, OBSWebSocketPane
\ No newline at end of file
+from .settings_block import pane
\ No newline at end of file

diff --git a/src/obs_ctl/interface/molecule/settings_block/__init__.py b/src/obs_ctl/interface/molecule/settings_block/__init__.py
index 274a1928f9f24e3ee8ab2a3581ba169255345e86..e414d1d413f312842b0385829476868383a1206f 100644 (file)
--- a/src/obs_ctl/interface/molecule/settings_block/__init__.py
+++ b/src/obs_ctl/interface/molecule/settings_block/__init__.py
@@ -1 +1 @@
-from .settings_block import SettingsBlock, OBSSettingsPane, OBSWebSocketPane, OBSCTLPane
\ No newline at end of file
+from .settings_block import SettingsBlock, OBSSettingsPane
\ No newline at end of file