Your message dated Wed, 04 Nov 2015 21:45:13 +0000
with message-id <[email protected]>
and subject line Bug#799303: fixed in zim 0.65-1
has caused the Debian Bug report #799303,
regarding zim: Doesn't notice if contents have changed on disk
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
799303: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=799303
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: zim
Version: 0.63-2
Severity: wishlist
Tags: patch
When sharing a Zim notebook over a sharing/synchronisation system such
as Owncloud, several Zim instances can be working on the same notebook.
But once a page is loaded in a Zim instance, Zim doesn't notice if it's
modified externally until it's too late (the conflict detection system
only triggers on save). Here's a patch that forces a reload of a page
when the user switches to a new page. It doesn't claim to be a 100%
solution (if the remotely-modified page is the same as the one currently
open, nothing reloads it), but it should handle a large proportion of
cases.
It could probably be submitted upstream, if only for discussion.
There's an upstream bug at https://bugs.launchpad.net/zim/+bug/792058
with a different approach for the resolution, but the implementation
doesn't address the same problem (doesn't detect file contents changes),
and the discussion stalled 3 years ago.
Thanks,
Roland.
-- System Information:
Debian Release: stretch/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 4.1.0-2-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages zim depends on:
ii python 2.7.9-1
ii python-gobject 3.16.2-1
ii python-gtk2 2.24.0-4
ii python-simplejson 3.7.3-1
ii python-xdg 0.25-4
pn python:any <none>
Versions of packages zim recommends:
pn python-gtkspell <none>
Versions of packages zim suggests:
ii bzr 2.6.0+bzr6602-3
pn ditaa <none>
pn dvipng <none>
ii git 1:2.5.1-1
pn gnuplot <none>
ii graphviz 2.38.0-10
pn lilypond <none>
pn mercurial <none>
pn python-zeitgeist <none>
pn r-base <none>
pn scrot <none>
-- no debconf information
>From 4428f3e6add65b63dd24d88690a8f1382584ba15 Mon Sep 17 00:00:00 2001
From: Roland Mas <[email protected]>
Date: Thu, 17 Sep 2015 17:38:32 +0200
Subject: [PATCH] Reload pages from storage when opening them
---
debian/changelog | 7 +++
debian/patches/0002-Reload-pages.patch | 79 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 87 insertions(+)
create mode 100644 debian/patches/0002-Reload-pages.patch
diff --git a/debian/changelog b/debian/changelog
index 3997f03..845e754 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,13 @@ zim (0.63-2) UNRELEASED; urgency=medium
-- Raphaël Hertzog <[email protected]> Wed, 17 Jun 2015 09:54:09 +0200
+zim (0.63-1+lld) unstable; urgency=medium
+
+ * Reload page content on page switch to allow for notebooks synced
+ across computers.
+
+ -- Roland Mas <[email protected]> Thu, 17 Sep 2015 17:27:23 +0200
+
zim (0.63-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/0002-Reload-pages.patch b/debian/patches/0002-Reload-pages.patch
new file mode 100644
index 0000000..dd15e38
--- /dev/null
+++ b/debian/patches/0002-Reload-pages.patch
@@ -0,0 +1,79 @@
+Index: zim/zim/gui/__init__.py
+===================================================================
+--- zim.orig/zim/gui/__init__.py
++++ zim/zim/gui/__init__.py
+@@ -3184,6 +3184,7 @@
+ def do_response_ok(self):
+ path = self.form['page']
+ if path:
++ self.ui.notebook.flush_page_cache(path)
+ self.ui.open_page(path)
+ return True
+ else:
+@@ -3296,6 +3297,7 @@
+
+ page.parse('wiki', file.readlines())
+ self.ui.notebook.store_page(page)
++ self.ui.notebook.flush_page_cache(page)
+ self.ui.open_page(page)
+ return True
+
+Index: zim/zim/gui/pageindex.py
+===================================================================
+--- zim.orig/zim/gui/pageindex.py
++++ zim/zim/gui/pageindex.py
+@@ -549,6 +549,7 @@
+ self.emit('page-activated', path)
+
+ def do_page_activated(self, path):
++ self.ui.notebook.flush_page_cache(path)
+ self.ui.open_page(path)
+
+ def do_key_press_event(self, event):
+Index: zim/zim/gui/pageview.py
+===================================================================
+--- zim.orig/zim/gui/pageview.py
++++ zim/zim/gui/pageview.py
+@@ -5374,6 +5374,7 @@
+ if new_window:
+ self.ui.open_new_window(path)
+ else:
++ self.ui.notebook.flush_page_cache(path)
+ self.ui.open_page(path)
+ elif type == 'file':
+ path = self.ui.notebook.resolve_file(href, self.page)
+Index: zim/zim/gui/pathbar.py
+===================================================================
+--- zim.orig/zim/gui/pathbar.py
++++ zim/zim/gui/pathbar.py
+@@ -457,6 +457,7 @@
+ set_active(self._selected, True)
+
+ def on_button_clicked(self, button):
++ self.ui.notebook.flush_page_cache(button.zim_path)
+ self.ui.open_page(button.zim_path)
+
+ def do_button_release_event(self, button, event):
+Index: zim/zim/gui/recentchangesdialog.py
+===================================================================
+--- zim.orig/zim/gui/recentchangesdialog.py
++++ zim/zim/gui/recentchangesdialog.py
+@@ -91,5 +91,6 @@
+
+ def _do_open_page(self, view, path, col):
+ page = Path( self.get_model()[path][self.NAME_COL].decode('utf-8') )
++ self.ui.notebook.flush_page_cache(page)
+ self.ui.open_page(page)
+
+Index: zim/zim/gui/searchdialog.py
+===================================================================
+--- zim.orig/zim/gui/searchdialog.py
++++ zim/zim/gui/searchdialog.py
+@@ -221,6 +221,7 @@
+
+ def _do_open_page(self, view, path, col):
+ page = Path( self.get_model()[path][0].decode('utf-8') )
++ self.ui.notebook.flush_page_cache(path)
+ self.ui.open_page(page)
+
+ # Popup find dialog with same query
diff --git a/debian/patches/series b/debian/patches/series
index a92cf6a..2e0854d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Add-filename-parameter-to-Exec-entry-of-desktop-file.patch
+0002-Reload-pages.patch
--
2.5.1
--- End Message ---
--- Begin Message ---
Source: zim
Source-Version: 0.65-1
We believe that the bug you reported is fixed in the latest version of
zim, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Raphaël Hertzog <[email protected]> (supplier of updated zim package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Wed, 04 Nov 2015 21:15:19 +0100
Source: zim
Binary: zim
Architecture: source all
Version: 0.65-1
Distribution: unstable
Urgency: medium
Maintainer: Emfox Zhou <[email protected]>
Changed-By: Raphaël Hertzog <[email protected]>
Description:
zim - graphical text editor based on wiki technologies
Closes: 799303
Changes:
zim (0.65-1) unstable; urgency=medium
.
* New upstream release.
* Add dh-python to Build-Depends.
* Drop patch on desktop file (merged upstream).
* Add patch to avoid using cached file so that external changes are taken
into account sooner. Closes: #799303
* Drop menu support. We already have a .desktop entry.
* Update Vcs-Browser URL to point to cgit instead of gitweb.
Checksums-Sha1:
7cd635506f54f30db998e81dfe50fb7aeb17b7c7 1572 zim_0.65-1.dsc
4a9be85c98b7f4397800f6d301428d64241034ce 1899614 zim_0.65.orig.tar.gz
46d277aede3364973727947809cd00e435a17dd9 9524 zim_0.65-1.debian.tar.xz
3dfad3cbd5d022627cc99f02b20458a52334d41c 1085128 zim_0.65-1_all.deb
Checksums-Sha256:
98f5c6741a6f6c460376ad2972303eb066a3b0d6facbde0ad86aa5171bc129ac 1572
zim_0.65-1.dsc
5442f3334395a2beafc5b9a2bbec2e53e38270d4bad696b5c4053dd51dc1ed96 1899614
zim_0.65.orig.tar.gz
df6b3ab20a1b889d5c23bead15c2cb54cd92518c08efee3fabff8aa5b4921258 9524
zim_0.65-1.debian.tar.xz
d55b2c22b67d6aac3bd7dc4fab5dc9cb40d905ade420cddc333b52c26b6fe60d 1085128
zim_0.65-1_all.deb
Files:
d3249f19eaf869ed5a96299faa6697cd 1572 x11 optional zim_0.65-1.dsc
63ab7a2070e6d1d3fb32700a851d7b8b 1899614 x11 optional zim_0.65.orig.tar.gz
1885667aa8b0353679aed5521d8a32a9 9524 x11 optional zim_0.65-1.debian.tar.xz
b38054741352f9534f916cdf0f32ed55 1085128 x11 optional zim_0.65-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: Signed by Raphael Hertzog
iQEcBAEBCAAGBQJWOmqnAAoJEAOIHavrwpq5vAgH/0OTXjwqO1Ox2dB6Jy6F25Om
PuEgtx+8j/rxUMnn88zGQtXAuF0ElnCwAI7RvFnHL1KF+R186UhQQw9s/43Cefbc
1CKWH27uwWhpfJvU8G8v3jY6LgwR+HNBd+S1Ph+Po1h2HApS6KnFZmBs1e+EFm/g
Do+zP/H/Q9UP3ubGlIRY2AX3527thQKx6tvCRWp5KCd/VnpX/3LO7fmuozgd/IBU
Ls1lMe4SLqQQsQi05X7s68cfV/60ddnOdKFeEGXFxok9bL+vKsTiWn3u5wItZw2k
o9BGfUU3s7Beuh9MoYWaN2k9tZh7uQvNL5T6AfedYLwfRmaiJTsmmc20G2TNSuE=
=w72S
-----END PGP SIGNATURE-----
--- End Message ---
