Sync to trunk

This commit is contained in:
John Schember 2009-01-15 20:42:23 -05:00
commit 1dfba2c88c
6 changed files with 88 additions and 34 deletions

View File

@ -2,7 +2,7 @@ __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
__docformat__ = 'restructuredtext en'
__appname__ = 'calibre'
__version__ = '0.4.127'
__version__ = '0.4.128'
__author__ = "Kovid Goyal <kovid@kovidgoyal.net>"
'''
Various run time constants.

Binary file not shown.

After

Width:  |  Height:  |  Size: 992 B

View File

@ -7,8 +7,8 @@ var column_titles = {
'rating' : 'Rating',
'date' : 'Date',
'tags' : 'Tags',
'series' : 'Series',
}
'series' : 'Series'
};
String.prototype.format = function() {
var pattern = /\{\d+\}/g;
@ -47,7 +47,7 @@ function render_book(book) {
// Render title cell
var title = '<i>{0}</i>'.format(book.attr("title")) + '<br /><span class="subtitle">';
var id = book.attr("id");
var comments = $.trim(book.text()).replace(/\n\n/, '<br/>');
var comments = $.trim(book.text()).replace(/\n\n/, '<br/>');
var formats = new Array();
var size = (parseFloat(book.attr('size'))/(1024*1024)).toFixed(1);
var tags = book.attr('tags').replace(/,/g, ', ');
@ -70,22 +70,22 @@ function render_book(book) {
authors += jQuery.trim(_authors[i]).replace(/ /g, '&nbsp;')+'<br />';
}
if (authors) { authors = authors.slice(0, authors.length-6); }
// Render rating cell
var _rating = parseFloat(book.attr('rating'))/2.;
var rating = '';
for (i = 0; i < _rating; i++) { rating += '&#9733;'}
// Render date cell
var _date = Date.parseExact(book.attr('timestamp'), 'yyyy/MM/dd HH:mm:ss');
var date = _date.toString('d MMM yyyy').replace(/ /g, '&nbsp;');
// Render series cell
var series = book.attr("series")
if (series) {
series += '&nbsp;[{0}]'.format(book.attr('series_index'));
}
var cells = {
'title' : title,
'authors' : authors,
@ -93,12 +93,12 @@ function render_book(book) {
'date' : date,
'series' : series
};
var row = '';
for (i = 0; i < cmap.length; i++) {
row += '<td class="{0}">{1}</td>'.format(cmap[i], cells[cmap[i]]);
}
return '<tr id="{0}">{1}</tr>'.format(id, row);
return '<tr id="{0}">{1}</tr>'.format(id, row);
}
function fetch_library_books(start, num, timeout, sort, order, search) {
@ -112,15 +112,15 @@ function fetch_library_books(start, num, timeout, sort, order, search) {
last_search = search;
last_sort = sort;
last_sort_order = order;
if (current_library_request != null) {
current_library_request.abort();
current_library_request = null;
}
$('#cover_pane').css('visibility', 'hidden');
$('#loading').css('visibility', 'visible');
current_library_request = $.ajax({
type: "GET",
url: "library",
@ -128,18 +128,18 @@ function fetch_library_books(start, num, timeout, sort, order, search) {
cache: false,
timeout: timeout, //milliseconds
dataType: "xml",
error : function(XMLHttpRequest, textStatus, errorThrown) {
alert('Error: '+textStatus+'\n\n'+errorThrown);
alert('Error: '+textStatus+'\n\n'+errorThrown);
},
success : function(xml, textStatus) {
var library = $(xml).find('library');
total = parseInt(library.attr('total'));
var num = parseInt(library.attr('num'));
var start = parseInt(library.attr('start'));
update_count_bar(start, num, total);
var display = '';
var display = '';
library.find('book').each( function() {
var book = $(this);
var row = render_book(book);
@ -170,18 +170,18 @@ function fetch_library_books(start, num, timeout, sort, order, search) {
$('#cover_pane').css('visibility', 'visible');
}
});
layout();
$('#book_list tbody tr:even()').css('background-color', '#eeeeee');
},
complete : function(XMLHttpRequest, textStatus) {
current_library_request = null;
document.getElementById('main').scrollTop = 0;
$('#loading').css('visibility', 'hidden');
}
});
}
@ -196,7 +196,7 @@ function update_count_bar(start, num, total) {
left.css('opacity', (start <= 0) ? 0.3 : 1);
var right = cb.find('#right');
right.css('opacity', (start + num >= total) ? 0.3 : 1);
}
function setup_count_bar() {
@ -205,7 +205,7 @@ function setup_count_bar() {
fetch_library_books(0, last_num, LIBRARY_FETCH_TIMEOUT, last_sort, last_sort_order, last_search);
}
});
$('#count_bar * img:eq(1)').click(function(){
if (last_start > 0) {
var new_start = last_start - last_num;
@ -215,14 +215,14 @@ function setup_count_bar() {
fetch_library_books(new_start, last_num, LIBRARY_FETCH_TIMEOUT, last_sort, last_sort_order, last_search);
}
});
$('#count_bar * img:eq(2)').click(function(){
if (last_start + last_num < total) {
var new_start = last_start + last_num;
fetch_library_books(new_start, last_num, LIBRARY_FETCH_TIMEOUT, last_sort, last_sort_order, last_search);
}
});
$('#count_bar * img:eq(3)').click(function(){
if (total - last_num > 0) {
fetch_library_books(total - last_num, last_num, LIBRARY_FETCH_TIMEOUT, last_sort, last_sort_order, last_search);
@ -234,7 +234,7 @@ function setup_count_bar() {
function search() {
var search = $.trim($('#search_box * #s').val());
fetch_library_books(0, last_num, LIBRARY_FETCH_TIMEOUT,
fetch_library_books(0, last_num, LIBRARY_FETCH_TIMEOUT,
last_sort, last_sort_order, search);
}
@ -245,11 +245,11 @@ function setup_sorting() {
$('table#book_list thead tr td').mouseover(function() {
this.style.backgroundColor = "#fff2a8";
});
$('table#book_list thead tr td').mouseout(function() {
this.style.backgroundColor = "inherit";
});
for (i = 0; i < cmap.length; i++) {
$('table#book_list span#{0}_sort'.format(cmap[i])).parent().click(function() {
var sort_indicator = $($(this).find('span'));
@ -258,7 +258,7 @@ function setup_sorting() {
var col = id.slice(0, id.indexOf("_"));
var order = 'ascending';
var html = '↑';
if (sort_indicator.html() == '↑') {
order = 'descending'; html = '↓';
}
@ -291,13 +291,13 @@ function layout() {
$(function() {
// document is ready
create_table_headers();
// Setup widgets
setup_sorting();
setup_count_bar();
$('#search_box * #s').val('');
$(window).resize(layout);
$($('#book_list * span#date_sort').parent()).click();
});

View File

@ -21,7 +21,8 @@ recipe_modules = ['recipe_' + r for r in (
'linux_magazine', 'telegraph_uk', 'utne', 'sciencedaily', 'forbes',
'time_magazine', 'endgadget', 'fudzilla', 'nspm_int', 'nspm', 'pescanik',
'spiegel_int', 'themarketticker', 'tomshardware', 'xkcd', 'ftd', 'zdnet',
'joelonsoftware', 'telepolis', 'common_dreams', 'nin',
'joelonsoftware', 'telepolis', 'common_dreams', 'nin', 'tomshardware_de',
)]
import re, imp, inspect, time, os

View File

@ -6,7 +6,6 @@ __copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
tomshardware.com
'''
from calibre.ebooks.BeautifulSoup import BeautifulSoup
from calibre.web.feeds.recipes import BasicNewsRecipe
class Tomshardware(BasicNewsRecipe):
@ -50,7 +49,7 @@ class Tomshardware(BasicNewsRecipe):
rmain, rsep, article_id = main.rpartition(',')
tmain, tsep, trest = rmain.rpartition('/reviews/')
if tsep:
return 'http://www.tomshardware.com/review_print.php?p1=' + article_id
return 'http://www.tomshardware.com/review_print.php?p1=' + article_id
return 'http://www.tomshardware.com/news_print.php?p1=' + article_id
def preprocess_html(self, soup):

