Commits December 2021

commits@gajim.org

1 participants
197 discussions

[Git][gajim/gajim][master] 2 commits: Helpers: Add type annotations
by Philipp Hörist (＠lovetox) 28 Dec '21

28 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: f6015828 by lovetox at 2021-12-28T17:29:55+01:00 Helpers: Add type annotations - - - - - b10fb655 by lovetox at 2021-12-28T22:11:03+01:00 Storage: Add type annotations - - - - - 6 changed files: - gajim/common/app.py - gajim/common/helpers.py - gajim/common/storage/archive.py - gajim/common/storage/base.py - gajim/common/storage/cache.py - pyrightconfig.json Changes: ===================================== gajim/common/app.py ===================================== @@ -56,6 +56,8 @@ if typing.TYPE_CHECKING: from gajim.gui.main import MainWindow from gajim.application import GajimApplication + from gajim.common.storage.cache import CacheStorage + from gajim.common.storage.archive import MessageArchiveStorage interface = cast(types.InterfaceT, None) @@ -76,8 +78,8 @@ class Storage: def __init__(self): - self.cache = None - self.archive = None + self.cache: CacheStorage = None + self.archive: MessageArchiveStorage = None storage = Storage() ===================================== gajim/common/helpers.py ===================================== @@ -827,17 +827,16 @@ def ignore_contact(account: str, jid: JID) -> bool: class AdditionalDataDict(collections.UserDict): - def __init__(self, initialdata=None): - collections.UserDict.__init__(self, initialdata) + data: dict[str, Any] @staticmethod - def _get_path_childs(full_path): + def _get_path_childs(full_path: str) -> list[str]: path_childs = [full_path] if ':' in full_path: path_childs = full_path.split(':') return path_childs - def set_value(self, full_path, key, value): + def set_value(self, full_path: str, key: str, value: str) -> None: path_childs = self._get_path_childs(full_path) _dict = self.data for path in path_childs: @@ -848,7 +847,11 @@ def set_value(self, full_path, key, value): _dict = _dict[path] _dict[key] = value - def get_value(self, full_path, key, default=None): + def get_value(self, + full_path: str, + key: str, + default: Optional[str] = None) -> Optional[str]: + path_childs = self._get_path_childs(full_path) _dict = self.data for path in path_childs: @@ -861,7 +864,7 @@ def get_value(self, full_path, key, default=None): except KeyError: return default - def remove_value(self, full_path, key): + def remove_value(self, full_path: str, key: str) -> None: path_childs = self._get_path_childs(full_path) _dict = self.data for path in path_childs: @@ -874,7 +877,7 @@ def remove_value(self, full_path, key): except KeyError: return - def copy(self): + def copy(self) -> AdditionalDataDict: return copy.deepcopy(self) @@ -1054,7 +1057,7 @@ def open_uri(uri: Union[URI, str], account: Optional[str] = None) -> None: @catch_exceptions -def open_file(path): +def open_file(path: str) -> None: if os.name == 'nt': os.startfile(path) else: @@ -1329,8 +1332,9 @@ def convert_gio_to_openssl_cert(cert): return cert -def get_custom_host(account: str - ) -> Optional[Tuple[str, ConnectionProtocol, str]]: +def get_custom_host(account: str) -> Optional[Tuple[str, + ConnectionProtocol, + ConnectionType]]: if not app.settings.get_account_setting(account, 'use_custom_host'): return None host = app.settings.get_account_setting(account, 'custom_host') ===================================== gajim/common/storage/archive.py ===================================== @@ -22,7 +22,8 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from typing import Any -from typing import List +from typing import KeysView +from typing import NamedTuple from typing import Optional import time @@ -34,6 +35,7 @@ from collections import namedtuple from nbxmpp import JID +from nbxmpp.structs import CommonError from nbxmpp.structs import MessageProperties from gajim.common import app @@ -87,6 +89,55 @@ log = logging.getLogger('gajim.c.storage.archive') +class JidsTableRow(NamedTuple): + jid_id: int + jid: JID + type: str + + +class ConversationRow(NamedTuple): + contact_name: str + time: float + kind: int + show: int + message: str + subject: str + additional_data: AdditionalDataDict + log_line_id: int + message_id: str + stanza_id: str + error: CommonError + marker: str + + +class LastConversationRow(NamedTuple): + contact_name: str + time: float + kind: int + message: str + additional_data: AdditionalDataDict + message_id: str + stanza_id: str + + +class SearchLogRow(NamedTuple): + contact_name: str + time: float + kind: int + show: int + message: str + subject: str + additional_data: AdditionalDataDict + log_line_id: int + + +class LastArchiveMessageRow(NamedTuple): + id: int + last_mam_id: str + oldest_mam_timestamp: str + last_muc_timestamp: str + + class MessageArchiveStorage(SqliteStorage): def __init__(self): SqliteStorage.__init__(self, @@ -94,10 +145,10 @@ def __init__(self): configpaths.get('LOG_DB'), ARCHIVE_SQL_STATEMENT) - self._jid_ids = {} - self._jid_ids_reversed = {} + self._jid_ids: dict[JID, JidsTableRow] = {} + self._jid_ids_reversed: dict[int, JidsTableRow] = {} - def init(self, **kwargs): + def init(self, **kwargs: Any) -> None: SqliteStorage.init(self, detect_types=sqlite.PARSE_COLNAMES) @@ -112,9 +163,12 @@ def init(self, **kwargs): self._get_jid_ids_from_db() self._cleanup_chat_history() - def _namedtuple_factory(self, cursor, row): + def _namedtuple_factory(self, + cursor: sqlite.Cursor, + row: tuple[Any, ...]) -> NamedTuple: + fields = [col[0] for col in cursor.description] - Row = namedtuple("Row", fields) + Row = namedtuple("Row", fields) # type: ignore named_row = Row(*row) if 'additional_data' in fields: _dict = json.loads(named_row.additional_data or '{}') @@ -209,10 +263,10 @@ def _get_jid_ids_from_db(self) -> None: self._jid_ids[row.jid] = row self._jid_ids_reversed[row.jid_id] = row - def get_jid_from_id(self, jid_id): + def get_jid_from_id(self, jid_id: int) -> JidsTableRow: return self._jid_ids_reversed[jid_id] - def get_jids_in_db(self): + def get_jids_in_db(self) -> KeysView[JID]: return self._jid_ids.keys() def jid_is_from_pm(self, jid: str) -> bool: @@ -230,7 +284,7 @@ def jid_is_from_pm(self, jid: str) -> bool: # it's not a full jid, so it's not a pm one return False - def jid_is_room_jid(self, jid: str) -> bool: + def jid_is_room_jid(self, jid: str) -> Optional[bool]: """ Return True if it's a room jid, False if it's not, None if we don't know """ @@ -246,8 +300,8 @@ def get_account_id(self, jid = app.get_jid_from_account(account) return self.get_jid_id(jid, type_=type_) - def get_active_account_ids(self) -> List[int]: - account_ids = [] + def get_active_account_ids(self) -> list[int]: + account_ids: list[int] = [] for account in app.settings.get_active_accounts(): account_ids.append(self.get_account_id(account)) return account_ids @@ -329,7 +383,7 @@ def get_conversation_before_after(self, before: bool, timestamp: float, n_lines: int - ) -> List[namedtuple]: + ) -> list[ConversationRow]: """ Load n_lines lines of conversation with jid before or after timestamp @@ -378,7 +432,7 @@ def get_conversation_muc_before_after(self, before: bool, timestamp: float, n_lines: int - ) -> List[namedtuple]: + ) -> list[ConversationRow]: """ Load n_lines lines of conversation with jid before or after timestamp @@ -422,7 +476,7 @@ def get_conversation_muc_before_after(self, def get_last_conversation_line(self, account: str, jid: JID - ) -> List[namedtuple]: + ) -> list[LastConversationRow]: """ Load the last line of a conversation with jid for account. Loads messages, but no status messages or error messages. @@ -458,7 +512,8 @@ def get_conversation_around(self, account: str, jid: JID, timestamp: float - ) -> List[namedtuple]: + ) -> tuple[list[ConversationRow], + list[ConversationRow]]: """ Load all lines of conversation with jid around a specific timestamp @@ -512,7 +567,11 @@ def get_conversation_around(self, return before, at_after @timeit - def get_conversation_between(self, account, jid, before, after): + def get_conversation_between(self, + account: str, + jid: str, + before: float, + after: float) -> list[ConversationRow]: """ Load all lines of conversation with jid between two timestamps @@ -549,7 +608,10 @@ def get_conversation_between(self, account, jid, before, after): tuple(jids) + (before, after)).fetchall() @timeit - def get_messages_for_date(self, account, jid, date): + def get_messages_for_date(self, + account: str, + jid: str, + date: datetime.datetime): """ Load the complete conversation with a given jid on a specific date @@ -590,10 +652,10 @@ def search_log(self, _account: str, jid: JID, query: str, - from_users: Optional[List[str]] = None, + from_users: Optional[list[str]] = None, before: Optional[datetime.datetime] = None, after: Optional[datetime.datetime] = None - ) -> List[namedtuple]: + ) -> list[SearchLogRow]: """ Search the conversation log for messages containing the `query` string. @@ -659,10 +721,10 @@ def search_log(self, @timeit def search_all_logs(self, query: str, - from_users: Optional[List[str]] = None, + from_users: Optional[list[str]] = None, before: Optional[datetime.datetime] = None, after: Optional[datetime.datetime] = None - ) -> List[namedtuple]: + ) -> list[SearchLogRow]: """ Search all conversation logs for messages containing the `query` string. @@ -718,7 +780,11 @@ def search_all_logs(self, sql, (query, users, after_ts, before_ts)).fetchall() @timeit - def get_days_with_logs(self, _account, jid, year, month): + def get_days_with_logs(self, + _account: str, + jid: str, + year: int, + month: int) -> Any: """ Request the days in a month where we received messages for a given `jid`. @@ -759,7 +825,7 @@ def get_days_with_logs(self, _account, jid, year, month): (date + delta).timestamp())).fetchall() @timeit - def get_last_date_that_has_logs(self, _account, jid): + def get_last_date_that_has_logs(self, _account: str, jid: str) -> Any: """ Get the timestamp of the last message we received for the jid. @@ -786,7 +852,7 @@ def get_last_date_that_has_logs(self, _account, jid): return self._con.execute(sql, tuple(jids)).fetchone().time @timeit - def get_first_date_that_has_logs(self, _account, jid): + def get_first_date_that_has_logs(self, _account: str, jid: str) -> Any: """ Get the timestamp of the first message we received for the jid. @@ -813,7 +879,10 @@ def get_first_date_that_has_logs(self, _account, jid): return self._con.execute(sql, tuple(jids)).fetchone().time @timeit - def get_date_has_logs(self, _account, jid, date): + def get_date_has_logs(self, + _account: str, + jid: str, + date: datetime.datetime) -> Any: """ Get single timestamp of a message we received for the jid in the time range of one day. @@ -921,7 +990,7 @@ def find_stanza_id(self, return True if the stanza-id was found """ - ids = [] + ids: list[str] = [] if stanza_id is not None: ids.append(stanza_id) if origin_id is not None: @@ -1219,17 +1288,17 @@ def set_marker(self, # Unknown JID return - state = 0 if state == 'received' else 1 + state_int = 0 if state == 'received' else 1 sql = ''' UPDATE logs SET marker = ? WHERE account_id = ? AND jid_id = ? AND message_id = ? ''' - self._con.execute(sql, (state, account_id, jid_id, message_id)) + self._con.execute(sql, (state_int, account_id, jid_id, message_id)) self._delayed_commit() @timeit - def get_archive_infos(self, jid): + def get_archive_infos(self, jid: str) -> Optional[LastArchiveMessageRow]: """ Get the archive infos @@ -1241,7 +1310,7 @@ def get_archive_infos(self, jid): return self._con.execute(sql, (jid_id,)).fetchone() @timeit - def set_archive_infos(self, jid, **kwargs): + def set_archive_infos(self, jid: str, **kwargs: Any) -> None: """ Set archive infos @@ -1285,7 +1354,7 @@ def set_archive_infos(self, jid, **kwargs): self._delayed_commit() @timeit - def reset_archive_infos(self, jid): + def reset_archive_infos(self, jid: str) -> None: """ Set archive infos ===================================== gajim/common/storage/base.py ===================================== @@ -12,11 +12,20 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Any +from typing import Callable +from typing import TypeVar +from typing import cast + import sys import math import time import sqlite3 import json +import logging +from pathlib import Path from gi.repository import GLib @@ -27,9 +36,10 @@ from nbxmpp.structs import CommonError from nbxmpp.modules.discovery import parse_disco_info +_T = TypeVar('_T') -def timeit(func): - def func_wrapper(self, *args, **kwargs): +def timeit(func: Callable[..., _T]) -> Callable[..., _T]: + def func_wrapper(self: Any, *args: Any, **kwargs: Any) -> _T: start = time.time() result = func(self, *args, **kwargs) exec_time = (time.time() - start) * 1e3 @@ -42,35 +52,35 @@ def func_wrapper(self, *args, **kwargs): return func_wrapper -def _convert_common_error(common_error): +def _convert_common_error(common_error: bytes) -> CommonError: return CommonError.from_string(common_error) -def _adapt_common_error(common_error): +def _adapt_common_error(common_error: CommonError) -> str: return common_error.serialize() sqlite3.register_converter('common_error', _convert_common_error) sqlite3.register_adapter(CommonError, _adapt_common_error) -def _convert_marker(marker): +def _convert_marker(marker: bytes): return 'received' if int(marker) == 0 else 'displayed' sqlite3.register_converter('marker', _convert_marker) -def _jid_adapter(jid): +def _jid_adapter(jid: JID) -> str: return str(jid) -def _jid_converter(jid): +def _jid_converter(jid: bytes) -> JID: return JID.from_string(jid.decode()) sqlite3.register_converter('jid', _jid_converter) sqlite3.register_adapter(JID, _jid_adapter) -def _convert_disco_info(disco_info): +def _convert_disco_info(disco_info: bytes) -> DiscoInfo: return parse_disco_info(Iq(node=disco_info)) -def _adapt_disco_info(disco_info): +def _adapt_disco_info(disco_info: DiscoInfo) -> str: return str(disco_info.stanza) sqlite3.register_converter('disco_info', _convert_disco_info) @@ -78,31 +88,33 @@ def _adapt_disco_info(disco_info): class Encoder(json.JSONEncoder): - def default(self, obj): - if isinstance(obj, set): - return list(obj) + def default(self, o: Any) -> Any: + if isinstance(o, set): + return list(o) # type: ignore - if isinstance(obj, JID): - return {'__type': 'JID', 'value': str(obj)} + if isinstance(o, JID): + return {'__type': 'JID', 'value': str(o)} - if isinstance(obj, RosterItem): - dct = obj.asdict() + if isinstance(o, RosterItem): + dct = o.asdict() dct['__type'] = 'RosterItem' return dct - return json.JSONEncoder.default(self, obj) + return json.JSONEncoder.default(self, o) -def json_decoder(dct): +def json_decoder(dct: dict[str, Any]) -> Any: type_ = dct.get('__type') if type_ is None: return dct if type_ == 'JID': return JID.from_string(dct['value']) if type_ == 'RosterItem': - dct.pop('__type') - dct['groups'] = set(dct['groups']) - return RosterItem(**dct) + return RosterItem(jid=dct['jid'], + name=dct['name'], + ask=dct['ask'], + subscription=dct['subscription'], + groups=set(dct['groups'])) return dct @@ -112,22 +124,22 @@ class SqliteStorage: ''' def __init__(self, - log, - path, - create_statement, - commit_delay=500): + log: logging.Logger, + path: Path, + create_statement: str, + commit_delay: int = 500) -> None: self._log = log self._path = path self._create_statement = create_statement self._commit_delay = commit_delay - self._con = None + self._con = cast(sqlite3.Connection, None) self._commit_source_id = None - def init(self, **kwargs): + def init(self, **kwargs: Any) -> None: if self._path.exists(): if not self._path.is_file(): - sys.exit('%s must be a file', self._path) + sys.exit('%s must be a file' % self._path) self._con = self._connect(**kwargs) else: @@ -135,10 +147,10 @@ def init(self, **kwargs): self._migrate_storage() - def _set_journal_mode(self, mode): + def _set_journal_mode(self, mode: str) -> None: self._con.execute(f'PRAGMA journal_mode={mode}') - def _set_synchronous(self, mode): + def _set_synchronous(self, mode: str) -> None: self._con.execute(f'PRAGMA synchronous={mode}') def _enable_secure_delete(self): @@ -148,10 +160,10 @@ def _enable_secure_delete(self): def user_version(self) -> int: return self._con.execute('PRAGMA user_version').fetchone()[0] - def _connect(self, **kwargs): + def _connect(self, **kwargs: Any) -> sqlite3.Connection: return sqlite3.connect(self._path, **kwargs) - def _create_storage(self, **kwargs): + def _create_storage(self, **kwargs: Any) -> sqlite3.Connection: self._log.info('Creating %s', self._path) con = self._connect(**kwargs) self._path.chmod(0o600) @@ -167,13 +179,13 @@ def _create_storage(self, **kwargs): con.commit() return con - def _reinit_storage(self): + def _reinit_storage(self) -> None: if self._con is not None: self._con.close() self._path.unlink() self.init() - def _migrate_storage(self): + def _migrate_storage(self) -> None: try: self._migrate() except Exception: @@ -181,10 +193,10 @@ def _migrate_storage(self): self._log.exception('Error') sys.exit() - def _migrate(self): + def _migrate(self) -> None: raise NotImplementedError - def _execute_multiple(self, statements): + def _execute_multiple(self, statements: list[str]) -> None: """ Execute multiple statements with the option to fail on duplicates but still continue @@ -202,22 +214,22 @@ def _execute_multiple(self, statements): sys.exit() @timeit - def _commit(self): + def _commit(self) -> bool: self._commit_source_id = None self._con.commit() return False - def _delayed_commit(self): + def _delayed_commit(self) -> None: if self._commit_source_id is not None: return self._commit_source_id = GLib.timeout_add(self._commit_delay, self._commit) - def shutdown(self): + def shutdown(self) -> None: if self._commit_source_id is not None: GLib.source_remove(self._commit_source_id) self._commit() self._con.close() - self._con = None + del self._con ===================================== gajim/common/storage/cache.py ===================================== @@ -12,12 +12,23 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Any +from typing import NamedTuple +from typing import Optional +from typing import Union + import json import time import sqlite3 import logging -from collections import namedtuple from collections import defaultdict +from collections import namedtuple + +from nbxmpp.protocol import JID +from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import RosterItem from gajim.common import configpaths from gajim.common.storage.base import SqliteStorage @@ -74,6 +85,14 @@ log = logging.getLogger('gajim.c.storage.cache') +class UnreadTableRow(NamedTuple): + account: str + jid: JID + count: int # type: ignore + message_id: str + timestamp: float + + class CacheStorage(SqliteStorage): def __init__(self): SqliteStorage.__init__(self, @@ -81,12 +100,12 @@ def __init__(self): configpaths.get('CACHE_DB'), CACHE_SQL_STATEMENT) - self._entity_caps_cache = {} - self._disco_info_cache = {} - self._muc_cache = defaultdict(dict) - self._contact_cache = defaultdict(dict) + self._entity_caps_cache: dict[tuple[str, str], DiscoInfo] = {} + self._disco_info_cache: dict[Union[JID, str], DiscoInfo] = {} + self._muc_cache: dict[JID, dict[str, Any]] = defaultdict(dict) + self._contact_cache: dict[JID, dict[str, Any]] = defaultdict(dict) - def init(self, **kwargs): + def init(self, **kwargs: Any) -> None: SqliteStorage.init(self, detect_types=sqlite3.PARSE_COLNAMES) self._set_journal_mode('WAL') @@ -97,12 +116,13 @@ def init(self, **kwargs): self._load_caps_data() @staticmethod - def _namedtuple_factory(cursor, row): + def _namedtuple_factory(cursor: sqlite3.Cursor, + row: tuple[Any, ...]) -> NamedTuple: fields = [col[0] for col in cursor.description] - Row = namedtuple('Row', fields) + Row = namedtuple('Row', fields) # type: ignore return Row(*row) - def _migrate(self): + def _migrate(self) -> None: user_version = self.user_version if user_version > CURRENT_USER_VERSION: # Gajim was downgraded, reinit the storage @@ -114,7 +134,7 @@ def _migrate(self): return @timeit - def _load_caps_data(self): + def _load_caps_data(self) -> None: rows = self._con.execute( 'SELECT hash_method, hash, data as "data [disco_info]" ' 'FROM caps_cache') @@ -123,7 +143,11 @@ def _load_caps_data(self): self._entity_caps_cache[(row.hash_method, row.hash)] = row.data @timeit - def add_caps_entry(self, jid, hash_method, hash_, caps_data): + def add_caps_entry(self, + jid: JID, + hash_method: str, + hash_: str, + caps_data: DiscoInfo) -> None: self._entity_caps_cache[(hash_method, hash_)] = caps_data self._disco_info_cache[jid] = caps_data @@ -134,18 +158,18 @@ def add_caps_entry(self, jid, hash_method, hash_, caps_data): ''', (hash_method, hash_, caps_data, int(time.time()))) self._delayed_commit() - def get_caps_entry(self, hash_method, hash_): + def get_caps_entry(self, hash_method: str, hash_: str): return self._entity_caps_cache.get((hash_method, hash_)) @timeit - def update_caps_time(self, method, hash_): + def update_caps_time(self, method: str, hash_: str) -> None: sql = '''UPDATE caps_cache SET last_seen = ? WHERE hash_method = ? and hash = ?''' self._con.execute(sql, (int(time.time()), method, hash_)) self._delayed_commit() @timeit - def _clean_caps_table(self): + def _clean_caps_table(self) -> None: """ Remove caps which was not seen for 3 months """ @@ -155,7 +179,7 @@ def _clean_caps_table(self): self._delayed_commit() @timeit - def _fill_disco_info_cache(self): + def _fill_disco_info_cache(self) -> None: sql = '''SELECT disco_info as "disco_info [disco_info]", jid, last_seen FROM last_seen_disco_info''' @@ -165,7 +189,9 @@ def _fill_disco_info_cache(self): self._disco_info_cache[row.jid] = disco_info log.info('%d DiscoInfo entries loaded', len(rows)) - def get_last_disco_info(self, jid, max_age=0): + def get_last_disco_info(self, + jid: Union[str, JID], + max_age: int = 0) -> Optional[DiscoInfo]: """ Get last disco info from jid @@ -178,12 +204,15 @@ def get_last_disco_info(self, jid, max_age=0): disco_info = self._disco_info_cache.get(jid) if disco_info is not None: max_timestamp = time.time() - max_age if max_age else 0 - if max_timestamp > disco_info.timestamp: + if max_timestamp > disco_info.timestamp: # type: ignore return None return disco_info @timeit - def set_last_disco_info(self, jid, disco_info, cache_only=False): + def set_last_disco_info(self, + jid: Union[str, JID], + disco_info: DiscoInfo, + cache_only: bool = False) -> None: """ Get last disco info from jid @@ -218,12 +247,7 @@ def set_last_disco_info(self, jid, disco_info, cache_only=False): self._delayed_commit() @timeit - def store_roster(self, account, roster): - # encoded_roster = {} - # for jid, data in roster.items(): - # encoded_roster[str(jid)] = data - - + def store_roster(self, account: str, roster: dict[JID, RosterItem]) -> None: serialized = json.dumps(list(roster.values()), cls=Encoder) insert_sql = 'INSERT INTO roster(account, roster) VALUES(?, ?)' @@ -237,27 +261,26 @@ def store_roster(self, account, roster): self._delayed_commit() @timeit - def load_roster(self, account): + def load_roster(self, account: str) -> Optional[dict[JID, RosterItem]]: select_sql = 'SELECT roster FROM roster WHERE account = ?' result = self._con.execute(select_sql, (account,)).fetchone() if result is None: return None - roster = {} + roster: dict[JID, RosterItem] = {} data = json.loads(result.roster, object_hook=json_decoder) for item in data: roster[item.jid] = item - # roster[JID.from_string(jid)] = data return roster @timeit - def remove_roster(self, account): + def remove_roster(self, account: str) -> None: delete_sql = 'DELETE FROM roster WHERE account = ?' self._con.execute(delete_sql, (account,)) self._commit() @timeit - def set_muc(self, jid, prop, value): + def set_muc(self, jid: JID, prop: str, value: Any) -> None: sql = f'''INSERT INTO muc (jid, {prop}) VALUES (?, ?)''' try: @@ -271,7 +294,7 @@ def set_muc(self, jid, prop, value): self._delayed_commit() @timeit - def get_muc(self, jid, prop): + def get_muc(self, jid: JID, prop: str) -> Any: try: return self._muc_cache[jid][prop] except KeyError: @@ -284,7 +307,7 @@ def get_muc(self, jid, prop): return value @timeit - def set_contact(self, jid, prop, value): + def set_contact(self, jid: JID, prop: str, value: Any) -> None: sql = f'INSERT INTO contact (jid, {prop}, {prop}_ts) VALUES (?, ?, ?)' prop_ts = time.time() @@ -300,7 +323,7 @@ def set_contact(self, jid, prop, value): self._delayed_commit() @timeit - def get_contact(self, jid, prop): + def get_contact(self, jid: JID, prop: str) -> Any: try: value, prop_ts = self._contact_cache[jid][prop] except KeyError: @@ -318,18 +341,24 @@ def get_contact(self, jid, prop): return value @timeit - def get_unread(self): + def get_unread(self) -> list[UnreadTableRow]: sql = 'SELECT * FROM unread' return self._con.execute(sql).fetchall() @timeit - def get_unread_count(self, account, jid): + def get_unread_count(self, account: str, jid: JID) -> int: sql = '''SELECT count, message_id, timestamp FROM unread WHERE account = ? AND jid = ?''' return self._con.execute(sql, (account, jid)).fetchone() @timeit - def set_unread_count(self, account, jid, count, message_id, timestamp): + def set_unread_count(self, + account: str, + jid: JID, + count: int, + message_id: str, + timestamp: float) -> None: + if self.get_unread_count(account, jid) is not None: self.update_unread_count(account, jid, count) else: @@ -340,13 +369,13 @@ def set_unread_count(self, account, jid, count, message_id, timestamp): self._delayed_commit() @timeit - def update_unread_count(self, account, jid, count): + def update_unread_count(self, account: str, jid: JID, count: int) -> None: sql = 'UPDATE unread SET count = ? WHERE account = ? AND jid = ?' self._con.execute(sql, (count, account, jid)) self._delayed_commit() @timeit - def reset_unread_count(self, account, jid): + def reset_unread_count(self, account: str, jid: JID) -> None: sql = 'DELETE FROM unread WHERE account = ? AND jid = ?' self._con.execute(sql, (account, jid)) self._delayed_commit() ===================================== pyrightconfig.json ===================================== @@ -16,6 +16,7 @@ "gajim/common/passwords.py", "gajim/common/regex.py", "gajim/common/sound.py", + "gajim/common/storage/cache.py", "gajim/gtk/app_side_bar.py", "gajim/gtk/chat_filter.py", "gajim/gtk/chat_page.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/34ab976517298b0399a3f58fb1a9eef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/34ab976517298b0399a3f58fb1a9eef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor load_file_async()
by Philipp Hörist (＠lovetox) 28 Dec '21

