Merge branch 'develop'

.gitignore

@@ -1,7 +1,8 @@
-# ==========================================
-# Eclipse
-# ==========================================
 
+# Created by https://www.gitignore.io/api/pydev,python,pycharm,windows,eclipse
+# Edit at https://www.gitignore.io/?templates=pydev,python,pycharm,windows,eclipse
+
+### Eclipse ###
 .metadata
 bin/
 tmp/
@@ -13,7 +14,6 @@ local.properties
 .settings/
 .loadpath
 .recommenders
-.project
 
 # External tool builders
 .externalToolBuilders/
@@ -59,10 +59,111 @@ local.properties
 .scala_dependencies
 .worksheet
 
-# ==========================================
-# Python
-# ==========================================
+### Eclipse Patch ###
+# Eclipse Core
+.project
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Annotation Processing
+.apt_generated
+
+.sts4-cache/
+
+### PyCharm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+.idea/
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
 
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### PyCharm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/**/sonarlint/
+
+# SonarQube Plugin
+.idea/**/sonarIssues.xml
+
+# Markdown Navigator plugin
+.idea/**/markdown-navigator.xml
+.idea/**/markdown-navigator/
+
+### pydev ###
+.pydevproject
+
+### Python ###
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -85,6 +186,7 @@ parts/
 sdist/
 var/
 wheels/
+pip-wheel-metadata/
 share/python-wheels/
 *.egg-info/
 .installed.cfg
@@ -118,15 +220,6 @@ coverage.xml
 *.mo
 *.pot
 
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-
-# Flask stuff:
-instance/
-.webassets-cache
-
 # Scrapy stuff:
 .scrapy
 
@@ -136,38 +229,32 @@ docs/_build/
 # PyBuilder
 target/
 
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
 # pyenv
 .python-version
 
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
 # celery beat schedule file
 celerybeat-schedule
 
 # SageMath parsed files
 *.sage.py
 
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
 # Spyder project settings
 .spyderproject
 .spyproject
 
 # Rope project settings
 .ropeproject
 
+# Mr Developer
+.mr.developer.cfg
+
 # mkdocs documentation
 /site
 
@@ -178,4 +265,32 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
-script.module.simplemedia/
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.gitignore.io/api/pydev,python,pycharm,windows,eclipse
+

context.united.search.search/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="context.united.search.search" version="0.1.1" name="United Search Context: Search" provider-name="vl.maksime">
+<addon id="context.united.search.search" version="0.1.2" name="United Search Context: Search" provider-name="vl.maksime">
     <requires>
         <import addon="plugin.video.united.search" version="0.2.2"/>
     </requires>

context.united.search.search/context_search.py

@@ -42,8 +42,9 @@ def main():
         else:
             keyword = ''
 
+    cont_edit_keyword = plugin.get_setting('cont_edit_keyword')
 
-    if keyword and plugin.cont_edit_keyword:
+    if keyword and cont_edit_keyword:
         kbd = xbmc.Keyboard()
         kbd.setDefault(keyword)
         kbd.setHeading(_('Search'))

plugin.video.united.search/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.united.search" version="0.2.5" name="United Search" provider-name="vl.maksime">
+<addon id="plugin.video.united.search" version="0.3.1" name="United Search" provider-name="vl.maksime">
     <requires>
         <import addon="xbmc.python" version="2.19.0"/>
         <import addon="script.module.simpleplugin" version="2.2.0"/>
@@ -22,7 +22,7 @@
         <forum>http://xbmc.ru/forum/showthread.php?t=14278</forum>
         <email>[email protected]</email>
         <source>https://github.com/vlmaksime/plugin.video.united.search</source>
-        <news>v0.2.5 (2019-08-09)[CR]- Добавлена поддержка "красивых ссылок"[CR][CR]v0.2.4 (2018-10-21)[CR]- Исправлены выявленные ошибки[CR][CR]v0.2.3 (2018-10-07)[CR]- Пункты контекстного меню вынесены в отдельные дополнения[CR][CR]v0.2.2 (2017-07-02)[CR]- Доработан механизм обучения и поиска в дополнениях без встроенной поддержки</news>
+        <news>v0.3.1 (2021-05-31)[CR]- Добавлена совместимость с Kodi 19</news>
         <assets>
             <icon>icon.png</icon>
             <screenshot>resources\media\screenshot-01.jpg</screenshot>

plugin.video.united.search/changelog.txt

@@ -1,3 +1,6 @@
+v0.3.1 (2021-05-31)
+- Добавлена совместимость с Kodi 19
+
 v0.2.5 (2019-08-09)
 - Добавлена поддержка "красивых ссылок"
 

plugin.video.united.search/default.py

@@ -11,7 +11,7 @@
 
 @plugin.action()
 def root( params ):
-    return plugin.create_listing(__list_root(), content='files')
+    plugin.create_directory(__list_root(), content='files')
 
 def __list_root():
     items = [ {'action': 'search',           'label': _('New Search'), 'is_folder': False},