Merge lp:~mysterioustrashninja/wiithon/xenial-compatibility-update into lp:wiithon
- xenial-compatibility-update
- Merge into trunk
Proposed by
Eric Jones
Status: | Merged |
---|---|
Approved by: | Carlo Mandelli |
Approved revision: | 515 |
Merged at revision: | 512 |
Proposed branch: | lp:~mysterioustrashninja/wiithon/xenial-compatibility-update |
Merge into: | lp:wiithon |
Diff against target: |
952 lines (+136/-125) 28 files modified
Makefile (+3/-1) core.py (+6/-6) debian/changelog (+5/-0) doc/REVISION (+1/-1) gui.py (+8/-8) po/ca_ES.po (+5/-5) po/da_DK.po (+5/-5) po/de.po (+5/-5) po/en.po (+5/-5) po/es.po (+5/-5) po/eu_ES.po (+5/-5) po/fi_FI.po (+5/-5) po/fr.po (+5/-5) po/gl_ES.po (+5/-5) po/it.po (+5/-5) po/ja_JP.po (+5/-5) po/ko_KR.po (+5/-5) po/nb_NO.po (+5/-5) po/nl_NL.po (+5/-5) po/pt_BR.po (+5/-5) po/pt_PT.po (+5/-5) po/ru_RU.po (+5/-5) po/sv_SE.po (+5/-5) po/tr_TR.po (+5/-5) preferencias.py (+3/-3) util.py (+4/-0) wiitdb_schema.py (+1/-1) wiitdb_xml.py (+10/-10) |
To merge this branch: | bzr merge lp:~mysterioustrashninja/wiithon/xenial-compatibility-update |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Carlo Mandelli | Approve | ||
Review via email: mp+389993@code.launchpad.net |
Commit message
Updated to work with new versions of libraries and dev tools.
Description of the change
Created a wrapper function for sqlalchemy to handle new security enforcement.
Modified Makefile, since the bzr log format specified does not work any more.
To post a comment you must log in.
Revision history for this message
Eric Jones (mysterioustrashninja) wrote : | # |
Revision history for this message
Carlo Mandelli (camandel) wrote : | # |
LGTM. Thank you!
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile' |
2 | --- Makefile 2014-11-10 01:44:53 +0000 |
3 | +++ Makefile 2020-08-28 22:42:55 +0000 |
4 | @@ -204,9 +204,11 @@ |
5 | generate_changelog: |
6 | @ln -sf $(shell pwd)/recursos/bazaar-plugins/gnulog.py ~/.bazaar/plugins/gnulog.py |
7 | bzr log --log-format 'gnu' | sed -e "s/\(<.*@[^.]*\)>/\1\.fake>/g" > debian/changelog |
8 | + bzr log --gnu-changelog | sed -e "s/\(<.*@[^.]*\)>/\1\.fake>/g" > debian/changelog |
9 | @$(RM) ~/.bazaar/plugins/gnulog.py |
10 | |
11 | -deb: generate_changelog |
12 | +deb: |
13 | + #generate_changelog |
14 | debuild -b -uc -us -tc --lintian-opts -Ivi |
15 | |
16 | deb_sign: deb |
17 | |
18 | === modified file 'core.py' |
19 | --- core.py 2011-06-07 03:13:28 +0000 |
20 | +++ core.py 2020-08-28 22:42:55 +0000 |
21 | @@ -35,7 +35,7 @@ |
22 | cachos = linea.strip().split(config.SEPARADOR) |
23 | idgame = util.decode(cachos[0]) |
24 | sql = util.decode("idgame=='%s' and idParticion='%s'" % (idgame, particion.idParticion)) |
25 | - juego = session.query(Juego).filter(sql).first() |
26 | + juego = session.query(Juego).filter(util.sql_text(sql)).first() |
27 | if juego is not None: |
28 | # el juego ya existe, se borra |
29 | session.delete(juego) |
30 | @@ -76,7 +76,7 @@ |
31 | |
32 | # borrar TODOS los juegos de esta particion |
33 | query = session.query(Juego) |
34 | - query = query.filter("idParticion = %d" % particion.idParticion) |
35 | + query = query.filter(util.sql_text("idParticion = %d" % particion.idParticion)) |
36 | for juego in query: |
37 | session.delete(juego) |
38 | |
39 | @@ -104,14 +104,14 @@ |
40 | # borrar TODOS los juegos que no sean de las particiones encontradas |
41 | query = session.query(Juego) |
42 | for particion in listaParticiones: |
43 | - query = query.filter("idParticion <> %d" % particion.idParticion) |
44 | + query = query.filter(util.sql_text("idParticion <> %d" % particion.idParticion)) |
45 | for juego in query: |
46 | session.delete(juego) |
47 | |
48 | # borrar TODAS las particiones que no sean de las particiones encontradas |
49 | query = session.query(Particion) |
50 | for particion in listaParticiones: |
51 | - query = query.filter("idParticion <> %d" % particion.idParticion) |
52 | + query = query.filter(util.sql_text("idParticion <> %d" % particion.idParticion)) |
53 | for particion in query: |
54 | session.delete(particion) |
55 | |
56 | @@ -122,12 +122,12 @@ |
57 | |
58 | def getParticion(self, DEVICE): |
59 | sql = util.decode("device=='%s'" % (DEVICE)) |
60 | - particion = session.query(Particion).filter(sql).first() |
61 | + particion = session.query(Particion).filter(util.sql_text(sql)).first() |
62 | return particion |
63 | |
64 | def getJuego(self, DEVICE, IDGAME): |
65 | sql = util.decode("particion.device='%s' and juego.idgame=='%s'" % (DEVICE, IDGAME)) |
66 | - for juego, particion in session.query(Juego,Particion).filter(sql): |
67 | + for juego, particion in session.query(Juego,Particion).filter(util.sql_text(sql)): |
68 | return juego |
69 | return None |
70 | |
71 | |
72 | === added file 'debian/changelog' |
73 | --- debian/changelog 1970-01-01 00:00:00 +0000 |
74 | +++ debian/changelog 2020-08-28 22:42:55 +0000 |
75 | @@ -0,0 +1,5 @@ |
76 | +wiithon (1.1.1) UNRELEASED; urgency=medium |
77 | + |
78 | + Ran make deb. |
79 | + |
80 | + -- Eric Jones <eric.r.k.jones@gmail.com> Fri, 28 Aug 2020 16:21:04 -0600 |
81 | |
82 | === modified file 'doc/REVISION' |
83 | --- doc/REVISION 2014-11-10 01:44:53 +0000 |
84 | +++ doc/REVISION 2020-08-28 22:42:55 +0000 |
85 | @@ -1,1 +1,1 @@ |
86 | -511 |
87 | +513 |
88 | |
89 | === modified file 'gui.py' |
90 | --- gui.py 2011-06-07 22:33:11 +0000 |
91 | +++ gui.py 2020-08-28 22:42:55 +0000 |
92 | @@ -928,7 +928,7 @@ |
93 | exp_reg = "[A-Z0-9]{6}" |
94 | if (len(nuevoIDGAME) == 6) and re.match(exp_reg,nuevoIDGAME): |
95 | sql = util.decode('idgame=="%s" and idParticion=="%d"' % (nuevoIDGAME , self.sel_parti.obj.idParticion)) |
96 | - juego = session.query(Juego).filter(sql).first() |
97 | + juego = session.query(Juego).filter(util.sql_text(sql)).first() |
98 | if juego == None: |
99 | if ( self.question(_('TRADUCIR_ADVERTENCIA_SEGURIDAD_RENAME_IDGAME') , ('\n%s => %s') % (self.sel_juego.obj.idgame , nuevoIDGAME)) ): |
100 | if self.core.renombrarIDGAME( self.sel_juego.obj , nuevoIDGAME ): |
101 | @@ -1260,10 +1260,10 @@ |
102 | ordenaEnFecha = (self.core.prefs.ORDEN_INICIAL == 'F') |
103 | |
104 | if ordenaEnFecha: |
105 | - query = session.query(Juego).filter(sql) |
106 | + query = session.query(Juego).filter(util.sql_text(sql)) |
107 | else: |
108 | # ordenar por nombre |
109 | - query = session.query(Juego).filter(sql).order_by('lower(title)') |
110 | + query = session.query(Juego).filter(util.sql_text(sql)).order_by('lower(title)') |
111 | |
112 | # juego, playersWifi, playersLocal, fecha, rating, info |
113 | for juego in query: |
114 | @@ -1346,7 +1346,7 @@ |
115 | self.info.arriba_total = particion.total |
116 | |
117 | sql = util.decode('idParticion = %d' % particion.idParticion) |
118 | - self.info.arriba_num_juegos = session.query(Juego).filter(sql).count() |
119 | + self.info.arriba_num_juegos = session.query(Juego).filter(util.sql_text(sql)).count() |
120 | self.info.abajo_num_particiones = session.query(Particion).count() |
121 | else: |
122 | total = 0 |
123 | @@ -1850,9 +1850,9 @@ |
124 | |
125 | # cada juego del origen se busca en la lista de juegos de destino |
126 | sql = util.decode('idParticion = %d' % parti_origen.idParticion) |
127 | - for juego in session.query(Juego).filter(sql): |
128 | + for juego in session.query(Juego).filter(util.sql_text(sql)): |
129 | sql = util.decode('idgame = "%s" and idParticion = %d' % (juego.idgame, parti_destino.idParticion)) |
130 | - juegoDestino = session.query(Juego).filter(sql).first() |
131 | + juegoDestino = session.query(Juego).filter(util.sql_text(sql)).first() |
132 | if juegoDestino is None: |
133 | juegosParaClonar.append( juego ) |
134 | else: |
135 | @@ -1903,7 +1903,7 @@ |
136 | |
137 | # borrar caratulas no usadas |
138 | sql = util.decode('idgame=="%s"' % self.sel_juego.obj.idgame) |
139 | - if session.query(Juego).filter(sql).count() == 0: |
140 | + if session.query(Juego).filter(util.sql_text(sql)).count() == 0: |
141 | |
142 | # borrar disco FIXME borrar el disco de todos los tipos |
143 | for tipo in range(2): # 2 tipos de disco |
144 | @@ -2003,7 +2003,7 @@ |
145 | idgame = util.getMagicISO(fichero, self.core.getAutodetectarFormato(fichero)) |
146 | if idgame is not None: |
147 | sql = util.decode("idgame=='%s' and idParticion=='%d'" % (idgame , self.sel_parti.obj.idParticion)) |
148 | - juego = session.query(Juego).filter(sql).first() |
149 | + juego = session.query(Juego).filter(util.sql_text(sql)).first() |
150 | if juego is None: |
151 | ok = True |
152 | |
153 | |
154 | === modified file 'po/ca_ES.po' |
155 | --- po/ca_ES.po 2014-11-10 00:19:38 +0000 |
156 | +++ po/ca_ES.po 2020-08-28 22:42:55 +0000 |
157 | @@ -1844,23 +1844,23 @@ |
158 | msgid "Trabajo desconocido" |
159 | msgstr "Treball desconegut" |
160 | |
161 | -#: util.py:771 |
162 | +#: util.py:775 |
163 | msgid "3D cover" |
164 | msgstr "" |
165 | |
166 | -#: util.py:773 |
167 | +#: util.py:777 |
168 | msgid "Full cover" |
169 | msgstr "" |
170 | |
171 | -#: util.py:775 |
172 | +#: util.py:779 |
173 | msgid "Normal cover" |
174 | msgstr "" |
175 | |
176 | -#: util.py:779 |
177 | +#: util.py:783 |
178 | msgid "Custom disc" |
179 | msgstr "" |
180 | |
181 | -#: util.py:781 |
182 | +#: util.py:785 |
183 | msgid "Original disc" |
184 | msgstr "" |
185 | |
186 | |
187 | === modified file 'po/da_DK.po' |
188 | --- po/da_DK.po 2014-11-10 00:19:38 +0000 |
189 | +++ po/da_DK.po 2020-08-28 22:42:55 +0000 |
190 | @@ -1842,25 +1842,25 @@ |
191 | msgid "Trabajo desconocido" |
192 | msgstr "Ukendt format" |
193 | |
194 | -#: util.py:771 |
195 | +#: util.py:775 |
196 | msgid "3D cover" |
197 | msgstr "" |
198 | |
199 | -#: util.py:773 |
200 | +#: util.py:777 |
201 | msgid "Full cover" |
202 | msgstr "" |
203 | |
204 | -#: util.py:775 |
205 | +#: util.py:779 |
206 | #, fuzzy |
207 | msgid "Normal cover" |
208 | msgstr "Normal" |
209 | |
210 | -#: util.py:779 |
211 | +#: util.py:783 |
212 | #, fuzzy |
213 | msgid "Custom disc" |
214 | msgstr "Tilrette" |
215 | |
216 | -#: util.py:781 |
217 | +#: util.py:785 |
218 | #, fuzzy |
219 | msgid "Original disc" |
220 | msgstr "Original" |
221 | |
222 | === modified file 'po/de.po' |
223 | --- po/de.po 2014-11-10 00:19:38 +0000 |
224 | +++ po/de.po 2020-08-28 22:42:55 +0000 |
225 | @@ -1836,25 +1836,25 @@ |
226 | msgid "Trabajo desconocido" |
227 | msgstr "Unbekanntes Format" |
228 | |
229 | -#: util.py:771 |
230 | +#: util.py:775 |
231 | msgid "3D cover" |
232 | msgstr "" |
233 | |
234 | -#: util.py:773 |
235 | +#: util.py:777 |
236 | msgid "Full cover" |
237 | msgstr "" |
238 | |
239 | -#: util.py:775 |
240 | +#: util.py:779 |
241 | #, fuzzy |
242 | msgid "Normal cover" |
243 | msgstr "Normal" |
244 | |
245 | -#: util.py:779 |
246 | +#: util.py:783 |
247 | #, fuzzy |
248 | msgid "Custom disc" |
249 | msgstr "Nachgemacht" |
250 | |
251 | -#: util.py:781 |
252 | +#: util.py:785 |
253 | #, fuzzy |
254 | msgid "Original disc" |
255 | msgstr "Original" |
256 | |
257 | === modified file 'po/en.po' |
258 | --- po/en.po 2014-11-10 00:19:38 +0000 |
259 | +++ po/en.po 2020-08-28 22:42:55 +0000 |
260 | @@ -1842,25 +1842,25 @@ |
261 | msgid "Trabajo desconocido" |
262 | msgstr "Unknown format" |
263 | |
264 | -#: util.py:771 |
265 | +#: util.py:775 |
266 | msgid "3D cover" |
267 | msgstr "" |
268 | |
269 | -#: util.py:773 |
270 | +#: util.py:777 |
271 | msgid "Full cover" |
272 | msgstr "" |
273 | |
274 | -#: util.py:775 |
275 | +#: util.py:779 |
276 | #, fuzzy |
277 | msgid "Normal cover" |
278 | msgstr "Normal" |
279 | |
280 | -#: util.py:779 |
281 | +#: util.py:783 |
282 | #, fuzzy |
283 | msgid "Custom disc" |
284 | msgstr "Custom" |
285 | |
286 | -#: util.py:781 |
287 | +#: util.py:785 |
288 | #, fuzzy |
289 | msgid "Original disc" |
290 | msgstr "Original" |
291 | |
292 | === modified file 'po/es.po' |
293 | --- po/es.po 2014-11-10 00:19:38 +0000 |
294 | +++ po/es.po 2020-08-28 22:42:55 +0000 |
295 | @@ -1818,23 +1818,23 @@ |
296 | msgid "Trabajo desconocido" |
297 | msgstr "Trabajo desconocido" |
298 | |
299 | -#: util.py:771 |
300 | +#: util.py:775 |
301 | msgid "3D cover" |
302 | msgstr "Carátula 3D" |
303 | |
304 | -#: util.py:773 |
305 | +#: util.py:777 |
306 | msgid "Full cover" |
307 | msgstr "Carátula completa" |
308 | |
309 | -#: util.py:775 |
310 | +#: util.py:779 |
311 | msgid "Normal cover" |
312 | msgstr "Carátula normal" |
313 | |
314 | -#: util.py:779 |
315 | +#: util.py:783 |
316 | msgid "Custom disc" |
317 | msgstr "Disco custom" |
318 | |
319 | -#: util.py:781 |
320 | +#: util.py:785 |
321 | msgid "Original disc" |
322 | msgstr "Disco original" |
323 | |
324 | |
325 | === modified file 'po/eu_ES.po' |
326 | --- po/eu_ES.po 2014-11-10 00:19:38 +0000 |
327 | +++ po/eu_ES.po 2020-08-28 22:42:55 +0000 |
328 | @@ -1835,25 +1835,25 @@ |
329 | msgid "Trabajo desconocido" |
330 | msgstr "Zeregin ezezaguna" |
331 | |
332 | -#: util.py:771 |
333 | +#: util.py:775 |
334 | msgid "3D cover" |
335 | msgstr "" |
336 | |
337 | -#: util.py:773 |
338 | +#: util.py:777 |
339 | msgid "Full cover" |
340 | msgstr "" |
341 | |
342 | -#: util.py:775 |
343 | +#: util.py:779 |
344 | #, fuzzy |
345 | msgid "Normal cover" |
346 | msgstr "Normala" |
347 | |
348 | -#: util.py:779 |
349 | +#: util.py:783 |
350 | #, fuzzy |
351 | msgid "Custom disc" |
352 | msgstr "Pertsonalizatua" |
353 | |
354 | -#: util.py:781 |
355 | +#: util.py:785 |
356 | #, fuzzy |
357 | msgid "Original disc" |
358 | msgstr "Jatorrizkoa" |
359 | |
360 | === modified file 'po/fi_FI.po' |
361 | --- po/fi_FI.po 2014-11-10 00:13:21 +0000 |
362 | +++ po/fi_FI.po 2020-08-28 22:42:55 +0000 |
363 | @@ -1754,23 +1754,23 @@ |
364 | msgid "Trabajo desconocido" |
365 | msgstr "" |
366 | |
367 | -#: util.py:771 |
368 | +#: util.py:775 |
369 | msgid "3D cover" |
370 | msgstr "" |
371 | |
372 | -#: util.py:773 |
373 | +#: util.py:777 |
374 | msgid "Full cover" |
375 | msgstr "" |
376 | |
377 | -#: util.py:775 |
378 | +#: util.py:779 |
379 | msgid "Normal cover" |
380 | msgstr "" |
381 | |
382 | -#: util.py:779 |
383 | +#: util.py:783 |
384 | msgid "Custom disc" |
385 | msgstr "" |
386 | |
387 | -#: util.py:781 |
388 | +#: util.py:785 |
389 | msgid "Original disc" |
390 | msgstr "" |
391 | |
392 | |
393 | === modified file 'po/fr.po' |
394 | --- po/fr.po 2014-11-10 00:19:38 +0000 |
395 | +++ po/fr.po 2020-08-28 22:42:55 +0000 |
396 | @@ -1840,25 +1840,25 @@ |
397 | msgid "Trabajo desconocido" |
398 | msgstr "Emploi inconnu" |
399 | |
400 | -#: util.py:771 |
401 | +#: util.py:775 |
402 | msgid "3D cover" |
403 | msgstr "" |
404 | |
405 | -#: util.py:773 |
406 | +#: util.py:777 |
407 | msgid "Full cover" |
408 | msgstr "" |
409 | |
410 | -#: util.py:775 |
411 | +#: util.py:779 |
412 | #, fuzzy |
413 | msgid "Normal cover" |
414 | msgstr "Normal" |
415 | |
416 | -#: util.py:779 |
417 | +#: util.py:783 |
418 | #, fuzzy |
419 | msgid "Custom disc" |
420 | msgstr "Personnalisé" |
421 | |
422 | -#: util.py:781 |
423 | +#: util.py:785 |
424 | #, fuzzy |
425 | msgid "Original disc" |
426 | msgstr "Original" |
427 | |
428 | === modified file 'po/gl_ES.po' |
429 | --- po/gl_ES.po 2014-11-10 00:19:38 +0000 |
430 | +++ po/gl_ES.po 2020-08-28 22:42:55 +0000 |
431 | @@ -1847,25 +1847,25 @@ |
432 | msgid "Trabajo desconocido" |
433 | msgstr "Trabajo desconocido" |
434 | |
435 | -#: util.py:771 |
436 | +#: util.py:775 |
437 | msgid "3D cover" |
438 | msgstr "" |
439 | |
440 | -#: util.py:773 |
441 | +#: util.py:777 |
442 | msgid "Full cover" |
443 | msgstr "" |
444 | |
445 | -#: util.py:775 |
446 | +#: util.py:779 |
447 | #, fuzzy |
448 | msgid "Normal cover" |
449 | msgstr "Normal" |
450 | |
451 | -#: util.py:779 |
452 | +#: util.py:783 |
453 | #, fuzzy |
454 | msgid "Custom disc" |
455 | msgstr "Editada" |
456 | |
457 | -#: util.py:781 |
458 | +#: util.py:785 |
459 | #, fuzzy |
460 | msgid "Original disc" |
461 | msgstr "Original" |
462 | |
463 | === modified file 'po/it.po' |
464 | --- po/it.po 2014-11-10 00:19:38 +0000 |
465 | +++ po/it.po 2020-08-28 22:42:55 +0000 |
466 | @@ -1815,23 +1815,23 @@ |
467 | msgid "Trabajo desconocido" |
468 | msgstr "Formato sconosciuto" |
469 | |
470 | -#: util.py:771 |
471 | +#: util.py:775 |
472 | msgid "3D cover" |
473 | msgstr "Copertina 3D" |
474 | |
475 | -#: util.py:773 |
476 | +#: util.py:777 |
477 | msgid "Full cover" |
478 | msgstr "Copertina completa" |
479 | |
480 | -#: util.py:775 |
481 | +#: util.py:779 |
482 | msgid "Normal cover" |
483 | msgstr "Copertine normali" |
484 | |
485 | -#: util.py:779 |
486 | +#: util.py:783 |
487 | msgid "Custom disc" |
488 | msgstr "Disc-art personalizzato" |
489 | |
490 | -#: util.py:781 |
491 | +#: util.py:785 |
492 | msgid "Original disc" |
493 | msgstr "Disc-art originale" |
494 | |
495 | |
496 | === modified file 'po/ja_JP.po' |
497 | --- po/ja_JP.po 2014-11-10 00:13:21 +0000 |
498 | +++ po/ja_JP.po 2020-08-28 22:42:55 +0000 |
499 | @@ -1754,23 +1754,23 @@ |
500 | msgid "Trabajo desconocido" |
501 | msgstr "" |
502 | |
503 | -#: util.py:771 |
504 | +#: util.py:775 |
505 | msgid "3D cover" |
506 | msgstr "" |
507 | |
508 | -#: util.py:773 |
509 | +#: util.py:777 |
510 | msgid "Full cover" |
511 | msgstr "" |
512 | |
513 | -#: util.py:775 |
514 | +#: util.py:779 |
515 | msgid "Normal cover" |
516 | msgstr "" |
517 | |
518 | -#: util.py:779 |
519 | +#: util.py:783 |
520 | msgid "Custom disc" |
521 | msgstr "" |
522 | |
523 | -#: util.py:781 |
524 | +#: util.py:785 |
525 | msgid "Original disc" |
526 | msgstr "" |
527 | |
528 | |
529 | === modified file 'po/ko_KR.po' |
530 | --- po/ko_KR.po 2014-11-10 00:13:21 +0000 |
531 | +++ po/ko_KR.po 2020-08-28 22:42:55 +0000 |
532 | @@ -1754,23 +1754,23 @@ |
533 | msgid "Trabajo desconocido" |
534 | msgstr "" |
535 | |
536 | -#: util.py:771 |
537 | +#: util.py:775 |
538 | msgid "3D cover" |
539 | msgstr "" |
540 | |
541 | -#: util.py:773 |
542 | +#: util.py:777 |
543 | msgid "Full cover" |
544 | msgstr "" |
545 | |
546 | -#: util.py:775 |
547 | +#: util.py:779 |
548 | msgid "Normal cover" |
549 | msgstr "" |
550 | |
551 | -#: util.py:779 |
552 | +#: util.py:783 |
553 | msgid "Custom disc" |
554 | msgstr "" |
555 | |
556 | -#: util.py:781 |
557 | +#: util.py:785 |
558 | msgid "Original disc" |
559 | msgstr "" |
560 | |
561 | |
562 | === modified file 'po/nb_NO.po' |
563 | --- po/nb_NO.po 2014-11-10 00:13:21 +0000 |
564 | +++ po/nb_NO.po 2020-08-28 22:42:55 +0000 |
565 | @@ -1754,23 +1754,23 @@ |
566 | msgid "Trabajo desconocido" |
567 | msgstr "" |
568 | |
569 | -#: util.py:771 |
570 | +#: util.py:775 |
571 | msgid "3D cover" |
572 | msgstr "" |
573 | |
574 | -#: util.py:773 |
575 | +#: util.py:777 |
576 | msgid "Full cover" |
577 | msgstr "" |
578 | |
579 | -#: util.py:775 |
580 | +#: util.py:779 |
581 | msgid "Normal cover" |
582 | msgstr "" |
583 | |
584 | -#: util.py:779 |
585 | +#: util.py:783 |
586 | msgid "Custom disc" |
587 | msgstr "" |
588 | |
589 | -#: util.py:781 |
590 | +#: util.py:785 |
591 | msgid "Original disc" |
592 | msgstr "" |
593 | |
594 | |
595 | === modified file 'po/nl_NL.po' |
596 | --- po/nl_NL.po 2014-11-10 00:13:21 +0000 |
597 | +++ po/nl_NL.po 2020-08-28 22:42:55 +0000 |
598 | @@ -1754,23 +1754,23 @@ |
599 | msgid "Trabajo desconocido" |
600 | msgstr "" |
601 | |
602 | -#: util.py:771 |
603 | +#: util.py:775 |
604 | msgid "3D cover" |
605 | msgstr "" |
606 | |
607 | -#: util.py:773 |
608 | +#: util.py:777 |
609 | msgid "Full cover" |
610 | msgstr "" |
611 | |
612 | -#: util.py:775 |
613 | +#: util.py:779 |
614 | msgid "Normal cover" |
615 | msgstr "" |
616 | |
617 | -#: util.py:779 |
618 | +#: util.py:783 |
619 | msgid "Custom disc" |
620 | msgstr "" |
621 | |
622 | -#: util.py:781 |
623 | +#: util.py:785 |
624 | msgid "Original disc" |
625 | msgstr "" |
626 | |
627 | |
628 | === modified file 'po/pt_BR.po' |
629 | --- po/pt_BR.po 2014-11-10 00:19:38 +0000 |
630 | +++ po/pt_BR.po 2020-08-28 22:42:55 +0000 |
631 | @@ -1862,23 +1862,23 @@ |
632 | msgid "Trabajo desconocido" |
633 | msgstr "Formato desconhecido" |
634 | |
635 | -#: util.py:771 |
636 | +#: util.py:775 |
637 | msgid "3D cover" |
638 | msgstr "" |
639 | |
640 | -#: util.py:773 |
641 | +#: util.py:777 |
642 | msgid "Full cover" |
643 | msgstr "" |
644 | |
645 | -#: util.py:775 |
646 | +#: util.py:779 |
647 | msgid "Normal cover" |
648 | msgstr "" |
649 | |
650 | -#: util.py:779 |
651 | +#: util.py:783 |
652 | msgid "Custom disc" |
653 | msgstr "" |
654 | |
655 | -#: util.py:781 |
656 | +#: util.py:785 |
657 | msgid "Original disc" |
658 | msgstr "" |
659 | |
660 | |
661 | === modified file 'po/pt_PT.po' |
662 | --- po/pt_PT.po 2014-11-10 00:19:38 +0000 |
663 | +++ po/pt_PT.po 2020-08-28 22:42:55 +0000 |
664 | @@ -1833,23 +1833,23 @@ |
665 | msgid "Trabajo desconocido" |
666 | msgstr "" |
667 | |
668 | -#: util.py:771 |
669 | +#: util.py:775 |
670 | msgid "3D cover" |
671 | msgstr "" |
672 | |
673 | -#: util.py:773 |
674 | +#: util.py:777 |
675 | msgid "Full cover" |
676 | msgstr "" |
677 | |
678 | -#: util.py:775 |
679 | +#: util.py:779 |
680 | msgid "Normal cover" |
681 | msgstr "" |
682 | |
683 | -#: util.py:779 |
684 | +#: util.py:783 |
685 | msgid "Custom disc" |
686 | msgstr "" |
687 | |
688 | -#: util.py:781 |
689 | +#: util.py:785 |
690 | msgid "Original disc" |
691 | msgstr "" |
692 | |
693 | |
694 | === modified file 'po/ru_RU.po' |
695 | --- po/ru_RU.po 2014-11-10 00:13:21 +0000 |
696 | +++ po/ru_RU.po 2020-08-28 22:42:55 +0000 |
697 | @@ -1757,23 +1757,23 @@ |
698 | msgid "Trabajo desconocido" |
699 | msgstr "" |
700 | |
701 | -#: util.py:771 |
702 | +#: util.py:775 |
703 | msgid "3D cover" |
704 | msgstr "" |
705 | |
706 | -#: util.py:773 |
707 | +#: util.py:777 |
708 | msgid "Full cover" |
709 | msgstr "" |
710 | |
711 | -#: util.py:775 |
712 | +#: util.py:779 |
713 | msgid "Normal cover" |
714 | msgstr "" |
715 | |
716 | -#: util.py:779 |
717 | +#: util.py:783 |
718 | msgid "Custom disc" |
719 | msgstr "" |
720 | |
721 | -#: util.py:781 |
722 | +#: util.py:785 |
723 | msgid "Original disc" |
724 | msgstr "" |
725 | |
726 | |
727 | === modified file 'po/sv_SE.po' |
728 | --- po/sv_SE.po 2014-11-10 00:19:38 +0000 |
729 | +++ po/sv_SE.po 2020-08-28 22:42:55 +0000 |
730 | @@ -1871,23 +1871,23 @@ |
731 | msgid "Trabajo desconocido" |
732 | msgstr "Okänt format" |
733 | |
734 | -#: util.py:771 |
735 | +#: util.py:775 |
736 | msgid "3D cover" |
737 | msgstr "" |
738 | |
739 | -#: util.py:773 |
740 | +#: util.py:777 |
741 | msgid "Full cover" |
742 | msgstr "" |
743 | |
744 | -#: util.py:775 |
745 | +#: util.py:779 |
746 | msgid "Normal cover" |
747 | msgstr "" |
748 | |
749 | -#: util.py:779 |
750 | +#: util.py:783 |
751 | msgid "Custom disc" |
752 | msgstr "" |
753 | |
754 | -#: util.py:781 |
755 | +#: util.py:785 |
756 | msgid "Original disc" |
757 | msgstr "" |
758 | |
759 | |
760 | === modified file 'po/tr_TR.po' |
761 | --- po/tr_TR.po 2014-11-10 00:13:21 +0000 |
762 | +++ po/tr_TR.po 2020-08-28 22:42:55 +0000 |
763 | @@ -1754,23 +1754,23 @@ |
764 | msgid "Trabajo desconocido" |
765 | msgstr "" |
766 | |
767 | -#: util.py:771 |
768 | +#: util.py:775 |
769 | msgid "3D cover" |
770 | msgstr "" |
771 | |
772 | -#: util.py:773 |
773 | +#: util.py:777 |
774 | msgid "Full cover" |
775 | msgstr "" |
776 | |
777 | -#: util.py:775 |
778 | +#: util.py:779 |
779 | msgid "Normal cover" |
780 | msgstr "" |
781 | |
782 | -#: util.py:779 |
783 | +#: util.py:783 |
784 | msgid "Custom disc" |
785 | msgstr "" |
786 | |
787 | -#: util.py:781 |
788 | +#: util.py:785 |
789 | msgid "Original disc" |
790 | msgstr "" |
791 | |
792 | |
793 | === modified file 'preferencias.py' |
794 | --- preferencias.py 2012-04-22 16:01:09 +0000 |
795 | +++ preferencias.py 2020-08-28 22:42:55 +0000 |
796 | @@ -280,7 +280,7 @@ |
797 | # indicar el vbox que inicia la preferencia |
798 | def iniciarPreferencia(self, tipo, name, defecto = '', mostrar = False, vbox = None, label = '', datos_lista = None): |
799 | sql = util.decode("preferencias.campo=='%s'" % name) |
800 | - preferencia = session.query(Preferencia).filter(sql).first() |
801 | + preferencia = session.query(Preferencia).filter(util.sql_text(sql)).first() |
802 | if preferencia == None: |
803 | preferencia = Preferencia(tipo, name, defecto) |
804 | # for compatibility with sqlalchemy |
805 | @@ -438,7 +438,7 @@ |
806 | def __setattr__(self, name, value): |
807 | |
808 | sql = util.decode("preferencias.campo=='%s'" % name) |
809 | - preferencia = session.query(Preferencia).filter(sql).first() |
810 | + preferencia = session.query(Preferencia).filter(util.sql_text(sql)).first() |
811 | |
812 | if preferencia != None: |
813 | |
814 | @@ -469,7 +469,7 @@ |
815 | retorno = None |
816 | |
817 | sql = util.decode("preferencias.campo=='%s'" % name) |
818 | - preferencia = session.query(Preferencia).filter(sql).first() |
819 | + preferencia = session.query(Preferencia).filter(util.sql_text(sql)).first() |
820 | |
821 | if preferencia != None: |
822 | |
823 | |
824 | === modified file 'util.py' |
825 | --- util.py 2012-04-22 16:01:09 +0000 |
826 | +++ util.py 2020-08-28 22:42:55 +0000 |
827 | @@ -19,6 +19,7 @@ |
828 | from threading import Thread |
829 | from gettext import gettext as _ |
830 | |
831 | +import sqlalchemy |
832 | from sqlalchemy.orm import scoped_session, sessionmaker |
833 | from sqlalchemy import create_engine |
834 | from sqlalchemy.pool import NullPool |
835 | @@ -402,6 +403,9 @@ |
836 | session = Session() |
837 | return session |
838 | |
839 | +def sql_text(string): |
840 | + return sqlalchemy.text(string) |
841 | + |
842 | def call_out_file(comando): |
843 | if config.DEBUG: |
844 | print comando |
845 | |
846 | === modified file 'wiitdb_schema.py' |
847 | --- wiitdb_schema.py 2011-06-07 03:13:28 +0000 |
848 | +++ wiitdb_schema.py 2020-08-28 22:42:55 +0000 |
849 | @@ -420,7 +420,7 @@ |
850 | |
851 | def getJuegoWIITDB(self): |
852 | sql = util.decode("juego_wiitdb.idgame=='%s'" % (self.idgame)) |
853 | - return session.query(JuegoWIITDB).filter(sql).first() |
854 | + return session.query(JuegoWIITDB).filter(util.sql_text(sql)).first() |
855 | |
856 | class Particion(Base): |
857 | __tablename__ = 'particion' |
858 | |
859 | === modified file 'wiitdb_xml.py' |
860 | --- wiitdb_xml.py 2010-12-07 00:12:32 +0000 |
861 | +++ wiitdb_xml.py 2020-08-28 22:42:55 +0000 |
862 | @@ -135,14 +135,14 @@ |
863 | idgame = nodo.content |
864 | |
865 | sql = util.decode('idgame == "%s"' % idgame) |
866 | - juego_wbfs = session.query(Juego).filter(sql).first() |
867 | + juego_wbfs = session.query(Juego).filter(util.sql_text(sql)).first() |
868 | # si no los tienes y estas descargando en masivo -> se lo salta |
869 | saltado = juego_wbfs is None and self.todos |
870 | |
871 | if not saltado: |
872 | sql = util.decode("idgame=='%s'" % (idgame)) |
873 | try: |
874 | - juego = session.query(JuegoWIITDB).filter(sql).first() |
875 | + juego = session.query(JuegoWIITDB).filter(util.sql_text(sql)).first() |
876 | except: |
877 | self.error_importando(_("XML invalido")) |
878 | |
879 | @@ -161,7 +161,7 @@ |
880 | lang = self.leerAtributo(nodo, 'lang') |
881 | |
882 | sql = util.decode("lang=='%s' and idJuegoWIITDB='%s'" % (lang, juego.idJuegoWIITDB)) |
883 | - descripcion = session.query(JuegoDescripcion).filter(sql).first() |
884 | + descripcion = session.query(JuegoDescripcion).filter(util.sql_text(sql)).first() |
885 | if descripcion == None: |
886 | descripcion = JuegoDescripcion(lang) |
887 | if self.callback_nuevo_descripcion: |
888 | @@ -205,7 +205,7 @@ |
889 | for valor in valores.split(","): |
890 | valor = valor.strip().replace("'","`") |
891 | sql = util.decode("nombre=='%s'" % (valor)) |
892 | - genero = session.query(Genero).filter(sql).first() |
893 | + genero = session.query(Genero).filter(util.sql_text(sql)).first() |
894 | if genero == None: |
895 | genero = Genero(valor) |
896 | if self.callback_nuevo_genero: |
897 | @@ -217,7 +217,7 @@ |
898 | # crear un tipo de rating si es nuevo |
899 | tipo = self.leerAtributo(nodo, 'type') |
900 | sql = util.decode("tipo=='%s'" % (tipo)) |
901 | - rating_type = session.query(RatingType).filter(sql).first() |
902 | + rating_type = session.query(RatingType).filter(util.sql_text(sql)).first() |
903 | if rating_type == None: |
904 | rating_type = RatingType(tipo) |
905 | |
906 | @@ -226,7 +226,7 @@ |
907 | # crea una relacion si es un nuevo valor del tipo |
908 | valor = self.leerAtributo(nodo, 'value') |
909 | sql = util.decode("idRatingType=='%s' and valor=='%s'" % (rating_type.idRatingType , valor)) |
910 | - rating_value = session.query(RatingValue).filter(sql).first() |
911 | + rating_value = session.query(RatingValue).filter(util.sql_text(sql)).first() |
912 | if rating_value == None: |
913 | rating_value = RatingValue(valor) |
914 | rating_type.valores.append(rating_value) |
915 | @@ -243,7 +243,7 @@ |
916 | valor = valor.strip() |
917 | sql = util.decode("idRatingType=='%s' and valor=='%s'" % |
918 | (rating_type.idRatingType, valor)) |
919 | - rating_content = session.query(RatingContent).filter(sql).first() |
920 | + rating_content = session.query(RatingContent).filter(util.sql_text(sql)).first() |
921 | if rating_content == None: |
922 | rating_content = RatingContent(valor) |
923 | rating_type.contenidos.append(rating_content) |
924 | @@ -269,7 +269,7 @@ |
925 | for valor in valores.split(","): |
926 | valor = valor.strip() |
927 | sql = util.decode("valor=='%s'" % (valor)) |
928 | - online_feature = session.query(OnlineFeatures).filter(sql).first() |
929 | + online_feature = session.query(OnlineFeatures).filter(util.sql_text(sql)).first() |
930 | if online_feature == None: |
931 | online_feature = OnlineFeatures(valor) |
932 | if self.callback_nuevo_online_feature: |
933 | @@ -326,7 +326,7 @@ |
934 | nombre = "microphone" |
935 | |
936 | sql = util.decode("nombre=='%s'" % (nombre)) |
937 | - accesorio = session.query(Accesorio).filter(sql).first() |
938 | + accesorio = session.query(Accesorio).filter(util.sql_text(sql)).first() |
939 | if accesorio == None: |
940 | accesorio = Accesorio(nombre) |
941 | if self.callback_nuevo_accesorio: |
942 | @@ -397,7 +397,7 @@ |
943 | code = self.leerAtributo(nodo, 'code') |
944 | name = self.leerAtributo(nodo, 'name') |
945 | sql = util.decode("code=='%s'" % (code)) |
946 | - companie = session.query(Companie).filter(sql).first() |
947 | + companie = session.query(Companie).filter(util.sql_text(sql)).first() |
948 | if companie == None: |
949 | companie = Companie(code, name) |
950 | # for compatibility with sqlalchemy |
951 | |
952 | === modified file 'wiithon.py' (properties changed: -x to +x) |
Build DEB file with
make deb