new logo and open with function

browser.py

@@ -0,0 +1,37 @@
+import winreg
+
+
+FIREFOX = 'Firefox'
+CHROME = "Chrome"
+IE = 'IE'
+
+PROGRAMS = {
+ IE: "iexplore.exe",
+ FIREFOX: "firefox.exe",
+ CHROME: "chrome.exe"
+}
+
+
+def get_path(browser_name) -> str:
+
+ reg_local_machine = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
+ reg_current_user = winreg.ConnectRegistry(None, winreg.HKEY_CURRENT_USER)
+ key = f'SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\{PROGRAMS[browser_name]}'
+
+ path = __get_default_value(reg_current_user, key)
+ if path:
+ return path
+
+ return __get_default_value(reg_local_machine, key)
+
+
+def __get_default_value(registry, key) -> str:
+ result = ''
+ try:
+ result_key = winreg.OpenKey(registry, key)
+ result = winreg.QueryValueEx(result_key, '')[0]
+ result_key.Close()
+ except FileNotFoundError:
+ pass
+ return result
+

firefox.py

@@ -3,9 +3,11 @@
 with load_module():
  import sqlite3
  import configparser
+ import winreg
  import os
  import webbrowser
  import json
+ import browser
  from os import path
  from typing import List
 
@@ -39,6 +41,22 @@ def query(self, param):
  results = self.get_results(db_path=db_path, sql=self.generate_sql(q))
  return results
 
+ def context_menu(self, data):
+
+ results = []
+ for browser_name in browser.PROGRAMS:
+ if browser.get_path(browser_name):
+ results.append({
+ "Title": f"Open With {browser_name}",
+ "SubTitle": str(data),
+ "IcoPath": f"img\\{browser_name}.ico",
+ 'JsonRPCAction': {
+ 'method': 'open_url',
+ 'parameters': [str(data), browser_name]
+ }
+ })
+ return results
+
  def get_db(self) -> str:
 
  dir = os.path.abspath(os.getcwd())
@@ -70,26 +88,25 @@ def generate_sql(self, keyword: str) -> List[str]:
  cond1 = f"'{keyword}%'"
  cond2 = f"'%{keyword}%'"
 
- sql1 = f'''select b.title, visit_count, url 
- from moz_bookmarks as b 
- join moz_places as p on b.fk = p.id
- where lower(b.title) like {cond1} 
- order by p.visit_count desc'''
- sql2 = f'''select b.title, visit_count, url 
- from moz_bookmarks as b 
- join moz_places as p on b.fk = p.id
- where lower(b.title) like {cond2} 
- and lower(b.title) not like {cond1} 
- order by p.visit_count desc'''
- sql3 = f'''select b.title, visit_count, url 
- from moz_bookmarks as b 
- join moz_places as p on b.fk = p.id
- where lower(p.url) like {cond2} 
- order by p.visit_count desc'''
-
- results += [sql1]
- results += [sql2]
- results += [sql3]
+ results.append(f'''select b.title, visit_count, url, frecency, b.guid
+ from moz_bookmarks as b
+ join moz_places as p on b.fk = p.id
+ where lower(b.title) like {cond1}
+ order by frecency desc '''
+ )
+ results.append(f'''select b.title, visit_count, url, frecency, b.guid 
+ from moz_bookmarks as b 
+ join moz_places as p on b.fk = p.id
+ where lower(b.title) like {cond2} 
+ and lower(b.title) not like {cond1} 
+ order by frecency desc '''
+ )
+ results.append(f'''select b.title, visit_count, url, frecency, b.guid 
+ from moz_bookmarks as b 
+ join moz_places as p on b.fk = p.id
+ where lower(p.url) like {cond2} 
+ order by frecency desc '''
+ ) 
 
  return results
 
@@ -144,7 +161,8 @@ def get_results(self, db_path: str, sql: List[str]) -> List[dict]:
  result = {
  'Title': title,
  'SubTitle': url,
- 'IcoPath': 'img\\firefox.ico',
+ 'IcoPath': 'img\\Firefox.ico',
+ "ContextData": url,
  'JsonRPCAction': {
  'method': 'open_url',
  'parameters': [url]
@@ -164,8 +182,13 @@ def get_results(self, db_path: str, sql: List[str]) -> List[dict]:
  }]
  return results
 
- def open_url(self, url=None):
- webbrowser.open(url)
+ def open_url(self, url=None, browser_name=None):
+ if not browser_name:
+ webbrowser.open(url)
+ else:
+ browser_path = browser.get_path(browser_name)
+ webbrowser.register(browser_name, None, webbrowser.BackgroundBrowser(browser_path))
+ webbrowser.get(browser_name).open_new_tab(url)
 
  def open_dir(self, dir=None):
  if dir:

plugin.json

@@ -4,7 +4,7 @@
  "Name":"Firefox Bookmarks",
  "Description":"Search Firefox Bookmarks",
  "Author":"hhelibeb",
- "Version":"1.0.0",
+ "Version":"1.0.1",
  "Language":"python",
  "Website":"https://github.com/hhelibeb/Wox.Plugin.Firefox-Bookmarks",
  "IcoPath": "img\\Firefox.ico",