28 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 34ab9765 by lovetox at 2021-12-28T16:57:27+01:00 Refactor load_file_async() - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1304,21 +1304,24 @@ def _on_file_created(file: Gio.File, result: Gio.AsyncResult) -> None: _on_file_created) -def load_file_async(path, callback, user_data=None): - file = Gio.File.new_for_path(str(path)) - file.load_contents_async(None, - _on_load_finished, - (callback, user_data)) +def load_file_async(path: Path, + callback: Callable[[Optional[bytes], + Optional[GLib.Error], + Optional[Any]], Any], + user_data: Optional[Any] = None) -> None: + def _on_load_finished(file: Gio.File, + result: Gio.AsyncResult) -> None: -def _on_load_finished(file, result, user_data): - callback, user_data = user_data - try: - _successful, contents, _etag = file.load_contents_finish(result) - except GLib.Error as error: - callback(None, error, user_data) - else: - callback(contents, None, user_data) + try: + _, contents, _ = file.load_contents_finish(result) + except GLib.Error as error: + callback(None, error, user_data) + else: + callback(contents, None, user_data) + + file = Gio.File.new_for_path(str(path)) + file.load_contents_async(None, _on_load_finished) def convert_gio_to_openssl_cert(cert): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/34ab976517298b0399a3f58fb1a9eef3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/34ab976517298b0399a3f58fb1a9eef3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Helpers: Add type annotations
by Philipp Hörist (＠lovetox) 28 Dec '21

28 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4362f42b by lovetox at 2021-12-28T16:09:14+01:00 Helpers: Add type annotations - - - - - 355e18ec by lovetox at 2021-12-28T16:25:50+01:00 Contacts: add type annotations - - - - - 59cbfb8f by lovetox at 2021-12-28T16:32:54+01:00 BaseRow: Add type annotations - - - - - b5df4334 by lovetox at 2021-12-28T16:33:00+01:00 Refactor write_file_async() - - - - - 4 changed files: - gajim/common/helpers.py - gajim/common/modules/contacts.py - gajim/common/structs.py - gajim/gtk/conversation/rows/base.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1174,7 +1174,10 @@ def get_groupchat_name(client: types.Client, jid: Union[str, JID]) -> str: return jid.localpart -def is_affiliation_change_allowed(self_contact, contact, target_aff): +def is_affiliation_change_allowed(self_contact: types.GroupchatParticipant, + contact: types.GroupchatParticipant, + target_aff: Affiliation) -> bool: + if contact.affiliation.value == target_aff: # Contact has already the target affiliation return False @@ -1191,13 +1194,17 @@ def is_affiliation_change_allowed(self_contact, contact, target_aff): return self_contact.affiliation > contact.affiliation -def is_role_change_allowed(self_contact, contact): +def is_role_change_allowed(self_contact: types.GroupchatParticipant, + contact: types.GroupchatParticipant) -> bool: + if self_contact.role < Role.MODERATOR: return False return self_contact.affiliation >= contact.affiliation -def is_retraction_allowed(self_contact, contact): +def is_retraction_allowed(self_contact: types.GroupchatParticipant, + contact: types.GroupchatParticipant) -> bool: + if self_contact.role < Role.MODERATOR: return False return self_contact.affiliation >= contact.affiliation @@ -1269,38 +1276,32 @@ def write_file_async( callback: Callable[[bool, Optional[GLib.Error], Any], Any], user_data: Optional[Any] = None): + def _on_write_finished(outputstream: Gio.OutputStream, + result: Gio.AsyncResult) -> None: + try: + successful, _bytes_written = outputstream.write_all_finish(result) + except GLib.Error as error: + callback(False, error, user_data) + else: + callback(successful, None, user_data) + + def _on_file_created(file: Gio.File, result: Gio.AsyncResult) -> None: + try: + outputstream = file.create_finish(result) + except GLib.Error as error: + callback(False, error, user_data) + return + + outputstream.write_all_async(data, + GLib.PRIORITY_DEFAULT, + None, + _on_write_finished) + file = Gio.File.new_for_path(str(path)) file.create_async(Gio.FileCreateFlags.PRIVATE, GLib.PRIORITY_DEFAULT, None, - _on_file_created, - (callback, data, user_data)) - -def _on_file_created(file, result, user_data): - callback, data, user_data = user_data - try: - outputstream = file.create_finish(result) - except GLib.Error as error: - callback(False, error, user_data) - return - - # Pass data as user_data to the callback, because - # write_all_async() takes not reference to the data - # and python gc collects it before the data are written - outputstream.write_all_async(data, - GLib.PRIORITY_DEFAULT, - None, - _on_write_finished, - (callback, data, user_data)) - -def _on_write_finished(outputstream, result, user_data): - callback, _data, user_data = user_data - try: - successful, _bytes_written = outputstream.write_all_finish(result) - except GLib.Error as error: - callback(False, error, user_data) - else: - callback(successful, None, user_data) + _on_file_created) def load_file_async(path, callback, user_data=None): @@ -1367,7 +1368,7 @@ def get_idle_status_message(state: str, status_message: str) -> str: return message -def should_log(account, jid): +def should_log(account: str, jid: str) -> bool: """ Should conversations between a local account and a remote jid be logged? """ @@ -1395,7 +1396,7 @@ def ask_for_status_message(status: str, signin: bool = False) -> bool: return app.settings.get('always_ask_for_status_message') -def get_group_chat_nick(account, room_jid): +def get_group_chat_nick(account: str, room_jid: str) -> str: nick = app.nicks[account] client = app.get_client(account) @@ -1408,7 +1409,7 @@ def get_group_chat_nick(account, room_jid): return nick -def get_muc_context(jid): +def get_muc_context(jid: str) -> str: disco_info = app.storage.cache.get_last_disco_info(jid) if disco_info is None: return None ===================================== gajim/common/modules/contacts.py ===================================== @@ -23,6 +23,8 @@ from functools import partial import cairo +from nbxmpp.const import Affiliation +from nbxmpp.const import Role from nbxmpp.protocol import JID from gajim.common import app @@ -30,6 +32,7 @@ from gajim.common.const import PresenceShowExt from gajim.common.const import SimpleClientState from gajim.common.structs import UNKNOWN_PRESENCE +from gajim.common.structs import PresenceData from gajim.common.structs import UNKNOWN_MUC_PRESENCE from gajim.common.structs import MUCPresenceData from gajim.common.helpers import Observable @@ -195,7 +198,7 @@ def __repr__(self): class BareContact(CommonContact): - def __init__(self, logger, jid, account): + def __init__(self, logger: logging.Logger, jid: JID, account: str) -> None: CommonContact.__init__(self, logger, jid, account) self.settings = ContactSettings(account, str(jid)) @@ -315,7 +318,7 @@ def get_avatar(self, transport_icon=transport_icon, style=style) - def update_presence(self, presence_data) -> None: + def update_presence(self, presence_data: PresenceData) -> None: for contact in self._resources.values(): contact.update_presence(presence_data, notify=False) self.notify('presence-update') @@ -388,7 +391,7 @@ def supports(self, requested_feature: str) -> bool: return CommonContact.supports(self, requested_feature) @property - def identity_type(self): + def identity_type(self) -> Optional[str]: disco_info = app.storage.cache.get_last_disco_info(self._jid) if disco_info is None: return None @@ -410,22 +413,24 @@ def show(self): return self._presence.show @property - def status(self): + def status(self) -> str: return self._presence.status @property - def priority(self): + def priority(self) -> int: return self._presence.priority @property - def idle_time(self): + def idle_time(self) -> Optional[float]: return self._presence.idle_time @property def chatstate(self): return self._module('Chatstate').get_remote_chatstate(self._jid) - def update_presence(self, presence_data, notify: bool = True) -> None: + def update_presence(self, + presence_data: PresenceData, + notify: bool = True) -> None: self._presence = presence_data if notify: self.notify('presence-update') @@ -438,7 +443,7 @@ def __init__(self, logger: logging.Logger, jid: JID, account: str) -> None: self.settings = GroupChatSettings(account, str(jid)) @property - def is_groupchat(self): + def is_groupchat(self) -> bool: return True def add_resource(self, resource: str) -> GroupchatParticipant: @@ -591,11 +596,11 @@ def show(self): return self._presence.show @property - def status(self): + def status(self) -> str: return self._presence.status @property - def idle_time(self): + def idle_time(self) -> Optional[float]: return self._presence.idle_time @property @@ -603,15 +608,15 @@ def name(self) -> str: return self._jid.resource @property - def real_jid(self): + def real_jid(self) -> Optional[JID]: return self._presence.real_jid @property - def affiliation(self): + def affiliation(self) -> Affiliation: return self._presence.affiliation @property - def role(self): + def role(self) -> Role: return self._presence.role @property ===================================== gajim/common/structs.py ===================================== @@ -187,7 +187,7 @@ class PresenceData: show: str status: str priority: int - idle_time: str + idle_time: Optional[float] available: bool @classmethod ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -13,7 +13,9 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from __future__ import annotations + from typing import Optional +from typing import Union from datetime import datetime @@ -22,14 +24,19 @@ from gi.repository import Pango from gajim.common import app -from gajim.common import types from gajim.common.i18n import _ from gajim.common.helpers import from_one_line from gajim.common.helpers import is_retraction_allowed +from gajim.common.modules.contacts import BareContact +from gajim.common.modules.contacts import GroupchatContact +from gajim.common.modules.contacts import GroupchatParticipant + from ...util import wrap_with_event_box from ...types import MessageRowType +ContactT = Union[BareContact, GroupchatContact, GroupchatParticipant] + class BaseRow(Gtk.ListBoxRow): def __init__(self, account: str, widget: Optional[str] = None) -> None: @@ -101,9 +108,10 @@ def __destroy(widget: Gtk.Widget) -> None: class MoreMenuButton(Gtk.Button): def __init__(self, row: MessageRowType, - contact: types.BareContact, + contact: ContactT, name: str ) -> None: + Gtk.Button.__init__(self) self.set_valign(Gtk.Align.START) self.set_halign(Gtk.Align.END) @@ -122,11 +130,12 @@ def __init__(self, def _on_click(self, _button: Gtk.Button) -> None: show_retract = False - if self._contact.is_groupchat: + if isinstance(self._contact, GroupchatContact): disco_info = app.storage.cache.get_last_disco_info( self._contact.jid) contact = self._contact.get_resource(self._name) self_contact = self._contact.get_self() + assert self_contact is not None is_allowed = is_retraction_allowed(self_contact, contact) if disco_info.has_message_moderation and is_allowed: show_retract = True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9e503a29e1f82c34bfe5633fc2d03ef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9e503a29e1f82c34bfe5633fc2d03ef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: EmojiData: Add type annotations
by Philipp Hörist (＠lovetox) 28 Dec '21

