Packman Build Service PMBS

gpodder3.changes Changed

gpodder3.spec Changed

gpodder-3.0.1.tar.bz2/ChangeLog Added

@@ -0,0 +1,102 @@
+commit 77b9e30974732314f313c506fab9297f435abcc7
+Author: Thomas Perl <m@thp.io>
+Date:   Sun Nov 13 23:19:45 2011 +0100
+
+    gPodder 3.0.1 "One Illegal Angel" released
+    
+    Bugfix galore, week one.
+
+commit 32a5ad156f6e0465f05792676f74e75f6c85e261
+Author: Thomas Perl <m@thp.io>
+Date:   Sun Nov 13 23:17:19 2011 +0100
+
+    Fix translation header in fr.po
+
+commit cdc019ca56a5dea0eeb420953e153ef7483d7639
+Author: Thomas Perl <m@thp.io>
+Date:   Sat Nov 12 15:31:30 2011 +0100
+
+    Don't hide failed attribute access in proxy
+
+commit f34442f217967ed6bb4aeeb948c7213ffd96d1d0
+Author: Thomas Perl <m@thp.io>
+Date:   Sat Nov 12 15:25:45 2011 +0100
+
+    Gtk UI: Cosmetic fix for progress dialog labels
+
+commit d02368dd3a3dd2cecefebb3d95fd2d460b1cc5b4
+Author: Thomas Perl <m@thp.io>
+Date:   Sat Nov 12 15:19:12 2011 +0100
+
+    Detect existing URLs on feed redirection (bug 1457)
+    
+    When the feed is redirected, we usually simply rewrite
+    the URL. However, if the new URL already exists in the
+    subscriptions, we must not allow this, and ideally
+    fail to update the feed to avoid duplicates.
+
+commit 1b0dc1a709db6c5f977254e9db7754a88c7f8c08
+Author: Thomas Perl <m@thp.io>
+Date:   Sat Nov 12 14:57:40 2011 +0100
+
+    Media RSS: Get filesize and duration (bug 1446)
+
+commit 85ea863c9475308054c211ff59cf9a4b9dbf8c91
+Author: Eric Le Lay <elelay@macports.org>
+Date:   Thu Nov 10 15:17:07 2011 +0100
+
+    OS X: Use "open" to open files on Mac OS X (bug 1482)
+
+commit f236554052446c1a5ce3a784cd7baed72dae3907
+Author: Eric Le Lay <elelay@macports.org>
+Date:   Thu Nov 10 15:16:34 2011 +0100
+
+    OS X: Add global flag for platform detection (bug 1482)
+
+commit 0506a048d7fb8225a0c6228503b73236c5aa07fd
+Author: Neal H. Walfield <neal@gnu.org>
+Date:   Tue Nov 1 10:51:41 2011 +0100
+
+    Woodchuck: Make soft errors quieter (bug 1476)
+
+commit b97faa7f1487d73fceb108d00f6811e3718b9d9c
+Author: Neal H. Walfield <neal@gnu.org>
+Date:   Tue Nov 1 10:29:46 2011 +0100
+
+    Woodchuck: Fix spelling mistakes (bug 1473)
+
+commit 182ef9eaee1f8100612e484ca8500d59c168caf7
+Author: Thomas Perl <m@thp.io>
+Date:   Sat Nov 12 01:10:16 2011 +0100
+
+    Fix UnicodeDecodeError on startup (bug 1485)
+
+commit 619b6f376753743f5b09b236e200ee24275f8288
+Author: Thomas Perl <m@thp.io>
+Date:   Fri Nov 11 23:03:53 2011 +0100
+
+    Windows: Support "just for me" Python installs (bug 1480)
+
+commit fab79cf6227e5c585e42648491e3dac2a23a6f8c
+Author: Thomas Perl <m@thp.io>
+Date:   Mon Nov 7 16:40:47 2011 +0100
+
+    Windows Launcher: Create non-existing directory
+
+commit b005c2a33bd782050d7131f2fb691697d0bd5d47
+Author: Thomas Perl <m@thp.io>
+Date:   Mon Nov 7 15:47:45 2011 +0100
+
+    Windows: Setup-compatible launcher + .iss file
+    
+    The launcher must download files to $GPODDER_HOME,
+    otherwise it won't be able to save files in the
+    application folder when installed using the setup.
+
+commit 30f3539fa9d06314385dfa45434c815703ca6c3e
+Author: Thomas Perl <m@thp.io>
+Date:   Mon Nov 7 01:00:25 2011 +0100
+
+    credits.txt: Update from Git history
+    
+    Oops.. forgot that in the 3.0.0 release.

