config fixes

com.roundabout_host.Izvor.yaml

@@ -33,7 +33,7 @@ modules:

                                
                                
                                
                            
                                
                                    
                                        
                                            33  
                                                  - pip install --prefix=/app --no-deps -r /app/share/izvor/requirements-flatpak.txt
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            34  
                                                  - chmod +x /app/share/izvor/__init__.py
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            35  
                                                  - ln -s /app/share/izvor/__init__.py /app/bin/izvor
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        36 -
                                              - fc-cache -fv
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        36 +
                                              #- fc-cache -fv
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            37  
                                                sources:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            38  
                                                  - type: dir
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            39  
                                                    path: src
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

src/__init__.py

@@ -399,7 +399,14 @@ class Izvor(Gtk.Application):

                                
                                
                                
                            
                                
                                    
                                        
                                            399  
                                                        switch.connect("notify::active", self.update_permanently_enabled_providers, provider.stem)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            400  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            401  
                                                        config_button = Gtk.Button.new_with_label(_("Configure"))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        402 -
                                                    config_button.connect("clicked", lambda _, stem=provider.stem: subprocess.Popen(["xdg-open", str(self.USER_PROVIDER_CONFIGS / f"{stem}.json")]))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        402 +
                                                    def open_config(widget, stem=provider.stem):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        403 +
                                                        # User-accessible provider config, not Flatpak sandboxed
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        404 +
                                                        config_path = str(Path.home() / ".config" / "izvor" / "providers" / f"{stem}.json")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        405 +
                                                        if os.getenv("FLATPAK_SANDBOX_DIR"):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        406 +
                                                            subprocess.Popen(["flatpak-spawn", "--host", "xdg-open", config_path])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        407 +
                                                        else:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        408 +
                                                            subprocess.Popen(["xdg-open", config_path])
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        409 +
                                                    config_button.connect("clicked", open_config)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            410  
                                                        config_button.set_relief(Gtk.ReliefStyle.NONE)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            411  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            412  
                                                        providers_table.attach(icon, 0, rows, 1, 1)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -414,7 +421,8 @@ class Izvor(Gtk.Application):

                                
                                
                                
                            
                                
                                    
                                        
                                            421  
                                                        rows += 1
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            422  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            423  
                                                    def open_provider_directory(widget):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        417 -
                                                    provider_directory = str(self.USER_PROVIDERS)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        424 +
                                                    # User-accessible provider directory, not Flatpak sandboxed
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        425 +
                                                    provider_directory = str(Path.home() / ".local" / "share" / "izvor" / "providers")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            426  
                                                        if os.getenv("FLATPAK_SANDBOX_DIR"):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            427  
                                                            subprocess.Popen(["flatpak-spawn", "--host", "xdg-open", provider_directory])
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            428  
                                                        else: