Skip to content

Commit 63cfbb2

Browse files
Wintermute0110Wintermute0110
committed
Update scrapers for Python 3.
1 parent a2a928c commit 63cfbb2

29 files changed

+542
-477
lines changed

‎changelog.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,13 @@ FEATURE [CORE] Disable Kodi screensaver when launching and reenable after app f
179179

180180
FEATURE Add support to remove unneeded blank spaces in `dev-core/check_line_endings.py`.
181181

182+
FEATURE In the ROMs CM add a menu to edit all assets as once, including scraping
183+
all assets at once.
184+
See https://github.com/Wintermute0110/plugin.program.AEL/issues/140
185+
186+
FIX Check issue #142, TGDB scraper not working well.
187+
The issue was a bug with TGDB engine and has been fixed.
188+
182189
FIX Fix TheGamesDB scraper. New asset titlescreen in TheGamesDB.
183190
See https://forums.thegamesdb.net/viewtopic.php?f=5&t=1947
184191
See https://github.com/Wintermute0110/plugin.program.AEL/issues/127

‎dev-core/test_multidisc_parser.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
# Test the parser for multidisc support.
1616

17-
1817
# --- Import AEL modules ---
1918
import os, sys
2019
if __name__ == "__main__" and __package__ is None:

‎dev-scrapers/common.py‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
# -*- coding: utf-8 -*-
22

3-
#
43
# Common data to test the scrapers.
5-
#
6-
from __future__ import unicode_literals
7-
import sys
4+
5+
from resources.misc import *
86

97
settings = {
108
# --- AEL Offline ---
@@ -36,6 +34,9 @@
3634
'ff7' : ('Final Fantasy VII', 'Final Fantasy VII (USA) (Disc 1).iso', 'Sony PlayStation'),
3735
'console_wrong_title' : ('Console invalid game', 'mjhyewqr.zip', 'Sega MegaDrive'),
3836
'console_wrong_platform' : ('Sonic the Hedgehog', 'Sonic the Hedgehog (USA, Europe).zip', 'mjhyewqr'),
37+
# Test Github AEL issue #142
38+
'bforever' : ('batman forever', 'batman forever.zip', 'Unknown'),
39+
'bforever_snes' : ('batman forever', 'batman forever.zip', 'Nintendo SNES'),
3940

4041
# MAME games
4142
'atetris' : ('Tetris (set 1)', 'atetris.zip', 'MAME'),
@@ -45,9 +46,16 @@
4546
'MAME_wrong_platform' : ('Tetris (set 1)', 'atetris.zip', 'mjhyewqr'),
4647
}
4748

48-
def handle_get_candidates(candidate_list, status_dic):
49-
if not status_dic['status']:
50-
print('Status error "{}"'.format(status_dic['msg']))
49+
def abort_on_error(st_dic):
50+
if st_dic['abort']:
51+
print('st_dic abort dialog "{}"'.format(st_dic['dialog']))
52+
print('st_dic abort msg "{}"'.format(st_dic['msg']))
53+
sys.exit(0)
54+
55+
def handle_get_candidates(candidate_list, st_dic):
56+
if st_dic['abort']:
57+
print('st_dic abort dialog "{}"'.format(st_dic['dialog']))
58+
print('st_dic abort msg "{}"'.format(st_dic['msg']))
5159
sys.exit(0)
5260
if candidate_list is None:
5361
print('Error/exception in get_candidates(). Exiting.')