gpodder-3.0.0.tar.bz2/PKG-INFO -> gpodder-3.0.1.tar.bz2/PKG-INFO Changed

gpodder-3.0.0.tar.bz2/data/credits.txt -> gpodder-3.0.1.tar.bz2/data/credits.txt Changed

gpodder-3.0.0.tar.bz2/data/man/gpo.1 -> gpodder-3.0.1.tar.bz2/data/man/gpo.1 Changed

gpodder-3.0.0.tar.bz2/data/man/gpodder.1 -> gpodder-3.0.1.tar.bz2/data/man/gpodder.1 Changed

gpodder-3.0.0.tar.bz2/data/po/fr.po -> gpodder-3.0.1.tar.bz2/data/po/fr.po Changed

gpodder-3.0.0.tar.bz2/src/gpodder/__init__.py -> gpodder-3.0.1.tar.bz2/src/gpodder/__init__.py Changed

gpodder-3.0.0.tar.bz2/src/gpodder/gtkui/interface/progress.py -> gpodder-3.0.1.tar.bz2/src/gpodder/gtkui/interface/progress.py Changed

gpodder-3.0.0.tar.bz2/src/gpodder/gtkui/main.py -> gpodder-3.0.1.tar.bz2/src/gpodder/gtkui/main.py Changed

gpodder-3.0.0.tar.bz2/src/gpodder/gtkui/model.py -> gpodder-3.0.1.tar.bz2/src/gpodder/gtkui/model.py Changed

gpodder-3.0.0.tar.bz2/src/gpodder/model.py -> gpodder-3.0.1.tar.bz2/src/gpodder/model.py Changed

@@ -272,10 +272,15 @@
                 continue
 
             try:
-                episode.file_size = int(m.fileSize) or -1
+                episode.file_size = int(m.get('filesize', 0)) or -1
             except:
                 episode.file_size = -1
 
+            try:
+                episode.total_time = int(m.get('duration', 0)) or 0
+            except:
+                episode.total_time = 0
+
             return episode
 
         # Brute-force detection of any links
@@ -571,7 +576,8 @@
             self.download_filename = wanted_filename
             self.save()
 
-        return os.path.join(util.sanitize_encoding(self.channel.save_dir), self.download_filename)
+        return os.path.join(util.sanitize_encoding(self.channel.save_dir),
+                util.sanitize_encoding(self.download_filename))
 
     def set_mimetype(self, mimetype, commit=False):
         """Sets the mimetype for this episode"""
@@ -1085,6 +1091,8 @@
         except feedcore.NewLocation, updated:
             feed = updated.data
             logger.info('New feed location: %s => %s', self.url, feed.href)
+            if feed.href in set(x.url for x in self.model.get_podcasts()):
+                raise Exception('Already subscribed to ' + feed.href)
             self.url = feed.href
             self._consume_updated_feed(feed, max_episodes, mimetype_prefs)
             self._update_etag_modified(feed)

gpodder-3.0.0.tar.bz2/src/gpodder/plugins/woodchuck.py -> gpodder-3.0.1.tar.bz2/src/gpodder/plugins/woodchuck.py Changed

@@ -311,7 +311,7 @@
                      % (podcast.title, podcast.url,))
 
         # Assume the error is transient.
-        status = woodchuck.DownloadStatus.TransientOther
+        status = woodchuck.TransferStatus.TransientOther
 
         if (any(isinstance(exception, exception_class)
                 for exception_class in [feedcore.Unsubscribe,
@@ -319,12 +319,12 @@
                                         feedcore.InvalidFeed,
                                         feedcore.UnknownStatusCode])):
             # The podcast disappeared...
-            status = woodchuck.DownloadStatus.FailureGone
+            status = woodchuck.TransferStatus.FailureGone
         elif (any(isinstance(exception, exception_class)
                   for exception_class in [feedcore.Offline,
                                           feedcore.WifiLogin])):
             # Tranient network error.
-            status = woodchuck.DownloadStatus.TransientNetwork
+            status = woodchuck.TransferStatus.TransientNetwork
 
         self.stream_update_failed(podcast.url, status)
 
@@ -392,7 +392,7 @@
             # Assume that the user played between the old current
             # position and the new current position.
             start = changes.get('current_position', 0)
-            end = obj.current_position
+            end = episode.current_position
             if start > end:
                 # The user rewound.  Assume [0, end]
                 start = 0
@@ -422,13 +422,21 @@
         logger.debug("Episode %s (%s): file deleted (%s)"
                      % (episode.guid, episode.title, filename))
 
