Removed some platform checks

2025-07-18 06:06:06 -04:00 · 2022-11-03 17:11:13 -06:00
parent b8637ba8ca
commit 1ded773e84
24 changed files with 67 additions and 246 deletions
--- a/src/controller/buffers/twitter/base.py
+++ b/src/controller/buffers/twitter/base.py
@@ -1,13 +1,8 @@
 # -*- coding: utf-8 -*-
 import time
-import platform
-if platform.system() == "Windows":
-    import wx
-    from wxUI import buffers, dialogs, commonMessageDialogs, menus
-    from controller import user
-elif platform.system() == "Linux":
-    from gi.repository import Gtk
-    from gtkUI import buffers, dialogs, commonMessageDialogs
+import wx
+from wxUI import buffers, dialogs, commonMessageDialogs, menus
+from controller import user
 from controller import messages
 import widgetUtils
 import arrow
@@ -309,9 +304,6 @@ class BaseBuffer(base.Buffer):
            self.buffer.list.insert_item(True, *tweet)
        if self.name in self.session.settings["other_buffers"]["autoread_buffers"] and self.name not in self.session.settings["other_buffers"]["muted_buffers"] and self.session.settings["sound"]["session_mute"] == False:
            output.speak(" ".join(tweet[:2]), speech=self.session.settings["reporting"]["speech_reporting"], braille=self.session.settings["reporting"]["braille_reporting"])
-        #Improve performance on Windows
-#  if platform.system() == "Windows":
-#   call_threaded(utils.is_audio,item)

    def bind_events(self):
        log.debug("Binding events...")
@@ -322,7 +314,6 @@ class BaseBuffer(base.Buffer):
        widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.share_item, self.buffer.retweet)
        widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.send_message, self.buffer.dm)
        widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.reply, self.buffer.reply)
-        # Replace for the correct way in other platforms.
        widgetUtils.connect_event(self.buffer.list.list, wx.EVT_LIST_ITEM_RIGHT_CLICK, self.show_menu)
        widgetUtils.connect_event(self.buffer.list.list, wx.EVT_LIST_KEY_DOWN, self.show_menu_by_key)

@@ -480,11 +471,10 @@ class BaseBuffer(base.Buffer):

    def onFocus(self, *args, **kwargs):
        tweet = self.get_tweet()
-        if platform.system() == "Windows" and self.session.settings["general"]["relative_times"] == True:
-            # fix this:
-            original_date = arrow.get(self.session.db[self.name][self.buffer.list.get_selected()].created_at, locale="en")
-            ts = original_date.humanize(locale=languageHandler.getLanguage())
-            self.buffer.list.list.SetItem(self.buffer.list.get_selected(), 2, ts)
+        # fix this:
+        original_date = arrow.get(self.session.db[self.name][self.buffer.list.get_selected()].created_at, locale="en")
+        ts = original_date.humanize(locale=languageHandler.getLanguage())
+        self.buffer.list.list.SetItem(self.buffer.list.get_selected(), 2, ts)
        if self.session.settings['sound']['indicate_audio'] and utils.is_audio(tweet):
            self.session.sound.play("audio.ogg")
        if self.session.settings['sound']['indicate_geo'] and utils.is_geocoded(tweet):
--- a/src/controller/buffers/twitter/directMessages.py
+++ b/src/controller/buffers/twitter/directMessages.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import platform
 import widgetUtils
 import arrow
 import webbrowser
@@ -99,7 +98,7 @@ class DirectMessagesBuffer(base.BaseBuffer):

    def onFocus(self, *args, **kwargs):
        tweet = self.get_tweet()
-        if platform.system() == "Windows" and self.session.settings["general"]["relative_times"] == True:
+        if self.session.settings["general"]["relative_times"] == True:
            # fix this:
            original_date = arrow.get(int(tweet.created_timestamp))
            ts = original_date.humanize(locale=languageHandler.getLanguage())
--- a/src/controller/buffers/twitter/list.py
+++ b/src/controller/buffers/twitter/list.py
@@ -1,10 +1,5 @@
 # -*- coding: utf-8 -*-
