add $GPODDER_HOME/pip/... to PYTHONPATH

Needs to be done in the native launcher.
Switch to objective-c launcher to get ApplicationSupport and ~ directories from Foundation framework.
GPODDER_HOME could be set from the native launcher, but let it be recomputed in python launcher

Author: elelay

bundle.sh

@@ -5,7 +5,7 @@ set -e
 source env.sh
 
 echo compiling native launcher...
-echo 'gcc -L$PREFIX/lib `python3-config --cflags --ldflags --embed` -o $PREFIX/bin/gpodder-launcher misc/bundle/launcher.c'| jhbuild shell
+echo 'clang -mmacosx-version-min=10.9 -framework Foundation -L$PREFIX/lib `python3-config --cflags --ldflags --embed` -o $PREFIX/bin/gpodder-launcher misc/bundle/launcher.m'| jhbuild shell
 
 echo creating app...
 jhbuild run gtk-mac-bundler misc/bundle/gpodder.bundle

misc/bundle/launcher.c misc/bundle/launcher.mmisc/bundle/launcher.c renamed to misc/bundle/launcher.m

@@ -21,6 +21,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <CoreFoundation/CoreFoundation.h>
+#import <Foundation/Foundation.h>
 #include <sys/syslimits.h>
 #include <stdio.h>
 
@@ -81,6 +82,80 @@ get_bundle_dir(void)
     return retval;
 }
 
+static NSString*
+gpodder_home(NSFileManager* fm) {
+    // 1. ${GPODDER_HOME}
+    char* gpodder_home = getenv("GPODDER_HOME");
+    if (gpodder_home != NULL) {
+        NSLog(@"gPodder home from environment GPODDER_HOME is %s", gpodder_home);
+        return [NSString stringWithUTF8String: gpodder_home];
+    }
+    // 2. Application Support/gPodder
+    NSError *error = nil;
+    NSURL *applicationSupport = [fm URLForDirectory:NSApplicationSupportDirectory
+                                                                      inDomain:NSUserDomainMask
+                                                                      appropriateForURL:0
+                                                                        create:YES
+                                                                         error:&error];
+    if (error) {
+        NSLog(@"Error getting Application Support directory %@", error);
+        exit(1);
+    }
+    NSString* path = applicationSupport.path;
+    path = [path stringByAppendingString: @"/gPodder"];
+    if ([fm fileExistsAtPath: path])
+    {
+        NSLog(@"gPodder home is %@", path);
+        return path;
+    }
+
+    // 3. ~/gPodder
+    NSURL* home = [fm homeDirectoryForCurrentUser];
+    path = home.path;
+    path = [path stringByAppendingString: @"/gPodder"];
+    NSLog(@"Default gPodder home is %@", path);
+    return path;
+}
+
+static NSString*
+handle_custom_pip_path(void) {
+    NSError *error = nil;
+    NSFileManager* fm = [NSFileManager defaultManager];
+    NSString* path = gpodder_home(fm);
+
+    NSString* new_path = [path stringByAppendingString: @"/new-pip"];
+    if ([fm fileExistsAtPath: new_path])
+    {
+        NSLog(@"new_path %@ exists", new_path);
+        NSString* old_path = [path stringByAppendingString: @"/pip"];
+        if ([fm fileExistsAtPath: old_path])
+        {
+            NSLog(@"old_path %@ exists, moving to trash", old_path);
+            NSURL *localURL = [NSURL fileURLWithPath:old_path];
+            if([fm trashItemAtURL:localURL resultingItemURL:nil error:&error] != YES)
+            {
+                NSLog(@"Unable to put old pip %@ to trash: %@", old_path, error);
+                exit(1);
+            }
+        }
+        NSLog(@"moving new_path %@ to %@", new_path, old_path);
+        if([fm moveItemAtPath:new_path toPath:old_path error:&error] != YES)
+        {
+            NSLog(@"Unable to move new pip %@ to %@: %@", new_path, old_path, error);
+            exit(1);
+        }
+    }
+
+    path = [path stringByAppendingString: @"/pip/lib/python3.8/site-packages"];
+    NSLog(@"considering %@", path);
+    if ([fm fileExistsAtPath: path])
+    {
+        NSLog(@"path %@ exists, adding to PYTHONPATH", path);
+        return path;
+    }
+    return nil;
+}
+
 static void
 set_python_path(void)
 {
@@ -90,7 +165,14 @@ set_python_path(void)
     wchar_t *path;
     CFStringRef str = make_filesystem_string(bundle_url);
     CFRelease(bundle_url);
-    mstr = CFStringCreateMutableCopy(NULL, 5 * PATH_MAX, str);
+    mstr = CFStringCreateMutable(NULL, 5 * PATH_MAX);
+
+    NSString* customPath = handle_custom_pip_path();
+    if (customPath != NULL)
+    {
+        CFStringAppend(mstr, (__bridge CFStringRef)customPath);
+        CFStringAppendCString(mstr, ":", kCFStringEncodingUTF8);
+    }
     CFStringAppendCString(mstr, "/lib/python36.zip:", kCFStringEncodingUTF8);
     CFStringAppend(mstr, str);
     CFStringAppendCString(mstr, "/lib/python3.8:",

misc/bundle/launcher.py

@@ -121,7 +121,6 @@ def regen(self, dest):
 for k, v in os.environ.items():
   print("%s=%s" % (k,v))
 
-# Gen cert.pem
 def gpodder_home():
     # don't inadvertently create the new gPodder home,
     # it would be prefered to the old one
@@ -136,6 +135,7 @@ def gpodder_home():
             return cand
     return default_path
 
+
 gphome = gpodder_home()
 os.makedirs(join(gphome, 'openssl'), exist_ok=True)
 # generate cert.extracted.pem