-        self[episode.channel.url][episode.guid].files_deleted()
+        try:
+            self[episode.channel.url][episode.guid].files_deleted()
+        except KeyError:
+            logger.debug("on_episode_delete: episode %s (%s) not registered",
+                         episode.guid, episode.title)
 
     @execute_in_main_thread
     def on_episode_removed_from_podcast(self, episode):
         logger.debug("Episode %s (%s) removed" % (episode.guid, episode.title))
 
-        del self[episode.channel.url][episode.guid]
+        try:
+            del self[episode.channel.url][episode.guid]
+        except KeyError:
+            logger.debug("on_episode_removed_from_podcast: episode %s (%s) not registered",
+                         episode.guid, episode.title)
 
 @coroutine
 def check_subscriptions():

gpodder-3.0.0.tar.bz2/src/gpodder/util.py -> gpodder-3.0.1.tar.bz2/src/gpodder/util.py Changed

gpodder-3.0.0.tar.bz2/tools/win32-launcher/downloader.c -> gpodder-3.0.1.tar.bz2/tools/win32-launcher/downloader.c Changed

gpodder-3.0.0.tar.bz2/tools/win32-launcher/gpo.exe -> gpodder-3.0.1.tar.bz2/tools/win32-launcher/gpo.exe Changed

gpodder-3.0.0.tar.bz2/tools/win32-launcher/gpodder.c -> gpodder-3.0.1.tar.bz2/tools/win32-launcher/gpodder.c Changed

@@ -60,17 +60,44 @@
 #define LOOKUP_FUNCTION(x) {x = GetProcAddress(python_dll, #x); \
     if(x == NULL) {BAILOUT("Cannot find function: " #x);}}
 
+
+const char *FindPythonDLL()
+{
+    static char InstallPath[MAX_PATH];
+    DWORD InstallPathSize = MAX_PATH;
+    HKEY RegKey;
+    char *result = NULL;
+
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+            "Software\\Python\\PythonCore\\2.7\\InstallPath",
+            0, KEY_READ, &RegKey) != ERROR_SUCCESS) {
+        return NULL;
+    }
+
+    if (RegQueryValueEx(RegKey, NULL, NULL, NULL,
+                InstallPath, &InstallPathSize) == ERROR_SUCCESS) {
+        strncat(InstallPath, "\\python27.dll", sizeof(InstallPath));
+        result = InstallPath;
+    }
+
+    RegCloseKey(RegKey);
+    return result;
+}
+
+
 int main(int argc, char** argv)
 {
     char path_env[MAX_PATH];
     char current_dir[MAX_PATH];
     char *endmarker = NULL;
+    char *dll_path = NULL;
     int i;
     void *MainPy;
     void *GtkModule;
     int _argc = 1;
     char *_argv[] = { MAIN_MODULE };
     TCHAR gPodder_Home[MAX_PATH];
+    TCHAR Temp_Download_Filename[MAX_PATH];
 
     HMODULE python_dll;
     FARPROC Py_Initialize;
@@ -95,11 +122,14 @@
             BAILOUT("Cannot determine your home directory (SHGetFolderPath).");
         }
 
-        strncat(gPodder_Home, "\\gPodder", MAX_PATH);
+        strncat(gPodder_Home, "\\gPodder\\", MAX_PATH);
         if (SetEnvironmentVariable("GPODDER_HOME", gPodder_Home) == 0) {
             BAILOUT("SetEnvironmentVariable for GPODDER_HOME failed.");
         }
+    } else {
+        strncpy(gPodder_Home, getenv("GPODDER_HOME"), MAX_PATH);
     }
+    CreateDirectory(gPodder_Home, NULL);
 
     /* Set current directory to directory of launcher */
     strncpy(current_dir, argv[0], MAX_PATH);