-import platform
-if platform.system() == "Windows":
-    from wxUI import dialogs, commonMessageDialogs
-elif platform.system() == "Linux":
-    from gi.repository import Gtk
-    from gtkUI import dialogs, commonMessageDialogs
+from wxUI import dialogs, commonMessageDialogs
 import widgetUtils
 import logging
 from tweepy.cursor import Cursor
--- a/src/controller/buffers/twitter/people.py
+++ b/src/controller/buffers/twitter/people.py
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
 import time
-import platform
-if platform.system() == "Windows":
-    from wxUI import commonMessageDialogs, menus
-    from controller import user
-elif platform.system() == "Linux":
-    from gi.repository import Gtk
-    from gtkUI import dialogs, commonMessageDialogs
+from wxUI import commonMessageDialogs, menus
+from controller import user
 from controller import messages
 import widgetUtils
 import webbrowser
--- a/src/controller/buffers/twitter/search.py
+++ b/src/controller/buffers/twitter/search.py
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
 import time
-import platform
 import locale
-if platform.system() == "Windows":
-    from wxUI import  commonMessageDialogs
-elif platform.system() == "Linux":
-    from gi.repository import Gtk
-    from gtkUI import commonMessageDialogs
+from wxUI import  commonMessageDialogs
 import widgetUtils
 import logging
 from tweepy.errors import TweepyException
--- a/src/controller/buffers/twitter/trends.py
+++ b/src/controller/buffers/twitter/trends.py
@@ -1,13 +1,8 @@
 # -*- coding: utf-8 -*-
 import time
-import platform
-if platform.system() == "Windows":
-    import wx
-    from wxUI import buffers, commonMessageDialogs, menus
-    from controller import user, messages
-elif platform.system() == "Linux":
-    from gi.repository import Gtk
-    from gtkUI import buffers, commonMessageDialogs
+import wx
+from wxUI import buffers, commonMessageDialogs, menus
+from controller import user, messages
 from controller import messages
 import widgetUtils
 import output
--- a/src/controller/mainController.py
+++ b/src/controller/mainController.py
@@ -1,26 +1,21 @@
 # -*- coding: utf-8 -*-
-import platform
-system = platform.system()
 import application
 import wx
 import requests
-from audio_services import youtube_utils
 import arrow
-if system == "Windows":
-    from update import updater
-    from wxUI import (view, dialogs, commonMessageDialogs, sysTrayIcon)
-    from . import settings
-    from extra import SoundsTutorial, ocr
-    import keystrokeEditor
-    from keyboard_handler.wx_handler import WXKeyboardHandler
-    from . import userActionsController
-    from . import trendingTopics
-    from . import user
-    from . import listsController
-    from . import filterController
-    from . import userSelector
-elif system == "Linux":
-    from gtkUI import (view, commonMessageDialogs)
+from audio_services import youtube_utils
+from update import updater
+from wxUI import (view, dialogs, commonMessageDialogs, sysTrayIcon)
+from . import settings
+from extra import SoundsTutorial, ocr
+import keystrokeEditor
+from keyboard_handler.wx_handler import WXKeyboardHandler
+from . import userActionsController
+from . import trendingTopics
+from . import user
+from . import listsController
+from . import filterController
+from . import userSelector
 from sessions.twitter import utils, compose
 from sessionmanager import manager, sessionManager
 from controller import buffers
@@ -136,18 +131,17 @@ class Controller(object):
        pub.subscribe(self.create_buffer, "createBuffer")
        pub.subscribe(self.toggle_share_settings, "toggleShare")
        pub.subscribe(self.restart_streaming, "restartStreaming")