28 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0e463d18 by lovetox at 2021-12-28T11:42:13+01:00 EmojiData: Add type annotations - - - - - 62ba43df by lovetox at 2021-12-28T11:42:48+01:00 Styling: Define name attribute on BaseUri - - - - - 9e503a29 by lovetox at 2021-12-28T11:44:12+01:00 PlainWidget: Fix type erros - - - - - 4 changed files: - gajim/common/styling.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/emoji_data.pyi - pyrightconfig.json Changes: ===================================== gajim/common/styling.py ===================================== @@ -65,7 +65,7 @@ class StyleObject: @dataclass class BaseUri(StyleObject): - + name: str start_byte: int end_byte: int ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -13,7 +13,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from typing import Any -from typing import Dict import logging import os @@ -27,7 +26,6 @@ from gajim.common import app from gajim.common.const import StyleAttr from gajim.common.helpers import open_uri -from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import parse_uri from gajim.common.structs import URI from gajim.common.styling import PlainBlock @@ -136,7 +134,7 @@ def __init__(self, account: str) -> None: self.set_cursor_visible(False) self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) - self._handlers: Dict[int, MessageTextview] = {} + self._handlers: dict[int, MessageTextview] = {} id_ = self.connect('query-tooltip', self._query_tooltip) self._handlers[id_] = self @@ -221,7 +219,7 @@ def print_text_with_styling(self, block: PlainBlock) -> None: else: pixbuf = pixbuf.copy() anchor = buffer_.create_child_anchor(end_iter) - anchor.plaintext = emoji.text + anchor.plaintext = emoji.text # type: ignore img = Gtk.Image.new_from_pixbuf(pixbuf) img.show() self.add_child_at_anchor(img, anchor) ===================================== gajim/gtk/emoji_data.pyi ===================================== @@ -16,6 +16,7 @@ from enum import IntEnum from collections import OrderedDict from gi.repository import GdkPixbuf +from gi.repository import Gtk class Emoji(IntEnum): ... @@ -27,10 +28,17 @@ class EmojiData(OrderedDict): def get_regex(self) -> str: ... class EmojiPixbufs(dict): - ... - -emoji_pixbufs = EmojiPixbufs() - + @property + def complete(self) -> bool: ... + @complete.setter + def complete(self, value: bool) -> None: ... + def clear(self) -> None: ... + def append_marks(self, + textview: Gtk.TextView, + start: Gtk.TextMark, + end: Gtk.TextMark, + codepoint: str) -> None: ... + +emoji_pixbufs: EmojiPixbufs emoji_ascii_data: dict[str, str] - -emoji_data = EmojiData() +emoji_data: EmojiData ===================================== pyrightconfig.json ===================================== @@ -1,14 +1,4 @@ { - "ignore": [ - "setup.py", - "test", - ".gitlab" - "data", - "flatpak", - "mac", - "scripts", - "win", - ], "pythonPlatform": "All", "pythonVersion": "3.9", "typeCheckingMode": "strict", @@ -31,6 +21,7 @@ "gajim/gtk/chat_page.py", "gajim/gtk/conversation/code_widget.py", "gajim/gtk/conversation/jump_to_end_button.py", + "gajim/gtk/conversation/plain_widget.py", "gajim/gtk/conversation/quote_widget.py", "gajim/gtk/conversation/rows/command_output.py", "gajim/gtk/conversation/rows/date.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8e99da675e8ee7b90d80ec5bd9e7143… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8e99da675e8ee7b90d80ec5bd9e7143… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PlainWidget: Fix type errors
by Philipp Hörist (＠lovetox) 27 Dec '21

