Merge pull request #317 from davidteather/nightly

V3.6.1
davidteather · Nov 5, 2020 · 3fb031c · 3fb031c
2 parents cf18461 + 7bed3a0
commit 3fb031c
Show file tree

Hide file tree

Showing 21 changed files with 85 additions and 160 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,5 @@ dist/*
 test.mp4
 test.txt
 .pytest_cache/*
-tests/__pycache__/*
+tests/__pycache__/*
+*.pyc
diff --git a/README.md b/README.md
@@ -95,16 +95,16 @@ results = 10
 trending = api.trending(count=results)
 
 for tiktok in trending:
-    # Prints the text of the tiktok
-    print(tiktok['desc'])
+    # Prints the id of the tiktok
+    print(tiktok['id'])
 
 print(len(trending))
 ```
 
 To run the example scripts from the repository root, make sure you use the
 module form of python the interpreter
 
-```sh
+```
 python -m examples.getTrending
 ```
 

diff --git a/TikTokApi/__pycache__/__init__.cpython-37.pyc b/TikTokApi/__pycache__/__init__.cpython-37.pyc
diff --git a/TikTokApi/__pycache__/__init__.cpython-38.pyc b/TikTokApi/__pycache__/__init__.cpython-38.pyc
diff --git a/TikTokApi/__pycache__/browser.cpython-37.pyc b/TikTokApi/__pycache__/browser.cpython-37.pyc
diff --git a/TikTokApi/__pycache__/browser.cpython-38.pyc b/TikTokApi/__pycache__/browser.cpython-38.pyc
diff --git a/TikTokApi/__pycache__/get_acrawler.cpython-37.pyc b/TikTokApi/__pycache__/get_acrawler.cpython-37.pyc
diff --git a/TikTokApi/__pycache__/get_acrawler.cpython-38.pyc b/TikTokApi/__pycache__/get_acrawler.cpython-38.pyc
diff --git a/TikTokApi/__pycache__/stealth.cpython-37.pyc b/TikTokApi/__pycache__/stealth.cpython-37.pyc
diff --git a/TikTokApi/__pycache__/stealth.cpython-38.pyc b/TikTokApi/__pycache__/stealth.cpython-38.pyc
diff --git a/TikTokApi/__pycache__/tiktok.cpython-37.pyc b/TikTokApi/__pycache__/tiktok.cpython-37.pyc
diff --git a/TikTokApi/__pycache__/tiktok.cpython-38.pyc b/TikTokApi/__pycache__/tiktok.cpython-38.pyc
diff --git a/TikTokApi/__pycache__/tiktokuser.cpython-38.pyc b/TikTokApi/__pycache__/tiktokuser.cpython-38.pyc
diff --git a/TikTokApi/__pycache__/user.cpython-38.pyc b/TikTokApi/__pycache__/user.cpython-38.pyc
diff --git a/TikTokApi/browser.py b/TikTokApi/browser.py
@@ -19,6 +19,15 @@ def set_async():
     global async_support
     async_support = True
 
+options = {}
+def custom_options(to_add):
+    global options
+    options = to_add
+
+args = []
+def custom_args(to_add):
+    global args
+    args = to_add
 
 class browser:
     def __init__(
@@ -37,15 +46,23 @@ def __init__(
         find_redirect = kwargs.get("find_redirect", False)
 
         self.userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.111 Safari/537.36"
-        self.args = [
-            "--no-sandbox",
-            "--disable-setuid-sandbox",
-            "--disable-infobars",
-            "--window-position=0,0",
-            "--ignore-certifcate-errors",
-            "--ignore-certifcate-errors-spki-list",
-            "--user-agent=" + self.userAgent,
-        ]
+
+        global args
+        global options
+
+        if len(args) == 0:
+            self.args = [
+                "--no-sandbox",
+                "--disable-setuid-sandbox",
+                "--disable-infobars",
+                "--window-position=0,0",
+                "--ignore-certifcate-errors",
+                "--ignore-certifcate-errors-spki-list",
+                "--user-agent=" + self.userAgent,
+            ]
+        else:
+            self.args = args
+            self.args.append("--user-agent=" + self.userAgent)
 
         if self.proxy != None:
             if "@" in self.proxy:
@@ -69,6 +86,8 @@ def __init__(
             "handleSIGHUP": False,
         }
 
+        self.options.update(options)
+
         if self.executablePath != None:
             self.options["executablePath"] = self.executablePath