-        if system == "Windows":
-            pub.subscribe(self.invisible_shorcuts_changed, "invisible-shorcuts-changed")
-            widgetUtils.connect_event(self.view, widgetUtils.MENU, self.show_hide, menuitem=self.view.show_hide)
-            widgetUtils.connect_event(self.view, widgetUtils.MENU, self.search, menuitem=self.view.menuitem_search)
-            widgetUtils.connect_event(self.view, widgetUtils.MENU, self.list_manager, menuitem=self.view.lists)
-            widgetUtils.connect_event(self.view, widgetUtils.MENU, self.get_trending_topics, menuitem=self.view.trends)
-            widgetUtils.connect_event(self.view, widgetUtils.MENU, self.filter, menuitem=self.view.filter)
-            widgetUtils.connect_event(self.view, widgetUtils.MENU, self.manage_filters, menuitem=self.view.manage_filters)
-            widgetUtils.connect_event(self.view, widgetUtils.MENU, self.find, menuitem=self.view.find)
-            widgetUtils.connect_event(self.view, widgetUtils.MENU, self.accountConfiguration, menuitem=self.view.account_settings)
-            widgetUtils.connect_event(self.view, widgetUtils.MENU, self.configuration, menuitem=self.view.prefs)
-            widgetUtils.connect_event(self.view, widgetUtils.MENU, self.ocr_image, menuitem=self.view.ocr)
+        pub.subscribe(self.invisible_shorcuts_changed, "invisible-shorcuts-changed")
+        widgetUtils.connect_event(self.view, widgetUtils.MENU, self.show_hide, menuitem=self.view.show_hide)
+        widgetUtils.connect_event(self.view, widgetUtils.MENU, self.search, menuitem=self.view.menuitem_search)
+        widgetUtils.connect_event(self.view, widgetUtils.MENU, self.list_manager, menuitem=self.view.lists)
+        widgetUtils.connect_event(self.view, widgetUtils.MENU, self.get_trending_topics, menuitem=self.view.trends)
+        widgetUtils.connect_event(self.view, widgetUtils.MENU, self.filter, menuitem=self.view.filter)
+        widgetUtils.connect_event(self.view, widgetUtils.MENU, self.manage_filters, menuitem=self.view.manage_filters)
+        widgetUtils.connect_event(self.view, widgetUtils.MENU, self.find, menuitem=self.view.find)
+        widgetUtils.connect_event(self.view, widgetUtils.MENU, self.accountConfiguration, menuitem=self.view.account_settings)
+        widgetUtils.connect_event(self.view, widgetUtils.MENU, self.configuration, menuitem=self.view.prefs)
+        widgetUtils.connect_event(self.view, widgetUtils.MENU, self.ocr_image, menuitem=self.view.ocr)
        widgetUtils.connect_event(self.view, widgetUtils.MENU, self.learn_sounds, menuitem=self.view.sounds_tutorial)
        widgetUtils.connect_event(self.view, widgetUtils.MENU, self.exit, menuitem=self.view.close)
        widgetUtils.connect_event(self.view, widgetUtils.CLOSE_EVENT, self.exit)
@@ -231,12 +225,10 @@ class Controller(object):
        self.current_account = ""
        self.view.prepare()
        self.bind_other_events()
-        if system == "Windows":
-            self.set_systray_icon()
+        self.set_systray_icon()

    def check_invisible_at_startup(self):
-        # Visibility check. It does only work for windows.
-        if system != "Windows": return
+        # Visibility check.
        if config.app["app-settings"]["hide_gui"] == True:
            self.show_hide()
            self.view.Show()
@@ -641,11 +633,10 @@ class Controller(object):
            sessions.sessions[item].sound.cleaner.cancel()
            log.debug("Saving database for " +    sessions.sessions[item].session_id)
            sessions.sessions[item].save_persistent_data()
-        if system == "Windows":
-            self.systrayIcon.RemoveIcon()
-            pidpath = os.path.join(os.getenv("temp"), "{}.pid".format(application.name))
-            if os.path.exists(pidpath):
-                os.remove(pidpath)
+        self.systrayIcon.RemoveIcon()
+        pidpath = os.path.join(os.getenv("temp"), "{}.pid".format(application.name))
+        if os.path.exists(pidpath):
+            os.remove(pidpath)
        if hasattr(self, "streams_checker_function"):
            log.debug("Stopping stream checker...")
            self.streams_checker_function.cancel()