psa: more fixes if wc unavailable
authorYves Marcoz <yves@marcoz.org>
Tue, 24 Jan 2012 07:52:50 +0000 (23:52 -0800)
committerYves Marcoz <yves@marcoz.org>
Tue, 24 Jan 2012 07:52:50 +0000 (23:52 -0800)
16 files changed:
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/changelog
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/DEBIAN/md5sums
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/doc/feedingit/changelog.Debian.gz
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/XmlHandler.py
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/feedingit.py
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/rss_sqlite.py
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/rules
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/XmlHandler.py
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/feedingit.py
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/pysrc/rss_sqlite.py
psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.debian.tar.gz
psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.dsc
psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_all.deb
psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_i386.changes
psa_harmattan/feedingit/deb_dist/feedingit_0.1.0.orig.tar.gz
psa_harmattan/feedingit/pysrc/rss_sqlite.py

index 385afb9..1429556 100644 (file)
@@ -2,4 +2,4 @@ feedingit (0.1.0-1) unstable; urgency=low
 
   * source package automatically created by stdeb 0.6.0+git
 
- -- Slocan <slocan@marcoz.org>  Mon, 23 Jan 2012 22:11:44 -0800
+ -- Slocan <slocan@marcoz.org>  Mon, 23 Jan 2012 23:47:32 -0800
index 89e558e..194bd12 100644 (file)
@@ -1,14 +1,14 @@
 ab6be1fce6e02f7f10857cd79755bf18  usr/bin/feedingit
 1af83cdf3d338e6460a92c00537c375b  usr/share/applications/feedingit.desktop
 eda8cc6ffe8d842d6dfe0244b01b3042  usr/share/dbus-1/services/feedingit_status.service
-696cb64a1b4ee2b9b40fa1ef3b194b07  usr/share/doc/feedingit/changelog.Debian.gz
+41527bae9dab9e0e673437836c6ad9a0  usr/share/doc/feedingit/changelog.Debian.gz
 bac2be6ae9673ee5096e20e8b714c9cd  usr/share/feedingit/BeautifulSoup.py
-8f6e980f2e1154103a90763be6c00dc4  usr/share/feedingit/XmlHandler.py
+01b4839b886ca158745e5ddd4742ba64  usr/share/feedingit/XmlHandler.py
 d41d8cd98f00b204e9800998ecf8427e  usr/share/feedingit/__init__.py
 25d2c59c4c9db6aad90fa47da2d01ece  usr/share/feedingit/config.py
 b4b00de5dccaf56d81a9dab1eeac63e1  usr/share/feedingit/debugging.py
 fae02e730b76761d43a626fe19828d5e  usr/share/feedingit/download.py
-37d8876ac21f4f71669e5fed3721176a  usr/share/feedingit/feedingit.py
+f45526ce8871f5c920b3542fd3e55e0b  usr/share/feedingit/feedingit.py
 afa4f462892136f59beaf96b6bf1cf96  usr/share/feedingit/feedparser.py
 c1a0c0a9ccefd64d1e27bddb817c72a3  usr/share/feedingit/httpprogresshandler.py
 f1e9ba0f44786f513659a7fa3111fc8a  usr/share/feedingit/jobmanager.py
@@ -26,7 +26,7 @@ cd30f5eaec0885358261d7a96bfaf8cd  usr/share/feedingit/qml/FeedingIt.qml
 afdb98e07e8b5e066e745a5df9de09b9  usr/share/feedingit/qml/Feeds.qml
 bec5fe4599a3ad5799ed96d7ed81fb5f  usr/share/feedingit/qml/MainPage.qml
 75b9275e76eb840e21199592e329feb7  usr/share/feedingit/qml/Settings.qml
-72e49362fba22b639464a538070efcae  usr/share/feedingit/qml/SettingsPage.qml
+ac2608869b0d4636d96475d355f164eb  usr/share/feedingit/qml/SettingsPage.qml
 ae761587ba98f662cfbe91ae9e23ff93  usr/share/feedingit/qml/SliderSetting.qml
 8c3766da8556e32346f50795e7421a8e  usr/share/feedingit/qml/SwitchSetting.qml
 aa3fc0a4edbd17d93a9dc5c39c433c3d  usr/share/feedingit/qml/TestWebview.qml
