Merge pull request #6 from jotyGill/develop

Version 2.0.1

docs/README.md

@@ -56,7 +56,7 @@ This script installs and configures the following tools. A huge thanks to all th
 
 2. [uBlock Origin](https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/): An efficient "wide-spectrum blocker", it blocks, ads, trackers and malware sites. [https://github.com/gorhill/uBlock]
 
-3. [Temporary containers](https://addons.mozilla.org/en-US/firefox/addon/temporary-containers/): Temporary Containers takes "Firefox Containers" to whole new level by making every new tab a different container. you may have heard of the advise to use multiple browsers. This pretty much makes every new tab a different, isolated (cookies, localstorage) browser, which gets deleted after it is closed. Eliminates long term tracking done using, cookies, storage caches, Etags.[https://github.com/stoically/temporary-containers]
+3. [Temporary Containers](https://addons.mozilla.org/en-US/firefox/addon/temporary-containers/): Temporary Containers takes "Firefox Containers" to whole new level by making every new tab a different container. you may have heard of the advise to use multiple browsers. This pretty much makes every new tab a different, isolated (cookies, localstorage) browser, which gets deleted after it is closed. Eliminates long term tracking done using, cookies, storage caches, Etags.[https://github.com/stoically/temporary-containers]
 
     Configuration: Automatic mode enabled (every new tab opens in a new isolated container). Containers colour is set to random.
 
@@ -68,9 +68,9 @@ HTTPS Everywhere is a Firefox extension by [EFF](https://www.eff.org/) to protec
 5. [Canvas Blocker](https://addons.mozilla.org/en-US/firefox/addon/canvasblocker/): Aims to prevent websites from using the some Javascript APIs to fingerprint users. resistFingerprinting takes preference to this, CanvasBlocker works as fallback for canvas fingerprinting. It also protects form fingerprinting the following APIs (by faking the values):
 canvas 2d, webGL, audio, history, DOMRect [https://github.com/kkapsner/CanvasBlocker]
 
-6. [decentraleyes](https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/): Protects you against tracking through "free", centralized, Content Delivery Networks, by locally storing libraries instead of fetching them from the tracking CDNs.
+6. [Decentraleyes](https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/): Protects you against tracking through "free", centralized, Content Delivery Networks, by locally storing libraries instead of fetching them from the tracking CDNs.
 
-7. [clear_urls](https://gitlab.com/KevinRoebert/ClearUrls/): Protects your privacy by removing the tracking fields in URLs.[https://gitlab.com/KevinRoebert/ClearUrls/]
+7. [ClearURLs](https://addons.mozilla.org/en-US/firefox/addon/clearurls/): Protects your privacy by removing the tracking fields in URLs.[https://gitlab.com/KevinRoebert/ClearUrls/]
 
 8. [Terms of Service; Didn't Read](https://addons.mozilla.org/en-US/firefox/addon/terms-of-service-didnt-read/): Provides rating and extracts key points of the lengthy Terms and Conditions no one reads.[https://tosdr.org/]
 

privacyfighter/pf.py

@@ -14,13 +14,12 @@
 
 import psutil
 import requests
-
 # GUI-SETUP, is a tag used to find lines to change, to produce the gui-version
 # from gooey import Gooey  # GUI-SETUP, comment out when producing cli version
 
 gui_mode = False  # GUI-SETUP, change to 'True' in gui-version
 
-__version__ = "2.0.0"
+__version__ = "2.0.1"
 __basefilepath__ = os.path.dirname(os.path.abspath(__file__))
 
 repo_location = "https://raw.githubusercontent.com/jotyGill/privacy-fighter/master/privacyfighter"
@@ -327,7 +326,11 @@ def import_profile_data(import_profile, profile_name, firefox_path, firefox_ini_
                 pass
 
     for file in data_files:
-        shutil.copy2(os.path.join(import_profile_path, file), os.path.join(firefox_path, profile_name))
+        try:
+            shutil.copy2(os.path.join(import_profile_path, file), os.path.join(firefox_path, profile_name))
+        except FileNotFoundError:
+            # logins.json is missing, user never saved any password in FF
+            pass
 
 
 def resource_path(relative_path):

privacyfighter/version.txt

@@ -1 +1 @@
-2.0.0
+2.0.1

setup.py

@@ -8,7 +8,7 @@
 
 # pf_location = os.path.join(os.path.abspath(os.path.dirname(__file__)), "privacyfighter")
 # exec(open(os.path.join(pf_location, "version.py")).read())
-__version__ = "2.0.0"
+__version__ = "2.0.1"
 
 if sys.version_info < (3, 5):
     sys.stderr.write("ERROR: requires Python 3.5 or above." + "Install using 'pip3' instead of just 'pip' \n")