From fa09d8a4609a960d21a8e84b54357de63308c1e4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 19 Mar 2011 01:22:33 -0600 Subject: [PATCH] Also store recipe favicons in builtin_recipes.zip --- .../news => recipes/icons}/20minutos.png | Bin .../images/news => recipes/icons}/24sata.png | Bin .../news => recipes/icons}/24sata_rs.png | Bin .../images/news => recipes/icons}/7seri.png | Bin .../news => recipes/icons}/DrawAndCook.png | Bin .../images/news => recipes/icons}/abc_py.png | Bin .../images/news => recipes/icons}/ad.png | Bin .../news => recipes/icons}/adevarul.png | Bin .../icons}/adventuregamers.png | Bin .../images/news => recipes/icons}/aif_ru.png | Bin .../images/news => recipes/icons}/ajc.png | Bin .../images/news => recipes/icons}/akter.png | Bin .../news => recipes/icons}/alo_novine.png | Bin .../images/news => recipes/icons}/ambito.png | Bin .../icons}/american_thinker.png | Bin .../images/news => recipes/icons}/amspec.png | Bin .../news => recipes/icons}/anandtech.png | Bin .../icons}/arabian_business.png | Bin .../news => recipes/icons}/ars_technica.png | Bin .../news => recipes/icons}/atlantic.png | Bin .../news => recipes/icons}/avantaje.png | Bin .../icons}/aventurilapescuit.png | Bin .../news => recipes/icons}/avto-magazin.png | Bin .../news => recipes/icons}/axxon_news.png | Bin .../news => recipes/icons}/azstarnet.png | Bin .../images/news => recipes/icons}/b92.png | Bin .../news => recipes/icons}/balkaninsight.png | Bin .../images/news => recipes/icons}/barrons.png | Bin .../images/news => recipes/icons}/bbc.png | Bin .../news => recipes/icons}/berlingske_dk.png | Bin .../images/news => recipes/icons}/beta.png | Bin .../images/news => recipes/icons}/beta_en.png | Bin .../news => recipes/icons}/biggovernment.png | Bin .../news => recipes/icons}/bighollywood.png | Bin .../images/news => recipes/icons}/blic.png | Bin .../images/news => recipes/icons}/boortz.png | Bin .../images/news => recipes/icons}/borba.png | Bin .../news => recipes/icons}/bucataras.png | Bin .../icons}/business_insider.png | Bin .../icons}/business_standard.png | Bin .../icons}/businessworldin.png | Bin .../news => recipes/icons}/bwmagazine.png | Bin .../images/news => recipes/icons}/capital.png | Bin .../images/news => recipes/icons}/carta.png | Bin .../news => recipes/icons}/catavencu.png | Bin .../icons}/chicago_breaking_news.png | Bin .../news => recipes/icons}/chinadaily.png | Bin .../images/news => recipes/icons}/chipro.png | Bin .../images/news => recipes/icons}/chr_mon.png | Bin .../images/news => recipes/icons}/clarin.png | Bin .../news => recipes/icons}/cnetjapan.png | Bin .../icons}/cnetjapan_digital.png | Bin .../icons}/cnetjapan_release.png | Bin .../news => recipes/icons}/cnetnews.png | Bin .../images/news => recipes/icons}/cnn.png | Bin .../news => recipes/icons}/coding_horror.png | Bin .../icons}/columbusdispatch.png | Bin .../news => recipes/icons}/consumerist.png | Bin .../icons}/corriere_della_sera_en.png | Bin .../icons}/corriere_della_sera_it.png | Bin .../news => recipes/icons}/cotidianul.png | Bin .../news => recipes/icons}/credit_slips.png | Bin .../news => recipes/icons}/criticadigital.png | Bin .../images/news => recipes/icons}/csid.png | Bin .../news => recipes/icons}/cubadebate.png | Bin .../icons}/curierulnational.png | Bin .../news => recipes/icons}/dailyreckoning.png | Bin .../news => recipes/icons}/dailytportal.png | Bin .../images/news => recipes/icons}/danas.png | Bin .../images/news => recipes/icons}/darknet.png | Bin .../news => recipes/icons}/de_standaard.png | Bin .../news => recipes/icons}/deadspin.png | Bin .../news => recipes/icons}/der_standard.png | Bin .../news => recipes/icons}/descopera.png | Bin .../icons}/deutsche_welle_bs.png | Bin .../icons}/deutsche_welle_en.png | Bin .../icons}/deutsche_welle_es.png | Bin .../icons}/deutsche_welle_hr.png | Bin .../icons}/deutsche_welle_pt.png | Bin .../icons}/deutsche_welle_sr.png | Bin .../images/news => recipes/icons}/di.png | Bin .../news => recipes/icons}/diariovasco.png | Bin .../news => recipes/icons}/diepresse.png | Bin .../news => recipes/icons}/digitaljournal.png | Bin .../news => recipes/icons}/digitalspy_uk.png | Bin .../images/news => recipes/icons}/dilbert.png | Bin .../icons}/discover_magazine.png | Bin .../images/news => recipes/icons}/dn_se.png | Bin .../news => recipes/icons}/dnevni_avaz.png | Bin .../images/news => recipes/icons}/dnevnik.png | Bin .../images/news => recipes/icons}/dr_dk.png | Bin .../news => recipes/icons}/e_novine.png | Bin .../images/news => recipes/icons}/eclicto.png | Bin .../news => recipes/icons}/economist.png | Bin .../news => recipes/icons}/ecuisine.png | Bin .../images/news => recipes/icons}/egirl.png | Bin .../news => recipes/icons}/eksiazki.png | Bin .../icons}/el_mercurio_chile.png | Bin .../news => recipes/icons}/el_universal.png | Bin .../news => recipes/icons}/elargentino.png | Bin .../news => recipes/icons}/elcomercio.png | Bin .../news => recipes/icons}/elcronista.png | Bin .../images/news => recipes/icons}/ele.png | Bin .../news => recipes/icons}/elektrolese.png | Bin .../images/news => recipes/icons}/elmundo.png | Bin .../news => recipes/icons}/elpais_impreso.png | Bin .../news => recipes/icons}/elpais_semanal.png | Bin .../icons}/elperiodico_catalan.png | Bin .../icons}/elperiodico_spanish.png | Bin .../news => recipes/icons}/elsevier.png | Bin .../news => recipes/icons}/eltiempo_hn.png | Bin .../news => recipes/icons}/eluniversal.png | Bin .../news => recipes/icons}/eluniversal_ve.png | Bin .../news => recipes/icons}/eluniverso_ec.png | Bin .../images/news => recipes/icons}/emg_en.png | Bin .../emg_rs.recipe => recipes/icons/emg_rs.png | Bin .../news => recipes/icons}/endgadget.png | Bin .../news => recipes/icons}/endgadget_ja.png | Bin .../news => recipes/icons}/entrepeneur.png | Bin .../images/news => recipes/icons}/espn.png | Bin .../images/news => recipes/icons}/esquire.png | Bin .../images/news => recipes/icons}/estadao.png | Bin .../images/news => recipes/icons}/evz.ro.png | Bin .../images/news => recipes/icons}/exiled.png | Bin .../icons}/expansion_spanish.png | Bin .../news => recipes/icons}/fastcompany.png | Bin .../images/news => recipes/icons}/faznet.png | Bin .../news => recipes/icons}/fe_india.png | Bin .../images/news => recipes/icons}/felicia.png | Bin .../images/news => recipes/icons}/fhmro.png | Bin .../news => recipes/icons}/financiarul.png | Bin .../news => recipes/icons}/fleshbot.png | Bin .../news => recipes/icons}/foreignaffairs.png | Bin .../images/news => recipes/icons}/foxnews.png | Bin .../images/news => recipes/icons}/frazpc.png | Bin .../news => recipes/icons}/freakonomics.png | Bin .../images/news => recipes/icons}/fronda.png | Bin .../images/news => recipes/icons}/fstream.png | Bin .../images/news => recipes/icons}/ftd.png | Bin .../news => recipes/icons}/fudzilla.png | Bin .../news => recipes/icons}/futurismic.png | Bin .../news => recipes/icons}/gamasutra_fa.png | Bin .../news => recipes/icons}/gamasutra_news.png | Bin .../images/news => recipes/icons}/gandul.png | Bin .../images/news => recipes/icons}/gawker.png | Bin .../icons}/gazeta_pomorska.png | Bin .../images/news => recipes/icons}/gizmodo.png | Bin .../news => recipes/icons}/glas_srpske.png | Bin .../news => recipes/icons}/glasjavnosti.png | Bin .../images/news => recipes/icons}/go4it.png | Bin .../images/news => recipes/icons}/granma.png | Bin .../icons}/greensboro_news_and_record.png | Bin .../images/news => recipes/icons}/gsp.png | Bin .../news => recipes/icons}/guardian.png | Bin .../images/news => recipes/icons}/gva_be.png | Bin .../images/news => recipes/icons}/haaretz.png | Bin .../news => recipes/icons}/haaretz_en.png | Bin .../images/news => recipes/icons}/heise.png | Bin .../news => recipes/icons}/historiaro.png | Bin .../images/news => recipes/icons}/hitro.png | Bin .../images/news => recipes/icons}/hln.png | Bin .../images/news => recipes/icons}/hln_be.png | Bin .../images/news => recipes/icons}/hna.png | Bin .../images/news => recipes/icons}/hotair.png | Bin .../images/news => recipes/icons}/hotcity.png | Bin .../images/news => recipes/icons}/hotnews.png | Bin .../icons}/houston_chronicle-2.png | Bin .../news => recipes/icons}/howtogeek.png | Bin .../images/news => recipes/icons}/hrt.png | Bin .../images/news => recipes/icons}/ieco.png | Bin .../icons}/imperatortravel.png | Bin .../images/news => recipes/icons}/infobae.png | Bin .../news => recipes/icons}/information_dk.png | Bin .../news => recipes/icons}/inquirer_net.png | Bin .../news => recipes/icons}/instapaper.png | Bin .../news => recipes/icons}/interia_fakty.png | Bin .../news => recipes/icons}/interia_sport.png | Bin .../news => recipes/icons}/intrefete.png | Bin .../images/news => recipes/icons}/io9.png | Bin .../news => recipes/icons}/ionline_pt.png | Bin .../news => recipes/icons}/izvestia.png | Bin .../news => recipes/icons}/jalopnik.png | Bin .../news => recipes/icons}/jb_online.png | Bin .../images/news => recipes/icons}/jezebel.png | Bin .../news => recipes/icons}/jijinews.png | Bin .../news => recipes/icons}/joelonsoftware.png | Bin .../images/news => recipes/icons}/joop.png | Bin .../news => recipes/icons}/journalgazette.png | Bin .../images/news => recipes/icons}/jp_dk.png | Bin .../images/news => recipes/icons}/jpost.png | Bin .../news => recipes/icons}/jpost_fr.png | Bin .../icons}/jurnalulnational.png | Bin .../news => recipes/icons}/jutarnji.png | Bin .../news => recipes/icons}/kamerabild.png | Bin .../news => recipes/icons}/kamikaze.png | Bin .../news => recipes/icons}/kitsapun.png | Bin .../news => recipes/icons}/kommersant.png | Bin .../news => recipes/icons}/kompiutierra.png | Bin .../news => recipes/icons}/kopalniawiedzy.png | Bin .../news => recipes/icons}/korespondent.png | Bin .../images/news => recipes/icons}/kotaku.png | Bin .../news => recipes/icons}/krstarica.png | Bin .../news => recipes/icons}/krstarica_en.png | Bin .../images/news => recipes/icons}/kstar.png | Bin .../images/news => recipes/icons}/kudika.png | Bin .../images/news => recipes/icons}/kurier.png | Bin .../news => recipes/icons}/la_cuarta.png | Bin .../news => recipes/icons}/la_jornada.png | Bin .../news => recipes/icons}/la_razon_bo.png | Bin .../news => recipes/icons}/la_tercera.png | Bin .../news => recipes/icons}/lanacion.png | Bin .../news => recipes/icons}/lanacion_chile.png | Bin .../news => recipes/icons}/laprensa_hn.png | Bin .../news => recipes/icons}/laprensa_ni.png | Bin .../images/news => recipes/icons}/latimes.png | Bin .../news => recipes/icons}/latribuna.png | Bin .../news => recipes/icons}/le_monde.png | Bin .../news => recipes/icons}/ledevoir.png | Bin .../news => recipes/icons}/legeartis.png | Bin .../news => recipes/icons}/legitymizm.png | Bin .../news => recipes/icons}/lemonde_dip.png | Bin .../news => recipes/icons}/liberation.png | Bin .../news => recipes/icons}/lifehacker.png | Bin .../news => recipes/icons}/linux_magazine.png | Bin .../news => recipes/icons}/linuxdevices.png | Bin .../news => recipes/icons}/livemint.png | Bin .../news => recipes/icons}/los_tiempos_bo.png | Bin .../images/news => recipes/icons}/lrb.png | Bin .../news => recipes/icons}/lrb_payed.png | Bin .../images/news => recipes/icons}/lwn.png | Bin .../news => recipes/icons}/lwn_weekly.png | Bin .../news => recipes/icons}/mainichi.png | Bin .../icons}/mainichi_it_news.png | Bin .../news => recipes/icons}/mediafax.png | Bin .../news => recipes/icons}/miami_herald.png | Bin .../news => recipes/icons}/michalkiewicz.png | Bin .../icons}/michellemalkin_icon.png | Bin .../images/news => recipes/icons}/monden.png | Bin .../images/news => recipes/icons}/moneyro.png | Bin .../news => recipes/icons}/moscow_times.png | Bin .../news => recipes/icons}/motherjones.png | Bin .../news => recipes/icons}/msdnmag_en.png | Bin .../images/news => recipes/icons}/msnbc.png | Bin .../news => recipes/icons}/msnsankei.png | Bin .../news => recipes/icons}/nacional_cro.png | Bin .../images/news => recipes/icons}/nasa.png | Bin .../news => recipes/icons}/nationalgeoro.png | Bin .../icons}/nationalreviewonline.png | Bin .../images/news => recipes/icons}/neowin.png | Bin .../news => recipes/icons}/new_yorker.png | Bin .../icons}/newsstraitstimes.png | Bin .../news => recipes/icons}/newsweek.png | Bin .../news => recipes/icons}/nikkei_free.png | Bin .../news => recipes/icons}/nikkei_sub.png | Bin .../icons}/nikkei_sub_economy.png | Bin .../icons}/nikkei_sub_industry.png | Bin .../icons}/nikkei_sub_life.png | Bin .../icons}/nikkei_sub_main.png | Bin .../icons}/nikkei_sub_sports.png | Bin .../news => recipes/icons}/njuz_net.png | Bin .../images/news => recipes/icons}/noaa.png | Bin .../news => recipes/icons}/novaya_gazeta.png | Bin .../images/news => recipes/icons}/novosti.png | Bin .../images/news => recipes/icons}/nrc.nl.png | Bin .../images/news => recipes/icons}/nrcnext.png | Bin .../images/news => recipes/icons}/nspm.png | Bin .../news => recipes/icons}/nspm_int.png | Bin .../news => recipes/icons}/nursingtimes.png | Bin .../images/news => recipes/icons}/nypost.png | Bin .../images/news => recipes/icons}/nytimes.png | Bin .../news => recipes/icons}/nytimes_sports.png | Bin .../news => recipes/icons}/nytimes_sub.png | Bin .../news => recipes/icons}/nytimes_tech.png | Bin .../images/news => recipes/icons}/nzz_ger.png | Bin .../images/news => recipes/icons}/o_globo.png | Bin .../news => recipes/icons}/observer.png | Bin .../news => recipes/icons}/oldnewthing.png | Bin .../news => recipes/icons}/onemagazine.png | Bin .../images/news => recipes/icons}/orsai.png | Bin .../news => recipes/icons}/ourdailybread.png | Bin .../news => recipes/icons}/pagina12.png | Bin .../news => recipes/icons}/pcworldro.png | Bin .../images/news => recipes/icons}/perfil.png | Bin .../news => recipes/icons}/pescanik.png | Bin .../images/news => recipes/icons}/pobjeda.png | Bin .../news => recipes/icons}/politico.png | Bin .../news => recipes/icons}/politika.png | Bin .../news => recipes/icons}/politiken_dk.png | Bin .../news => recipes/icons}/popscience.png | Bin .../news => recipes/icons}/portfolio.png | Bin .../news => recipes/icons}/praguemonitor.png | Bin .../news => recipes/icons}/pressonline.png | Bin .../news => recipes/icons}/pressthink.png | Bin .../news => recipes/icons}/promotor.png | Bin .../news => recipes/icons}/propublica.png | Bin .../news => recipes/icons}/prosport.png | Bin .../news => recipes/icons}/protvmagazin.png | Bin .../news => recipes/icons}/psychologies.png | Bin .../images/news => recipes/icons}/publika.png | Bin .../news => recipes/icons}/radikal_tr.png | Bin .../images/news => recipes/icons}/rbc_ru.png | Bin .../news => recipes/icons}/readitlater.png | Bin .../news => recipes/icons}/realitatea.png | Bin .../images/news => recipes/icons}/reuters.png | Bin .../news => recipes/icons}/reuters_ja.png | Bin .../images/news => recipes/icons}/ria_ru.png | Bin .../news => recipes/icons}/rmf24_ESKN.png | Bin .../news => recipes/icons}/rmf24_fakty.png | Bin .../news => recipes/icons}/rollingstone.png | Bin .../news => recipes/icons}/romanialibera.png | Bin .../images/news => recipes/icons}/rstones.png | Bin .../images/news => recipes/icons}/rts.png | Bin .../news => recipes/icons}/rusiahoy.png | Bin .../icons}/sanjosemercurynews.png | Bin .../news => recipes/icons}/sarajevo_x.png | Bin .../icons}/science_news_recent_issues.png | Bin .../news => recipes/icons}/sciencedaily.png | Bin .../icons}/scott_hanselman.png | Bin .../news => recipes/icons}/seattle_times.png | Bin .../news => recipes/icons}/security_watch.png | Bin .../images/news => recipes/icons}/sfin.png | Bin .../images/news => recipes/icons}/siol.png | Bin .../news => recipes/icons}/smashing.png | Bin .../images/news => recipes/icons}/smh.png | Bin .../news => recipes/icons}/soldiers.png | Bin .../news => recipes/icons}/spiegel_int.png | Bin .../news => recipes/icons}/spiegelde.png | Bin .../news => recipes/icons}/stackoverflow.png | Bin .../news => recipes/icons}/standardmoney.png | Bin .../news => recipes/icons}/staradvertiser.png | Bin .../news => recipes/icons}/straitstimes.png | Bin .../news => recipes/icons}/sueddeutsche.png | Bin .../icons}/sueddeutschezeitung.png | Bin .../news => recipes/icons}/superbebe.png | Bin .../images/news => recipes/icons}/svd_se.png | Bin .../images/news => recipes/icons}/tabu.png | Bin .../images/news => recipes/icons}/tanjug.png | Bin .../news => recipes/icons}/telegraph_uk.png | Bin .../news => recipes/icons}/telepolis.png | Bin .../icons}/telepolis_artikel.png | Bin .../news => recipes/icons}/teleread.png | Bin .../images/news => recipes/icons}/the_oz.png | Bin .../icons}/the_week_magazine_free.png | Bin .../icons}/the_workingham_times.png | Bin .../news => recipes/icons}/theecocolapse.png | Bin .../icons}/theeconomictimes_india.png | Bin .../icons}/theluminouslandscape.png | Bin .../icons}/themarketticker.png | Bin .../news => recipes/icons}/theonion.png | Bin .../images/news => recipes/icons}/thestar.png | Bin .../news => recipes/icons}/thewest_au.png | Bin .../images/news => recipes/icons}/tidbits.png | Bin .../images/news => recipes/icons}/tijd.png | Bin .../news => recipes/icons}/time_magazine.png | Bin .../news => recipes/icons}/times_online.png | Bin .../news => recipes/icons}/timesnewroman.png | Bin .../news => recipes/icons}/tomshardware.png | Bin .../icons}/tomshardware_de.png | Bin .../news => recipes/icons}/toronto_sun.png | Bin .../images/news => recipes/icons}/tpm_uk.png | Bin .../images/news => recipes/icons}/trombon.png | Bin .../news => recipes/icons}/tulsaworld.png | Bin .../images/news => recipes/icons}/tvmania.png | Bin .../news => recipes/icons}/ultimahora.png | Bin .../images/news => recipes/icons}/uncrate.png | Bin .../images/news => recipes/icons}/unica.png | Bin .../images/news => recipes/icons}/usnews.png | Bin .../images/news => recipes/icons}/utne.png | Bin .../images/news => recipes/icons}/variety.png | Bin .../news => recipes/icons}/vecernji_list.png | Bin .../news => recipes/icons}/vedomosti.png | Bin .../images/news => recipes/icons}/vijesti.png | Bin .../icons}/virtualshackles.png | Bin .../images/news => recipes/icons}/viva.png | Bin .../images/news => recipes/icons}/vreme.png | Bin .../news => recipes/icons}/wallstreetro.png | Bin .../news => recipes/icons}/walrusmag.png | Bin .../news => recipes/icons}/wapo_cartoons.png | Bin .../images/news => recipes/icons}/welt.png | Bin .../news => recipes/icons}/wikinews_en.png | Bin .../images/news => recipes/icons}/wired.png | Bin .../news => recipes/icons}/wired_uk.png | Bin .../images/news => recipes/icons}/wsj.png | Bin .../images/news => recipes/icons}/yomiuri.png | Bin .../images/news => recipes/icons}/zdnet.png | Bin .../images/news => recipes/icons}/zeitde.png | Bin .../news => recipes/icons}/zerohedge.png | Bin .../icons}/ziarulfinanciar.png | Bin setup/resources.py | 13 +++++--- src/calibre/web/feeds/recipes/collection.py | 17 +++++----- src/calibre/web/feeds/recipes/model.py | 30 ++++++++++++++---- 391 files changed, 40 insertions(+), 20 deletions(-) rename {resources/images/news => recipes/icons}/20minutos.png (100%) rename {resources/images/news => recipes/icons}/24sata.png (100%) rename {resources/images/news => recipes/icons}/24sata_rs.png (100%) rename {resources/images/news => recipes/icons}/7seri.png (100%) rename {resources/images/news => recipes/icons}/DrawAndCook.png (100%) rename {resources/images/news => recipes/icons}/abc_py.png (100%) rename {resources/images/news => recipes/icons}/ad.png (100%) rename {resources/images/news => recipes/icons}/adevarul.png (100%) rename {resources/images/news => recipes/icons}/adventuregamers.png (100%) rename {resources/images/news => recipes/icons}/aif_ru.png (100%) rename {resources/images/news => recipes/icons}/ajc.png (100%) rename {resources/images/news => recipes/icons}/akter.png (100%) rename {resources/images/news => recipes/icons}/alo_novine.png (100%) rename {resources/images/news => recipes/icons}/ambito.png (100%) rename {resources/images/news => recipes/icons}/american_thinker.png (100%) rename {resources/images/news => recipes/icons}/amspec.png (100%) rename {resources/images/news => recipes/icons}/anandtech.png (100%) rename {resources/images/news => recipes/icons}/arabian_business.png (100%) rename {resources/images/news => recipes/icons}/ars_technica.png (100%) rename {resources/images/news => recipes/icons}/atlantic.png (100%) rename {resources/images/news => recipes/icons}/avantaje.png (100%) rename {resources/images/news => recipes/icons}/aventurilapescuit.png (100%) rename {resources/images/news => recipes/icons}/avto-magazin.png (100%) rename {resources/images/news => recipes/icons}/axxon_news.png (100%) rename {resources/images/news => recipes/icons}/azstarnet.png (100%) rename {resources/images/news => recipes/icons}/b92.png (100%) rename {resources/images/news => recipes/icons}/balkaninsight.png (100%) rename {resources/images/news => recipes/icons}/barrons.png (100%) rename {resources/images/news => recipes/icons}/bbc.png (100%) rename {resources/images/news => recipes/icons}/berlingske_dk.png (100%) rename {resources/images/news => recipes/icons}/beta.png (100%) rename {resources/images/news => recipes/icons}/beta_en.png (100%) rename {resources/images/news => recipes/icons}/biggovernment.png (100%) rename {resources/images/news => recipes/icons}/bighollywood.png (100%) rename {resources/images/news => recipes/icons}/blic.png (100%) rename {resources/images/news => recipes/icons}/boortz.png (100%) rename {resources/images/news => recipes/icons}/borba.png (100%) rename {resources/images/news => recipes/icons}/bucataras.png (100%) rename {resources/images/news => recipes/icons}/business_insider.png (100%) rename {resources/images/news => recipes/icons}/business_standard.png (100%) rename {resources/images/news => recipes/icons}/businessworldin.png (100%) rename {resources/images/news => recipes/icons}/bwmagazine.png (100%) rename {resources/images/news => recipes/icons}/capital.png (100%) rename {resources/images/news => recipes/icons}/carta.png (100%) rename {resources/images/news => recipes/icons}/catavencu.png (100%) rename {resources/images/news => recipes/icons}/chicago_breaking_news.png (100%) rename {resources/images/news => recipes/icons}/chinadaily.png (100%) rename {resources/images/news => recipes/icons}/chipro.png (100%) rename {resources/images/news => recipes/icons}/chr_mon.png (100%) rename {resources/images/news => recipes/icons}/clarin.png (100%) rename {resources/images/news => recipes/icons}/cnetjapan.png (100%) rename {resources/images/news => recipes/icons}/cnetjapan_digital.png (100%) rename {resources/images/news => recipes/icons}/cnetjapan_release.png (100%) rename {resources/images/news => recipes/icons}/cnetnews.png (100%) rename {resources/images/news => recipes/icons}/cnn.png (100%) rename {resources/images/news => recipes/icons}/coding_horror.png (100%) rename {resources/images/news => recipes/icons}/columbusdispatch.png (100%) rename {resources/images/news => recipes/icons}/consumerist.png (100%) rename {resources/images/news => recipes/icons}/corriere_della_sera_en.png (100%) rename {resources/images/news => recipes/icons}/corriere_della_sera_it.png (100%) rename {resources/images/news => recipes/icons}/cotidianul.png (100%) rename {resources/images/news => recipes/icons}/credit_slips.png (100%) rename {resources/images/news => recipes/icons}/criticadigital.png (100%) rename {resources/images/news => recipes/icons}/csid.png (100%) rename {resources/images/news => recipes/icons}/cubadebate.png (100%) rename {resources/images/news => recipes/icons}/curierulnational.png (100%) rename {resources/images/news => recipes/icons}/dailyreckoning.png (100%) rename {resources/images/news => recipes/icons}/dailytportal.png (100%) rename {resources/images/news => recipes/icons}/danas.png (100%) rename {resources/images/news => recipes/icons}/darknet.png (100%) rename {resources/images/news => recipes/icons}/de_standaard.png (100%) rename {resources/images/news => recipes/icons}/deadspin.png (100%) rename {resources/images/news => recipes/icons}/der_standard.png (100%) rename {resources/images/news => recipes/icons}/descopera.png (100%) rename {resources/images/news => recipes/icons}/deutsche_welle_bs.png (100%) rename {resources/images/news => recipes/icons}/deutsche_welle_en.png (100%) rename {resources/images/news => recipes/icons}/deutsche_welle_es.png (100%) rename {resources/images/news => recipes/icons}/deutsche_welle_hr.png (100%) rename {resources/images/news => recipes/icons}/deutsche_welle_pt.png (100%) rename {resources/images/news => recipes/icons}/deutsche_welle_sr.png (100%) rename {resources/images/news => recipes/icons}/di.png (100%) rename {resources/images/news => recipes/icons}/diariovasco.png (100%) rename {resources/images/news => recipes/icons}/diepresse.png (100%) rename {resources/images/news => recipes/icons}/digitaljournal.png (100%) rename {resources/images/news => recipes/icons}/digitalspy_uk.png (100%) rename {resources/images/news => recipes/icons}/dilbert.png (100%) rename {resources/images/news => recipes/icons}/discover_magazine.png (100%) rename {resources/images/news => recipes/icons}/dn_se.png (100%) rename {resources/images/news => recipes/icons}/dnevni_avaz.png (100%) rename {resources/images/news => recipes/icons}/dnevnik.png (100%) rename {resources/images/news => recipes/icons}/dr_dk.png (100%) rename {resources/images/news => recipes/icons}/e_novine.png (100%) rename {resources/images/news => recipes/icons}/eclicto.png (100%) rename {resources/images/news => recipes/icons}/economist.png (100%) rename {resources/images/news => recipes/icons}/ecuisine.png (100%) rename {resources/images/news => recipes/icons}/egirl.png (100%) rename {resources/images/news => recipes/icons}/eksiazki.png (100%) rename {resources/images/news => recipes/icons}/el_mercurio_chile.png (100%) rename {resources/images/news => recipes/icons}/el_universal.png (100%) rename {resources/images/news => recipes/icons}/elargentino.png (100%) rename {resources/images/news => recipes/icons}/elcomercio.png (100%) rename {resources/images/news => recipes/icons}/elcronista.png (100%) rename {resources/images/news => recipes/icons}/ele.png (100%) rename {resources/images/news => recipes/icons}/elektrolese.png (100%) rename {resources/images/news => recipes/icons}/elmundo.png (100%) rename {resources/images/news => recipes/icons}/elpais_impreso.png (100%) rename {resources/images/news => recipes/icons}/elpais_semanal.png (100%) rename {resources/images/news => recipes/icons}/elperiodico_catalan.png (100%) rename {resources/images/news => recipes/icons}/elperiodico_spanish.png (100%) rename {resources/images/news => recipes/icons}/elsevier.png (100%) rename {resources/images/news => recipes/icons}/eltiempo_hn.png (100%) rename {resources/images/news => recipes/icons}/eluniversal.png (100%) rename {resources/images/news => recipes/icons}/eluniversal_ve.png (100%) rename {resources/images/news => recipes/icons}/eluniverso_ec.png (100%) rename {resources/images/news => recipes/icons}/emg_en.png (100%) rename resources/images/news/emg_rs.recipe => recipes/icons/emg_rs.png (100%) rename {resources/images/news => recipes/icons}/endgadget.png (100%) rename {resources/images/news => recipes/icons}/endgadget_ja.png (100%) rename {resources/images/news => recipes/icons}/entrepeneur.png (100%) rename {resources/images/news => recipes/icons}/espn.png (100%) rename {resources/images/news => recipes/icons}/esquire.png (100%) rename {resources/images/news => recipes/icons}/estadao.png (100%) rename {resources/images/news => recipes/icons}/evz.ro.png (100%) rename {resources/images/news => recipes/icons}/exiled.png (100%) rename {resources/images/news => recipes/icons}/expansion_spanish.png (100%) rename {resources/images/news => recipes/icons}/fastcompany.png (100%) rename {resources/images/news => recipes/icons}/faznet.png (100%) rename {resources/images/news => recipes/icons}/fe_india.png (100%) rename {resources/images/news => recipes/icons}/felicia.png (100%) rename {resources/images/news => recipes/icons}/fhmro.png (100%) rename {resources/images/news => recipes/icons}/financiarul.png (100%) rename {resources/images/news => recipes/icons}/fleshbot.png (100%) rename {resources/images/news => recipes/icons}/foreignaffairs.png (100%) rename {resources/images/news => recipes/icons}/foxnews.png (100%) rename {resources/images/news => recipes/icons}/frazpc.png (100%) rename {resources/images/news => recipes/icons}/freakonomics.png (100%) rename {resources/images/news => recipes/icons}/fronda.png (100%) rename {resources/images/news => recipes/icons}/fstream.png (100%) rename {resources/images/news => recipes/icons}/ftd.png (100%) rename {resources/images/news => recipes/icons}/fudzilla.png (100%) rename {resources/images/news => recipes/icons}/futurismic.png (100%) rename {resources/images/news => recipes/icons}/gamasutra_fa.png (100%) rename {resources/images/news => recipes/icons}/gamasutra_news.png (100%) rename {resources/images/news => recipes/icons}/gandul.png (100%) rename {resources/images/news => recipes/icons}/gawker.png (100%) rename {resources/images/news => recipes/icons}/gazeta_pomorska.png (100%) rename {resources/images/news => recipes/icons}/gizmodo.png (100%) rename {resources/images/news => recipes/icons}/glas_srpske.png (100%) rename {resources/images/news => recipes/icons}/glasjavnosti.png (100%) rename {resources/images/news => recipes/icons}/go4it.png (100%) rename {resources/images/news => recipes/icons}/granma.png (100%) rename {resources/images/news => recipes/icons}/greensboro_news_and_record.png (100%) rename {resources/images/news => recipes/icons}/gsp.png (100%) rename {resources/images/news => recipes/icons}/guardian.png (100%) rename {resources/images/news => recipes/icons}/gva_be.png (100%) rename {resources/images/news => recipes/icons}/haaretz.png (100%) rename {resources/images/news => recipes/icons}/haaretz_en.png (100%) rename {resources/images/news => recipes/icons}/heise.png (100%) rename {resources/images/news => recipes/icons}/historiaro.png (100%) rename {resources/images/news => recipes/icons}/hitro.png (100%) rename {resources/images/news => recipes/icons}/hln.png (100%) rename {resources/images/news => recipes/icons}/hln_be.png (100%) rename {resources/images/news => recipes/icons}/hna.png (100%) rename {resources/images/news => recipes/icons}/hotair.png (100%) rename {resources/images/news => recipes/icons}/hotcity.png (100%) rename {resources/images/news => recipes/icons}/hotnews.png (100%) rename {resources/images/news => recipes/icons}/houston_chronicle-2.png (100%) rename {resources/images/news => recipes/icons}/howtogeek.png (100%) rename {resources/images/news => recipes/icons}/hrt.png (100%) rename {resources/images/news => recipes/icons}/ieco.png (100%) rename {resources/images/news => recipes/icons}/imperatortravel.png (100%) rename {resources/images/news => recipes/icons}/infobae.png (100%) rename {resources/images/news => recipes/icons}/information_dk.png (100%) rename {resources/images/news => recipes/icons}/inquirer_net.png (100%) rename {resources/images/news => recipes/icons}/instapaper.png (100%) rename {resources/images/news => recipes/icons}/interia_fakty.png (100%) rename {resources/images/news => recipes/icons}/interia_sport.png (100%) rename {resources/images/news => recipes/icons}/intrefete.png (100%) rename {resources/images/news => recipes/icons}/io9.png (100%) rename {resources/images/news => recipes/icons}/ionline_pt.png (100%) rename {resources/images/news => recipes/icons}/izvestia.png (100%) rename {resources/images/news => recipes/icons}/jalopnik.png (100%) rename {resources/images/news => recipes/icons}/jb_online.png (100%) rename {resources/images/news => recipes/icons}/jezebel.png (100%) rename {resources/images/news => recipes/icons}/jijinews.png (100%) rename {resources/images/news => recipes/icons}/joelonsoftware.png (100%) rename {resources/images/news => recipes/icons}/joop.png (100%) rename {resources/images/news => recipes/icons}/journalgazette.png (100%) rename {resources/images/news => recipes/icons}/jp_dk.png (100%) rename {resources/images/news => recipes/icons}/jpost.png (100%) rename {resources/images/news => recipes/icons}/jpost_fr.png (100%) rename {resources/images/news => recipes/icons}/jurnalulnational.png (100%) rename {resources/images/news => recipes/icons}/jutarnji.png (100%) rename {resources/images/news => recipes/icons}/kamerabild.png (100%) rename {resources/images/news => recipes/icons}/kamikaze.png (100%) rename {resources/images/news => recipes/icons}/kitsapun.png (100%) rename {resources/images/news => recipes/icons}/kommersant.png (100%) rename {resources/images/news => recipes/icons}/kompiutierra.png (100%) rename {resources/images/news => recipes/icons}/kopalniawiedzy.png (100%) rename {resources/images/news => recipes/icons}/korespondent.png (100%) rename {resources/images/news => recipes/icons}/kotaku.png (100%) rename {resources/images/news => recipes/icons}/krstarica.png (100%) rename {resources/images/news => recipes/icons}/krstarica_en.png (100%) rename {resources/images/news => recipes/icons}/kstar.png (100%) rename {resources/images/news => recipes/icons}/kudika.png (100%) rename {resources/images/news => recipes/icons}/kurier.png (100%) rename {resources/images/news => recipes/icons}/la_cuarta.png (100%) rename {resources/images/news => recipes/icons}/la_jornada.png (100%) rename {resources/images/news => recipes/icons}/la_razon_bo.png (100%) rename {resources/images/news => recipes/icons}/la_tercera.png (100%) rename {resources/images/news => recipes/icons}/lanacion.png (100%) rename {resources/images/news => recipes/icons}/lanacion_chile.png (100%) rename {resources/images/news => recipes/icons}/laprensa_hn.png (100%) rename {resources/images/news => recipes/icons}/laprensa_ni.png (100%) rename {resources/images/news => recipes/icons}/latimes.png (100%) rename {resources/images/news => recipes/icons}/latribuna.png (100%) rename {resources/images/news => recipes/icons}/le_monde.png (100%) rename {resources/images/news => recipes/icons}/ledevoir.png (100%) rename {resources/images/news => recipes/icons}/legeartis.png (100%) rename {resources/images/news => recipes/icons}/legitymizm.png (100%) rename {resources/images/news => recipes/icons}/lemonde_dip.png (100%) rename {resources/images/news => recipes/icons}/liberation.png (100%) rename {resources/images/news => recipes/icons}/lifehacker.png (100%) rename {resources/images/news => recipes/icons}/linux_magazine.png (100%) rename {resources/images/news => recipes/icons}/linuxdevices.png (100%) rename {resources/images/news => recipes/icons}/livemint.png (100%) rename {resources/images/news => recipes/icons}/los_tiempos_bo.png (100%) rename {resources/images/news => recipes/icons}/lrb.png (100%) rename {resources/images/news => recipes/icons}/lrb_payed.png (100%) rename {resources/images/news => recipes/icons}/lwn.png (100%) rename {resources/images/news => recipes/icons}/lwn_weekly.png (100%) rename {resources/images/news => recipes/icons}/mainichi.png (100%) rename {resources/images/news => recipes/icons}/mainichi_it_news.png (100%) rename {resources/images/news => recipes/icons}/mediafax.png (100%) rename {resources/images/news => recipes/icons}/miami_herald.png (100%) rename {resources/images/news => recipes/icons}/michalkiewicz.png (100%) rename {resources/images/news => recipes/icons}/michellemalkin_icon.png (100%) rename {resources/images/news => recipes/icons}/monden.png (100%) rename {resources/images/news => recipes/icons}/moneyro.png (100%) rename {resources/images/news => recipes/icons}/moscow_times.png (100%) rename {resources/images/news => recipes/icons}/motherjones.png (100%) rename {resources/images/news => recipes/icons}/msdnmag_en.png (100%) rename {resources/images/news => recipes/icons}/msnbc.png (100%) rename {resources/images/news => recipes/icons}/msnsankei.png (100%) rename {resources/images/news => recipes/icons}/nacional_cro.png (100%) rename {resources/images/news => recipes/icons}/nasa.png (100%) rename {resources/images/news => recipes/icons}/nationalgeoro.png (100%) rename {resources/images/news => recipes/icons}/nationalreviewonline.png (100%) rename {resources/images/news => recipes/icons}/neowin.png (100%) rename {resources/images/news => recipes/icons}/new_yorker.png (100%) rename {resources/images/news => recipes/icons}/newsstraitstimes.png (100%) rename {resources/images/news => recipes/icons}/newsweek.png (100%) rename {resources/images/news => recipes/icons}/nikkei_free.png (100%) rename {resources/images/news => recipes/icons}/nikkei_sub.png (100%) rename {resources/images/news => recipes/icons}/nikkei_sub_economy.png (100%) rename {resources/images/news => recipes/icons}/nikkei_sub_industry.png (100%) rename {resources/images/news => recipes/icons}/nikkei_sub_life.png (100%) rename {resources/images/news => recipes/icons}/nikkei_sub_main.png (100%) rename {resources/images/news => recipes/icons}/nikkei_sub_sports.png (100%) rename {resources/images/news => recipes/icons}/njuz_net.png (100%) rename {resources/images/news => recipes/icons}/noaa.png (100%) rename {resources/images/news => recipes/icons}/novaya_gazeta.png (100%) rename {resources/images/news => recipes/icons}/novosti.png (100%) rename {resources/images/news => recipes/icons}/nrc.nl.png (100%) rename {resources/images/news => recipes/icons}/nrcnext.png (100%) rename {resources/images/news => recipes/icons}/nspm.png (100%) rename {resources/images/news => recipes/icons}/nspm_int.png (100%) rename {resources/images/news => recipes/icons}/nursingtimes.png (100%) rename {resources/images/news => recipes/icons}/nypost.png (100%) rename {resources/images/news => recipes/icons}/nytimes.png (100%) rename {resources/images/news => recipes/icons}/nytimes_sports.png (100%) rename {resources/images/news => recipes/icons}/nytimes_sub.png (100%) rename {resources/images/news => recipes/icons}/nytimes_tech.png (100%) rename {resources/images/news => recipes/icons}/nzz_ger.png (100%) rename {resources/images/news => recipes/icons}/o_globo.png (100%) rename {resources/images/news => recipes/icons}/observer.png (100%) rename {resources/images/news => recipes/icons}/oldnewthing.png (100%) rename {resources/images/news => recipes/icons}/onemagazine.png (100%) rename {resources/images/news => recipes/icons}/orsai.png (100%) rename {resources/images/news => recipes/icons}/ourdailybread.png (100%) rename {resources/images/news => recipes/icons}/pagina12.png (100%) rename {resources/images/news => recipes/icons}/pcworldro.png (100%) rename {resources/images/news => recipes/icons}/perfil.png (100%) rename {resources/images/news => recipes/icons}/pescanik.png (100%) rename {resources/images/news => recipes/icons}/pobjeda.png (100%) rename {resources/images/news => recipes/icons}/politico.png (100%) rename {resources/images/news => recipes/icons}/politika.png (100%) rename {resources/images/news => recipes/icons}/politiken_dk.png (100%) rename {resources/images/news => recipes/icons}/popscience.png (100%) rename {resources/images/news => recipes/icons}/portfolio.png (100%) rename {resources/images/news => recipes/icons}/praguemonitor.png (100%) rename {resources/images/news => recipes/icons}/pressonline.png (100%) rename {resources/images/news => recipes/icons}/pressthink.png (100%) rename {resources/images/news => recipes/icons}/promotor.png (100%) rename {resources/images/news => recipes/icons}/propublica.png (100%) rename {resources/images/news => recipes/icons}/prosport.png (100%) rename {resources/images/news => recipes/icons}/protvmagazin.png (100%) rename {resources/images/news => recipes/icons}/psychologies.png (100%) rename {resources/images/news => recipes/icons}/publika.png (100%) rename {resources/images/news => recipes/icons}/radikal_tr.png (100%) rename {resources/images/news => recipes/icons}/rbc_ru.png (100%) rename {resources/images/news => recipes/icons}/readitlater.png (100%) rename {resources/images/news => recipes/icons}/realitatea.png (100%) rename {resources/images/news => recipes/icons}/reuters.png (100%) rename {resources/images/news => recipes/icons}/reuters_ja.png (100%) rename {resources/images/news => recipes/icons}/ria_ru.png (100%) rename {resources/images/news => recipes/icons}/rmf24_ESKN.png (100%) rename {resources/images/news => recipes/icons}/rmf24_fakty.png (100%) rename {resources/images/news => recipes/icons}/rollingstone.png (100%) rename {resources/images/news => recipes/icons}/romanialibera.png (100%) rename {resources/images/news => recipes/icons}/rstones.png (100%) rename {resources/images/news => recipes/icons}/rts.png (100%) rename {resources/images/news => recipes/icons}/rusiahoy.png (100%) rename {resources/images/news => recipes/icons}/sanjosemercurynews.png (100%) rename {resources/images/news => recipes/icons}/sarajevo_x.png (100%) rename {resources/images/news => recipes/icons}/science_news_recent_issues.png (100%) rename {resources/images/news => recipes/icons}/sciencedaily.png (100%) rename {resources/images/news => recipes/icons}/scott_hanselman.png (100%) rename {resources/images/news => recipes/icons}/seattle_times.png (100%) rename {resources/images/news => recipes/icons}/security_watch.png (100%) rename {resources/images/news => recipes/icons}/sfin.png (100%) rename {resources/images/news => recipes/icons}/siol.png (100%) rename {resources/images/news => recipes/icons}/smashing.png (100%) rename {resources/images/news => recipes/icons}/smh.png (100%) rename {resources/images/news => recipes/icons}/soldiers.png (100%) rename {resources/images/news => recipes/icons}/spiegel_int.png (100%) rename {resources/images/news => recipes/icons}/spiegelde.png (100%) rename {resources/images/news => recipes/icons}/stackoverflow.png (100%) rename {resources/images/news => recipes/icons}/standardmoney.png (100%) rename {resources/images/news => recipes/icons}/staradvertiser.png (100%) rename {resources/images/news => recipes/icons}/straitstimes.png (100%) rename {resources/images/news => recipes/icons}/sueddeutsche.png (100%) rename {resources/images/news => recipes/icons}/sueddeutschezeitung.png (100%) rename {resources/images/news => recipes/icons}/superbebe.png (100%) rename {resources/images/news => recipes/icons}/svd_se.png (100%) rename {resources/images/news => recipes/icons}/tabu.png (100%) rename {resources/images/news => recipes/icons}/tanjug.png (100%) rename {resources/images/news => recipes/icons}/telegraph_uk.png (100%) rename {resources/images/news => recipes/icons}/telepolis.png (100%) rename {resources/images/news => recipes/icons}/telepolis_artikel.png (100%) rename {resources/images/news => recipes/icons}/teleread.png (100%) rename {resources/images/news => recipes/icons}/the_oz.png (100%) rename {resources/images/news => recipes/icons}/the_week_magazine_free.png (100%) rename {resources/images/news => recipes/icons}/the_workingham_times.png (100%) rename {resources/images/news => recipes/icons}/theecocolapse.png (100%) rename {resources/images/news => recipes/icons}/theeconomictimes_india.png (100%) rename {resources/images/news => recipes/icons}/theluminouslandscape.png (100%) rename {resources/images/news => recipes/icons}/themarketticker.png (100%) rename {resources/images/news => recipes/icons}/theonion.png (100%) rename {resources/images/news => recipes/icons}/thestar.png (100%) rename {resources/images/news => recipes/icons}/thewest_au.png (100%) rename {resources/images/news => recipes/icons}/tidbits.png (100%) rename {resources/images/news => recipes/icons}/tijd.png (100%) rename {resources/images/news => recipes/icons}/time_magazine.png (100%) rename {resources/images/news => recipes/icons}/times_online.png (100%) rename {resources/images/news => recipes/icons}/timesnewroman.png (100%) rename {resources/images/news => recipes/icons}/tomshardware.png (100%) rename {resources/images/news => recipes/icons}/tomshardware_de.png (100%) rename {resources/images/news => recipes/icons}/toronto_sun.png (100%) rename {resources/images/news => recipes/icons}/tpm_uk.png (100%) rename {resources/images/news => recipes/icons}/trombon.png (100%) rename {resources/images/news => recipes/icons}/tulsaworld.png (100%) rename {resources/images/news => recipes/icons}/tvmania.png (100%) rename {resources/images/news => recipes/icons}/ultimahora.png (100%) rename {resources/images/news => recipes/icons}/uncrate.png (100%) rename {resources/images/news => recipes/icons}/unica.png (100%) rename {resources/images/news => recipes/icons}/usnews.png (100%) rename {resources/images/news => recipes/icons}/utne.png (100%) rename {resources/images/news => recipes/icons}/variety.png (100%) rename {resources/images/news => recipes/icons}/vecernji_list.png (100%) rename {resources/images/news => recipes/icons}/vedomosti.png (100%) rename {resources/images/news => recipes/icons}/vijesti.png (100%) rename {resources/images/news => recipes/icons}/virtualshackles.png (100%) rename {resources/images/news => recipes/icons}/viva.png (100%) rename {resources/images/news => recipes/icons}/vreme.png (100%) rename {resources/images/news => recipes/icons}/wallstreetro.png (100%) rename {resources/images/news => recipes/icons}/walrusmag.png (100%) rename {resources/images/news => recipes/icons}/wapo_cartoons.png (100%) rename {resources/images/news => recipes/icons}/welt.png (100%) rename {resources/images/news => recipes/icons}/wikinews_en.png (100%) rename {resources/images/news => recipes/icons}/wired.png (100%) rename {resources/images/news => recipes/icons}/wired_uk.png (100%) rename {resources/images/news => recipes/icons}/wsj.png (100%) rename {resources/images/news => recipes/icons}/yomiuri.png (100%) rename {resources/images/news => recipes/icons}/zdnet.png (100%) rename {resources/images/news => recipes/icons}/zeitde.png (100%) rename {resources/images/news => recipes/icons}/zerohedge.png (100%) rename {resources/images/news => recipes/icons}/ziarulfinanciar.png (100%) diff --git a/resources/images/news/20minutos.png b/recipes/icons/20minutos.png similarity index 100% rename from resources/images/news/20minutos.png rename to recipes/icons/20minutos.png diff --git a/resources/images/news/24sata.png b/recipes/icons/24sata.png similarity index 100% rename from resources/images/news/24sata.png rename to recipes/icons/24sata.png diff --git a/resources/images/news/24sata_rs.png b/recipes/icons/24sata_rs.png similarity index 100% rename from resources/images/news/24sata_rs.png rename to recipes/icons/24sata_rs.png diff --git a/resources/images/news/7seri.png b/recipes/icons/7seri.png similarity index 100% rename from resources/images/news/7seri.png rename to recipes/icons/7seri.png diff --git a/resources/images/news/DrawAndCook.png b/recipes/icons/DrawAndCook.png similarity index 100% rename from resources/images/news/DrawAndCook.png rename to recipes/icons/DrawAndCook.png diff --git a/resources/images/news/abc_py.png b/recipes/icons/abc_py.png similarity index 100% rename from resources/images/news/abc_py.png rename to recipes/icons/abc_py.png diff --git a/resources/images/news/ad.png b/recipes/icons/ad.png similarity index 100% rename from resources/images/news/ad.png rename to recipes/icons/ad.png diff --git a/resources/images/news/adevarul.png b/recipes/icons/adevarul.png similarity index 100% rename from resources/images/news/adevarul.png rename to recipes/icons/adevarul.png diff --git a/resources/images/news/adventuregamers.png b/recipes/icons/adventuregamers.png similarity index 100% rename from resources/images/news/adventuregamers.png rename to recipes/icons/adventuregamers.png diff --git a/resources/images/news/aif_ru.png b/recipes/icons/aif_ru.png similarity index 100% rename from resources/images/news/aif_ru.png rename to recipes/icons/aif_ru.png diff --git a/resources/images/news/ajc.png b/recipes/icons/ajc.png similarity index 100% rename from resources/images/news/ajc.png rename to recipes/icons/ajc.png diff --git a/resources/images/news/akter.png b/recipes/icons/akter.png similarity index 100% rename from resources/images/news/akter.png rename to recipes/icons/akter.png diff --git a/resources/images/news/alo_novine.png b/recipes/icons/alo_novine.png similarity index 100% rename from resources/images/news/alo_novine.png rename to recipes/icons/alo_novine.png diff --git a/resources/images/news/ambito.png b/recipes/icons/ambito.png similarity index 100% rename from resources/images/news/ambito.png rename to recipes/icons/ambito.png diff --git a/resources/images/news/american_thinker.png b/recipes/icons/american_thinker.png similarity index 100% rename from resources/images/news/american_thinker.png rename to recipes/icons/american_thinker.png diff --git a/resources/images/news/amspec.png b/recipes/icons/amspec.png similarity index 100% rename from resources/images/news/amspec.png rename to recipes/icons/amspec.png diff --git a/resources/images/news/anandtech.png b/recipes/icons/anandtech.png similarity index 100% rename from resources/images/news/anandtech.png rename to recipes/icons/anandtech.png diff --git a/resources/images/news/arabian_business.png b/recipes/icons/arabian_business.png similarity index 100% rename from resources/images/news/arabian_business.png rename to recipes/icons/arabian_business.png diff --git a/resources/images/news/ars_technica.png b/recipes/icons/ars_technica.png similarity index 100% rename from resources/images/news/ars_technica.png rename to recipes/icons/ars_technica.png diff --git a/resources/images/news/atlantic.png b/recipes/icons/atlantic.png similarity index 100% rename from resources/images/news/atlantic.png rename to recipes/icons/atlantic.png diff --git a/resources/images/news/avantaje.png b/recipes/icons/avantaje.png similarity index 100% rename from resources/images/news/avantaje.png rename to recipes/icons/avantaje.png diff --git a/resources/images/news/aventurilapescuit.png b/recipes/icons/aventurilapescuit.png similarity index 100% rename from resources/images/news/aventurilapescuit.png rename to recipes/icons/aventurilapescuit.png diff --git a/resources/images/news/avto-magazin.png b/recipes/icons/avto-magazin.png similarity index 100% rename from resources/images/news/avto-magazin.png rename to recipes/icons/avto-magazin.png diff --git a/resources/images/news/axxon_news.png b/recipes/icons/axxon_news.png similarity index 100% rename from resources/images/news/axxon_news.png rename to recipes/icons/axxon_news.png diff --git a/resources/images/news/azstarnet.png b/recipes/icons/azstarnet.png similarity index 100% rename from resources/images/news/azstarnet.png rename to recipes/icons/azstarnet.png diff --git a/resources/images/news/b92.png b/recipes/icons/b92.png similarity index 100% rename from resources/images/news/b92.png rename to recipes/icons/b92.png diff --git a/resources/images/news/balkaninsight.png b/recipes/icons/balkaninsight.png similarity index 100% rename from resources/images/news/balkaninsight.png rename to recipes/icons/balkaninsight.png diff --git a/resources/images/news/barrons.png b/recipes/icons/barrons.png similarity index 100% rename from resources/images/news/barrons.png rename to recipes/icons/barrons.png diff --git a/resources/images/news/bbc.png b/recipes/icons/bbc.png similarity index 100% rename from resources/images/news/bbc.png rename to recipes/icons/bbc.png diff --git a/resources/images/news/berlingske_dk.png b/recipes/icons/berlingske_dk.png similarity index 100% rename from resources/images/news/berlingske_dk.png rename to recipes/icons/berlingske_dk.png diff --git a/resources/images/news/beta.png b/recipes/icons/beta.png similarity index 100% rename from resources/images/news/beta.png rename to recipes/icons/beta.png diff --git a/resources/images/news/beta_en.png b/recipes/icons/beta_en.png similarity index 100% rename from resources/images/news/beta_en.png rename to recipes/icons/beta_en.png diff --git a/resources/images/news/biggovernment.png b/recipes/icons/biggovernment.png similarity index 100% rename from resources/images/news/biggovernment.png rename to recipes/icons/biggovernment.png diff --git a/resources/images/news/bighollywood.png b/recipes/icons/bighollywood.png similarity index 100% rename from resources/images/news/bighollywood.png rename to recipes/icons/bighollywood.png diff --git a/resources/images/news/blic.png b/recipes/icons/blic.png similarity index 100% rename from resources/images/news/blic.png rename to recipes/icons/blic.png diff --git a/resources/images/news/boortz.png b/recipes/icons/boortz.png similarity index 100% rename from resources/images/news/boortz.png rename to recipes/icons/boortz.png diff --git a/resources/images/news/borba.png b/recipes/icons/borba.png similarity index 100% rename from resources/images/news/borba.png rename to recipes/icons/borba.png diff --git a/resources/images/news/bucataras.png b/recipes/icons/bucataras.png similarity index 100% rename from resources/images/news/bucataras.png rename to recipes/icons/bucataras.png diff --git a/resources/images/news/business_insider.png b/recipes/icons/business_insider.png similarity index 100% rename from resources/images/news/business_insider.png rename to recipes/icons/business_insider.png diff --git a/resources/images/news/business_standard.png b/recipes/icons/business_standard.png similarity index 100% rename from resources/images/news/business_standard.png rename to recipes/icons/business_standard.png diff --git a/resources/images/news/businessworldin.png b/recipes/icons/businessworldin.png similarity index 100% rename from resources/images/news/businessworldin.png rename to recipes/icons/businessworldin.png diff --git a/resources/images/news/bwmagazine.png b/recipes/icons/bwmagazine.png similarity index 100% rename from resources/images/news/bwmagazine.png rename to recipes/icons/bwmagazine.png diff --git a/resources/images/news/capital.png b/recipes/icons/capital.png similarity index 100% rename from resources/images/news/capital.png rename to recipes/icons/capital.png diff --git a/resources/images/news/carta.png b/recipes/icons/carta.png similarity index 100% rename from resources/images/news/carta.png rename to recipes/icons/carta.png diff --git a/resources/images/news/catavencu.png b/recipes/icons/catavencu.png similarity index 100% rename from resources/images/news/catavencu.png rename to recipes/icons/catavencu.png diff --git a/resources/images/news/chicago_breaking_news.png b/recipes/icons/chicago_breaking_news.png similarity index 100% rename from resources/images/news/chicago_breaking_news.png rename to recipes/icons/chicago_breaking_news.png diff --git a/resources/images/news/chinadaily.png b/recipes/icons/chinadaily.png similarity index 100% rename from resources/images/news/chinadaily.png rename to recipes/icons/chinadaily.png diff --git a/resources/images/news/chipro.png b/recipes/icons/chipro.png similarity index 100% rename from resources/images/news/chipro.png rename to recipes/icons/chipro.png diff --git a/resources/images/news/chr_mon.png b/recipes/icons/chr_mon.png similarity index 100% rename from resources/images/news/chr_mon.png rename to recipes/icons/chr_mon.png diff --git a/resources/images/news/clarin.png b/recipes/icons/clarin.png similarity index 100% rename from resources/images/news/clarin.png rename to recipes/icons/clarin.png diff --git a/resources/images/news/cnetjapan.png b/recipes/icons/cnetjapan.png similarity index 100% rename from resources/images/news/cnetjapan.png rename to recipes/icons/cnetjapan.png diff --git a/resources/images/news/cnetjapan_digital.png b/recipes/icons/cnetjapan_digital.png similarity index 100% rename from resources/images/news/cnetjapan_digital.png rename to recipes/icons/cnetjapan_digital.png diff --git a/resources/images/news/cnetjapan_release.png b/recipes/icons/cnetjapan_release.png similarity index 100% rename from resources/images/news/cnetjapan_release.png rename to recipes/icons/cnetjapan_release.png diff --git a/resources/images/news/cnetnews.png b/recipes/icons/cnetnews.png similarity index 100% rename from resources/images/news/cnetnews.png rename to recipes/icons/cnetnews.png diff --git a/resources/images/news/cnn.png b/recipes/icons/cnn.png similarity index 100% rename from resources/images/news/cnn.png rename to recipes/icons/cnn.png diff --git a/resources/images/news/coding_horror.png b/recipes/icons/coding_horror.png similarity index 100% rename from resources/images/news/coding_horror.png rename to recipes/icons/coding_horror.png diff --git a/resources/images/news/columbusdispatch.png b/recipes/icons/columbusdispatch.png similarity index 100% rename from resources/images/news/columbusdispatch.png rename to recipes/icons/columbusdispatch.png diff --git a/resources/images/news/consumerist.png b/recipes/icons/consumerist.png similarity index 100% rename from resources/images/news/consumerist.png rename to recipes/icons/consumerist.png diff --git a/resources/images/news/corriere_della_sera_en.png b/recipes/icons/corriere_della_sera_en.png similarity index 100% rename from resources/images/news/corriere_della_sera_en.png rename to recipes/icons/corriere_della_sera_en.png diff --git a/resources/images/news/corriere_della_sera_it.png b/recipes/icons/corriere_della_sera_it.png similarity index 100% rename from resources/images/news/corriere_della_sera_it.png rename to recipes/icons/corriere_della_sera_it.png diff --git a/resources/images/news/cotidianul.png b/recipes/icons/cotidianul.png similarity index 100% rename from resources/images/news/cotidianul.png rename to recipes/icons/cotidianul.png diff --git a/resources/images/news/credit_slips.png b/recipes/icons/credit_slips.png similarity index 100% rename from resources/images/news/credit_slips.png rename to recipes/icons/credit_slips.png diff --git a/resources/images/news/criticadigital.png b/recipes/icons/criticadigital.png similarity index 100% rename from resources/images/news/criticadigital.png rename to recipes/icons/criticadigital.png diff --git a/resources/images/news/csid.png b/recipes/icons/csid.png similarity index 100% rename from resources/images/news/csid.png rename to recipes/icons/csid.png diff --git a/resources/images/news/cubadebate.png b/recipes/icons/cubadebate.png similarity index 100% rename from resources/images/news/cubadebate.png rename to recipes/icons/cubadebate.png diff --git a/resources/images/news/curierulnational.png b/recipes/icons/curierulnational.png similarity index 100% rename from resources/images/news/curierulnational.png rename to recipes/icons/curierulnational.png diff --git a/resources/images/news/dailyreckoning.png b/recipes/icons/dailyreckoning.png similarity index 100% rename from resources/images/news/dailyreckoning.png rename to recipes/icons/dailyreckoning.png diff --git a/resources/images/news/dailytportal.png b/recipes/icons/dailytportal.png similarity index 100% rename from resources/images/news/dailytportal.png rename to recipes/icons/dailytportal.png diff --git a/resources/images/news/danas.png b/recipes/icons/danas.png similarity index 100% rename from resources/images/news/danas.png rename to recipes/icons/danas.png diff --git a/resources/images/news/darknet.png b/recipes/icons/darknet.png similarity index 100% rename from resources/images/news/darknet.png rename to recipes/icons/darknet.png diff --git a/resources/images/news/de_standaard.png b/recipes/icons/de_standaard.png similarity index 100% rename from resources/images/news/de_standaard.png rename to recipes/icons/de_standaard.png diff --git a/resources/images/news/deadspin.png b/recipes/icons/deadspin.png similarity index 100% rename from resources/images/news/deadspin.png rename to recipes/icons/deadspin.png diff --git a/resources/images/news/der_standard.png b/recipes/icons/der_standard.png similarity index 100% rename from resources/images/news/der_standard.png rename to recipes/icons/der_standard.png diff --git a/resources/images/news/descopera.png b/recipes/icons/descopera.png similarity index 100% rename from resources/images/news/descopera.png rename to recipes/icons/descopera.png diff --git a/resources/images/news/deutsche_welle_bs.png b/recipes/icons/deutsche_welle_bs.png similarity index 100% rename from resources/images/news/deutsche_welle_bs.png rename to recipes/icons/deutsche_welle_bs.png diff --git a/resources/images/news/deutsche_welle_en.png b/recipes/icons/deutsche_welle_en.png similarity index 100% rename from resources/images/news/deutsche_welle_en.png rename to recipes/icons/deutsche_welle_en.png diff --git a/resources/images/news/deutsche_welle_es.png b/recipes/icons/deutsche_welle_es.png similarity index 100% rename from resources/images/news/deutsche_welle_es.png rename to recipes/icons/deutsche_welle_es.png diff --git a/resources/images/news/deutsche_welle_hr.png b/recipes/icons/deutsche_welle_hr.png similarity index 100% rename from resources/images/news/deutsche_welle_hr.png rename to recipes/icons/deutsche_welle_hr.png diff --git a/resources/images/news/deutsche_welle_pt.png b/recipes/icons/deutsche_welle_pt.png similarity index 100% rename from resources/images/news/deutsche_welle_pt.png rename to recipes/icons/deutsche_welle_pt.png diff --git a/resources/images/news/deutsche_welle_sr.png b/recipes/icons/deutsche_welle_sr.png similarity index 100% rename from resources/images/news/deutsche_welle_sr.png rename to recipes/icons/deutsche_welle_sr.png diff --git a/resources/images/news/di.png b/recipes/icons/di.png similarity index 100% rename from resources/images/news/di.png rename to recipes/icons/di.png diff --git a/resources/images/news/diariovasco.png b/recipes/icons/diariovasco.png similarity index 100% rename from resources/images/news/diariovasco.png rename to recipes/icons/diariovasco.png diff --git a/resources/images/news/diepresse.png b/recipes/icons/diepresse.png similarity index 100% rename from resources/images/news/diepresse.png rename to recipes/icons/diepresse.png diff --git a/resources/images/news/digitaljournal.png b/recipes/icons/digitaljournal.png similarity index 100% rename from resources/images/news/digitaljournal.png rename to recipes/icons/digitaljournal.png diff --git a/resources/images/news/digitalspy_uk.png b/recipes/icons/digitalspy_uk.png similarity index 100% rename from resources/images/news/digitalspy_uk.png rename to recipes/icons/digitalspy_uk.png diff --git a/resources/images/news/dilbert.png b/recipes/icons/dilbert.png similarity index 100% rename from resources/images/news/dilbert.png rename to recipes/icons/dilbert.png diff --git a/resources/images/news/discover_magazine.png b/recipes/icons/discover_magazine.png similarity index 100% rename from resources/images/news/discover_magazine.png rename to recipes/icons/discover_magazine.png diff --git a/resources/images/news/dn_se.png b/recipes/icons/dn_se.png similarity index 100% rename from resources/images/news/dn_se.png rename to recipes/icons/dn_se.png diff --git a/resources/images/news/dnevni_avaz.png b/recipes/icons/dnevni_avaz.png similarity index 100% rename from resources/images/news/dnevni_avaz.png rename to recipes/icons/dnevni_avaz.png diff --git a/resources/images/news/dnevnik.png b/recipes/icons/dnevnik.png similarity index 100% rename from resources/images/news/dnevnik.png rename to recipes/icons/dnevnik.png diff --git a/resources/images/news/dr_dk.png b/recipes/icons/dr_dk.png similarity index 100% rename from resources/images/news/dr_dk.png rename to recipes/icons/dr_dk.png diff --git a/resources/images/news/e_novine.png b/recipes/icons/e_novine.png similarity index 100% rename from resources/images/news/e_novine.png rename to recipes/icons/e_novine.png diff --git a/resources/images/news/eclicto.png b/recipes/icons/eclicto.png similarity index 100% rename from resources/images/news/eclicto.png rename to recipes/icons/eclicto.png diff --git a/resources/images/news/economist.png b/recipes/icons/economist.png similarity index 100% rename from resources/images/news/economist.png rename to recipes/icons/economist.png diff --git a/resources/images/news/ecuisine.png b/recipes/icons/ecuisine.png similarity index 100% rename from resources/images/news/ecuisine.png rename to recipes/icons/ecuisine.png diff --git a/resources/images/news/egirl.png b/recipes/icons/egirl.png similarity index 100% rename from resources/images/news/egirl.png rename to recipes/icons/egirl.png diff --git a/resources/images/news/eksiazki.png b/recipes/icons/eksiazki.png similarity index 100% rename from resources/images/news/eksiazki.png rename to recipes/icons/eksiazki.png diff --git a/resources/images/news/el_mercurio_chile.png b/recipes/icons/el_mercurio_chile.png similarity index 100% rename from resources/images/news/el_mercurio_chile.png rename to recipes/icons/el_mercurio_chile.png diff --git a/resources/images/news/el_universal.png b/recipes/icons/el_universal.png similarity index 100% rename from resources/images/news/el_universal.png rename to recipes/icons/el_universal.png diff --git a/resources/images/news/elargentino.png b/recipes/icons/elargentino.png similarity index 100% rename from resources/images/news/elargentino.png rename to recipes/icons/elargentino.png diff --git a/resources/images/news/elcomercio.png b/recipes/icons/elcomercio.png similarity index 100% rename from resources/images/news/elcomercio.png rename to recipes/icons/elcomercio.png diff --git a/resources/images/news/elcronista.png b/recipes/icons/elcronista.png similarity index 100% rename from resources/images/news/elcronista.png rename to recipes/icons/elcronista.png diff --git a/resources/images/news/ele.png b/recipes/icons/ele.png similarity index 100% rename from resources/images/news/ele.png rename to recipes/icons/ele.png diff --git a/resources/images/news/elektrolese.png b/recipes/icons/elektrolese.png similarity index 100% rename from resources/images/news/elektrolese.png rename to recipes/icons/elektrolese.png diff --git a/resources/images/news/elmundo.png b/recipes/icons/elmundo.png similarity index 100% rename from resources/images/news/elmundo.png rename to recipes/icons/elmundo.png diff --git a/resources/images/news/elpais_impreso.png b/recipes/icons/elpais_impreso.png similarity index 100% rename from resources/images/news/elpais_impreso.png rename to recipes/icons/elpais_impreso.png diff --git a/resources/images/news/elpais_semanal.png b/recipes/icons/elpais_semanal.png similarity index 100% rename from resources/images/news/elpais_semanal.png rename to recipes/icons/elpais_semanal.png diff --git a/resources/images/news/elperiodico_catalan.png b/recipes/icons/elperiodico_catalan.png similarity index 100% rename from resources/images/news/elperiodico_catalan.png rename to recipes/icons/elperiodico_catalan.png diff --git a/resources/images/news/elperiodico_spanish.png b/recipes/icons/elperiodico_spanish.png similarity index 100% rename from resources/images/news/elperiodico_spanish.png rename to recipes/icons/elperiodico_spanish.png diff --git a/resources/images/news/elsevier.png b/recipes/icons/elsevier.png similarity index 100% rename from resources/images/news/elsevier.png rename to recipes/icons/elsevier.png diff --git a/resources/images/news/eltiempo_hn.png b/recipes/icons/eltiempo_hn.png similarity index 100% rename from resources/images/news/eltiempo_hn.png rename to recipes/icons/eltiempo_hn.png diff --git a/resources/images/news/eluniversal.png b/recipes/icons/eluniversal.png similarity index 100% rename from resources/images/news/eluniversal.png rename to recipes/icons/eluniversal.png diff --git a/resources/images/news/eluniversal_ve.png b/recipes/icons/eluniversal_ve.png similarity index 100% rename from resources/images/news/eluniversal_ve.png rename to recipes/icons/eluniversal_ve.png diff --git a/resources/images/news/eluniverso_ec.png b/recipes/icons/eluniverso_ec.png similarity index 100% rename from resources/images/news/eluniverso_ec.png rename to recipes/icons/eluniverso_ec.png diff --git a/resources/images/news/emg_en.png b/recipes/icons/emg_en.png similarity index 100% rename from resources/images/news/emg_en.png rename to recipes/icons/emg_en.png diff --git a/resources/images/news/emg_rs.recipe b/recipes/icons/emg_rs.png similarity index 100% rename from resources/images/news/emg_rs.recipe rename to recipes/icons/emg_rs.png diff --git a/resources/images/news/endgadget.png b/recipes/icons/endgadget.png similarity index 100% rename from resources/images/news/endgadget.png rename to recipes/icons/endgadget.png diff --git a/resources/images/news/endgadget_ja.png b/recipes/icons/endgadget_ja.png similarity index 100% rename from resources/images/news/endgadget_ja.png rename to recipes/icons/endgadget_ja.png diff --git a/resources/images/news/entrepeneur.png b/recipes/icons/entrepeneur.png similarity index 100% rename from resources/images/news/entrepeneur.png rename to recipes/icons/entrepeneur.png diff --git a/resources/images/news/espn.png b/recipes/icons/espn.png similarity index 100% rename from resources/images/news/espn.png rename to recipes/icons/espn.png diff --git a/resources/images/news/esquire.png b/recipes/icons/esquire.png similarity index 100% rename from resources/images/news/esquire.png rename to recipes/icons/esquire.png diff --git a/resources/images/news/estadao.png b/recipes/icons/estadao.png similarity index 100% rename from resources/images/news/estadao.png rename to recipes/icons/estadao.png diff --git a/resources/images/news/evz.ro.png b/recipes/icons/evz.ro.png similarity index 100% rename from resources/images/news/evz.ro.png rename to recipes/icons/evz.ro.png diff --git a/resources/images/news/exiled.png b/recipes/icons/exiled.png similarity index 100% rename from resources/images/news/exiled.png rename to recipes/icons/exiled.png diff --git a/resources/images/news/expansion_spanish.png b/recipes/icons/expansion_spanish.png similarity index 100% rename from resources/images/news/expansion_spanish.png rename to recipes/icons/expansion_spanish.png diff --git a/resources/images/news/fastcompany.png b/recipes/icons/fastcompany.png similarity index 100% rename from resources/images/news/fastcompany.png rename to recipes/icons/fastcompany.png diff --git a/resources/images/news/faznet.png b/recipes/icons/faznet.png similarity index 100% rename from resources/images/news/faznet.png rename to recipes/icons/faznet.png diff --git a/resources/images/news/fe_india.png b/recipes/icons/fe_india.png similarity index 100% rename from resources/images/news/fe_india.png rename to recipes/icons/fe_india.png diff --git a/resources/images/news/felicia.png b/recipes/icons/felicia.png similarity index 100% rename from resources/images/news/felicia.png rename to recipes/icons/felicia.png diff --git a/resources/images/news/fhmro.png b/recipes/icons/fhmro.png similarity index 100% rename from resources/images/news/fhmro.png rename to recipes/icons/fhmro.png diff --git a/resources/images/news/financiarul.png b/recipes/icons/financiarul.png similarity index 100% rename from resources/images/news/financiarul.png rename to recipes/icons/financiarul.png diff --git a/resources/images/news/fleshbot.png b/recipes/icons/fleshbot.png similarity index 100% rename from resources/images/news/fleshbot.png rename to recipes/icons/fleshbot.png diff --git a/resources/images/news/foreignaffairs.png b/recipes/icons/foreignaffairs.png similarity index 100% rename from resources/images/news/foreignaffairs.png rename to recipes/icons/foreignaffairs.png diff --git a/resources/images/news/foxnews.png b/recipes/icons/foxnews.png similarity index 100% rename from resources/images/news/foxnews.png rename to recipes/icons/foxnews.png diff --git a/resources/images/news/frazpc.png b/recipes/icons/frazpc.png similarity index 100% rename from resources/images/news/frazpc.png rename to recipes/icons/frazpc.png diff --git a/resources/images/news/freakonomics.png b/recipes/icons/freakonomics.png similarity index 100% rename from resources/images/news/freakonomics.png rename to recipes/icons/freakonomics.png diff --git a/resources/images/news/fronda.png b/recipes/icons/fronda.png similarity index 100% rename from resources/images/news/fronda.png rename to recipes/icons/fronda.png diff --git a/resources/images/news/fstream.png b/recipes/icons/fstream.png similarity index 100% rename from resources/images/news/fstream.png rename to recipes/icons/fstream.png diff --git a/resources/images/news/ftd.png b/recipes/icons/ftd.png similarity index 100% rename from resources/images/news/ftd.png rename to recipes/icons/ftd.png diff --git a/resources/images/news/fudzilla.png b/recipes/icons/fudzilla.png similarity index 100% rename from resources/images/news/fudzilla.png rename to recipes/icons/fudzilla.png diff --git a/resources/images/news/futurismic.png b/recipes/icons/futurismic.png similarity index 100% rename from resources/images/news/futurismic.png rename to recipes/icons/futurismic.png diff --git a/resources/images/news/gamasutra_fa.png b/recipes/icons/gamasutra_fa.png similarity index 100% rename from resources/images/news/gamasutra_fa.png rename to recipes/icons/gamasutra_fa.png diff --git a/resources/images/news/gamasutra_news.png b/recipes/icons/gamasutra_news.png similarity index 100% rename from resources/images/news/gamasutra_news.png rename to recipes/icons/gamasutra_news.png diff --git a/resources/images/news/gandul.png b/recipes/icons/gandul.png similarity index 100% rename from resources/images/news/gandul.png rename to recipes/icons/gandul.png diff --git a/resources/images/news/gawker.png b/recipes/icons/gawker.png similarity index 100% rename from resources/images/news/gawker.png rename to recipes/icons/gawker.png diff --git a/resources/images/news/gazeta_pomorska.png b/recipes/icons/gazeta_pomorska.png similarity index 100% rename from resources/images/news/gazeta_pomorska.png rename to recipes/icons/gazeta_pomorska.png diff --git a/resources/images/news/gizmodo.png b/recipes/icons/gizmodo.png similarity index 100% rename from resources/images/news/gizmodo.png rename to recipes/icons/gizmodo.png diff --git a/resources/images/news/glas_srpske.png b/recipes/icons/glas_srpske.png similarity index 100% rename from resources/images/news/glas_srpske.png rename to recipes/icons/glas_srpske.png diff --git a/resources/images/news/glasjavnosti.png b/recipes/icons/glasjavnosti.png similarity index 100% rename from resources/images/news/glasjavnosti.png rename to recipes/icons/glasjavnosti.png diff --git a/resources/images/news/go4it.png b/recipes/icons/go4it.png similarity index 100% rename from resources/images/news/go4it.png rename to recipes/icons/go4it.png diff --git a/resources/images/news/granma.png b/recipes/icons/granma.png similarity index 100% rename from resources/images/news/granma.png rename to recipes/icons/granma.png diff --git a/resources/images/news/greensboro_news_and_record.png b/recipes/icons/greensboro_news_and_record.png similarity index 100% rename from resources/images/news/greensboro_news_and_record.png rename to recipes/icons/greensboro_news_and_record.png diff --git a/resources/images/news/gsp.png b/recipes/icons/gsp.png similarity index 100% rename from resources/images/news/gsp.png rename to recipes/icons/gsp.png diff --git a/resources/images/news/guardian.png b/recipes/icons/guardian.png similarity index 100% rename from resources/images/news/guardian.png rename to recipes/icons/guardian.png diff --git a/resources/images/news/gva_be.png b/recipes/icons/gva_be.png similarity index 100% rename from resources/images/news/gva_be.png rename to recipes/icons/gva_be.png diff --git a/resources/images/news/haaretz.png b/recipes/icons/haaretz.png similarity index 100% rename from resources/images/news/haaretz.png rename to recipes/icons/haaretz.png diff --git a/resources/images/news/haaretz_en.png b/recipes/icons/haaretz_en.png similarity index 100% rename from resources/images/news/haaretz_en.png rename to recipes/icons/haaretz_en.png diff --git a/resources/images/news/heise.png b/recipes/icons/heise.png similarity index 100% rename from resources/images/news/heise.png rename to recipes/icons/heise.png diff --git a/resources/images/news/historiaro.png b/recipes/icons/historiaro.png similarity index 100% rename from resources/images/news/historiaro.png rename to recipes/icons/historiaro.png diff --git a/resources/images/news/hitro.png b/recipes/icons/hitro.png similarity index 100% rename from resources/images/news/hitro.png rename to recipes/icons/hitro.png diff --git a/resources/images/news/hln.png b/recipes/icons/hln.png similarity index 100% rename from resources/images/news/hln.png rename to recipes/icons/hln.png diff --git a/resources/images/news/hln_be.png b/recipes/icons/hln_be.png similarity index 100% rename from resources/images/news/hln_be.png rename to recipes/icons/hln_be.png diff --git a/resources/images/news/hna.png b/recipes/icons/hna.png similarity index 100% rename from resources/images/news/hna.png rename to recipes/icons/hna.png diff --git a/resources/images/news/hotair.png b/recipes/icons/hotair.png similarity index 100% rename from resources/images/news/hotair.png rename to recipes/icons/hotair.png diff --git a/resources/images/news/hotcity.png b/recipes/icons/hotcity.png similarity index 100% rename from resources/images/news/hotcity.png rename to recipes/icons/hotcity.png diff --git a/resources/images/news/hotnews.png b/recipes/icons/hotnews.png similarity index 100% rename from resources/images/news/hotnews.png rename to recipes/icons/hotnews.png diff --git a/resources/images/news/houston_chronicle-2.png b/recipes/icons/houston_chronicle-2.png similarity index 100% rename from resources/images/news/houston_chronicle-2.png rename to recipes/icons/houston_chronicle-2.png diff --git a/resources/images/news/howtogeek.png b/recipes/icons/howtogeek.png similarity index 100% rename from resources/images/news/howtogeek.png rename to recipes/icons/howtogeek.png diff --git a/resources/images/news/hrt.png b/recipes/icons/hrt.png similarity index 100% rename from resources/images/news/hrt.png rename to recipes/icons/hrt.png diff --git a/resources/images/news/ieco.png b/recipes/icons/ieco.png similarity index 100% rename from resources/images/news/ieco.png rename to recipes/icons/ieco.png diff --git a/resources/images/news/imperatortravel.png b/recipes/icons/imperatortravel.png similarity index 100% rename from resources/images/news/imperatortravel.png rename to recipes/icons/imperatortravel.png diff --git a/resources/images/news/infobae.png b/recipes/icons/infobae.png similarity index 100% rename from resources/images/news/infobae.png rename to recipes/icons/infobae.png diff --git a/resources/images/news/information_dk.png b/recipes/icons/information_dk.png similarity index 100% rename from resources/images/news/information_dk.png rename to recipes/icons/information_dk.png diff --git a/resources/images/news/inquirer_net.png b/recipes/icons/inquirer_net.png similarity index 100% rename from resources/images/news/inquirer_net.png rename to recipes/icons/inquirer_net.png diff --git a/resources/images/news/instapaper.png b/recipes/icons/instapaper.png similarity index 100% rename from resources/images/news/instapaper.png rename to recipes/icons/instapaper.png diff --git a/resources/images/news/interia_fakty.png b/recipes/icons/interia_fakty.png similarity index 100% rename from resources/images/news/interia_fakty.png rename to recipes/icons/interia_fakty.png diff --git a/resources/images/news/interia_sport.png b/recipes/icons/interia_sport.png similarity index 100% rename from resources/images/news/interia_sport.png rename to recipes/icons/interia_sport.png diff --git a/resources/images/news/intrefete.png b/recipes/icons/intrefete.png similarity index 100% rename from resources/images/news/intrefete.png rename to recipes/icons/intrefete.png diff --git a/resources/images/news/io9.png b/recipes/icons/io9.png similarity index 100% rename from resources/images/news/io9.png rename to recipes/icons/io9.png diff --git a/resources/images/news/ionline_pt.png b/recipes/icons/ionline_pt.png similarity index 100% rename from resources/images/news/ionline_pt.png rename to recipes/icons/ionline_pt.png diff --git a/resources/images/news/izvestia.png b/recipes/icons/izvestia.png similarity index 100% rename from resources/images/news/izvestia.png rename to recipes/icons/izvestia.png diff --git a/resources/images/news/jalopnik.png b/recipes/icons/jalopnik.png similarity index 100% rename from resources/images/news/jalopnik.png rename to recipes/icons/jalopnik.png diff --git a/resources/images/news/jb_online.png b/recipes/icons/jb_online.png similarity index 100% rename from resources/images/news/jb_online.png rename to recipes/icons/jb_online.png diff --git a/resources/images/news/jezebel.png b/recipes/icons/jezebel.png similarity index 100% rename from resources/images/news/jezebel.png rename to recipes/icons/jezebel.png diff --git a/resources/images/news/jijinews.png b/recipes/icons/jijinews.png similarity index 100% rename from resources/images/news/jijinews.png rename to recipes/icons/jijinews.png diff --git a/resources/images/news/joelonsoftware.png b/recipes/icons/joelonsoftware.png similarity index 100% rename from resources/images/news/joelonsoftware.png rename to recipes/icons/joelonsoftware.png diff --git a/resources/images/news/joop.png b/recipes/icons/joop.png similarity index 100% rename from resources/images/news/joop.png rename to recipes/icons/joop.png diff --git a/resources/images/news/journalgazette.png b/recipes/icons/journalgazette.png similarity index 100% rename from resources/images/news/journalgazette.png rename to recipes/icons/journalgazette.png diff --git a/resources/images/news/jp_dk.png b/recipes/icons/jp_dk.png similarity index 100% rename from resources/images/news/jp_dk.png rename to recipes/icons/jp_dk.png diff --git a/resources/images/news/jpost.png b/recipes/icons/jpost.png similarity index 100% rename from resources/images/news/jpost.png rename to recipes/icons/jpost.png diff --git a/resources/images/news/jpost_fr.png b/recipes/icons/jpost_fr.png similarity index 100% rename from resources/images/news/jpost_fr.png rename to recipes/icons/jpost_fr.png diff --git a/resources/images/news/jurnalulnational.png b/recipes/icons/jurnalulnational.png similarity index 100% rename from resources/images/news/jurnalulnational.png rename to recipes/icons/jurnalulnational.png diff --git a/resources/images/news/jutarnji.png b/recipes/icons/jutarnji.png similarity index 100% rename from resources/images/news/jutarnji.png rename to recipes/icons/jutarnji.png diff --git a/resources/images/news/kamerabild.png b/recipes/icons/kamerabild.png similarity index 100% rename from resources/images/news/kamerabild.png rename to recipes/icons/kamerabild.png diff --git a/resources/images/news/kamikaze.png b/recipes/icons/kamikaze.png similarity index 100% rename from resources/images/news/kamikaze.png rename to recipes/icons/kamikaze.png diff --git a/resources/images/news/kitsapun.png b/recipes/icons/kitsapun.png similarity index 100% rename from resources/images/news/kitsapun.png rename to recipes/icons/kitsapun.png diff --git a/resources/images/news/kommersant.png b/recipes/icons/kommersant.png similarity index 100% rename from resources/images/news/kommersant.png rename to recipes/icons/kommersant.png diff --git a/resources/images/news/kompiutierra.png b/recipes/icons/kompiutierra.png similarity index 100% rename from resources/images/news/kompiutierra.png rename to recipes/icons/kompiutierra.png diff --git a/resources/images/news/kopalniawiedzy.png b/recipes/icons/kopalniawiedzy.png similarity index 100% rename from resources/images/news/kopalniawiedzy.png rename to recipes/icons/kopalniawiedzy.png diff --git a/resources/images/news/korespondent.png b/recipes/icons/korespondent.png similarity index 100% rename from resources/images/news/korespondent.png rename to recipes/icons/korespondent.png diff --git a/resources/images/news/kotaku.png b/recipes/icons/kotaku.png similarity index 100% rename from resources/images/news/kotaku.png rename to recipes/icons/kotaku.png diff --git a/resources/images/news/krstarica.png b/recipes/icons/krstarica.png similarity index 100% rename from resources/images/news/krstarica.png rename to recipes/icons/krstarica.png diff --git a/resources/images/news/krstarica_en.png b/recipes/icons/krstarica_en.png similarity index 100% rename from resources/images/news/krstarica_en.png rename to recipes/icons/krstarica_en.png diff --git a/resources/images/news/kstar.png b/recipes/icons/kstar.png similarity index 100% rename from resources/images/news/kstar.png rename to recipes/icons/kstar.png diff --git a/resources/images/news/kudika.png b/recipes/icons/kudika.png similarity index 100% rename from resources/images/news/kudika.png rename to recipes/icons/kudika.png diff --git a/resources/images/news/kurier.png b/recipes/icons/kurier.png similarity index 100% rename from resources/images/news/kurier.png rename to recipes/icons/kurier.png diff --git a/resources/images/news/la_cuarta.png b/recipes/icons/la_cuarta.png similarity index 100% rename from resources/images/news/la_cuarta.png rename to recipes/icons/la_cuarta.png diff --git a/resources/images/news/la_jornada.png b/recipes/icons/la_jornada.png similarity index 100% rename from resources/images/news/la_jornada.png rename to recipes/icons/la_jornada.png diff --git a/resources/images/news/la_razon_bo.png b/recipes/icons/la_razon_bo.png similarity index 100% rename from resources/images/news/la_razon_bo.png rename to recipes/icons/la_razon_bo.png diff --git a/resources/images/news/la_tercera.png b/recipes/icons/la_tercera.png similarity index 100% rename from resources/images/news/la_tercera.png rename to recipes/icons/la_tercera.png diff --git a/resources/images/news/lanacion.png b/recipes/icons/lanacion.png similarity index 100% rename from resources/images/news/lanacion.png rename to recipes/icons/lanacion.png diff --git a/resources/images/news/lanacion_chile.png b/recipes/icons/lanacion_chile.png similarity index 100% rename from resources/images/news/lanacion_chile.png rename to recipes/icons/lanacion_chile.png diff --git a/resources/images/news/laprensa_hn.png b/recipes/icons/laprensa_hn.png similarity index 100% rename from resources/images/news/laprensa_hn.png rename to recipes/icons/laprensa_hn.png diff --git a/resources/images/news/laprensa_ni.png b/recipes/icons/laprensa_ni.png similarity index 100% rename from resources/images/news/laprensa_ni.png rename to recipes/icons/laprensa_ni.png diff --git a/resources/images/news/latimes.png b/recipes/icons/latimes.png similarity index 100% rename from resources/images/news/latimes.png rename to recipes/icons/latimes.png diff --git a/resources/images/news/latribuna.png b/recipes/icons/latribuna.png similarity index 100% rename from resources/images/news/latribuna.png rename to recipes/icons/latribuna.png diff --git a/resources/images/news/le_monde.png b/recipes/icons/le_monde.png similarity index 100% rename from resources/images/news/le_monde.png rename to recipes/icons/le_monde.png diff --git a/resources/images/news/ledevoir.png b/recipes/icons/ledevoir.png similarity index 100% rename from resources/images/news/ledevoir.png rename to recipes/icons/ledevoir.png diff --git a/resources/images/news/legeartis.png b/recipes/icons/legeartis.png similarity index 100% rename from resources/images/news/legeartis.png rename to recipes/icons/legeartis.png diff --git a/resources/images/news/legitymizm.png b/recipes/icons/legitymizm.png similarity index 100% rename from resources/images/news/legitymizm.png rename to recipes/icons/legitymizm.png diff --git a/resources/images/news/lemonde_dip.png b/recipes/icons/lemonde_dip.png similarity index 100% rename from resources/images/news/lemonde_dip.png rename to recipes/icons/lemonde_dip.png diff --git a/resources/images/news/liberation.png b/recipes/icons/liberation.png similarity index 100% rename from resources/images/news/liberation.png rename to recipes/icons/liberation.png diff --git a/resources/images/news/lifehacker.png b/recipes/icons/lifehacker.png similarity index 100% rename from resources/images/news/lifehacker.png rename to recipes/icons/lifehacker.png diff --git a/resources/images/news/linux_magazine.png b/recipes/icons/linux_magazine.png similarity index 100% rename from resources/images/news/linux_magazine.png rename to recipes/icons/linux_magazine.png diff --git a/resources/images/news/linuxdevices.png b/recipes/icons/linuxdevices.png similarity index 100% rename from resources/images/news/linuxdevices.png rename to recipes/icons/linuxdevices.png diff --git a/resources/images/news/livemint.png b/recipes/icons/livemint.png similarity index 100% rename from resources/images/news/livemint.png rename to recipes/icons/livemint.png diff --git a/resources/images/news/los_tiempos_bo.png b/recipes/icons/los_tiempos_bo.png similarity index 100% rename from resources/images/news/los_tiempos_bo.png rename to recipes/icons/los_tiempos_bo.png diff --git a/resources/images/news/lrb.png b/recipes/icons/lrb.png similarity index 100% rename from resources/images/news/lrb.png rename to recipes/icons/lrb.png diff --git a/resources/images/news/lrb_payed.png b/recipes/icons/lrb_payed.png similarity index 100% rename from resources/images/news/lrb_payed.png rename to recipes/icons/lrb_payed.png diff --git a/resources/images/news/lwn.png b/recipes/icons/lwn.png similarity index 100% rename from resources/images/news/lwn.png rename to recipes/icons/lwn.png diff --git a/resources/images/news/lwn_weekly.png b/recipes/icons/lwn_weekly.png similarity index 100% rename from resources/images/news/lwn_weekly.png rename to recipes/icons/lwn_weekly.png diff --git a/resources/images/news/mainichi.png b/recipes/icons/mainichi.png similarity index 100% rename from resources/images/news/mainichi.png rename to recipes/icons/mainichi.png diff --git a/resources/images/news/mainichi_it_news.png b/recipes/icons/mainichi_it_news.png similarity index 100% rename from resources/images/news/mainichi_it_news.png rename to recipes/icons/mainichi_it_news.png diff --git a/resources/images/news/mediafax.png b/recipes/icons/mediafax.png similarity index 100% rename from resources/images/news/mediafax.png rename to recipes/icons/mediafax.png diff --git a/resources/images/news/miami_herald.png b/recipes/icons/miami_herald.png similarity index 100% rename from resources/images/news/miami_herald.png rename to recipes/icons/miami_herald.png diff --git a/resources/images/news/michalkiewicz.png b/recipes/icons/michalkiewicz.png similarity index 100% rename from resources/images/news/michalkiewicz.png rename to recipes/icons/michalkiewicz.png diff --git a/resources/images/news/michellemalkin_icon.png b/recipes/icons/michellemalkin_icon.png similarity index 100% rename from resources/images/news/michellemalkin_icon.png rename to recipes/icons/michellemalkin_icon.png diff --git a/resources/images/news/monden.png b/recipes/icons/monden.png similarity index 100% rename from resources/images/news/monden.png rename to recipes/icons/monden.png diff --git a/resources/images/news/moneyro.png b/recipes/icons/moneyro.png similarity index 100% rename from resources/images/news/moneyro.png rename to recipes/icons/moneyro.png diff --git a/resources/images/news/moscow_times.png b/recipes/icons/moscow_times.png similarity index 100% rename from resources/images/news/moscow_times.png rename to recipes/icons/moscow_times.png diff --git a/resources/images/news/motherjones.png b/recipes/icons/motherjones.png similarity index 100% rename from resources/images/news/motherjones.png rename to recipes/icons/motherjones.png diff --git a/resources/images/news/msdnmag_en.png b/recipes/icons/msdnmag_en.png similarity index 100% rename from resources/images/news/msdnmag_en.png rename to recipes/icons/msdnmag_en.png diff --git a/resources/images/news/msnbc.png b/recipes/icons/msnbc.png similarity index 100% rename from resources/images/news/msnbc.png rename to recipes/icons/msnbc.png diff --git a/resources/images/news/msnsankei.png b/recipes/icons/msnsankei.png similarity index 100% rename from resources/images/news/msnsankei.png rename to recipes/icons/msnsankei.png diff --git a/resources/images/news/nacional_cro.png b/recipes/icons/nacional_cro.png similarity index 100% rename from resources/images/news/nacional_cro.png rename to recipes/icons/nacional_cro.png diff --git a/resources/images/news/nasa.png b/recipes/icons/nasa.png similarity index 100% rename from resources/images/news/nasa.png rename to recipes/icons/nasa.png diff --git a/resources/images/news/nationalgeoro.png b/recipes/icons/nationalgeoro.png similarity index 100% rename from resources/images/news/nationalgeoro.png rename to recipes/icons/nationalgeoro.png diff --git a/resources/images/news/nationalreviewonline.png b/recipes/icons/nationalreviewonline.png similarity index 100% rename from resources/images/news/nationalreviewonline.png rename to recipes/icons/nationalreviewonline.png diff --git a/resources/images/news/neowin.png b/recipes/icons/neowin.png similarity index 100% rename from resources/images/news/neowin.png rename to recipes/icons/neowin.png diff --git a/resources/images/news/new_yorker.png b/recipes/icons/new_yorker.png similarity index 100% rename from resources/images/news/new_yorker.png rename to recipes/icons/new_yorker.png diff --git a/resources/images/news/newsstraitstimes.png b/recipes/icons/newsstraitstimes.png similarity index 100% rename from resources/images/news/newsstraitstimes.png rename to recipes/icons/newsstraitstimes.png diff --git a/resources/images/news/newsweek.png b/recipes/icons/newsweek.png similarity index 100% rename from resources/images/news/newsweek.png rename to recipes/icons/newsweek.png diff --git a/resources/images/news/nikkei_free.png b/recipes/icons/nikkei_free.png similarity index 100% rename from resources/images/news/nikkei_free.png rename to recipes/icons/nikkei_free.png diff --git a/resources/images/news/nikkei_sub.png b/recipes/icons/nikkei_sub.png similarity index 100% rename from resources/images/news/nikkei_sub.png rename to recipes/icons/nikkei_sub.png diff --git a/resources/images/news/nikkei_sub_economy.png b/recipes/icons/nikkei_sub_economy.png similarity index 100% rename from resources/images/news/nikkei_sub_economy.png rename to recipes/icons/nikkei_sub_economy.png diff --git a/resources/images/news/nikkei_sub_industry.png b/recipes/icons/nikkei_sub_industry.png similarity index 100% rename from resources/images/news/nikkei_sub_industry.png rename to recipes/icons/nikkei_sub_industry.png diff --git a/resources/images/news/nikkei_sub_life.png b/recipes/icons/nikkei_sub_life.png similarity index 100% rename from resources/images/news/nikkei_sub_life.png rename to recipes/icons/nikkei_sub_life.png diff --git a/resources/images/news/nikkei_sub_main.png b/recipes/icons/nikkei_sub_main.png similarity index 100% rename from resources/images/news/nikkei_sub_main.png rename to recipes/icons/nikkei_sub_main.png diff --git a/resources/images/news/nikkei_sub_sports.png b/recipes/icons/nikkei_sub_sports.png similarity index 100% rename from resources/images/news/nikkei_sub_sports.png rename to recipes/icons/nikkei_sub_sports.png diff --git a/resources/images/news/njuz_net.png b/recipes/icons/njuz_net.png similarity index 100% rename from resources/images/news/njuz_net.png rename to recipes/icons/njuz_net.png diff --git a/resources/images/news/noaa.png b/recipes/icons/noaa.png similarity index 100% rename from resources/images/news/noaa.png rename to recipes/icons/noaa.png diff --git a/resources/images/news/novaya_gazeta.png b/recipes/icons/novaya_gazeta.png similarity index 100% rename from resources/images/news/novaya_gazeta.png rename to recipes/icons/novaya_gazeta.png diff --git a/resources/images/news/novosti.png b/recipes/icons/novosti.png similarity index 100% rename from resources/images/news/novosti.png rename to recipes/icons/novosti.png diff --git a/resources/images/news/nrc.nl.png b/recipes/icons/nrc.nl.png similarity index 100% rename from resources/images/news/nrc.nl.png rename to recipes/icons/nrc.nl.png diff --git a/resources/images/news/nrcnext.png b/recipes/icons/nrcnext.png similarity index 100% rename from resources/images/news/nrcnext.png rename to recipes/icons/nrcnext.png diff --git a/resources/images/news/nspm.png b/recipes/icons/nspm.png similarity index 100% rename from resources/images/news/nspm.png rename to recipes/icons/nspm.png diff --git a/resources/images/news/nspm_int.png b/recipes/icons/nspm_int.png similarity index 100% rename from resources/images/news/nspm_int.png rename to recipes/icons/nspm_int.png diff --git a/resources/images/news/nursingtimes.png b/recipes/icons/nursingtimes.png similarity index 100% rename from resources/images/news/nursingtimes.png rename to recipes/icons/nursingtimes.png diff --git a/resources/images/news/nypost.png b/recipes/icons/nypost.png similarity index 100% rename from resources/images/news/nypost.png rename to recipes/icons/nypost.png diff --git a/resources/images/news/nytimes.png b/recipes/icons/nytimes.png similarity index 100% rename from resources/images/news/nytimes.png rename to recipes/icons/nytimes.png diff --git a/resources/images/news/nytimes_sports.png b/recipes/icons/nytimes_sports.png similarity index 100% rename from resources/images/news/nytimes_sports.png rename to recipes/icons/nytimes_sports.png diff --git a/resources/images/news/nytimes_sub.png b/recipes/icons/nytimes_sub.png similarity index 100% rename from resources/images/news/nytimes_sub.png rename to recipes/icons/nytimes_sub.png diff --git a/resources/images/news/nytimes_tech.png b/recipes/icons/nytimes_tech.png similarity index 100% rename from resources/images/news/nytimes_tech.png rename to recipes/icons/nytimes_tech.png diff --git a/resources/images/news/nzz_ger.png b/recipes/icons/nzz_ger.png similarity index 100% rename from resources/images/news/nzz_ger.png rename to recipes/icons/nzz_ger.png diff --git a/resources/images/news/o_globo.png b/recipes/icons/o_globo.png similarity index 100% rename from resources/images/news/o_globo.png rename to recipes/icons/o_globo.png diff --git a/resources/images/news/observer.png b/recipes/icons/observer.png similarity index 100% rename from resources/images/news/observer.png rename to recipes/icons/observer.png diff --git a/resources/images/news/oldnewthing.png b/recipes/icons/oldnewthing.png similarity index 100% rename from resources/images/news/oldnewthing.png rename to recipes/icons/oldnewthing.png diff --git a/resources/images/news/onemagazine.png b/recipes/icons/onemagazine.png similarity index 100% rename from resources/images/news/onemagazine.png rename to recipes/icons/onemagazine.png diff --git a/resources/images/news/orsai.png b/recipes/icons/orsai.png similarity index 100% rename from resources/images/news/orsai.png rename to recipes/icons/orsai.png diff --git a/resources/images/news/ourdailybread.png b/recipes/icons/ourdailybread.png similarity index 100% rename from resources/images/news/ourdailybread.png rename to recipes/icons/ourdailybread.png diff --git a/resources/images/news/pagina12.png b/recipes/icons/pagina12.png similarity index 100% rename from resources/images/news/pagina12.png rename to recipes/icons/pagina12.png diff --git a/resources/images/news/pcworldro.png b/recipes/icons/pcworldro.png similarity index 100% rename from resources/images/news/pcworldro.png rename to recipes/icons/pcworldro.png diff --git a/resources/images/news/perfil.png b/recipes/icons/perfil.png similarity index 100% rename from resources/images/news/perfil.png rename to recipes/icons/perfil.png diff --git a/resources/images/news/pescanik.png b/recipes/icons/pescanik.png similarity index 100% rename from resources/images/news/pescanik.png rename to recipes/icons/pescanik.png diff --git a/resources/images/news/pobjeda.png b/recipes/icons/pobjeda.png similarity index 100% rename from resources/images/news/pobjeda.png rename to recipes/icons/pobjeda.png diff --git a/resources/images/news/politico.png b/recipes/icons/politico.png similarity index 100% rename from resources/images/news/politico.png rename to recipes/icons/politico.png diff --git a/resources/images/news/politika.png b/recipes/icons/politika.png similarity index 100% rename from resources/images/news/politika.png rename to recipes/icons/politika.png diff --git a/resources/images/news/politiken_dk.png b/recipes/icons/politiken_dk.png similarity index 100% rename from resources/images/news/politiken_dk.png rename to recipes/icons/politiken_dk.png diff --git a/resources/images/news/popscience.png b/recipes/icons/popscience.png similarity index 100% rename from resources/images/news/popscience.png rename to recipes/icons/popscience.png diff --git a/resources/images/news/portfolio.png b/recipes/icons/portfolio.png similarity index 100% rename from resources/images/news/portfolio.png rename to recipes/icons/portfolio.png diff --git a/resources/images/news/praguemonitor.png b/recipes/icons/praguemonitor.png similarity index 100% rename from resources/images/news/praguemonitor.png rename to recipes/icons/praguemonitor.png diff --git a/resources/images/news/pressonline.png b/recipes/icons/pressonline.png similarity index 100% rename from resources/images/news/pressonline.png rename to recipes/icons/pressonline.png diff --git a/resources/images/news/pressthink.png b/recipes/icons/pressthink.png similarity index 100% rename from resources/images/news/pressthink.png rename to recipes/icons/pressthink.png diff --git a/resources/images/news/promotor.png b/recipes/icons/promotor.png similarity index 100% rename from resources/images/news/promotor.png rename to recipes/icons/promotor.png diff --git a/resources/images/news/propublica.png b/recipes/icons/propublica.png similarity index 100% rename from resources/images/news/propublica.png rename to recipes/icons/propublica.png diff --git a/resources/images/news/prosport.png b/recipes/icons/prosport.png similarity index 100% rename from resources/images/news/prosport.png rename to recipes/icons/prosport.png diff --git a/resources/images/news/protvmagazin.png b/recipes/icons/protvmagazin.png similarity index 100% rename from resources/images/news/protvmagazin.png rename to recipes/icons/protvmagazin.png diff --git a/resources/images/news/psychologies.png b/recipes/icons/psychologies.png similarity index 100% rename from resources/images/news/psychologies.png rename to recipes/icons/psychologies.png diff --git a/resources/images/news/publika.png b/recipes/icons/publika.png similarity index 100% rename from resources/images/news/publika.png rename to recipes/icons/publika.png diff --git a/resources/images/news/radikal_tr.png b/recipes/icons/radikal_tr.png similarity index 100% rename from resources/images/news/radikal_tr.png rename to recipes/icons/radikal_tr.png diff --git a/resources/images/news/rbc_ru.png b/recipes/icons/rbc_ru.png similarity index 100% rename from resources/images/news/rbc_ru.png rename to recipes/icons/rbc_ru.png diff --git a/resources/images/news/readitlater.png b/recipes/icons/readitlater.png similarity index 100% rename from resources/images/news/readitlater.png rename to recipes/icons/readitlater.png diff --git a/resources/images/news/realitatea.png b/recipes/icons/realitatea.png similarity index 100% rename from resources/images/news/realitatea.png rename to recipes/icons/realitatea.png diff --git a/resources/images/news/reuters.png b/recipes/icons/reuters.png similarity index 100% rename from resources/images/news/reuters.png rename to recipes/icons/reuters.png diff --git a/resources/images/news/reuters_ja.png b/recipes/icons/reuters_ja.png similarity index 100% rename from resources/images/news/reuters_ja.png rename to recipes/icons/reuters_ja.png diff --git a/resources/images/news/ria_ru.png b/recipes/icons/ria_ru.png similarity index 100% rename from resources/images/news/ria_ru.png rename to recipes/icons/ria_ru.png diff --git a/resources/images/news/rmf24_ESKN.png b/recipes/icons/rmf24_ESKN.png similarity index 100% rename from resources/images/news/rmf24_ESKN.png rename to recipes/icons/rmf24_ESKN.png diff --git a/resources/images/news/rmf24_fakty.png b/recipes/icons/rmf24_fakty.png similarity index 100% rename from resources/images/news/rmf24_fakty.png rename to recipes/icons/rmf24_fakty.png diff --git a/resources/images/news/rollingstone.png b/recipes/icons/rollingstone.png similarity index 100% rename from resources/images/news/rollingstone.png rename to recipes/icons/rollingstone.png diff --git a/resources/images/news/romanialibera.png b/recipes/icons/romanialibera.png similarity index 100% rename from resources/images/news/romanialibera.png rename to recipes/icons/romanialibera.png diff --git a/resources/images/news/rstones.png b/recipes/icons/rstones.png similarity index 100% rename from resources/images/news/rstones.png rename to recipes/icons/rstones.png diff --git a/resources/images/news/rts.png b/recipes/icons/rts.png similarity index 100% rename from resources/images/news/rts.png rename to recipes/icons/rts.png diff --git a/resources/images/news/rusiahoy.png b/recipes/icons/rusiahoy.png similarity index 100% rename from resources/images/news/rusiahoy.png rename to recipes/icons/rusiahoy.png diff --git a/resources/images/news/sanjosemercurynews.png b/recipes/icons/sanjosemercurynews.png similarity index 100% rename from resources/images/news/sanjosemercurynews.png rename to recipes/icons/sanjosemercurynews.png diff --git a/resources/images/news/sarajevo_x.png b/recipes/icons/sarajevo_x.png similarity index 100% rename from resources/images/news/sarajevo_x.png rename to recipes/icons/sarajevo_x.png diff --git a/resources/images/news/science_news_recent_issues.png b/recipes/icons/science_news_recent_issues.png similarity index 100% rename from resources/images/news/science_news_recent_issues.png rename to recipes/icons/science_news_recent_issues.png diff --git a/resources/images/news/sciencedaily.png b/recipes/icons/sciencedaily.png similarity index 100% rename from resources/images/news/sciencedaily.png rename to recipes/icons/sciencedaily.png diff --git a/resources/images/news/scott_hanselman.png b/recipes/icons/scott_hanselman.png similarity index 100% rename from resources/images/news/scott_hanselman.png rename to recipes/icons/scott_hanselman.png diff --git a/resources/images/news/seattle_times.png b/recipes/icons/seattle_times.png similarity index 100% rename from resources/images/news/seattle_times.png rename to recipes/icons/seattle_times.png diff --git a/resources/images/news/security_watch.png b/recipes/icons/security_watch.png similarity index 100% rename from resources/images/news/security_watch.png rename to recipes/icons/security_watch.png diff --git a/resources/images/news/sfin.png b/recipes/icons/sfin.png similarity index 100% rename from resources/images/news/sfin.png rename to recipes/icons/sfin.png diff --git a/resources/images/news/siol.png b/recipes/icons/siol.png similarity index 100% rename from resources/images/news/siol.png rename to recipes/icons/siol.png diff --git a/resources/images/news/smashing.png b/recipes/icons/smashing.png similarity index 100% rename from resources/images/news/smashing.png rename to recipes/icons/smashing.png diff --git a/resources/images/news/smh.png b/recipes/icons/smh.png similarity index 100% rename from resources/images/news/smh.png rename to recipes/icons/smh.png diff --git a/resources/images/news/soldiers.png b/recipes/icons/soldiers.png similarity index 100% rename from resources/images/news/soldiers.png rename to recipes/icons/soldiers.png diff --git a/resources/images/news/spiegel_int.png b/recipes/icons/spiegel_int.png similarity index 100% rename from resources/images/news/spiegel_int.png rename to recipes/icons/spiegel_int.png diff --git a/resources/images/news/spiegelde.png b/recipes/icons/spiegelde.png similarity index 100% rename from resources/images/news/spiegelde.png rename to recipes/icons/spiegelde.png diff --git a/resources/images/news/stackoverflow.png b/recipes/icons/stackoverflow.png similarity index 100% rename from resources/images/news/stackoverflow.png rename to recipes/icons/stackoverflow.png diff --git a/resources/images/news/standardmoney.png b/recipes/icons/standardmoney.png similarity index 100% rename from resources/images/news/standardmoney.png rename to recipes/icons/standardmoney.png diff --git a/resources/images/news/staradvertiser.png b/recipes/icons/staradvertiser.png similarity index 100% rename from resources/images/news/staradvertiser.png rename to recipes/icons/staradvertiser.png diff --git a/resources/images/news/straitstimes.png b/recipes/icons/straitstimes.png similarity index 100% rename from resources/images/news/straitstimes.png rename to recipes/icons/straitstimes.png diff --git a/resources/images/news/sueddeutsche.png b/recipes/icons/sueddeutsche.png similarity index 100% rename from resources/images/news/sueddeutsche.png rename to recipes/icons/sueddeutsche.png diff --git a/resources/images/news/sueddeutschezeitung.png b/recipes/icons/sueddeutschezeitung.png similarity index 100% rename from resources/images/news/sueddeutschezeitung.png rename to recipes/icons/sueddeutschezeitung.png diff --git a/resources/images/news/superbebe.png b/recipes/icons/superbebe.png similarity index 100% rename from resources/images/news/superbebe.png rename to recipes/icons/superbebe.png diff --git a/resources/images/news/svd_se.png b/recipes/icons/svd_se.png similarity index 100% rename from resources/images/news/svd_se.png rename to recipes/icons/svd_se.png diff --git a/resources/images/news/tabu.png b/recipes/icons/tabu.png similarity index 100% rename from resources/images/news/tabu.png rename to recipes/icons/tabu.png diff --git a/resources/images/news/tanjug.png b/recipes/icons/tanjug.png similarity index 100% rename from resources/images/news/tanjug.png rename to recipes/icons/tanjug.png diff --git a/resources/images/news/telegraph_uk.png b/recipes/icons/telegraph_uk.png similarity index 100% rename from resources/images/news/telegraph_uk.png rename to recipes/icons/telegraph_uk.png diff --git a/resources/images/news/telepolis.png b/recipes/icons/telepolis.png similarity index 100% rename from resources/images/news/telepolis.png rename to recipes/icons/telepolis.png diff --git a/resources/images/news/telepolis_artikel.png b/recipes/icons/telepolis_artikel.png similarity index 100% rename from resources/images/news/telepolis_artikel.png rename to recipes/icons/telepolis_artikel.png diff --git a/resources/images/news/teleread.png b/recipes/icons/teleread.png similarity index 100% rename from resources/images/news/teleread.png rename to recipes/icons/teleread.png diff --git a/resources/images/news/the_oz.png b/recipes/icons/the_oz.png similarity index 100% rename from resources/images/news/the_oz.png rename to recipes/icons/the_oz.png diff --git a/resources/images/news/the_week_magazine_free.png b/recipes/icons/the_week_magazine_free.png similarity index 100% rename from resources/images/news/the_week_magazine_free.png rename to recipes/icons/the_week_magazine_free.png diff --git a/resources/images/news/the_workingham_times.png b/recipes/icons/the_workingham_times.png similarity index 100% rename from resources/images/news/the_workingham_times.png rename to recipes/icons/the_workingham_times.png diff --git a/resources/images/news/theecocolapse.png b/recipes/icons/theecocolapse.png similarity index 100% rename from resources/images/news/theecocolapse.png rename to recipes/icons/theecocolapse.png diff --git a/resources/images/news/theeconomictimes_india.png b/recipes/icons/theeconomictimes_india.png similarity index 100% rename from resources/images/news/theeconomictimes_india.png rename to recipes/icons/theeconomictimes_india.png diff --git a/resources/images/news/theluminouslandscape.png b/recipes/icons/theluminouslandscape.png similarity index 100% rename from resources/images/news/theluminouslandscape.png rename to recipes/icons/theluminouslandscape.png diff --git a/resources/images/news/themarketticker.png b/recipes/icons/themarketticker.png similarity index 100% rename from resources/images/news/themarketticker.png rename to recipes/icons/themarketticker.png diff --git a/resources/images/news/theonion.png b/recipes/icons/theonion.png similarity index 100% rename from resources/images/news/theonion.png rename to recipes/icons/theonion.png diff --git a/resources/images/news/thestar.png b/recipes/icons/thestar.png similarity index 100% rename from resources/images/news/thestar.png rename to recipes/icons/thestar.png diff --git a/resources/images/news/thewest_au.png b/recipes/icons/thewest_au.png similarity index 100% rename from resources/images/news/thewest_au.png rename to recipes/icons/thewest_au.png diff --git a/resources/images/news/tidbits.png b/recipes/icons/tidbits.png similarity index 100% rename from resources/images/news/tidbits.png rename to recipes/icons/tidbits.png diff --git a/resources/images/news/tijd.png b/recipes/icons/tijd.png similarity index 100% rename from resources/images/news/tijd.png rename to recipes/icons/tijd.png diff --git a/resources/images/news/time_magazine.png b/recipes/icons/time_magazine.png similarity index 100% rename from resources/images/news/time_magazine.png rename to recipes/icons/time_magazine.png diff --git a/resources/images/news/times_online.png b/recipes/icons/times_online.png similarity index 100% rename from resources/images/news/times_online.png rename to recipes/icons/times_online.png diff --git a/resources/images/news/timesnewroman.png b/recipes/icons/timesnewroman.png similarity index 100% rename from resources/images/news/timesnewroman.png rename to recipes/icons/timesnewroman.png diff --git a/resources/images/news/tomshardware.png b/recipes/icons/tomshardware.png similarity index 100% rename from resources/images/news/tomshardware.png rename to recipes/icons/tomshardware.png diff --git a/resources/images/news/tomshardware_de.png b/recipes/icons/tomshardware_de.png similarity index 100% rename from resources/images/news/tomshardware_de.png rename to recipes/icons/tomshardware_de.png diff --git a/resources/images/news/toronto_sun.png b/recipes/icons/toronto_sun.png similarity index 100% rename from resources/images/news/toronto_sun.png rename to recipes/icons/toronto_sun.png diff --git a/resources/images/news/tpm_uk.png b/recipes/icons/tpm_uk.png similarity index 100% rename from resources/images/news/tpm_uk.png rename to recipes/icons/tpm_uk.png diff --git a/resources/images/news/trombon.png b/recipes/icons/trombon.png similarity index 100% rename from resources/images/news/trombon.png rename to recipes/icons/trombon.png diff --git a/resources/images/news/tulsaworld.png b/recipes/icons/tulsaworld.png similarity index 100% rename from resources/images/news/tulsaworld.png rename to recipes/icons/tulsaworld.png diff --git a/resources/images/news/tvmania.png b/recipes/icons/tvmania.png similarity index 100% rename from resources/images/news/tvmania.png rename to recipes/icons/tvmania.png diff --git a/resources/images/news/ultimahora.png b/recipes/icons/ultimahora.png similarity index 100% rename from resources/images/news/ultimahora.png rename to recipes/icons/ultimahora.png diff --git a/resources/images/news/uncrate.png b/recipes/icons/uncrate.png similarity index 100% rename from resources/images/news/uncrate.png rename to recipes/icons/uncrate.png diff --git a/resources/images/news/unica.png b/recipes/icons/unica.png similarity index 100% rename from resources/images/news/unica.png rename to recipes/icons/unica.png diff --git a/resources/images/news/usnews.png b/recipes/icons/usnews.png similarity index 100% rename from resources/images/news/usnews.png rename to recipes/icons/usnews.png diff --git a/resources/images/news/utne.png b/recipes/icons/utne.png similarity index 100% rename from resources/images/news/utne.png rename to recipes/icons/utne.png diff --git a/resources/images/news/variety.png b/recipes/icons/variety.png similarity index 100% rename from resources/images/news/variety.png rename to recipes/icons/variety.png diff --git a/resources/images/news/vecernji_list.png b/recipes/icons/vecernji_list.png similarity index 100% rename from resources/images/news/vecernji_list.png rename to recipes/icons/vecernji_list.png diff --git a/resources/images/news/vedomosti.png b/recipes/icons/vedomosti.png similarity index 100% rename from resources/images/news/vedomosti.png rename to recipes/icons/vedomosti.png diff --git a/resources/images/news/vijesti.png b/recipes/icons/vijesti.png similarity index 100% rename from resources/images/news/vijesti.png rename to recipes/icons/vijesti.png diff --git a/resources/images/news/virtualshackles.png b/recipes/icons/virtualshackles.png similarity index 100% rename from resources/images/news/virtualshackles.png rename to recipes/icons/virtualshackles.png diff --git a/resources/images/news/viva.png b/recipes/icons/viva.png similarity index 100% rename from resources/images/news/viva.png rename to recipes/icons/viva.png diff --git a/resources/images/news/vreme.png b/recipes/icons/vreme.png similarity index 100% rename from resources/images/news/vreme.png rename to recipes/icons/vreme.png diff --git a/resources/images/news/wallstreetro.png b/recipes/icons/wallstreetro.png similarity index 100% rename from resources/images/news/wallstreetro.png rename to recipes/icons/wallstreetro.png diff --git a/resources/images/news/walrusmag.png b/recipes/icons/walrusmag.png similarity index 100% rename from resources/images/news/walrusmag.png rename to recipes/icons/walrusmag.png diff --git a/resources/images/news/wapo_cartoons.png b/recipes/icons/wapo_cartoons.png similarity index 100% rename from resources/images/news/wapo_cartoons.png rename to recipes/icons/wapo_cartoons.png diff --git a/resources/images/news/welt.png b/recipes/icons/welt.png similarity index 100% rename from resources/images/news/welt.png rename to recipes/icons/welt.png diff --git a/resources/images/news/wikinews_en.png b/recipes/icons/wikinews_en.png similarity index 100% rename from resources/images/news/wikinews_en.png rename to recipes/icons/wikinews_en.png diff --git a/resources/images/news/wired.png b/recipes/icons/wired.png similarity index 100% rename from resources/images/news/wired.png rename to recipes/icons/wired.png diff --git a/resources/images/news/wired_uk.png b/recipes/icons/wired_uk.png similarity index 100% rename from resources/images/news/wired_uk.png rename to recipes/icons/wired_uk.png diff --git a/resources/images/news/wsj.png b/recipes/icons/wsj.png similarity index 100% rename from resources/images/news/wsj.png rename to recipes/icons/wsj.png diff --git a/resources/images/news/yomiuri.png b/recipes/icons/yomiuri.png similarity index 100% rename from resources/images/news/yomiuri.png rename to recipes/icons/yomiuri.png diff --git a/resources/images/news/zdnet.png b/recipes/icons/zdnet.png similarity index 100% rename from resources/images/news/zdnet.png rename to recipes/icons/zdnet.png diff --git a/resources/images/news/zeitde.png b/recipes/icons/zeitde.png similarity index 100% rename from resources/images/news/zeitde.png rename to recipes/icons/zeitde.png diff --git a/resources/images/news/zerohedge.png b/recipes/icons/zerohedge.png similarity index 100% rename from resources/images/news/zerohedge.png rename to recipes/icons/zerohedge.png diff --git a/resources/images/news/ziarulfinanciar.png b/recipes/icons/ziarulfinanciar.png similarity index 100% rename from resources/images/news/ziarulfinanciar.png rename to recipes/icons/ziarulfinanciar.png diff --git a/setup/resources.py b/setup/resources.py index 26c8ec3ef2..84ff136371 100644 --- a/setup/resources.py +++ b/setup/resources.py @@ -6,7 +6,7 @@ __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import os, cPickle, re, anydbm, shutil, marshal, zipfile +import os, cPickle, re, anydbm, shutil, marshal, zipfile, glob from zlib import compress from setup import Command, basenames, __appname__ @@ -55,10 +55,15 @@ class Resources(Command): xml = serialize_builtin_recipes() with open(dest, 'wb') as f: f.write(xml) - dest = os.path.splitext(dest)[0] + '.zip' + + recipe_icon_dir = self.a(self.j(self.RESOURCES, '..', 'recipes', + 'icons')) + dest = os.path.splitext(dest)[0] + '.zip' + files += glob.glob(self.j(recipe_icon_dir, '*.png')) + if self.newer(dest, files): self.info('\tCreating builtin_recipes.zip') - with zipfile.ZipFile(dest, 'w', zipfile.ZIP_DEFLATED) as zf: - for n in files: + with zipfile.ZipFile(dest, 'w', zipfile.ZIP_STORED) as zf: + for n in sorted(files, key=self.b): with open(n, 'rb') as f: zf.writestr(os.path.basename(n), f.read()) diff --git a/src/calibre/web/feeds/recipes/collection.py b/src/calibre/web/feeds/recipes/collection.py index f1231d7188..1eb504d282 100644 --- a/src/calibre/web/feeds/recipes/collection.py +++ b/src/calibre/web/feeds/recipes/collection.py @@ -25,15 +25,14 @@ def iterate_over_builtin_recipe_files(): 'indian_express', 'india_today', 'livemint'] d = os.path.dirname base = os.path.join(d(d(d(d(d(d(os.path.abspath(__file__))))))), 'recipes') - for x in os.walk(base): - for f in x[-1]: - fbase, ext = os.path.splitext(f) - if ext != '.recipe' or fbase in exclude: - continue - f = os.path.join(x[0], f) - rid = os.path.splitext(os.path.relpath(f, base).replace(os.sep, - '/'))[0] - yield rid, f + for f in os.listdir(base): + fbase, ext = os.path.splitext(f) + if ext != '.recipe' or fbase in exclude: + continue + f = os.path.join(base, f) + rid = os.path.splitext(os.path.relpath(f, base).replace(os.sep, + '/'))[0] + yield rid, f def serialize_recipe(urn, recipe_class): diff --git a/src/calibre/web/feeds/recipes/model.py b/src/calibre/web/feeds/recipes/model.py index 19e73dd5f8..d08ff73e26 100644 --- a/src/calibre/web/feeds/recipes/model.py +++ b/src/calibre/web/feeds/recipes/model.py @@ -6,10 +6,10 @@ __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import os, copy +import copy, zipfile from PyQt4.Qt import QAbstractItemModel, QVariant, Qt, QColor, QFont, QIcon, \ - QModelIndex, pyqtSignal + QModelIndex, pyqtSignal, QPixmap from calibre.utils.search_query_parser import SearchQueryParser from calibre.gui2 import NONE @@ -93,12 +93,13 @@ class NewsCategory(NewsTreeItem): class NewsItem(NewsTreeItem): - def __init__(self, urn, title, default_icon, custom_icon, + def __init__(self, urn, title, default_icon, custom_icon, favicons, zf, builtin, custom, scheduler_config, parent): NewsTreeItem.__init__(self, builtin, custom, scheduler_config, parent) self.urn, self.title = urn, title self.icon = self.default_icon = None self.default_icon = default_icon + self.favicons, self.zf = favicons, zf if 'custom:' in self.urn: self.icon = custom_icon @@ -107,9 +108,16 @@ class NewsItem(NewsTreeItem): return QVariant(self.title) if role == Qt.DecorationRole: if self.icon is None: - icon = I('news/%s.png'%self.urn[8:]) - if os.path.exists(icon): - self.icon = QVariant(QIcon(icon)) + icon = '%s.png'%self.urn[8:] + p = QPixmap() + if icon in self.favicons: + try: + with zipfile.ZipFile(self.zf, 'r') as zf: + p.loadFromData(zf.read(icon)) + except: + pass + if not p.isNull(): + self.icon = QVariant(QIcon(p)) else: self.icon = self.default_icon return self.icon @@ -130,6 +138,12 @@ class RecipeModel(QAbstractItemModel, SearchQueryParser): self.custom_icon = QVariant(QIcon(I('user_profile.png'))) self.builtin_recipe_collection = get_builtin_recipe_collection() self.scheduler_config = SchedulerConfig() + try: + with zipfile.ZipFile(P('builtin_recipes.zip'), 'r') as zf: + self.favicons = frozenset([x for x in zf.namelist() if + x.endswith('.png')]) + except: + self.favicons = frozenset() self.do_refresh() def get_builtin_recipe(self, urn, download=True): @@ -166,11 +180,13 @@ class RecipeModel(QAbstractItemModel, SearchQueryParser): def do_refresh(self, restrict_to_urns=set([])): self.custom_recipe_collection = get_custom_recipe_collection() + zf = P('builtin_recipes.zip') def factory(cls, parent, *args): args = list(args) if cls is NewsItem: - args.extend([self.default_icon, self.custom_icon]) + args.extend([self.default_icon, self.custom_icon, + self.favicons, zf]) args += [self.builtin_recipe_collection, self.custom_recipe_collection, self.scheduler_config, parent]