View File

@ -0,0 +1,54 @@
__license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
'''
Fetch tomshardware.
'''
from calibre.web.feeds.news import BasicNewsRecipe
import re
class TomsHardwareDe(BasicNewsRecipe):
title = 'Tom\'s Hardware German'
description = 'Computer news in german'
__author__ = 'Oliver Niesner'
use_embedded_content = False
timefmt = ' [%d %b %Y]'
max_articles_per_feed = 50
no_stylesheets = True
encoding = 'utf-8'
#preprocess_regexps = \
# [(re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in
# [
# (r'<84>', lambda match: ''),
# (r'<93>', lambda match: ''),
# ]
# ]
remove_tags = [dict(id='outside-advert'),
dict(id='advertRightWhite'),
dict(id='header-advert'),
dict(id='header-banner'),
dict(id='header-menu'),
dict(id='header-top'),
dict(id='header-tools'),
dict(id='nbComment'),
dict(id='internalSidebar'),
dict(id='header-news-infos'),
dict(id='breadcrumbs'),
dict(id=''),
dict(name='div', attrs={'class':'pyjama'}),
dict(name='href', attrs={'class':'comment'}),
dict(name='div', attrs={'class':'greyBoxR clearfix'}),
dict(name='div', attrs={'class':'greyBoxL clearfix'}),
dict(name='div', attrs={'class':'greyBox clearfix'}),
dict(id='')]
#remove_tags_before = [dict(id='header-news-title')]
remove_tags_after = [dict(name='div', attrs={'class':'news-elm'})]
#remove_tags_after = [dict(name='div', attrs={'class':'intelliTXT'})]
feeds = [ ('tomshardware', 'http://www.tomshardware.com/de/feeds/rss2/tom-s-hardware-de,12-1.xml') ]