diff --git a/core/item.py b/core/item.py index c8411533..a2b119e3 100644 --- a/core/item.py +++ b/core/item.py @@ -350,7 +350,7 @@ class Item(object): def fromurl(self, url): """ Generate an item from a text string. The string can be created by the tourl () function or have -        the old format: plugin: //plugin.video.kod/? channel = ... (+ other parameters) + the old format: plugin: //plugin.video.kod/? channel = ... (+ other parameters) Use: item.fromurl("string") @param url: url diff --git a/lib/guessit/rules/properties/country.py b/lib/guessit/rules/properties/country.py index 172c2990..4084aee6 100644 --- a/lib/guessit/rules/properties/country.py +++ b/lib/guessit/rules/properties/country.py @@ -33,7 +33,7 @@ def country(config, common_words): return CountryFinder(allowed_countries, common_words).find(string) rebulk.functional(find_countries, - #  Prefer language and any other property over country if not US or GB. + # Prefer language and any other property over country if not US or GB. conflict_solver=lambda match, other: match if other.name != 'language' or match.value not in (babelfish.Country('US'), babelfish.Country('GB')) diff --git a/lib/guessit/test/episodes.yml b/lib/guessit/test/episodes.yml index 4bbbde4a..44db98b0 100644 --- a/lib/guessit/test/episodes.yml +++ b/lib/guessit/test/episodes.yml @@ -1370,13 +1370,13 @@ video_codec: Xvid release_group: Etc-Group type: movie - # Fallback to movie type because we can't tell it's a series ... + # Fallback to movie type because we can't tell it's a series ... ? Show.Name.Part.1.and.Part.2.Blah-Group : part: [1, 2] title: Show Name type: movie - # Fallback to movie type because we can't tell it's a series ... + # Fallback to movie type because we can't tell it's a series ... ? Show Name - 01 - Ep Name : episode: 1 diff --git a/lib/guessit/test/various.yml b/lib/guessit/test/various.yml index 6fb58deb..4cf1fd4e 100644 --- a/lib/guessit/test/various.yml +++ b/lib/guessit/test/various.yml @@ -544,7 +544,7 @@ episode: - 1 - 7 - episode_title: FooBar-Group # Make sure it doesn't conflict with uuid + episode_title: FooBar-Group # Make sure it doesn't conflict with uuid season: 1 title: Test type: episode diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index 029f8b2a..0d1c415a 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -441,13 +441,13 @@ def set_view_mode(item, parent_item): def set_infolabels(listitem, item, player=False): """ Method to pass the information to the listitem (see tmdb.set_InfoLabels()) -    item.infoLabels is a dictionary with the key / value pairs described in: -    http://mirrors.xbmc.org/docs/python-docs/14.x-helix/xbmcgui.html#ListItem-setInfo -    https://kodi.wiki/view/InfoLabels -    @param listitem: xbmcgui.ListItem object -    @type listitem: xbmcgui.ListItem -    @param item: Item object that represents a movie, series or chapter -    @type item: item + item.infoLabels is a dictionary with the key / value pairs described in: + http://mirrors.xbmc.org/docs/python-docs/14.x-helix/xbmcgui.html#ListItem-setInfo + https://kodi.wiki/view/InfoLabels + @param listitem: xbmcgui.ListItem object + @type listitem: xbmcgui.ListItem + @param item: Item object that represents a movie, series or chapter + @type item: item """ infoLabels_dict = {'aired': 'aired', 'album': 'album', 'artist': 'artist', 'cast': 'cast', @@ -482,31 +482,31 @@ def set_infolabels(listitem, item, player=False): def set_context_commands(item, item_url, parent_item, **kwargs): """ Function to generate context menus. -        1. Based on the data in item.context -            a. Old method item.context type str separating options by "|" (example: item.context = "1 | 2 | 3") -                (only predefined) -            b. List method: item.context is a list with the different menu options: -                - Predefined: A predefined option will be loaded with a name. -                    item.context = ["1", "2", "3"] + 1. Based on the data in item.context + a. Old method item.context type str separating options by "|" (example: item.context = "1 | 2 | 3") + (only predefined) + b. List method: item.context is a list with the different menu options: + - Predefined: A predefined option will be loaded with a name. + item.context = ["1", "2", "3"] -                - dict (): The current item will be loaded modifying the fields included in the dict () in case of -                    modify the channel and action fields these will be saved in from_channel and from_action. -                    item.context = [{"title": "Name of the menu", "action": "action of the menu", "channel": "menu channel"}, {...}] + - dict (): The current item will be loaded modifying the fields included in the dict () in case of + modify the channel and action fields these will be saved in from_channel and from_action. + item.context = [{"title": "Name of the menu", "action": "action of the menu", "channel": "menu channel"}, {...}] -        2. Adding options according to criteria -            Options can be added to the context menu to items that meet certain conditions. + 2. Adding options according to criteria + Options can be added to the context menu to items that meet certain conditions. -        3. Adding options to all items -            Options can be added to the context menu for all items + 3. Adding options to all items + Options can be added to the context menu for all items -        4. You can disable the context menu options by adding a command 'no_context' to the item.context. -            The options that Kodi, the skin or another added add to the contextual menu cannot be disabled. + 4. You can disable the context menu options by adding a command 'no_context' to the item.context. + The options that Kodi, the skin or another added add to the contextual menu cannot be disabled. -    @param item: element that contains the contextual menus -    @type item: item -    @param parent_item: -    @type parent_item: item + @param item: element that contains the contextual menus + @type item: item + @param parent_item: + @type parent_item: item """ context_commands = [] # num_version_xbmc = config.get_platform(True)['num_version'] @@ -821,9 +821,9 @@ def show_channel_settings(**kwargs): def show_video_info(*args, **kwargs): """ It shows a window with the info of the video. -    The parameters passed to it can be seen in the method that is called + The parameters passed to it can be seen in the method that is called -    @return: returns the window with the elements + @return: returns the window with the elements @rtype: InfoWindow """ diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index a89b9f0a..7096e7e8 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -2017,7 +2017,7 @@ msgid "Yes, the option to display merged or split results by channels can be fou msgstr "" msgctxt "#60467" -msgid "To report a problem on'https://t.me/kodiondemand' you need to:|the version you're using of Alpha.|The version you're using of Kodi, mediaserver, etc.|the version and name of the operating system you're using.|The name of the skin (in case you're using Kodi) and whether using the default skin has solved the problem.|Description of the problem and any test cases.To activate the log in detailed mode, go to:|Configuration.|Preferences.|In the General tab - Check the option: Generate detailed log. The detailed log file can be found in the following path: \n\n%s" +msgid "To report a problem on'https://t.me/kodiondemand' you need to:|the version you're using of Alpha.|The version you're using of Kodi, mediaserver, etc.|the version and name of the operating system you're using.|The name of the skin (in case you're using Kodi) and whether using the default skin has solved the problem.|Description of the problem and any test cases.To activate the log in detailed mode, go to:|Configuration.|Preferences.|In the General tab - Check the option: Generate detailed log. The detailed log file can be found in the following path: \n\n%s" msgstr "" msgctxt "#60468" diff --git a/resources/language/resource.language.it_it/strings.po b/resources/language/resource.language.it_it/strings.po index 715aaf3d..25328b8b 100644 --- a/resources/language/resource.language.it_it/strings.po +++ b/resources/language/resource.language.it_it/strings.po @@ -2016,7 +2016,7 @@ msgid "Yes, the option to display merged or split results by channels can be fou msgstr "Sì, l'opzione per mostrare i risultati uniti o divisi per canali si trova in 'Impostazioni>Impostazioni ricerca globale>Altre impostazioni'. Vuoi accedere a queste impostazioni?" msgctxt "#60467" -msgid "To report a problem on'https://t.me/kodiondemand' you need to:|the version you're using of Alpha.|The version you're using of Kodi, mediaserver, etc.|the version and name of the operating system you're using.|The name of the skin (in case you're using Kodi) and whether using the default skin has solved the problem.|Description of the problem and any test cases.To activate the log in detailed mode, go to:|Configuration.|Preferences.|In the General tab - Check the option: Generate detailed log. The detailed log file can be found in the following path: \n\n%s" +msgid "To report a problem on'https://t.me/kodiondemand' you need to:|the version you're using of Alpha.|The version you're using of Kodi, mediaserver, etc.|the version and name of the operating system you're using.|The name of the skin (in case you're using Kodi) and whether using the default skin has solved the problem.|Description of the problem and any test cases.To activate the log in detailed mode, go to:|Configuration.|Preferences.|In the General tab - Check the option: Generate detailed log. The detailed log file can be found in the following path: \n\n%s" msgstr "Per segnalare un problema su 'https://t.me/kodiondemand' è necessario:|la versione che si sta usando di Kodi on Demand.|La versione che si sta usando di Kodi, mediaserver, ecc.|la versione e il nome del sistema operativo che si sta usando.|Il nome della skin (nel caso in cui si stia usando Kodi) e se l'utilizzo della skin predefinita ha risolto il problema.|La descrizione del problema e tutti i casi di test.Per attivare il log in modalità dettagliata, andare su:|Configurazione.|Preferenze.|Nella scheda Generale - Selezionare l'opzione: Genera log dettagliato Il file di log dettagliato si trova nel seguente percorso: \n\n%s" msgctxt "#60468" diff --git a/specials/downloads.py b/specials/downloads.py index 45dd43a4..fc6ec34f 100644 --- a/specials/downloads.py +++ b/specials/downloads.py @@ -477,15 +477,15 @@ def get_server_position(server): def get_match_list(data, match_list, order_list=None, only_ascii=False, ignorecase=False): """ Search for matches in a text string, with a dictionary of "ID" / "List of search strings": -    {"ID1": ["String 1", "String 2", "String 3"], -      "ID2": ["String 4", "String 5", "String 6"] -    } + {"ID1": ["String 1", "String 2", "String 3"], + "ID2": ["String 4", "String 5", "String 6"] + } -    The dictionary could not contain the same search string in several IDs. -    The search is performed in order of search string size (from longest to shortest) if a string matches, -    it is removed from the search string for the following, so that two categories are not detected if one string is part of another: -    for example: "Spanish Language" and "Spanish" if the first appears in the string "Pablo knows how to speak the Spanish Language" -    It will match "Spanish Language" but not "Spanish" since the longest match has priority. + The dictionary could not contain the same search string in several IDs. + The search is performed in order of search string size (from longest to shortest) if a string matches, + it is removed from the search string for the following, so that two categories are not detected if one string is part of another: + for example: "Spanish Language" and "Spanish" if the first appears in the string "Pablo knows how to speak the Spanish Language" + It will match "Spanish Language" but not "Spanish" since the longest match has priority. """ match_dict = dict()