Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update price detection

Browse Source 
Previous method was showing a price of 0 due to kindle unlimited
This commit is contained in:
Serized 2017-07-15 16:28:30 +02:00
parent ae55d07a59
commit 54b591a01d
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/store/stores/amazon_au_plugin.py
View File

@ -4,7 +4,7 @@
from __future__ import (unicode_literals, division, absolute_import, from __future__ import (unicode_literals, division, absolute_import,
print_function) print_function)
store_version = 4 # Needed for dynamic plugin loading store_version = 5 # Needed for dynamic plugin loading
from contextlib import closing from contextlib import closing
import urllib import urllib
@ -66,7 +66,7 @@ def search_amazon(query, max_results=10, timeout=60,
cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src" cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src"
title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()" title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()"
author_xpath = './/span[starts-with(text(), "by ")]/following-sibling::span//text()' author_xpath = './/span[starts-with(text(), "by ")]/following-sibling::span//text()'
price_xpath = 'descendant::span[contains(@class, "s-price")]//text()' price_xpath = 'descendant::div[@class="a-row a-spacing-none" and not(span[contains(@class, "kindle-unlimited")])]//span[contains(@class, "s-price")]//text()'
else: else:
return return

4
src/calibre/gui2/store/stores/amazon_ca_plugin.py
View File

@ -4,7 +4,7 @@
from __future__ import (unicode_literals, division, absolute_import, from __future__ import (unicode_literals, division, absolute_import,
print_function) print_function)
store_version = 6 # Needed for dynamic plugin loading store_version = 7 # Needed for dynamic plugin loading
from contextlib import closing from contextlib import closing
import urllib import urllib
@ -66,7 +66,7 @@ def search_amazon(query, max_results=10, timeout=60,
cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src" cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src"
title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()" title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()"
author_xpath = './/span[starts-with(text(), "by ")]/following-sibling::span//text()' author_xpath = './/span[starts-with(text(), "by ")]/following-sibling::span//text()'
price_xpath = 'descendant::span[contains(@class, "s-price")]//text()' price_xpath = 'descendant::div[@class="a-row a-spacing-none" and not(span[contains(@class, "kindle-unlimited")])]//span[contains(@class, "s-price")]//text()'
else: else:
return return

4
src/calibre/gui2/store/stores/amazon_de_plugin.py
View File

@ -4,7 +4,7 @@
from __future__ import (unicode_literals, division, absolute_import, from __future__ import (unicode_literals, division, absolute_import,
print_function) print_function)
store_version = 14 # Needed for dynamic plugin loading store_version = 15 # Needed for dynamic plugin loading
from contextlib import closing from contextlib import closing
import urllib import urllib
@ -68,7 +68,7 @@ def search_amazon(query, max_results=10, timeout=60,
cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src" cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src"
title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()" title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()"
author_xpath = './/span[starts-with(text(), "%s ")]/following-sibling::span//text()' % BY author_xpath = './/span[starts-with(text(), "%s ")]/following-sibling::span//text()' % BY
price_xpath = 'descendant::span[contains(@class, "s-price")]//text()' price_xpath = 'descendant::div[@class="a-row a-spacing-none" and not(span[contains(@class, "kindle-unlimited")])]//span[contains(@class, "s-price")]//text()'
else: else:
return return

4
src/calibre/gui2/store/stores/amazon_es_plugin.py
View File

@ -4,7 +4,7 @@
from __future__ import (unicode_literals, division, absolute_import, from __future__ import (unicode_literals, division, absolute_import,
print_function) print_function)
store_version = 14 # Needed for dynamic plugin loading store_version = 15 # Needed for dynamic plugin loading
from contextlib import closing from contextlib import closing
import urllib import urllib
@ -68,7 +68,7 @@ def search_amazon(query, max_results=10, timeout=60,
cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src" cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src"
title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()" title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()"
author_xpath = './/span[starts-with(text(), "%s ")]/following-sibling::span//text()' % BY author_xpath = './/span[starts-with(text(), "%s ")]/following-sibling::span//text()' % BY
price_xpath = 'descendant::span[contains(@class, "s-price")]//text()' price_xpath = 'descendant::div[@class="a-row a-spacing-none" and not(span[contains(@class, "kindle-unlimited")])]//span[contains(@class, "s-price")]//text()'
else: else:
return return

4
src/calibre/gui2/store/stores/amazon_in_plugin.py
View File

@ -4,7 +4,7 @@
from __future__ import (unicode_literals, division, absolute_import, from __future__ import (unicode_literals, division, absolute_import,
print_function) print_function)
store_version = 4 # Needed for dynamic plugin loading store_version = 5 # Needed for dynamic plugin loading
from contextlib import closing from contextlib import closing
import urllib import urllib
@ -66,7 +66,7 @@ def search_amazon(query, max_results=10, timeout=60,
cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src" cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src"
title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()" title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()"
author_xpath = './/span[starts-with(text(), "by ")]/following-sibling::span//text()' author_xpath = './/span[starts-with(text(), "by ")]/following-sibling::span//text()'
price_xpath = 'descendant::span[contains(@class, "s-price")]//text()' price_xpath = 'descendant::div[@class="a-row a-spacing-none" and not(span[contains(@class, "kindle-unlimited")])]//span[contains(@class, "s-price")]//text()'
else: else:
return return

4
src/calibre/gui2/store/stores/amazon_it_plugin.py
View File

@ -4,7 +4,7 @@
from __future__ import (unicode_literals, division, absolute_import, from __future__ import (unicode_literals, division, absolute_import,
print_function) print_function)
store_version = 14 # Needed for dynamic plugin loading store_version = 15 # Needed for dynamic plugin loading
from contextlib import closing from contextlib import closing
import urllib import urllib
@ -68,7 +68,7 @@ def search_amazon(query, max_results=10, timeout=60,
cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src" cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src"
title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()" title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()"
author_xpath = './/span[starts-with(text(), "%s ")]/following-sibling::span//text()' % BY author_xpath = './/span[starts-with(text(), "%s ")]/following-sibling::span//text()' % BY
price_xpath = 'descendant::span[contains(@class, "s-price")]//text()' price_xpath = 'descendant::div[@class="a-row a-spacing-none" and not(span[contains(@class, "kindle-unlimited")])]//span[contains(@class, "s-price")]//text()'
else: else:
return return

4
src/calibre/gui2/store/stores/amazon_uk_plugin.py
View File

@ -4,7 +4,7 @@
from __future__ import (unicode_literals, division, absolute_import, from __future__ import (unicode_literals, division, absolute_import,
print_function) print_function)
store_version = 14 # Needed for dynamic plugin loading store_version = 15 # Needed for dynamic plugin loading
from contextlib import closing from contextlib import closing
import urllib import urllib
@ -66,7 +66,7 @@ def search_amazon(query, max_results=10, timeout=60,
cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src" cover_xpath = "descendant-or-self::img[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-image ')]/@src"
title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()" title_xpath = "descendant-or-self::h2[@class and contains(concat(' ', normalize-space(@class), ' '), ' s-access-title ')]//text()"
author_xpath = './/span[starts-with(text(), "by ")]/following-sibling::span//text()' author_xpath = './/span[starts-with(text(), "by ")]/following-sibling::span//text()'
price_xpath = 'descendant::span[contains(@class, "s-price")]//text()' price_xpath = 'descendant::div[@class="a-row a-spacing-none" and not(span[contains(@class, "kindle-unlimited")])]//span[contains(@class, "s-price")]//text()'
else: else:
return return