Skip to content

Extraction of settings access into own module #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leonsbane wants to merge 3 commits into
base: release-0.9.x-python2
Choose a base branch
from
Open

Extraction of settings access into own module #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19122a2
move configuration access (paths, user settings) into own python package
leonsbane May 13, 2021
49a7bfe
Merge branch 'release-0.9.x-python2' into feature/own_config_module
leonsbane May 24, 2021
ca354f4
Merge branch 'release-0.9.x-python2' into feature/own_config_module
leonsbane May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev-scrapers/scrap_MobyGames_list_platforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = MobyGames(common.settings)
scraper_obj = MobyGames()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/scrap_ScreenScraper_clean_JSON_URLs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
json_data = json.loads(json_str)

set_log_level(LOG_DEBUG)
scraper_obj = ScreenScraper(common.settings)
scraper_obj = ScreenScraper()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/scrap_ScreenScraper_get_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = ScreenScraper(common.settings)
scraper_obj = ScreenScraper()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/scrap_ScreenScraper_list_languages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
else:
set_log_level(LOG_DEBUG)
# --- Create scraper object ---
scraper_obj = ScreenScraper(common.settings)
scraper_obj = ScreenScraper()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/scrap_ScreenScraper_list_media_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
else:
set_log_level(LOG_DEBUG)
# --- Create scraper object ---
scraper_obj = ScreenScraper(common.settings)
scraper_obj = ScreenScraper()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/scrap_ScreenScraper_list_platforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = ScreenScraper(common.settings)
scraper_obj = ScreenScraper()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/scrap_ScreenScraper_list_regions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
else:
set_log_level(LOG_DEBUG)
# --- Create scraper object ---
scraper_obj = ScreenScraper(common.settings)
scraper_obj = ScreenScraper()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/scrap_TGDB_list_platforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = TheGamesDB(common.settings)
scraper_obj = TheGamesDB()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/test_AEL_offline_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
print('Setting scraper_aeloffline_addon_code_dir = "{}"'.format(path))

# --- Create scraper object ---
scraper_obj = AEL_Offline(common.settings)
scraper_obj = AEL_Offline()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/test_ArcadeDB_asset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = ArcadeDB(common.settings)
scraper_obj = ArcadeDB()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/test_ArcadeDB_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = ArcadeDB(common.settings)
scraper_obj = ArcadeDB()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/test_GameFAQs_asset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = GameFAQs(common.settings)
scraper_obj = GameFAQs()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/test_GameFAQs_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = GameFAQs(common.settings)
scraper_obj = GameFAQs()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/test_MobyGames_asset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = MobyGames(common.settings)
scraper_obj = MobyGames()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/test_MobyGames_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = MobyGames(common.settings)
scraper_obj = MobyGames()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/test_ScreenScraper_asset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = ScreenScraper(common.settings)
scraper_obj = ScreenScraper()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
scraper_obj.set_debug_checksums(True, '414FA339', '9db5682a4d778ca2cb79580bdb67083f',
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/test_ScreenScraper_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = ScreenScraper(common.settings)
scraper_obj = ScreenScraper()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
scraper_obj.set_debug_checksums(True,
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/test_TGDB_asset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = TheGamesDB(common.settings)
scraper_obj = TheGamesDB()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
2 changes: 1 addition & 1 deletion dev-scrapers/test_TGDB_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
set_log_level(LOG_DEBUG)

# --- Create scraper object ---
scraper_obj = TheGamesDB(common.settings)
scraper_obj = TheGamesDB()
scraper_obj.set_verbose_mode(False)
scraper_obj.set_debug_file_dump(True, os.path.join(os.path.dirname(__file__), 'assets'))
status_dic = kodi_new_status_dic('Scraper test was OK')
Expand Down
13 changes: 7 additions & 6 deletions resources/disk_IO.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from .misc import *
from .utils import *
from .assets import *
from settings.config import Appconfig, Userconfig, Config

# --- Python standard library ---
import copy
Expand Down Expand Up @@ -1296,9 +1297,9 @@ def fs_read_launcher_NFO(nfo_FN):
return launcher_dic

# Returns a FileName object
def fs_get_launcher_NFO_name(settings, launcher):
def fs_get_launcher_NFO_name(launcher):
launcher_name = launcher['m_name']
nfo_dir = settings['launchers_asset_dir']
nfo_dir = Config.get(Userconfig.LAUNCHERS_ASSET_DIR)
nfo_FN = FileName(os.path.join(nfo_dir, launcher_name + '.nfo'))
return nfo_FN

Expand Down Expand Up @@ -1340,9 +1341,9 @@ def fs_import_category_NFO(nfo_FN, categories, categoryID):
return True

# Returns a FileName object.
def fs_get_category_NFO_name(settings, category):
def fs_get_category_NFO_name(category):
category_name = category['m_name']
nfo_dir = settings['categories_asset_dir']
nfo_dir = Config.get(Userconfig.CATEGORIES_ASSET_DIR)
nfo_FN = FileName(os.path.join(nfo_dir, category_name + '.nfo'))
return nfo_FN

Expand Down Expand Up @@ -1380,8 +1381,8 @@ def fs_import_collection_NFO(nfo_FileName, collections, launcherID):
update_dic_with_NFO_str(nfo_str, 'plot', nfo_dic, 'm_plot')
return True

def fs_get_collection_NFO_name(settings, collection):
def fs_get_collection_NFO_name(collection):
collection_name = collection['m_name']
nfo_dir = settings['collections_asset_dir']
nfo_dir = Config.get(Userconfig.COLLECTIONS_ASSET_DIR)
nfo_FN = FileName(os.path.join(nfo_dir, collection_name + '.nfo'))
return nfo_FN
Loading