diff options
| author | Jimmy <jimmy@spalge.com> | 2019-03-18 18:22:36 +1300 |
|---|---|---|
| committer | Jimmy <jimmy@spalge.com> | 2019-04-13 15:24:27 +1200 |
| commit | 56f99f98f9cbe6628d927f680db05c60f761c9f9 (patch) | |
| tree | f498208f9e1aa7164e91095427170715300e4457 /qutebrowser/misc/sessions.py | |
| parent | 10107812a81cca25d3389a56a6c0e890b87fcc56 (diff) | |
| download | qutebrowser-56f99f98f9cbe6628d927f680db05c60f761c9f9.tar.gz qutebrowser-56f99f98f9cbe6628d927f680db05c60f761c9f9.zip | |
Move some session load stuff into separate method.
For Mr. McCabe.
> qutebrowser/misc/sessions.py:407:5: C901 'SessionManager.load' is too complex (14)
Diffstat (limited to 'qutebrowser/misc/sessions.py')
| -rw-r--r-- | qutebrowser/misc/sessions.py | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py index add4678bd..def72d9dc 100644 --- a/qutebrowser/misc/sessions.py +++ b/qutebrowser/misc/sessions.py @@ -404,6 +404,27 @@ class SessionManager(QObject): except ValueError as e: raise SessionError(e) + def _load_window(self, win): + """Turn yaml data into windows.""" + window = mainwindow.MainWindow(geometry=win['geometry'], + private=win.get('private', None)) + window.show() + tabbed_browser = objreg.get('tabbed-browser', scope='window', + window=window.win_id) + tab_to_focus = None + for i, tab in enumerate(win['tabs']): + new_tab = tabbed_browser.tabopen(background=False) + self._load_tab(new_tab, tab) + if tab.get('active', False): + tab_to_focus = i + if new_tab.data.pinned: + tabbed_browser.widget.set_tab_pinned(new_tab, + new_tab.data.pinned) + if tab_to_focus is not None: + tabbed_browser.widget.setCurrentIndex(tab_to_focus) + if win.get('active', False): + QTimer.singleShot(0, tabbed_browser.widget.activateWindow) + def load(self, name, temp=False): """Load a named session. @@ -429,24 +450,7 @@ class SessionManager(QObject): "in single process mode.") for win in data['windows']: - window = mainwindow.MainWindow(geometry=win['geometry'], - private=win.get('private', None)) - window.show() - tabbed_browser = objreg.get('tabbed-browser', scope='window', - window=window.win_id) - tab_to_focus = None - for i, tab in enumerate(win['tabs']): - new_tab = tabbed_browser.tabopen(background=False) - self._load_tab(new_tab, tab) - if tab.get('active', False): - tab_to_focus = i - if new_tab.data.pinned: - tabbed_browser.widget.set_tab_pinned(new_tab, - new_tab.data.pinned) - if tab_to_focus is not None: - tabbed_browser.widget.setCurrentIndex(tab_to_focus) - if win.get('active', False): - QTimer.singleShot(0, tabbed_browser.widget.activateWindow) + self._load_window(win) if data['windows']: self.did_load = True |