@@ -64,7 +64,7 @@ af11b73b195513d08c17723b41db0b04  usr/share/feedingit/qml/common/images/wmBackIc
 7790a99425dd7c1046e6ae3b1ee72a03  usr/share/feedingit/qml/i18n/qml_en.qm
 1674fcce45bcf3319e61d19a9adf4fdd  usr/share/feedingit/qml/i18n/qml_en.ts
 17f4f1f51d356494f17139abd703df42  usr/share/feedingit/qml/main.qml
-786a2729020764f64d885a43b29070bc  usr/share/feedingit/rss_sqlite.py
+19e7640909b303c7f8e2cc87ddea60e6  usr/share/feedingit/rss_sqlite.py
 6e88950ff9c416c362c6ca17cf4317f7  usr/share/feedingit/splash.jpg
 721777a26cd2a5b8466ce2aa2b99fad7  usr/share/feedingit/update_feeds.py
 6ccf12dc4379e91800ae8505b2e86082  usr/share/feedingit/updatedbus.py
index 5f0abb0..0182bc1 100644 (file)
Binary files a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/doc/feedingit/changelog.Debian.gz and b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/doc/feedingit/changelog.Debian.gz differ
index 41167cb..50cf7f0 100644 (file)
@@ -49,7 +49,6 @@ class XmlHandler():
     def generateCategoryXml(self):
         xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?><xml>"
         for cat in self.listing.getListOfCategories():
-            print cat
             xml += "<category>"
             xml += "<catname>%s</catname>" %sanitize(self.listing.getCategoryTitle(cat))
             xml += "<catid>%s</catid>" % cat
index a951ec9..93ffc6a 100644 (file)
@@ -46,7 +46,8 @@ class Controller(QtCore.QObject):
         root.updateProgress(int(total), int(completed))
         
     def articleCountUpdated(self):
-        print "article updated"
+        #print "article updated"
+        pass
     
     def update_started(self):
         root.updateStarted()
@@ -79,7 +80,7 @@ class Controller(QtCore.QObject):
     @QtCore.Slot(str,str,bool,result=str)
     def getNextId(self, key, articleid, onlyUnread):
         if (onlyUnread):
-            print self.cachedList, articleid
+            #print self.cachedList, articleid
             index = self.cachedList.index(articleid)
             return self.cachedList[(index + 1) % len(self.cachedList)]
         else:
@@ -89,7 +90,7 @@ class Controller(QtCore.QObject):
     @QtCore.Slot(str,str,bool,result=str)
     def getPreviousId(self, key, articleid, onlyUnread):
         if (onlyUnread):
-            print self.cachedList, articleid
+            #print self.cachedList, articleid
             index = self.cachedList.index(articleid)
             return self.cachedList[(index - 1) % len(self.cachedList)]
         else:
@@ -240,7 +241,7 @@ class Controller(QtCore.QObject):
         bus = dbus.SessionBus()
         settingService = bus.get_object('com.nokia.DuiControlPanel', '/')
         setting = shareService.get_dbus_method('appletPage', 'com.nokia.DuiControlPanelIf')
-        setting("feedingitsync")
+        setting("FeedingIt Updates")
 
     @QtCore.Slot(str, str)
     def share(self, key, articleid):
index 2fda0f5..9d5a24d 100644 (file)
@@ -374,7 +374,7 @@ class Feed(BaseObject):
 
             def wc_success():
                 try:
-                    if wc().available:
+                    if wc().available():
                         wc().stream_register (self.key, "", 6 * 60 * 60)
                 except woodchuck.ObjectExistsError:
                     pass
@@ -435,7 +435,7 @@ class Feed(BaseObject):
                             ec = woodchuck.TransferStatus.TransientNetwork
                         wc()[self.key].update_failed(ec)
                     return doit
-                if wc().available:
+                if wc().available():
                     mainthread.execute(
                         register_stream_update_failed(
                             http_status=http_status),
@@ -629,7 +629,7 @@ class Feed(BaseObject):
                                    transferred_up=sent,
                                    object_size=object_size)
                        return doit
