Increment version

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="galaxy.plugin.api",
-    version="0.66.0",
+    version="0.68",
     description="GOG Galaxy Integrations Python API",
     author='Galaxy team',
     author_email='galaxy@gog.com',

src/galaxy/__init__.py

@@ -1 +1,6 @@
-__path__: str = __import__('pkgutil').extend_path(__path__, __name__) # type: ignore
+import logging
+
+
+logging.getLogger(__name__).setLevel(logging.INFO)
+
+__path__: str = __import__('pkgutil').extend_path(__path__, __name__)  # type: ignore

src/galaxy/api/importer.py

@@ -87,3 +87,16 @@ class CollectionImporter(Importer):
             self._notification_failure(id_, UnknownError())
         finally:
             self._notification_partially_finished(id_)
+
+
+class SynchroneousImporter(Importer):
+    async def _import_elements(self, ids_, context_):
+        try:
+            for id_ in ids_:
+                await self._import_element(id_, context_)
+            self._notification_finished()
+            self._complete()
+        except asyncio.CancelledError:
+            logger.debug("Importing %s cancelled", self._name)
+        finally:
+            self._import_in_progress = False

src/galaxy/api/jsonrpc.py

@@ -306,7 +306,7 @@ class Connection():
             if sensitive:
                 logger.debug("Sending %d bytes of data", len(data))
             else:
-                logging.debug("Sending data: %s", line)
+                logger.debug("Sending data: %s", line)
             self._writer.write(data)
         except TypeError as error:
             logger.error(str(error))

src/galaxy/api/plugin.py

@@ -13,7 +13,7 @@ from galaxy.api.types import (
     Subscription, SubscriptionGame
 )
 from galaxy.task_manager import TaskManager
-from galaxy.api.importer import Importer, CollectionImporter
+from galaxy.api.importer import Importer, CollectionImporter, SynchroneousImporter
 
 
 logger = logging.getLogger(__name__)
@@ -104,7 +104,7 @@ class Plugin:
             self._user_presence_import_finished,
             self.user_presence_import_complete
         )
-        self._local_size_importer = Importer(
+        self._local_size_importer = SynchroneousImporter(
             self._external_task_manager,
             "local size",
             self.get_local_size,
@@ -292,7 +292,7 @@ class Plugin:
         await self._external_task_manager.wait()
         await self._internal_task_manager.wait()
         await self._connection.wait_closed()
-        logger.debug("Plugin closed")
+        logger.info("Plugin closed")
 
     def create_task(self, coro, description):
         """Wrapper around asyncio.create_task - takes care of canceling tasks on shutdown"""

src/galaxy/api/types.py

@@ -166,8 +166,8 @@ class UserInfo:
     """
     user_id: str
     user_name: str
-    avatar_url: Optional[str]
+    avatar_url: Optional[str] = None
-    profile_url: Optional[str]
+    profile_url: Optional[str] = None
 
 
 @dataclass

tests/test_friends.py

@@ -18,7 +18,9 @@ async def test_get_friends_success(plugin, read, write):
     read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
     plugin.get_friends.return_value = async_return_value([
         UserInfo("3", "Jan", "https://avatar.url/u3", None),
-        UserInfo("5", "Ola", None, "https://profile.url/u5")
+        UserInfo("5", "Ola", None, "https://profile.url/u5"),
+        UserInfo("6", "Ola2", None),
+        UserInfo("7", "Ola3"),
     ])
     await plugin.run()
     plugin.get_friends.assert_called_with()
@@ -30,7 +32,9 @@ async def test_get_friends_success(plugin, read, write):
             "result": {
                 "friend_info_list": [
                     {"user_id": "3", "user_name": "Jan", "avatar_url": "https://avatar.url/u3"},
-                    {"user_id": "5", "user_name": "Ola", "profile_url": "https://profile.url/u5"}
+                    {"user_id": "5", "user_name": "Ola", "profile_url": "https://profile.url/u5"},
+                    {"user_id": "6", "user_name": "Ola2"},
+                    {"user_id": "7", "user_name": "Ola3"},
                 ]
             }
         }

tests/test_local_size.py

@@ -19,7 +19,7 @@ async def test_get_local_size_success(plugin, read, write):
     }
     read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
     plugin.get_local_size.side_effect = [
-        async_return_value(100000000000),
+        async_return_value(100000000000, 1),
         async_return_value(None),
         async_return_value(3333333)
     ]
@@ -89,12 +89,15 @@ async def test_get_local_size_error(exception, code, message, plugin, read, writ
     plugin.get_local_size.assert_called()
     plugin.local_size_import_complete.assert_called_once_with()
 
-    assert get_messages(write) == [
+    direct_response = {
-        {
+        "jsonrpc": "2.0",
-            "jsonrpc": "2.0",
+        "id": request_id,
-            "id": request_id,
+        "result": None
-            "result": None
+    }
-        },
+    responses = get_messages(write)
+    assert direct_response in responses
+    responses.remove(direct_response)
+    assert responses == [
         {
             "jsonrpc": "2.0",
             "method": "local_size_import_failure",
@@ -145,6 +148,7 @@ async def test_prepare_get_local_size_context_error(plugin, read, write):
 @pytest.mark.asyncio
 async def test_import_already_in_progress_error(plugin, read, write):
     plugin.prepare_local_size_context.return_value = async_return_value(None)
+    plugin.get_local_size.return_value = async_return_value(100, 5)
     requests = [
         {
             "jsonrpc": "2.0",
@@ -185,4 +189,3 @@ async def test_import_already_in_progress_error(plugin, read, write):
             "message": "Import already in progress"
         }
     } in responses
-