Merge lp:~tomek3d/calibre/store into lp:calibre

[Tomasz Długosz]

[lp:~tomek3d/calibre/store]

8584. By Tomasz Długosz on 2013-06-01

forgotten line...

[Kovid Goyal (kovid)]

calibre development has moved to GitHub, see http://www.mobileread.com/forums/showthread.php?t=214465

I have merged this patch into master on GitHub.

[Tomasz Długosz (tomek3d)]

Thanks, I just didn't notice you already did the switch.

Did you consider making recipes a subtree?
https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt

I did a quick check. In my fork of the calibre repo I've added a subtree
"recipes" (the recipes directory was removed just before that step) that
follows the repo kalibrator that used to be used for deveoping polish
recipes. This allows people to add their recipes only by cloning a small
part of the original calibre repo, while a clone of full calibre repo still
incorporates the recipes directory (that means this is transparent for
people not tinkering in recipes directory).

Should you use this idea, you probably should make a split in calibre repo
(git subtree split -P ), and not add my repo as an alien subtree :D . I did
my check to see whether I can preserve my repo's history during the
transition to subtree (still trying to find a way to adopt the kalibrator
to calibre being hosted on github :D ).

Regards,
Tomasz

On 2 June 2013 03:53, Kovid Goyal <email address hidden> wrote:

> calibre development has moved to GitHub, see
> http://www.mobileread.com/forums/showthread.php?t=214465
>
> I have merged this patch into master on GitHub.
> --
> https://code.launchpad.net/~tomek3d/calibre/store/+merge/166951
> You are the owner of lp:~tomek3d/calibre/store.
>

[Kovid Goyal (kovid)]

I'd rather not do that. It adds an extra thing to remember both for me
and for other people, as sometimes there are commits that affect both
the recipes/ directory and files outside it as well. For instance this
commonly happens when I run python setup.py check on the whole tree
before making a release.

Regarding kalibrator, what is the problem exactly? If the issue is that
some recipes are ignored in the global .gitignore I can always move
those ignores into .git/info/exclude.

Kovid.

On Sun, Jun 02, 2013 at 07:01:24PM -0000, Tomasz Długosz wrote:
> Thanks, I just didn't notice you already did the switch.
>
> Did you consider making recipes a subtree?
> https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt
>
> I did a quick check. In my fork of the calibre repo I've added a subtree
> "recipes" (the recipes directory was removed just before that step) that
> follows the repo kalibrator that used to be used for deveoping polish
> recipes. This allows people to add their recipes only by cloning a small
> part of the original calibre repo, while a clone of full calibre repo still
> incorporates the recipes directory (that means this is transparent for
> people not tinkering in recipes directory).
>
> Should you use this idea, you probably should make a split in calibre repo
> (git subtree split -P ), and not add my repo as an alien subtree :D . I did
> my check to see whether I can preserve my repo's history during the
> transition to subtree (still trying to find a way to adopt the kalibrator
> to calibre being hosted on github :D ).
>
> Regards,
> Tomasz
>
>
> On 2 June 2013 03:53, Kovid Goyal <email address hidden> wrote:
>
> > calibre development has moved to GitHub, see
> > http://www.mobileread.com/forums/showthread.php?t=214465
> >
> > I have merged this patch into master on GitHub.
> > --
> > https://code.launchpad.net/~tomek3d/calibre/store/+merge/166951
> > You are the owner of lp:~tomek3d/calibre/store.
> >
>
> --
> https://code.launchpad.net/~tomek3d/calibre/store/+merge/166951
> You are requested to review the proposed merge of lp:~tomek3d/calibre/store into lp:calibre.
>
> !DSPAM:3,51ab9689281101707354534!
>
>

--
_____________________________________

Dr. Kovid Goyal
http://www.kovidgoyal.net
http://calibre-ebook.com
_____________________________________

[Tomasz Długosz (tomek3d)]

On Jun 3, 2013 3:52 AM, "Kovid Goyal" <email address hidden> wrote:
>
> I'd rather not do that. It adds an extra thing to remember both for me
> and for other people, as sometimes there are commits that affect both
> the recipes/ directory and files outside it as well. For instance this
> commonly happens when I run python setup.py check on the whole tree
> before making a release.

I see.

>
> Regarding kalibrator, what is the problem exactly? If the issue is that
> some recipes are ignored in the global .gitignore I can always move
> those ignores into .git/info/exclude.

No, it's not a matter of ignored files (I can have them in another branch),
but rather a question of whether it is possible to have both
1. History (and if possible simple layout) of kalibrator preserved
2. Ability to request merges directly to your calibre branch.

The second point seems more important to me.

Probably the ultimate solution will be to make kalibrator repo obsolete,
and just work from a normal calibre fork, but I'm still not sure.

>
> Kovid.
>
> On Sun, Jun 02, 2013 at 07:01:24PM -0000, Tomasz Długosz wrote:
> > Thanks, I just didn't notice you already did the switch.
> >
> > Did you consider making recipes a subtree?
> > https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt
> >
> > I did a quick check. In my fork of the calibre repo I've added a subtree
> > "recipes" (the recipes directory was removed just before that step) that
> > follows the repo kalibrator that used to be used for deveoping polish
> > recipes. This allows people to add their recipes only by cloning a small
> > part of the original calibre repo, while a clone of full calibre repo
still
> > incorporates the recipes directory (that means this is transparent for
> > people not tinkering in recipes directory).
> >
> > Should you use this idea, you probably should make a split in calibre
repo
> > (git subtree split -P ), and not add my repo as an alien subtree :D . I
did
> > my check to see whether I can preserve my repo's history during the
> > transition to subtree (still trying to find a way to adopt the
kalibrator
> > to calibre being hosted on github :D ).
> >
> > Regards,
> > Tomasz
> >
> >
> > On 2 June 2013 03:53, Kovid Goyal <email address hidden> wrote:
> >
> > > calibre development has moved to GitHub, see
> > > http://www.mobileread.com/forums/showthread.php?t=214465
> > >
> > > I have merged this patch into master on GitHub.
> > > --
> > > https://code.launchpad.net/~tomek3d/calibre/store/+merge/166951
> > > You are the owner of lp:~tomek3d/calibre/store.
> > >
> >
> > --
> > https://code.launchpad.net/~tomek3d/calibre/store/+merge/166951
> > You are requested to review the proposed merge of
lp:~tomek3d/calibre/store into lp:calibre.
> >
> > !DSPAM:3,51ab9689281101707354534!
> >
> >
>
> --
> _____________________________________
>
> Dr. Kovid Goyal
> http://www.kovidgoyal.net
> http://calibre-ebook.com
> _____________________________________
>
> https://code.launchpad.net/~tomek3d/calibre/store/+merge/166951
> You are the owner of lp:~tomek3d/calibre/store.

[Kovid Goyal (kovid)]

Another alternative is to continue using kalibrator and write a simple
script that updates your calibre fork from kalibrator and submits a pull
request. Something like:

copy-updates::
#!/bin/sh
cp kalibrator/*.recipe calibre/recipes/
cd calibre
git commit -am $1
git push
git pull-request (you need to install hub for this)

So now when you want to send me updates, you just do:
copy-updates

Otherwise, I suggest just go with a calibre fork, that's the most maintainable
solution going forward. Previous history, if it is really needed, can
remain available in the kalibrator repo.

Kovid.

On Mon, Jun 03, 2013 at 06:43:24AM -0000, Tomasz Długosz wrote:
> On Jun 3, 2013 3:52 AM, "Kovid Goyal" <email address hidden> wrote:
> >
> > I'd rather not do that. It adds an extra thing to remember both for me
> > and for other people, as sometimes there are commits that affect both
> > the recipes/ directory and files outside it as well. For instance this
> > commonly happens when I run python setup.py check on the whole tree
> > before making a release.
>
> I see.
>
> >
> > Regarding kalibrator, what is the problem exactly? If the issue is that
> > some recipes are ignored in the global .gitignore I can always move
> > those ignores into .git/info/exclude.
>
> No, it's not a matter of ignored files (I can have them in another branch),
> but rather a question of whether it is possible to have both
> 1. History (and if possible simple layout) of kalibrator preserved
> 2. Ability to request merges directly to your calibre branch.
>
> The second point seems more important to me.
>
> Probably the ultimate solution will be to make kalibrator repo obsolete,
> and just work from a normal calibre fork, but I'm still not sure.
>
> >
> > Kovid.
> >
> > On Sun, Jun 02, 2013 at 07:01:24PM -0000, Tomasz Długosz wrote:
> > > Thanks, I just didn't notice you already did the switch.
> > >
> > > Did you consider making recipes a subtree?
> > > https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt
> > >
> > > I did a quick check. In my fork of the calibre repo I've added a subtree
> > > "recipes" (the recipes directory was removed just before that step) that
> > > follows the repo kalibrator that used to be used for deveoping polish
> > > recipes. This allows people to add their recipes only by cloning a small
> > > part of the original calibre repo, while a clone of full calibre repo
> still
> > > incorporates the recipes directory (that means this is transparent for
> > > people not tinkering in recipes directory).
> > >
> > > Should you use this idea, you probably should make a split in calibre
> repo
> > > (git subtree split -P ), and not add my repo as an alien subtree :D . I
> did
> > > my check to see whether I can preserve my repo's history during the
> > > transition to subtree (still trying to find a way to adopt the
> kalibrator
> > > to calibre being hosted on github :D ).
> > >
> > > Regards,
> > > Tomasz
> > >
> > >
> > > On 2 June 2013 03:53, Kovid Goyal <email address hidden> wrote:
> > >
> > > > calibre development has moved to GitHub, see
> > > > http://www.mobileread.com/forums/showthread.php?t=214465
> > > >
> > > > I have merged ...

Unmerged revisions

8584. By Tomasz Długosz on 2013-06-01

forgotten line...

8583. By Tomasz Długosz on 2013-06-01

remove EscapeMagazine plugin

8582. By Tomasz Długosz on 2013-05-19

remove trailing whitespaces

=== modified file 'src/calibre/customize/builtins.py'
--- src/calibre/customize/builtins.py	2013-05-27 10:12:08 +0000
+++ src/calibre/customize/builtins.py	2013-06-01 20:00:36 +0000
@@ -1419,17 +1419,6 @@
     headquarters = 'PL'
     formats = ['EPUB', 'MOBI', 'PDF']
 
-class StoreEscapeMagazineStore(StoreBase):
-    name = 'EscapeMagazine'
-    author = u'Tomasz Długosz'
-    description = u'Książki elektroniczne w formie pliku komputerowego PDF. Zabezpieczone hasłem.'
-    actual_plugin = 'calibre.gui2.store.stores.escapemagazine_plugin:EscapeMagazineStore'
-
-    drm_free_only = True
-    headquarters = 'PL'
-    formats = ['PDF']
-    affiliate = True
-
 class StoreFeedbooksStore(StoreBase):
     name = 'Feedbooks'
     description = u'Feedbooks is a cloud publishing and distribution service, connected to a large ecosystem of reading systems and social networks. Provides a variety of genres from independent and classic books.'  # noqa
@@ -1700,7 +1689,6 @@
     StoreEHarlequinStore,
     StoreEKnigiStore,
     StoreEmpikStore,
-    StoreEscapeMagazineStore,
     StoreFeedbooksStore,
     StoreFoylesUKStore,
     StoreGoogleBooksStore,

=== removed file 'src/calibre/gui2/store/stores/escapemagazine_plugin.py'
--- src/calibre/gui2/store/stores/escapemagazine_plugin.py	2013-01-14 06:20:23 +0000
+++ src/calibre/gui2/store/stores/escapemagazine_plugin.py	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 1 # Needed for dynamic plugin loading
-
-__license__ = 'GPL 3'
-__copyright__ = '2011, Tomasz Długosz <[e-mail]>'
-__docformat__ = 'restructuredtext en'
-
-import urllib
-from contextlib import closing
-
-from lxml import html
-
-from PyQt4.Qt import QUrl
-
-from calibre import browser, url_slash_cleaner
-from calibre.gui2 import open_url
-from calibre.gui2.store import StorePlugin
-from calibre.gui2.store.basic_config import BasicStoreConfig
-from calibre.gui2.store.search_result import SearchResult
-from calibre.gui2.store.web_store_dialog import WebStoreDialog
-
-class EscapeMagazineStore(BasicStoreConfig, StorePlugin):
-
-    def open(self, parent=None, detail_item=None, external=False):
-        pid = '44010'
-
-        url = 'http://www.escapemagazine.pl/s/' + pid
-
-        if external or self.config.get('open_external', False):
-            open_url(QUrl(url_slash_cleaner(detail_item + '/s/' + pid if detail_item else url)))
-        else:
-            d = WebStoreDialog(self.gui, url, parent, detail_item)
-            d.setWindowTitle(self.name)
-            d.set_tags(self.config.get('tags', ''))
-            d.exec_()
-
-    def search(self, query, max_results=20, timeout=60):
-        url = 'http://www.escapemagazine.pl/wyszukiwarka?query=' + urllib.quote_plus(query)
-
-        br = browser()
-
-        counter = max_results
-        with closing(br.open(url, timeout=timeout)) as f:
-            doc = html.fromstring(f.read())
-            for data in doc.xpath('//div[@class="item item_short"]'):
-                if counter <= 0:
-                    break
-
-                id = ''.join(data.xpath('.//h2[@class="title"]/a[1]/@href'))
-                if not id:
-                    continue
-
-                title = ''.join(data.xpath('.//h2[@class="title"]/a[1]/text()'))
-                author = ''.join(data.xpath('.//div[@class="author"]/text()'))
-                price = ''.join(data.xpath('.//span[@class="price_now"]/strong/text()')) + ' zł'
-                cover_url = ''.join(data.xpath('.//img[@class="cover"]/@src'))
-
-                counter -= 1
-
-                s = SearchResult()
-                s.cover_url = cover_url
-                s.title = title.strip()
-                s.author = author.strip()
-                s.price = price
-                s.detail_item = 'http://www.escapemagazine.pl' + id.strip()
-                s.drm = SearchResult.DRM_UNLOCKED
-                s.formats = 'PDF'
-
-                yield s

=== modified file 'src/calibre/gui2/store/web_store_dialog.py'
--- src/calibre/gui2/store/web_store_dialog.py	2011-03-07 12:35:21 +0000
+++ src/calibre/gui2/store/web_store_dialog.py	2013-06-01 20:00:36 +0000
@@ -16,10 +16,10 @@
     def __init__(self, gui, base_url, parent=None, detail_url=None):
         QDialog.__init__(self, parent=parent)
         self.setupUi(self)
-        
+
         self.gui = gui
         self.base_url = base_url
-        
+
         self.view.set_gui(self.gui)
         self.view.loadStarted.connect(self.load_started)
         self.view.loadProgress.connect(self.load_progress)
@@ -27,7 +27,7 @@
         self.home.clicked.connect(self.go_home)
         self.reload.clicked.connect(self.view.reload)
         self.back.clicked.connect(self.view.back)
-        
+
         self.go_home(detail_url=detail_url)
 
     def set_tags(self, tags):
@@ -35,21 +35,21 @@
 
     def load_started(self):
         self.progress.setValue(0)
-    
+
     def load_progress(self, val):
         self.progress.setValue(val)
-        
+
     def load_finished(self, ok=True):
         self.progress.setValue(100)
-    
+
     def go_home(self, checked=False, detail_url=None):
         if detail_url:
             url = detail_url
         else:
             url = self.base_url
-            
+
         # Reduce redundant /'s because some stores
         # (Feedbooks) and server frameworks (cherrypy)
-        # choke on them. 
+        # choke on them.
         url = url_slash_cleaner(url)
         self.view.load(QUrl(url))