@@ -119,17 +149,27 @@
     python_dll = LoadLibrary("python27.dll");
 
     if (python_dll == NULL) {
+        /* Try to detect "just for me"-installed Python version (bug 1480) */
+        dll_path = FindPythonDLL();
+        if (dll_path != NULL) {
+            python_dll = LoadLibrary(dll_path);
+        }
+    }
+
+    if (python_dll == NULL) {
         if (MessageBox(NULL,
                 PROGNAME " requires Python 2.7.\n"
                 "Do you want to install it now?",
                 "Python 2.7 installation not found",
                 MB_YESNO | MB_ICONQUESTION) == IDYES) {
-            if (DownloadFile(PYTHON_INSTALLER_FILE,
+            strncpy(Temp_Download_Filename, gPodder_Home, MAX_PATH);
+            strncat(Temp_Download_Filename, PYTHON_INSTALLER_FILE, MAX_PATH);
+            if (DownloadFile(Temp_Download_Filename,
                         PYTHON_INSTALLER_URL,
                         PYTHON_INSTALLER_SIZE) == PYTHON_INSTALLER_SIZE) {
                 ShellExecute(NULL,
                         "open",
-                        PYTHON_INSTALLER_FILE,
+                        Temp_Download_Filename,
                         NULL,
                         NULL,
                         SW_SHOWNORMAL);
@@ -160,12 +200,14 @@
                 "Do you want to install it now?",
                 "PyGTK installation not found",
                 MB_YESNO | MB_ICONQUESTION) == IDYES) {
-            if (DownloadFile(PYGTK_INSTALLER_FILE,
+            strncpy(Temp_Download_Filename, gPodder_Home, MAX_PATH);
+            strncat(Temp_Download_Filename, PYGTK_INSTALLER_FILE, MAX_PATH);
+            if (DownloadFile(Temp_Download_Filename,
                         PYGTK_INSTALLER_URL,
                         PYGTK_INSTALLER_SIZE) == PYGTK_INSTALLER_SIZE) {
                 ShellExecute(NULL,
                         "open",
-                        PYGTK_INSTALLER_FILE,
+                        Temp_Download_Filename,
                         NULL,
                         NULL,
                         SW_SHOWNORMAL);

gpodder-3.0.0.tar.bz2/tools/win32-launcher/gpodder.exe -> gpodder-3.0.1.tar.bz2/tools/win32-launcher/gpodder.exe Changed

gpodder-3.0.1.tar.bz2/tools/win32-setup Added

gpodder-3.0.1.tar.bz2/tools/win32-setup/gpodder-setup.iss Added

@@ -0,0 +1,54 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{ABE123A1-41D1-4917-8E1E-C7E37991B673}
+AppName=gPodder
+AppVersion=3.0.0
+;AppVerName=gPodder 3.0.0
+AppPublisher=Thomas Perl
+AppPublisherURL=http://gpodder.org/
+AppSupportURL=http://gpodder.org/
+AppUpdatesURL=http://gpodder.org/
+DefaultDirName={pf}\gPodder
+DefaultGroupName=gPodder
+LicenseFile=C:\Users\thp\gpodder\tools\win32-setup\gpodder-3.0.0-win32\COPYING
+InfoBeforeFile=C:\Users\thp\gpodder\tools\win32-setup\gpodder-3.0.0-win32\README
+OutputDir=C:\Users\thp\gpodder\tools\win32-setup
+OutputBaseFilename=gpodder-3.0.0-setup
+Compression=lzma
+SolidCompression=yes
+WizardSmallImageFile=C:\Users\thp\gpodder\tools\win32-setup\wizard-small-image.bmp
+WizardImageFile=C:\Users\thp\gpodder\tools\win32-setup\wizard-image.bmp
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
+
+[Files]
+Source: "C:\Users\thp\gpodder\tools\win32-setup\gpodder-3.0.0-win32\gpodder.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\thp\gpodder\tools\win32-setup\gpodder-3.0.0-win32\COPYING"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\thp\gpodder\tools\win32-setup\gpodder-3.0.0-win32\gpo.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\thp\gpodder\tools\win32-setup\gpodder-3.0.0-win32\README"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\thp\gpodder\tools\win32-setup\gpodder-3.0.0-win32\bin\*"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\thp\gpodder\tools\win32-setup\gpodder-3.0.0-win32\data\*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\thp\gpodder\tools\win32-setup\gpodder-3.0.0-win32\src\*"; DestDir: "{app}\src"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\gPodder"; Filename: "{app}\gpodder.exe"
+Name: "{group}\gPodder (CLI)"; Filename: "{app}\gpo.exe"
+Name: "{group}\{cm:ProgramOnTheWeb,gPodder}"; Filename: "http://gpodder.org/"
+Name: "{group}\{cm:UninstallProgram,gPodder}"; Filename: "{uninstallexe}"
+Name: "{commondesktop}\gPodder"; Filename: "{app}\gpodder.exe"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\gPodder"; Filename: "{app}\gpodder.exe"; Tasks: quicklaunchicon
+
+[Run]
+Filename: "{app}\gpodder.exe"; Description: "{cm:LaunchProgram,gPodder}"; Flags: nowait postinstall skipifsilent
+

gpodder-3.0.1.tar.bz2/tools/win32-setup/wizard-image.bmp Added

gpodder-3.0.1.tar.bz2/tools/win32-setup/wizard-small-image.bmp Added

Changes of Revision 2