Commit Graph

3011 Commits

Author SHA1 Message Date
Laurent Monin
7de9477b7b Add types_and_front() helper function
- it converts id3 type to CAA-like type list
- it returns a is_front boolean, emulating CAA flag
2014-05-07 18:01:13 +02:00
Laurent Monin
7a1607e8c3 Remove useless import 2014-05-07 18:01:13 +02:00
Laurent Monin
5b5ca9a481 Add image description to debug message if available 2014-05-07 18:01:12 +02:00
Laurent Monin
73c57108f6 Use an explicit is_front property for CAA front flag indicator 2014-05-07 18:01:12 +02:00
Laurent Monin
d5b4bfec91 Subclass CoverArtImage and add support_types property
- CaaCoverArtImage is only used for CAA images
- drop host comparaison (vs 'archive.org'), use a much cleaner "flag"
- all current providers but CAA don't support multiple types, so we defaults to a "front" type
- once we have one image from one of those providers we are done
- we don't want to remove all images from CAA having front type
2014-05-07 18:01:12 +02:00
Laurent Monin
67c9225767 Use types intersection to select caa images to download, clarify code
- lowercase types from json, to match lowercased types from options
- fix up logic concerning caa_front_found
- add few comments and debug info
2014-05-07 18:01:12 +02:00
Laurent Monin
46649c6332 Drop useless coverartobj argument, cleanup 2014-05-07 18:01:12 +02:00
Laurent Monin
3a4f062694 _coverart_downloaded(): better handling of not enough data case
At least log a message in debug mode in this case.
Btw, i'm not sure why this condition was added, even if it makes sense.
2014-05-07 18:01:12 +02:00
Laurent Monin
825abdda5d _fill() -> _fill_from_relationships() 2014-05-07 18:01:12 +02:00
Laurent Monin
2df6c9759e _walk(): reduce indentation level 2014-05-07 18:01:12 +02:00
Laurent Monin
4ea310c983 _process_asin_relation(): reduce indentation level 2014-05-07 18:01:12 +02:00
Laurent Monin
cdec8f4e92 No need to calculate length of the list to test if empty. 2014-05-07 18:01:12 +02:00
Laurent Monin
e31d77f8d5 Wraps self.album.tagger.xmlws.download() in new _download() method 2014-05-07 18:01:12 +02:00
Laurent Monin
a43569755d Introduce CoverArtImage class and simplify code
- move is_front_image() from metadata.py to class CoverArtImage as it is only used here
2014-05-07 18:01:12 +02:00
Laurent Monin
f7bf4acfa1 Pass url as text to _append_image_url() instead of QUrl object 2014-05-07 18:01:12 +02:00
Laurent Monin
c5efe95ff0 Wrap QObject.tagger.window.set_statusbar_message() in new message() class method 2014-05-07 18:00:58 +02:00
Laurent Monin
84ffb3f32c imagedata -> image 2014-05-07 17:35:03 +02:00
Laurent Monin
0908b0e6c9 _caa_append_image_to_trylist() -> _append_caa_image() 2014-05-07 17:35:03 +02:00
Laurent Monin
b5625207c4 Tidy up, PEP8 conformance 2014-05-07 17:35:03 +02:00
Laurent Monin
139ab5b1e8 Store accepted CAA types and number of them in class properties 2014-05-07 17:35:02 +02:00
Laurent Monin
f3edf6cefe Drop '_try_list' prefix/suffix and shorten method names 2014-05-07 17:35:02 +02:00
Laurent Monin
6cdecc328e Convert release argument to class property 2014-05-07 17:35:02 +02:00
Laurent Monin
7ab4677a4e Move _coverart_http_error() to class CoverArt 2014-05-07 17:35:02 +02:00
Laurent Monin
d6cd3eb467 Convert metadata argument to class property 2014-05-07 17:35:02 +02:00
Laurent Monin
007c30dd21 Convert album argument to class property 2014-05-07 17:35:02 +02:00
Laurent Monin
48bd904cf8 Move coverart_init() code to __init__() 2014-05-07 17:35:02 +02:00
Laurent Monin
d2744cae02 Convert most functions to class methods 2014-05-07 17:35:02 +02:00
Laurent Monin
7b65ec2e50 Move class CoverArt and coverart() at end of the file 2014-05-07 17:35:02 +02:00
Laurent Monin
c04ffeed9e Move most code from coverart() to new coverart_init() 2014-05-07 17:35:02 +02:00
Laurent Monin
7a1e01006f Re-order _coverart_downloaded() arguments, place coverartobj first 2014-05-07 17:35:02 +02:00
Laurent Monin
3287546f00 Re-order _caa_json_downloaded() arguments, place coverartobj first 2014-05-07 17:35:02 +02:00
Laurent Monin
1dd3ba051f Re-order _walk_try_list() argument, place coverartobj in first position 2014-05-07 17:35:02 +02:00
Laurent Monin
01a815018a Re-order _fill_try_list arguments, place coverartobj in first position 2014-05-07 17:35:02 +02:00
Laurent Monin
a8906f3cec Introduce class CoverArt 2014-05-07 17:35:02 +02:00
Laurent Monin
55c80f588c Reduce code redundancy using intermediate variables has_front and has_back 2014-05-07 17:35:02 +02:00
Laurent Monin
f7834bfea7 _fill_try_list(): do not enter loops if not needed 2014-05-07 17:35:02 +02:00
Laurent Monin
cec7c60db4 Merge pull request #316 from Sophist-UK/sophist_exclude_unneeded_dist_files
Exclude unnecessary python modules...
2014-05-07 16:22:02 +02:00
Sophist
63639d066c Restructure to import in correct order etc. 2014-05-05 21:59:30 +01:00
Sophist
4bb1079c4a Remove cgi from exclude_module list 2014-05-05 20:20:38 +01:00
Sophist
fd27cc2cd9 Add back use of cgi escape
Added originally in 27cc6d7086 and
reverted in error in 5a2eee3484.
2014-05-05 20:20:02 +01:00
Sophist
8b76501cdd Revert "Remove obsolete ref to cgi"
This reverts commit 95ec346c2a.
2014-05-05 20:16:43 +01:00
Sophist
a0cc9a636b Eliminate unnecessary modules 2014-05-05 19:14:30 +01:00
Laurent Monin
b42dc5f10c Add missing import 2014-05-05 17:57:35 +02:00
Sophist
95ec346c2a Remove obsolete ref to cgi 2014-05-05 15:03:42 +01:00
Laurent Monin
c9a975b185 PICARD-603: fix missing imports
Traceback (most recent call last):
File "/usr/lib/picard/picard/ui/mainwindow.py", line 302, in _on_submit
self.tagger.acoustidmanager.submit()
File "/usr/lib/picard/picard/acoustidmanager.py", line 78, in submit
log.debug("AcoustID: submitting ...")
NameError: global name 'log' is not defined


and pylint tells more:

Module picard.ui.infodialog
E: 55,16: Undefined variable 'log' (undefined-variable)
E: 55,26: Undefined variable 'traceback' (undefined-variable)
2014-05-05 16:00:32 +02:00
Sophist
373302db24 Make py2app includes consistent with py2exe
and make indents standard.
2014-05-05 12:50:03 +01:00
Laurent Monin
4658f9ff7f Update translations 2014-05-05 07:20:01 +02:00
Laurent Monin
8ab91f939a PICARD-602: import missing log
Traceback (most recent call last):
File "/usr/lib/picard/picard/webservice.py", line 241, in _process_reply
handler(str(reply.readAll()), reply, error)
File "/usr/lib/picard/picard/collection.py", line 102, in request_finished
echo=log.error
NameError: global name 'log' is not defined
2014-05-05 07:13:40 +02:00
Laurent Monin
c1d071339f Merge pull request #314 from Sophist-UK/sophist_fix_setup.py_windows_build
Fix setup.py plugin_files
2014-05-04 23:10:22 +02:00
Sophist
dea6599641 Revert unintended global change
made in commit 25505c9216
2014-05-04 22:04:33 +01:00