‎dev-scrapers/data/MobyGames_platforms.csv‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ID,Name
1313
60,Amstrad CPC
1414
136,Amstrad PCW
1515
91,Android
16+
286,Antstream
1617
245,Apple I
1718
31,Apple II
1819
51,Apple IIgs
@@ -31,11 +32,13 @@ ID,Name
3132
160,Bally Astrocade
3233
165,BeOS
3334
90,BlackBerry
35+
290,Blacknut
3436
168,Blu-ray Disc Player
3537
84,Browser
3638
231,Bubble
3739
73,CD-i
3840
83,CDTV
41+
216,COSMAC
3942
261,CP/M
4043
154,Camputers Lynx
4144
124,Casio Loopy
@@ -49,12 +52,14 @@ ID,Name
4952
115,Commodore 16, Plus/4
5053
27,Commodore 64
5154
77,Commodore PET/CBM
55+
277,Compal 80
5256
243,Compucolor I
5357
198,Compucolor II
5458
238,Compucorp Programmable Calculator
5559
212,CreatiVision
5660
2,DOS
5761
166,DVD Player
62+
285,Danger OS
5863
204,Dedicated console
5964
205,Dedicated handheld
6065
184,Didj
@@ -67,12 +72,12 @@ ID,Name
6772
137,Epoch Cassette Vision
6873
139,Epoch Game Pocket Computer
6974
138,Epoch Super Cassette Vision
75+
284,Evercade
7076
70,ExEn
7177
195,Exelvision
7278
176,Exidy Sorcerer
7379
102,FM Towns
7480
126,FM-7
75-
216,FRED/COSMAC
7681
159,Fire OS
7782
268,Freebox
7883
251,GIMINI
@@ -92,6 +97,7 @@ ID,Name
9297
155,GameStick
9398
16,Genesis
9499
55,Gizmondo
100+
292,Gloud
95101
172,Glulx
96102
167,HD DVD Player
97103
219,HP 9800
@@ -106,6 +112,7 @@ ID,Name
106112
224,Intel 8008
107113
225,Intel 8080
108114
30,Intellivision
115+
295,Interact Model One
109116
221,Interton Video 2000
110117
64,J2ME
111118
17,Jaguar
@@ -119,6 +126,7 @@ ID,Name
119126
186,LeapTV
120127
183,Leapster
121128
1,Linux
129+
297,Luna
122130
18,Lynx
123131
240,MOS Technology 6502
124132
229,MRE
@@ -134,6 +142,7 @@ ID,Name
134142
97,Microvision
135143
71,Mophun
136144
235,Motorola 6800
145+
275,Motorola 68k
137146
32,N-Gage
138147
89,N-Gage (service)
139148
22,NES
@@ -142,6 +151,7 @@ ID,Name
142151
54,Neo Geo CD
143152
52,Neo Geo Pocket
144153
53,Neo Geo Pocket Color
154+
279,Neo Geo X
145155
174,New Nintendo 3DS
146156
177,NewBrain
147157
207,Newton
@@ -159,6 +169,7 @@ ID,Name
159169
75,Odyssey
160170
78,Odyssey 2
161171
178,Ohio Scientific
172+
282,OnLive
162173
270,Orao
163174
111,Oric
164175
144,Ouya
@@ -178,7 +189,10 @@ ID,Name
178189
7,PlayStation 2
179190
81,PlayStation 3
180191
141,PlayStation 4
192+
288,PlayStation 5
193+
294,PlayStation Now
181194
107,Playdia
195+
291,Plex Arcade
182196
230,Pokitto
183197
152,Pokémon Mini
184198
249,Poly-88
@@ -203,14 +217,18 @@ ID,Name
203217
121,Sharp X1
204218
106,Sharp X68000
205219
202,Sharp Zaurus
220+
278,Signetics 2650
206221
131,Sinclair QL
207222
190,Socrates
208223
199,Sol-20
209224
134,Sord M5
210225
85,Spectravideo
226+
281,Stadia
211227
110,Super A'can
228+
296,Super Vision 8000
212229
127,SuperGrafx
213230
109,Supervision
231+
287,Sure Shot HD
214232
67,Symbian
215233
171,TADS
216234
239,TI Programmable Calculator
@@ -219,6 +237,7 @@ ID,Name
219237
58,TRS-80
220238
62,TRS-80 CoCo
221239
193,TRS-80 MC-10
240+
283,Taito X-55
222241
150,Tatung Einstein
223242
223,Tektronix 4050
224243
220,Tele-Spiel ES-2201
@@ -255,14 +274,18 @@ ID,Name
255274
191,XaviXPORT
256275
13,Xbox
257276
69,Xbox 360
277+
293,Xbox Cloud Gaming
258278
142,Xbox One
279+
289,Xbox Series
259280
254,Xerox Alto
260281
169,Z-machine
261282
41,ZX Spectrum
283+
280,ZX Spectrum Next
262284
118,ZX80
263285
119,ZX81
264286
88,Zeebo
265287
227,Zilog Z80
288+
276,Zilog Z8000
266289
68,Zodiac
267290
211,Zune
268291
99,bada

‎dev-scrapers/data/MobyGames_platforms.txt‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Number of MobyGames platforms 274
1+
Number of MobyGames platforms 297
22

