Merge branch 'release/1.1.1'

resources/tools/util_scripts/ftp_game_list.py

@@ -9,15 +9,14 @@
 if '\util_scripts' not in os.getcwd():
 	os.chdir('./resources/tools/util_scripts/')
 
-mock = False
 mock_data_file = '../util_resources/mock_ftp_game_list_response.txt'
 user_settings_file = '../../../settings/ftp_settings.txt'
 ftp_game_list = ''
 
 psxiso_path  = '/dev_hdd0/PSISO/'
 ps2iso_path = '/dev_hdd0/PS2ISO/'
 ps3iso_path = '/dev_hdd0/PS3ISO/'
-psn_games_path = '/dev_hdd0/games/'
+psn_games_path = '/dev_hdd0/game/'
 
 psxlines = []
 ps2lines = []
@@ -31,6 +30,7 @@
 
 		ps3_lan_ip = json_data['ps3_lan_ip']
 		ftp_timeout = json_data['ftp_timeout']
+		use_mock_data = json_data['use_mock_data']
 		show_psx_list = json_data['show_psx_list']
 		show_ps2_list = json_data['show_ps2_list']
 		show_ps3_list = json_data['show_ps3_list']
@@ -59,7 +59,7 @@
 		print('ERROR: ' + error_message)
 		print('Check your PS3 FTP-IP in webMAN (hold SELECT for 2-3s), then update the /setting/ftp_settings.txt.\n')
 
-	if mock is True:
+	if user_mock_data is True:
 		print('\nUsing PS2 ISO mock data.')
 		os.system("pause")
 
@@ -139,7 +139,8 @@ def iso_filter(list_of_files):
 
 	if len(psnlines) > 0:
 		for game_name in psnlines:
-			psn_list = psn_list + (psn_games_path + game_name) + '\n'
+			if not game_name in ['.', '..']:
+				psn_list = psn_list + (psn_games_path + game_name) + '\n'
 		psn_list = psn_list + '\n'
 	else:
 		psn_list = psn_list + ('No PSN games found.\n')

settings/ftp_settings.txt

@@ -1,6 +1,7 @@
 {
   "ps3_lan_ip": "10.251.40.200",
   "ftp_timeout": 5,
+  "use_mock_data": false,
   "show_psx_list": true,
   "show_ps2_list": true,
   "show_ps3_list": true,