27 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8e99da67 by lovetox at 2021-12-28T00:59:02+01:00 PlainWidget: Fix type errors - Remove some unused code - - - - - 2 changed files: - gajim/gtk/conversation/plain_widget.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -181,8 +181,10 @@ def _create_url_tags(self) -> None: def update_text_tags(self) -> None: tag_table = self.get_buffer().get_tag_table() url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) - for tag in URI_TAGS: - tag_table.lookup(tag).set_property('foreground', url_color) + for tag_name in URI_TAGS: + tag = tag_table.lookup(tag_name) + assert tag is not None + tag.set_property('foreground', url_color) def clear(self) -> None: buffer_ = self.get_buffer() @@ -250,22 +252,15 @@ def _query_tooltip(self, _keyboard_mode: bool, tooltip: Gtk.Tooltip ) -> bool: + window = widget.get_window(Gtk.TextWindowType.TEXT) + assert window is not None x_pos, y_pos = self.window_to_buffer_coords( Gtk.TextWindowType.TEXT, x_pos, y_pos) iter_ = self.get_iter_at_position(x_pos, y_pos)[1] for tag in iter_.get_tags(): tag_name = tag.get_property('name') - if getattr(tag, 'is_anchor', False): - text = getattr(tag, 'title', False) - if text: - if len(text) > 50: - text = reduce_chars_newlines(text, 47, 1) - tooltip.set_text(text) - window.set_cursor(get_cursor('pointer')) - self._cursor_changed = True - return True if tag_name in URI_TAGS: window.set_cursor(get_cursor('pointer')) self._cursor_changed = True @@ -292,9 +287,7 @@ def _on_button_press(self, _widget: Any, event: Gdk.EventButton) -> bool: Gtk.TextWindowType.TEXT, int(event.x), int(event.y)) - iter_ = self.get_iter_at_location(x_pos, y_pos) - if isinstance(iter_, tuple): - iter_ = iter_[1] + _, iter_ = self.get_iter_at_location(x_pos, y_pos) tags = iter_.get_tags() if tags: ===================================== gajim/gui_menu_builder.py ===================================== @@ -286,7 +286,7 @@ def get_encryption_menu(control_id: str, return menu -def get_conv_action_context_menu(account: str, selected_text: str) -> Gtk.Menu: +def get_conv_action_context_menu(account: str, selected_text: str) -> Gtk.MenuItem: selected_text_short = reduce_chars_newlines(selected_text, 10, 1) action_menu_item = Gtk.MenuItem.new_with_mnemonic( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e99da675e8ee7b90d80ec5bd9e71434… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e99da675e8ee7b90d80ec5bd9e71434… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: PlainWidget: Typing
by Daniel Brötzmann (＠wurstsalat) 27 Dec '21

27 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 57978e7d by wurstsalat at 2021-12-28T00:19:40+01:00 PlainWidget: Typing - - - - - 65e2dd7b by wurstsalat at 2021-12-28T00:20:17+01:00 GUI menu builder: Typing - - - - - 2 changed files: - gajim/gtk/conversation/plain_widget.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -22,6 +22,7 @@ from gi.repository import Pango from gi.repository import Gdk from gi.repository import GLib +from gi.repository import GObject from gajim.common import app from gajim.common.const import StyleAttr @@ -31,12 +32,11 @@ from gajim.common.structs import URI from gajim.common.styling import PlainBlock -from gajim.gui.emoji_data import emoji_pixbufs -from gajim.gui.emoji_data import get_emoji_pixbuf - from gajim.gui_menu_builder import get_conv_action_context_menu from gajim.gui_menu_builder import get_conv_uri_context_menu +from ..emoji_data import emoji_pixbufs +from ..emoji_data import get_emoji_pixbuf from ..util import get_cursor from ..util import make_pango_attributes @@ -136,7 +136,7 @@ def __init__(self, account: str) -> None: self.set_cursor_visible(False) self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) - self._handlers: Dict[str, MessageTextview] = {} + self._handlers: Dict[int, MessageTextview] = {} id_ = self.connect('query-tooltip', self._query_tooltip) self._handlers[id_] = self @@ -164,7 +164,7 @@ def __init__(self, account: str) -> None: self.connect('destroy', self._on_destroy) - def _on_destroy(self, *args): + def _on_destroy(self, *args: Any) -> None: for id_, widget in self._handlers.items(): if widget.handler_is_connected(id_): widget.disconnect(id_) @@ -243,8 +243,13 @@ def add_action_phrase(self, text: str) -> None: end_iter = buffer_.get_end_iter() buffer_.apply_tag_by_name('emphasis', start_iter, end_iter) - def _query_tooltip(self, widget: Any, x_pos: int, y_pos: int, - _keyboard_mode: bool, tooltip: Gtk.Tooltip) -> bool: + def _query_tooltip(self, + widget: Gtk.TextView, + x_pos: int, + y_pos: int, + _keyboard_mode: bool, + tooltip: Gtk.Tooltip + ) -> bool: window = widget.get_window(Gtk.TextWindowType.TEXT) x_pos, y_pos = self.window_to_buffer_coords( Gtk.TextWindowType.TEXT, x_pos, y_pos) @@ -320,8 +325,10 @@ def _on_button_press(self, _widget: Any, event: Gdk.EventButton) -> bool: start_sel, finish_sel, True) return False - def _on_populate_popup(self, _textview: Gtk.TextView, - menu: Gtk.Menu) -> None: + def _on_populate_popup(self, + _textview: Gtk.TextView, + menu: Gtk.Menu + ) -> None: ''' Overrides the default context menu. If text is selected, a submenu with actions on the selection is added. @@ -336,9 +343,13 @@ def _on_populate_popup(self, _textview: Gtk.TextView, menu.prepend(action_menu_item) menu.show_all() - def _on_uri_clicked(self, texttag: Gtk.TextTag, _widget: Any, - event: Gdk.Event, iter_: Gtk.TextIter, - _kind: Gtk.TextTag) -> int: + def _on_uri_clicked(self, + texttag: Gtk.TextTag, + _widget: Any, + event: Gdk.Event, + iter_: Gtk.TextIter, + _kind: Gtk.TextTag + ) -> int: if event.type != Gdk.EventType.BUTTON_PRESS: return Gdk.EVENT_PROPAGATE @@ -377,11 +388,11 @@ def _show_uri_context_menu(self, uri: URI) -> None: log.warning('No handler for URI type: %s', uri) return - def destroy(menu, _pspec): + def _destroy(menu: Gtk.Menu, _pspec: GObject.ParamSpec) -> None: visible = menu.get_property('visible') if not visible: GLib.idle_add(menu.destroy) menu.attach_to_widget(self, None) - menu.connect('notify::visible', destroy) + menu.connect('notify::visible', _destroy) menu.popup_at_pointer() ===================================== gajim/gui_menu_builder.py ===================================== @@ -14,10 +14,12 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations from typing import Tuple from typing import List from typing import Union from typing import Any +from typing import Optional from urllib.parse import quote @@ -28,6 +30,7 @@ from nbxmpp import JID from gajim.common import app +from gajim.common import types from gajim.common.helpers import is_affiliation_change_allowed from gajim.common.helpers import is_role_change_allowed from gajim.common.helpers import jid_is_blocked @@ -41,8 +44,11 @@ from gajim.gui.const import ControlType -def get_singlechat_menu(control_id: str, account: str, jid: JID, - type_: ControlType) -> Gio.Menu: +def get_singlechat_menu(control_id: str, + account: str, + jid: JID, + type_: ControlType + ) -> Gio.Menu: client = app.get_client(account) is_self_contact = jid.bare == client.get_own_jid().bare @@ -70,7 +76,7 @@ def get_singlechat_menu(control_id: str, account: str, jid: JID, singlechat_menu.append(('win.search-history', _('Search…'))) - def build_chatstate_menu(): + def build_chatstate_menu() -> Gio.Menu: menu = Gio.Menu() entries = [ (_('Disabled'), 'disabled'), @@ -136,37 +142,33 @@ def get_groupchat_menu(control_id: str, account: str, jid: str) -> Gio.Menu: ('win.search-history', _('Search…')), ] - def build_menu(preset): + def build_menu(preset: list[tuple[str, str]]) -> Gio.Menu: menu = Gio.Menu() for item in preset: - if isinstance(item[1], str): - action_name, label = item - if action_name == 'win.search-history': - menuitem = Gio.MenuItem.new(label, action_name) - menuitem.set_action_and_target_value(action_name, None) - menu.append_item(menuitem) + action_name, label = item + if action_name == 'win.search-history': + menuitem = Gio.MenuItem.new(label, action_name) + menuitem.set_action_and_target_value(action_name, None) + menu.append_item(menuitem) - elif action_name == 'app.browse-history': - menuitem = Gio.MenuItem.new(label, action_name) - dict_ = {'account': GLib.Variant('s', account), - 'jid': GLib.Variant('s', jid)} - variant_dict = GLib.Variant('a{sv}', dict_) - menuitem.set_action_and_target_value(action_name, - variant_dict) - menu.append_item(menuitem) + elif action_name == 'app.browse-history': + menuitem = Gio.MenuItem.new(label, action_name) + dict_ = {'account': GLib.Variant('s', account), + 'jid': GLib.Variant('s', jid)} + variant_dict = GLib.Variant('a{sv}', dict_) + menuitem.set_action_and_target_value( + action_name, variant_dict) + menu.append_item(menuitem) - elif action_name == 'win.execute-command-': - action_name = action_name + control_id - menuitem = Gio.MenuItem.new(label, action_name) - menuitem.set_action_and_target_value(action_name, - GLib.Variant('s', '')) - menu.append_item(menuitem) - else: - menu.append(label, action_name + control_id) + elif action_name == 'win.execute-command-': + action_name = action_name + control_id + menuitem = Gio.MenuItem.new(label, action_name) + menuitem.set_action_and_target_value( + action_name, GLib.Variant('s', '')) + menu.append_item(menuitem) else: - label, sub_menu = item - submenu = build_menu(sub_menu) - menu.append_submenu(label, submenu) + menu.append(label, action_name + control_id) + return menu return build_menu(groupchat_menu) @@ -179,7 +181,7 @@ def get_account_menu(account: str) -> Gio.Menu: label: string sub menu: list ''' - account_menu = [ + account_menu: list[tuple[str, Union[str, list[tuple[str, str]]]]] = [ ('-profile', _('Profile')), ('-start-single-chat', _('Send Single Message…')), ('-services', _('Discover Services…')), @@ -201,7 +203,7 @@ def get_account_menu(account: str) -> Gio.Menu: if app.settings.get('developer_modus'): account_menu[5][1].append(('-bookmarks', _('Bookmarks'))) - def build_menu(preset): + def build_menu(preset: list[tuple[str, Union[str, list[tuple[str, str]]]]]): menu = Gio.Menu() for item in preset: if isinstance(item[1], str): @@ -260,8 +262,10 @@ def build_accounts_menu() -> None: menubar.insert_submenu(menu_position, _('Accounts'), acc_menu) -def get_encryption_menu(control_id: str, control_type: ControlType, - zeroconf: bool = False) -> Gio.Menu: +def get_encryption_menu(control_id: str, + control_type: ControlType, + zeroconf: bool = False + ) -> Optional[Gio.Menu]: menu = Gio.Menu() menu.append( _('Disabled'), f'win.set-encryption-{control_id}::disabled') @@ -350,7 +354,7 @@ def get_conv_action_context_menu(account: str, selected_text: str) -> Gtk.Menu: return action_menu_item -def get_conv_uri_context_menu(account: str, uri: URI) -> Gtk.Menu: +def get_conv_uri_context_menu(account: str, uri: URI) -> Optional[Gtk.Menu]: if uri.type == URIType.XMPP: if uri.action == URIAction.JOIN: context_menu = [ @@ -411,6 +415,7 @@ def get_conv_uri_context_menu(account: str, uri: URI) -> Gtk.Menu: data = uri.data['jid'] else: data = '' + assert isinstance(data, str) if action in ('app.open-mail', 'app.copy-text'): value = GLib.Variant.new_string(data) @@ -480,7 +485,9 @@ def get_subscription_menu(account: str, jid: str) -> Gio.Menu: return menu -def get_start_chat_row_menu(account: str, jid: Union[JID, str]) -> Gio.Menu: +def get_start_chat_row_menu(account: str, + jid: Union[JID, str] + ) -> Gio.Menu: jid = str(jid) menu_items: List[Tuple[str, str]] = [ ('forget-groupchat', _('Forget this Group Chat')), @@ -496,8 +503,11 @@ def get_start_chat_row_menu(account: str, jid: Union[JID, str]) -> Gio.Menu: return menu -def get_chat_list_row_menu(workspace_id: str, account: str, - jid: Union[JID, str], pinned: bool) -> Gio.Menu: +def get_chat_list_row_menu(workspace_id: str, + account: str, + jid: Union[JID, str], + pinned: bool + ) -> Gio.Menu: jid = str(jid) client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) @@ -546,8 +556,10 @@ def get_chat_list_row_menu(workspace_id: str, account: str, return menu -def build_workspaces_submenu(current_workspace_id: str, account: str, - jid: str) -> Gio.Menu: +def build_workspaces_submenu(current_workspace_id: str, + account: str, + jid: str + ) -> Gio.Menu: submenu = Gio.Menu() for workspace_id in app.settings.get_workspaces(): if workspace_id == current_workspace_id: @@ -561,7 +573,11 @@ def build_workspaces_submenu(current_workspace_id: str, account: str, return submenu -def get_groupchat_roster_menu(account, control_id, self_contact, contact): +def get_groupchat_roster_menu(account: str, + control_id: str, + self_contact: types.GroupchatParticipant, + contact: types.GroupchatParticipant + ) -> Gtk.Menu: menu = Gtk.Menu() real_jid = '' if contact.real_jid is not None: @@ -662,7 +678,7 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): class SearchMenu(Gtk.Menu): - def __init__(self, treeview): + def __init__(self, treeview: Gtk.TreeView) -> None: Gtk.Menu.__init__(self) self._copy_item = Gtk.MenuItem(label=_('Copy')) self._copy_item.set_action_name('app.copy-text') @@ -671,13 +687,13 @@ def __init__(self, treeview): self.append(self._copy_item) self.attach_to_widget(treeview, None) - def set_copy_text(self, text): + def set_copy_text(self, text: str) -> None: self._copy_item.set_action_target_value(GLib.Variant('s', text)) -def escape_mnemonic(label): +def escape_mnemonic(label: Optional[str]) -> Optional[str]: if label is None: - return + return None # Underscore inside a label means the next letter is a keyboard # shortcut. To show an underscore we have to use double underscore return label.replace('_', '__') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3001b79a266669046f759a054baa367… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3001b79a266669046f759a054baa367… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: FileTransfer: Fix type errors
by Philipp Hörist (＠lovetox) 27 Dec '21

27 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4a442bdb by lovetox at 2021-12-27T23:17:37+01:00 FileTransfer: Fix type errors - Add a INIT state, so we don’t have to check for None - Add type annotations - - - - - 3001b79a by lovetox at 2021-12-27T23:18:22+01:00 Update pyrightjson.py - - - - - 5 changed files: - gajim/common/const.py - gajim/common/filetransfer.py - gajim/common/modules/httpupload.py - gajim/gtk/conversation/rows/file_transfer.py - pyrightconfig.json Changes: ===================================== gajim/common/const.py ===================================== @@ -781,6 +781,7 @@ def __str__(self): class FTState(Enum): + INIT = 'init' PREPARING = 'prepare' ENCRYPTING = 'encrypting' DECRYPTING = 'decrypting' ===================================== gajim/common/filetransfer.py ===================================== @@ -12,15 +12,15 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Dict from typing import Optional from gajim.common.helpers import Observable from gajim.common.const import FTState + class FileTransfer(Observable): - _state_descriptions: Dict[FTState, str] = {} + _state_descriptions: dict[FTState, str] = {} def __init__(self, account: str) -> None: Observable.__init__(self) @@ -30,7 +30,7 @@ def __init__(self, account: str) -> None: self._seen: int = 0 self.size: int = 0 - self._state: Optional[FTState] = None + self._state = FTState.INIT self._error_text: str = '' self._error_domain: Optional[str] = None @@ -39,7 +39,7 @@ def account(self) -> str: return self._account @property - def state(self) -> Optional[FTState]: + def state(self) -> FTState: return self._state @property @@ -53,7 +53,7 @@ def is_complete(self) -> bool: return self._seen >= self.size @property - def filename(self): + def filename(self) -> str: raise NotImplementedError @property @@ -65,6 +65,8 @@ def error_domain(self) -> Optional[str]: return self._error_domain def get_state_description(self) -> str: + if self._state is None: + return '' return self._state_descriptions.get(self._state, '') def set_preparing(self) -> None: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -351,7 +351,7 @@ def set_uri_transform_func(self, func): self._uri_transform_func = func @property - def filename(self): + def filename(self) -> str: return os.path.basename(self._path) def set_error(self, domain, text=''): ===================================== gajim/gtk/conversation/rows/file_transfer.py ===================================== @@ -83,7 +83,7 @@ def _on_destroy(self, *args: Any) -> None: if self._transfer.state.is_active: self._transfer.cancel() - self._transfer = None + del self._transfer if self._pulse is not None: GLib.source_remove(self._pulse) ===================================== pyrightconfig.json ===================================== @@ -17,6 +17,7 @@ "gajim/common/configpaths.py", "gajim/common/const.py", "gajim/common/exceptions.py", + "gajim/common/filetransfer.py", "gajim/common/ged.py", "gajim/common/i18n.py", "gajim/common/idle.py", @@ -33,6 +34,7 @@ "gajim/gtk/conversation/quote_widget.py", "gajim/gtk/conversation/rows/command_output.py", "gajim/gtk/conversation/rows/date.py", + "gajim/gtk/conversation/rows/file_transfer.py", "gajim/gtk/conversation/rows/info.py", "gajim/gtk/conversation/rows/muc_join_left.py", "gajim/gtk/conversation/rows/muc_subject.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/34724b3b004c7ee6b4075f2fdd19d9e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/34724b3b004c7ee6b4075f2fdd19d9e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update pyrightconfig.json
by Philipp Hörist (＠lovetox) 27 Dec '21

27 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 34724b3b by lovetox at 2021-12-27T22:55:48+01:00 Update pyrightconfig.json - - - - - 1 changed file: - pyrightconfig.json Changes: ===================================== pyrightconfig.json ===================================== @@ -37,6 +37,7 @@ "gajim/gtk/conversation/rows/muc_join_left.py", "gajim/gtk/conversation/rows/muc_subject.py", "gajim/gtk/conversation/rows/muc_user_status.py", + "gajim/gtk/conversation/rows/read_marker.py", "gajim/gtk/conversation/rows/scroll_hint.py", "gajim/gtk/conversation/rows/widgets.py", "gajim/gtk/conversation/scrolled.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/34724b3b004c7ee6b4075f2fdd19d9e3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/34724b3b004c7ee6b4075f2fdd19d9e3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Client: Add annotations and light refactor
by Philipp Hörist (＠lovetox) 27 Dec '21

27 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: cbb7243b by lovetox at 2021-12-27T22:52:50+01:00 Client: Add annotations and light refactor - - - - - 1 changed file: - gajim/common/client.py Changes: ===================================== gajim/common/client.py ===================================== @@ -12,10 +12,13 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import logging +from __future__ import annotations + from typing import Any from typing import Optional +import logging + import nbxmpp from nbxmpp.client import Client as NBXMPPClient from nbxmpp.protocol import JID @@ -27,12 +30,11 @@ from gi.repository import GObject from gi.repository import Gtk -from gajim.common import passwords -from gajim.common.nec import NetworkEvent - from gajim.common import app from gajim.common import helpers from gajim.common import modules +from gajim.common import passwords +from gajim.common.nec import NetworkEvent from gajim.common.const import ClientState from gajim.common.const import SimpleClientState from gajim.common.helpers import get_custom_host @@ -42,6 +44,7 @@ from gajim.common.helpers import get_idle_status_message from gajim.common.helpers import Observable from gajim.common.idle import Monitor +from gajim.common.idle import IdleMonitorManager from gajim.common.i18n import _ from gajim.gui.util import open_window @@ -274,7 +277,7 @@ def _on_disconnected(self, self._destroy_client = True if error in ('not-authorized', 'no-password'): - def _on_password(password): + def _on_password(password: str) -> None: self.password = password self._client.set_password(password) self._prepare_for_connect() @@ -400,8 +403,8 @@ def change_status(self, show: str, message: str) -> None: # We are connected if show == 'offline': - self.set_user_tune(None) - self.set_user_location(None) + self.get_module('UserTune').set_tune(None) + self.get_module('UserLocation').set_location(None) presence = self.get_module('Presence').get_presence( typ='unavailable', status=message, @@ -427,12 +430,6 @@ def update_presence(self, include_muc: bool = True) -> None: if include_muc: self.get_module('MUC').update_presence() - def set_user_tune(self, tune): - self.get_module('UserTune').set_tune(tune) - - def set_user_location(self, location): - self.get_module('UserLocation').set_location(location) - def get_module(self, name: str): return modules.get(self._account, name) @@ -595,7 +592,7 @@ def _disable_reconnect_timer(self) -> None: GLib.source_remove(self._reconnect_timer_source) self._reconnect_timer_source = None - def _idle_state_changed(self, monitor): + def _idle_state_changed(self, monitor: IdleMonitorManager) -> None: state = monitor.state.value if monitor.is_awake(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cbb7243b811e6184e85e0f1077daadd9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cbb7243b811e6184e85e0f1077daadd9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Idle: Refactor
by Philipp Hörist (＠lovetox) 27 Dec '21

27 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8665bdad by lovetox at 2021-12-27T22:26:06+01:00 Idle: Refactor - Inherit from base class - Add type annotations - Improve debug messages - - - - - 2 changed files: - gajim/common/idle.py - pyrightconfig.json Changes: ===================================== gajim/common/idle.py ===================================== @@ -19,11 +19,17 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Optional +from typing import cast + import sys import time import ctypes import ctypes.util import logging + from gi.repository import Gio from gi.repository import GLib from gi.repository import GObject @@ -35,13 +41,27 @@ log = logging.getLogger('gajim.c.idle') -class DBusFreedesktopIdleMonitor: - +class IdleMonitor: def __init__(self): - self.last_idle_time = 0 self._extended_away = False - log.debug('Connecting to D-Bus') + def get_idle_sec(self) -> int: + raise NotImplementedError + + def set_extended_away(self, state: bool) -> None: + self._extended_away = state + + def is_extended_away(self) -> bool: + return self._extended_away + + +class DBusFreedesktop(IdleMonitor): + + def __init__(self) -> None: + IdleMonitor.__init__(self) + self.last_idle_time = 0 + + log.debug('Connecting to org.freedesktop.ScreenSaver') self.dbus_proxy = Gio.DBusProxy.new_for_bus_sync( Gio.BusType.SESSION, Gio.DBusProxyFlags.NONE, @@ -51,25 +71,25 @@ def __init__(self): 'org.freedesktop.ScreenSaver', None ) - log.debug('D-Bus connected') + log.debug('Connected') # Only the following call will trigger exceptions if the D-Bus # interface/method/... does not exist. Using the failing method # for class init to allow other idle monitors to be used on failure. self._get_idle_sec_fail() - log.debug('D-Bus call test successful') + log.debug('Test successful') - def _get_idle_sec_fail(self): - (idle_time,) = self.dbus_proxy.call_sync( + def _get_idle_sec_fail(self) -> int: + (idle_time,) = cast(tuple[int], self.dbus_proxy.call_sync( 'GetSessionIdleTime', None, Gio.DBusCallFlags.NO_AUTO_START, -1, - None - ) - return idle_time//1000 + None)) + + return idle_time // 1000 - def get_idle_sec(self): + def get_idle_sec(self) -> int: try: self.last_idle_time = self._get_idle_sec_fail() except GLib.Error as error: @@ -79,20 +99,17 @@ def get_idle_sec(self): return self.last_idle_time - def set_extended_away(self, state): - self._extended_away = state - - def is_extended_away(self): + def is_extended_away(self) -> bool: return self._extended_away -class DBusGnomeIdleMonitor: +class DBusGnome(IdleMonitor): - def __init__(self): + def __init__(self) -> None: + IdleMonitor.__init__(self) self.last_idle_time = 0 - self._extended_away = False - log.debug('Connecting to D-Bus') + log.debug('Connecting to org.gnome.Mutter.IdleMonitor') self.dbus_gnome_proxy = Gio.DBusProxy.new_for_bus_sync( Gio.BusType.SESSION, Gio.DBusProxyFlags.NONE, @@ -102,25 +119,25 @@ def __init__(self): 'org.gnome.Mutter.IdleMonitor', None ) - log.debug('D-Bus connected') + log.debug('Connected') # Only the following call will trigger exceptions if the D-Bus # interface/method/... does not exist. Using the failing method # for class init to allow other idle monitors to be used on failure. self._get_idle_sec_fail() - log.debug('D-Bus call test successful') + log.debug('Test successful') - def _get_idle_sec_fail(self): - (idle_time,) = self.dbus_gnome_proxy.call_sync( + def _get_idle_sec_fail(self) -> int: + (idle_time,) = cast(tuple[int], self.dbus_gnome_proxy.call_sync( 'GetIdletime', None, Gio.DBusCallFlags.NO_AUTO_START, -1, - None - ) - return int(idle_time / 1000) + None)) + + return idle_time // 1000 - def get_idle_sec(self): + def get_idle_sec(self) -> int: try: self.last_idle_time = self._get_idle_sec_fail() except GLib.Error as error: @@ -130,17 +147,10 @@ def get_idle_sec(self): return self.last_idle_time - def set_extended_away(self, state): - self._extended_away = state - - def is_extended_away(self): - return self._extended_away - -class XssIdleMonitor: - def __init__(self): - - self._extended_away = False +class Xss(IdleMonitor): + def __init__(self) -> None: + IdleMonitor.__init__(self) class XScreenSaverInfo(ctypes.Structure): _fields_ = [ @@ -193,22 +203,19 @@ class XScreenSaverInfo(ctypes.Structure): self.rootwindow = libX11.XDefaultRootWindow(self.dpy_p) - def get_idle_sec(self): + def get_idle_sec(self) -> int: info = self.libXss.XScreenSaverQueryInfo( self.dpy_p, self.rootwindow, self.xss_info_p) if info == 0: return info - return int(self.xss_info_p.contents.idle / 1000) - - def set_extended_away(self, state): - self._extended_away = state + return self.xss_info_p.contents.idle // 1000 - def is_extended_away(self): - return False + def set_extended_away(self, state: bool) -> None: + raise NotImplementedError -class WindowsIdleMonitor: - def __init__(self): +class Windows(IdleMonitor): + def __init__(self) -> None: self.OpenInputDesktop = ctypes.windll.user32.OpenInputDesktop self.CloseDesktop = ctypes.windll.user32.CloseDesktop self.SystemParametersInfo = ctypes.windll.user32.SystemParametersInfoW @@ -217,17 +224,23 @@ def __init__(self): self._locked_time = None - class LASTINPUTINFO(ctypes.Structure): - _fields_ = [('cbSize', ctypes.c_uint), ('dwTime', ctypes.c_uint)] + class LastInputInfo(ctypes.Structure): + _fields_ = [ + ('cbSize', ctypes.c_uint), + ('dwTime', ctypes.c_uint) + ] - self.lastInputInfo = LASTINPUTINFO() + self.lastInputInfo = LastInputInfo() # type: ignore self.lastInputInfo.cbSize = ctypes.sizeof(self.lastInputInfo) - def get_idle_sec(self): + def get_idle_sec(self) -> int: self.GetLastInputInfo(ctypes.byref(self.lastInputInfo)) - return float(self.GetTickCount() - self.lastInputInfo.dwTime) / 1000 + return int(self.GetTickCount() - self.lastInputInfo.dwTime) // 1000 # type: ignore + + def set_extended_away(self, state: bool) -> None: + raise NotImplementedError - def is_extended_away(self): + def is_extended_away(self) -> bool: # Check if Screen Saver is running # 0x72 is SPI_GETSCREENSAVERRUNNING saver_runing = ctypes.c_int(0) @@ -254,9 +267,10 @@ def is_extended_away(self): threshold = time.time() - 10 if threshold > self._locked_time: return True + return False -class IdleMonitor(GObject.GObject): +class IdleMonitorManager(GObject.Object): __gsignals__ = { 'state-changed': ( @@ -266,7 +280,7 @@ class IdleMonitor(GObject.GObject): )} def __init__(self): - GObject.GObject.__init__(self) + GObject.Object.__init__(self) self.set_interval() self._state = IdleState.AWAKE self._idle_monitor = self._get_idle_monitor() @@ -274,66 +288,80 @@ def __init__(self): if self.is_available(): GLib.timeout_add_seconds(1, self._poll) - def set_interval(self, away_interval=60, xa_interval=120): + def set_interval(self, + away_interval: int = 60, + xa_interval: int = 120) -> None: + log.info('Set interval: away: %s, xa: %s', away_interval, xa_interval) self._away_interval = away_interval self._xa_interval = xa_interval - def set_extended_away(self, state): + def set_extended_away(self, state: bool) -> None: + if self._idle_monitor is None: + raise ValueError('No idle monitor available') + self._idle_monitor.set_extended_away(state) - def is_available(self): + def is_available(self) -> bool: return self._idle_monitor is not None @property - def state(self): + def state(self) -> IdleState: if not self.is_available(): return IdleState.UNKNOWN return self._state - def is_xa(self): + def is_xa(self) -> bool: return self.state == IdleState.XA - def is_away(self): + def is_away(self) -> bool: return self.state == IdleState.AWAY - def is_awake(self): + def is_awake(self) -> bool: return self.state == IdleState.AWAKE - def is_unknown(self): + def is_unknown(self) -> bool: return self.state == IdleState.UNKNOWN @staticmethod - def _get_idle_monitor(): + def _get_idle_monitor() -> Optional[IdleMonitor]: if sys.platform == 'win32': - return WindowsIdleMonitor() + return Windows() try: - return DBusFreedesktopIdleMonitor() + return DBusFreedesktop() except GLib.Error as error: - log.info('Idle time via D-Bus not available: %s', error) + log.info('Idle time via org.freedesktop.Screensaver ' + 'not available: %s', error) try: - return DBusGnomeIdleMonitor() + return DBusGnome() except GLib.Error as error: - log.info('Idle time via D-Bus (GNOME) not available: %s', error) + log.info('Idle time via org.gnome.Mutter.IdleMonitor ' + 'not available: %s', error) if app.is_display(Display.WAYLAND): - return + return None try: - return XssIdleMonitor() + return Xss() except OSError as error: log.info('Idle time via XScreenSaverInfo not available: %s', error) - def get_idle_sec(self): + return None + + def get_idle_sec(self) -> int: + if self._idle_monitor is None: + raise ValueError('No idle monitor available') return self._idle_monitor.get_idle_sec() - def _poll(self): + def _poll(self) -> bool: """ Check to see if we should change state """ + assert self._idle_monitor is not None + if self._idle_monitor.is_extended_away(): log.info('Extended Away: Screensaver or Locked Screen') self._set_state(IdleState.XA) @@ -350,7 +378,7 @@ def _poll(self): self._set_state(IdleState.AWAKE) return True - def _set_state(self, state): + def _set_state(self, state: IdleState) -> None: if self._state == state: return @@ -359,4 +387,4 @@ def _set_state(self, state): self.emit('state-changed') -Monitor = IdleMonitor() +Monitor = IdleMonitorManager() ===================================== pyrightconfig.json ===================================== @@ -19,6 +19,7 @@ "gajim/common/exceptions.py", "gajim/common/ged.py", "gajim/common/i18n.py", + "gajim/common/idle.py", "gajim/common/logging_helpers.py", "gajim/common/nec.py", "gajim/common/passwords.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8665bdad2a9762d1c2794ca1eea3963b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8665bdad2a9762d1c2794ca1eea3963b… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2021