33
ID Name
44
--------------------------------------------
@@ -16,6 +16,7 @@ ID Name
1616
60 Amstrad CPC
1717
136 Amstrad PCW
1818
91 Android
19+
286 Antstream
1920
245 Apple I
2021
31 Apple II
2122
51 Apple IIgs
@@ -34,11 +35,13 @@ ID Name
3435
160 Bally Astrocade
3536
165 BeOS
3637
90 BlackBerry
38+
290 Blacknut
3739
168 Blu-ray Disc Player
3840
84 Browser
3941
231 Bubble
4042
73 CD-i
4143
83 CDTV
44+
216 COSMAC
4245
261 CP/M
4346
154 Camputers Lynx
4447
124 Casio Loopy
@@ -52,12 +55,14 @@ ID Name
5255
115 Commodore 16, Plus/4
5356
27 Commodore 64
5457
77 Commodore PET/CBM
58+
277 Compal 80
5559
243 Compucolor I
5660
198 Compucolor II
5761
238 Compucorp Programmable Calculator
5862
212 CreatiVision
5963
2 DOS
6064
166 DVD Player
65+
285 Danger OS
6166
204 Dedicated console
6267
205 Dedicated handheld
6368
184 Didj
@@ -70,12 +75,12 @@ ID Name
7075
137 Epoch Cassette Vision
7176
139 Epoch Game Pocket Computer
7277
138 Epoch Super Cassette Vision
78+
284 Evercade
7379
70 ExEn
7480
195 Exelvision
7581
176 Exidy Sorcerer
7682
102 FM Towns
7783
126 FM-7
78-
216 FRED/COSMAC
7984
159 Fire OS
8085
268 Freebox
8186
251 GIMINI
@@ -95,6 +100,7 @@ ID Name
95100
155 GameStick
96101
16 Genesis
97102
55 Gizmondo
103+
292 Gloud
98104
172 Glulx
99105
167 HD DVD Player
100106
219 HP 9800
@@ -109,6 +115,7 @@ ID Name
109115
224 Intel 8008
110116
225 Intel 8080
111117
30 Intellivision
118+
295 Interact Model One
112119
221 Interton Video 2000
113120
64 J2ME
114121
17 Jaguar
@@ -122,6 +129,7 @@ ID Name
122129
186 LeapTV
123130
183 Leapster
124131
1 Linux
132+
297 Luna
125133
18 Lynx
126134
240 MOS Technology 6502
127135
229 MRE
@@ -137,6 +145,7 @@ ID Name
137145
97 Microvision
138146
71 Mophun
139147
235 Motorola 6800
148+
275 Motorola 68k
140149
32 N-Gage
141150
89 N-Gage (service)
142151
22 NES
@@ -145,6 +154,7 @@ ID Name
145154
54 Neo Geo CD
146155
52 Neo Geo Pocket
147156
53 Neo Geo Pocket Color
157+
279 Neo Geo X
148158
174 New Nintendo 3DS
149159
177 NewBrain
150160
207 Newton
@@ -162,6 +172,7 @@ ID Name
162172
75 Odyssey
163173
78 Odyssey 2
164174
178 Ohio Scientific
175+
282 OnLive
165176
270 Orao
166177
111 Oric
167178
144 Ouya
@@ -181,7 +192,10 @@ ID Name
181192
7 PlayStation 2
182193
81 PlayStation 3
183194
141 PlayStation 4
195+
288 PlayStation 5
196+
294 PlayStation Now
184197
107 Playdia
198+
291 Plex Arcade
185199
230 Pokitto
186200
152 Pokémon Mini
187201
249 Poly-88
@@ -206,14 +220,18 @@ ID Name
206220
121 Sharp X1
207221
106 Sharp X68000
208222
202 Sharp Zaurus
223+
278 Signetics 2650
209224
131 Sinclair QL
210225
190 Socrates
211226
199 Sol-20
212227
134 Sord M5
213228
85 Spectravideo
229+
281 Stadia
214230
110 Super A'can
231+
296 Super Vision 8000
215232
127 SuperGrafx
216233
109 Supervision
234+
287 Sure Shot HD
217235
67 Symbian
218236
171 TADS
219237
239 TI Programmable Calculator
@@ -222,6 +240,7 @@ ID Name
222240
58 TRS-80
223241
62 TRS-80 CoCo
224242
193 TRS-80 MC-10
243+
283 Taito X-55
225244
150 Tatung Einstein
226245
223 Tektronix 4050
227246
220 Tele-Spiel ES-2201
@@ -258,14 +277,18 @@ ID Name
258277
191 XaviXPORT
259278
13 Xbox
260279
69 Xbox 360
280+
293 Xbox Cloud Gaming
261281
142 Xbox One
282+
289 Xbox Series
262283
254 Xerox Alto
263284
169 Z-machine
264285
41 ZX Spectrum
286+
280 ZX Spectrum Next
265287
118 ZX80
266288
119 ZX81
267289
88 Zeebo
268290
227 Zilog Z80
291+
276 Zilog Z8000
269292
68 Zodiac
270293
211 Zune
271294
99 bada

0 commit comments

Comments
 (0)