-                   if wc().available:
+                   if wc().available():
                        # If the entry does not contain a publication
                        # time, the attribute won't exist.
                        pubtime = entry.get('date_parsed', None)
@@ -1353,7 +1353,7 @@ class Listing(BaseObject):
         self.cache_invalidate('categories')
     
     def removeFeed(self, key):
-        if wc().available ():
+        if wc().available():
             try:
                 del wc()[key]
             except KeyError, woodchuck.Error:
index eed2963..cb2a112 100755 (executable)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # This file was automatically generated by stdeb 0.6.0+git at
-# Mon, 23 Jan 2012 22:11:44 -0800
+# Mon, 23 Jan 2012 23:47:32 -0800
 
 %:
        dh $@ --with python2 --buildsystem=python_distutils
index 41167cb..50cf7f0 100644 (file)
@@ -49,7 +49,6 @@ class XmlHandler():
     def generateCategoryXml(self):
         xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?><xml>"
         for cat in self.listing.getListOfCategories():
-            print cat
             xml += "<category>"
             xml += "<catname>%s</catname>" %sanitize(self.listing.getCategoryTitle(cat))
             xml += "<catid>%s</catid>" % cat
index a951ec9..93ffc6a 100644 (file)
@@ -46,7 +46,8 @@ class Controller(QtCore.QObject):
         root.updateProgress(int(total), int(completed))
         
     def articleCountUpdated(self):
-        print "article updated"
+        #print "article updated"
+        pass
     
     def update_started(self):
         root.updateStarted()
@@ -79,7 +80,7 @@ class Controller(QtCore.QObject):
     @QtCore.Slot(str,str,bool,result=str)
     def getNextId(self, key, articleid, onlyUnread):
         if (onlyUnread):
-            print self.cachedList, articleid
+            #print self.cachedList, articleid
             index = self.cachedList.index(articleid)
             return self.cachedList[(index + 1) % len(self.cachedList)]
         else:
@@ -89,7 +90,7 @@ class Controller(QtCore.QObject):
     @QtCore.Slot(str,str,bool,result=str)
     def getPreviousId(self, key, articleid, onlyUnread):
         if (onlyUnread):
-            print self.cachedList, articleid
+            #print self.cachedList, articleid
             index = self.cachedList.index(articleid)
             return self.cachedList[(index - 1) % len(self.cachedList)]
         else:
@@ -240,7 +241,7 @@ class Controller(QtCore.QObject):
         bus = dbus.SessionBus()
         settingService = bus.get_object('com.nokia.DuiControlPanel', '/')
         setting = shareService.get_dbus_method('appletPage', 'com.nokia.DuiControlPanelIf')
-        setting("feedingitsync")
+        setting("FeedingIt Updates")
 
     @QtCore.Slot(str, str)
     def share(self, key, articleid):
index 2fda0f5..9d5a24d 100644 (file)
@@ -374,7 +374,7 @@ class Feed(BaseObject):
 
             def wc_success():
                 try:
-                    if wc().available:
+                    if wc().available():
                         wc().stream_register (self.key, "", 6 * 60 * 60)
                 except woodchuck.ObjectExistsError:
                     pass
@@ -435,7 +435,7 @@ class Feed(BaseObject):
                             ec = woodchuck.TransferStatus.TransientNetwork
                         wc()[self.key].update_failed(ec)
                     return doit
-                if wc().available:
+                if wc().available():
                     mainthread.execute(
                         register_stream_update_failed(
                             http_status=http_status),
@@ -629,7 +629,7 @@ class Feed(BaseObject):
                                    transferred_up=sent,
                                    object_size=object_size)
                        return doit
-                   if wc().available:
+                   if wc().available():
                        # If the entry does not contain a publication
                        # time, the attribute won't exist.
                        pubtime = entry.get('date_parsed', None)
@@ -1353,7 +1353,7 @@ class Listing(BaseObject):
         self.cache_invalidate('categories')
     
     def removeFeed(self, key):
-        if wc().available ():
+        if wc().available():
             try:
                 del wc()[key]
             except KeyError, woodchuck.Error:
index f1e23da..be8c3a5 100644 (file)
Binary files a/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.debian.tar.gz and b/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1.debian.tar.gz differ
index bf0b815..695e61a 100644 (file)
@@ -7,11 +7,11 @@ Maintainer: Slocan <slocan@marcoz.org>
 Standards-Version: 3.9.1
 Build-Depends: python-all (>= 2.6.6-3), debhelper (>= 7.4.3)
 Checksums-Sha1: 
- db929a585c8b70cbc5c8e6b91f341b4cea66de0d 201088 feedingit_0.1.0.orig.tar.gz
- 6a5e12732d01ce5606d2e8a7ea0b9f8d9ac68d99 887 feedingit_0.1.0-1.debian.tar.gz
+ 4b7b3144ca1fa9985be156fcbf7f1c29fdd91be4 201086 feedingit_0.1.0.orig.tar.gz
+ c16d604bca8d42a91e6dd7c36ef7fe79fa4f9dc6 957 feedingit_0.1.0-1.debian.tar.gz
 Checksums-Sha256: 
- d0dc31488af20a38fa7bdae8080bd6bb2df9cebf46f58440e194a5e69ded37a3 201088 feedingit_0.1.0.orig.tar.gz
- cb984a498ae074606dbf1d139cb0286825f3c7dd8f4a075a236b005861c29de7 887 feedingit_0.1.0-1.debian.tar.gz
+ 72220fd8bd7b76fcdc355933500b65fbc13a97195102a9cc88084ed71bb4192f 201086 feedingit_0.1.0.orig.tar.gz
+ 87fa88dc37fc744f1e458db5edaa785402d0d6d13a9ae47a8e18af7c7e0bd052 957 feedingit_0.1.0-1.debian.tar.gz
 Files: 
- 40acf0ce3f7c2701f3b510cb039aa224 201088 feedingit_0.1.0.orig.tar.gz
- 7989d159e0dadcd7c01421782d1610ce 887 feedingit_0.1.0-1.debian.tar.gz
+ eda2859b847192070f8d635ca2832bfe 201086 feedingit_0.1.0.orig.tar.gz
+ c28183ab0473b7edbd11de7247ad46db 957 feedingit_0.1.0-1.debian.tar.gz
index a664465..7d26682 100644 (file)
Binary files a/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_all.deb and b/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0-1_all.deb differ
index ce272fd..a8cacb2 100644 (file)
@@ -1,5 +1,5 @@
 Format: 1.8
-Date: Mon, 23 Jan 2012 22:11:44 -0800
+Date: Mon, 23 Jan 2012 23:47:32 -0800
 Source: feedingit
 Binary: feedingit
 Architecture: all
@@ -15,8 +15,8 @@ Changes:
  .
    * source package automatically created by stdeb 0.6.0+git
 Checksums-Sha1: 
- ce54afcaf70d924ff15be5291747e1385e48ab07 189784 feedingit_0.1.0-1_all.deb
+ 3e5de07e30eab1a5a5bf3fa5925a29a45b6bf069 189792 feedingit_0.1.0-1_all.deb
 Checksums-Sha256: 
- 684e1264d466b10a2caab7f8c3f172e825fa18695aae02735e1cea5566fc5238 189784 feedingit_0.1.0-1_all.deb
+ e48d475d082758c91b680f716120383c516e898314abec6be350421546261a59 189792 feedingit_0.1.0-1_all.deb
 Files: 
- a29280f2ff7f99e0b87777cf1eba3f67 189784 user/network optional feedingit_0.1.0-1_all.deb
+ e82641cfc3f694601f09f5553c1d9e12 189792 user/network optional feedingit_0.1.0-1_all.deb
index 770a217..92d4182 100644 (file)
Binary files a/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0.orig.tar.gz and b/psa_harmattan/feedingit/deb_dist/feedingit_0.1.0.orig.tar.gz differ
index 9d5a24d..7e52cb2 100644 (file)
@@ -404,7 +404,8 @@ class Feed(BaseObject):
             # this first.
             if http_status == 304:
                 logger.debug("%s: No changes to feed." % (self.key,))
-                mainthread.execute(wc_success, async=True)
+                if wc().available():
+                    mainthread.execute(wc_success, async=True)
                 success = True
             elif len(tmp["entries"])==0 and not tmp.get('version', None):
                 # An error occured fetching or parsing the feed.  (Version