Commit 89e9c20c authored by Francesco Poldi's avatar Francesco Poldi

Merge branch 'master' of https://github.com/twintproject/twint

parents 93963902 246dccf5
...@@ -24,18 +24,6 @@ Some of the benefits of using Twint vs Twitter API: ...@@ -24,18 +24,6 @@ Some of the benefits of using Twint vs Twitter API:
## Installing ## Installing
### Stable version
**Pip:**
```bash
pip3 install twint
```
**Pipenv**:
```bash
pipenv install twint
```
### Development version
**Git:** **Git:**
```bash ```bash
git clone https://github.com/twintproject/twint.git git clone https://github.com/twintproject/twint.git
......
import sys, os import sys, os
from asyncio import get_event_loop, TimeoutError from asyncio import get_event_loop, TimeoutError, ensure_future
from datetime import timedelta, datetime from datetime import timedelta, datetime
from . import datelock, feed, get, output, verbose, storage from . import datelock, feed, get, output, verbose, storage
...@@ -131,7 +131,16 @@ class Twint: ...@@ -131,7 +131,16 @@ class Twint:
self.count += 1 self.count += 1
await output.Tweets(tweet, "", self.config, self.conn) await output.Tweets(tweet, "", self.config, self.conn)
async def main(self): async def main(self, callback=None):
task = ensure_future(self.run()) # Might be changed to create_task in 3.7+.
if callback:
task.add_done_callback(callback)
await task
async def run(self):
self.user_agent = await get.RandomUserAgent() self.user_agent = await get.RandomUserAgent()
if self.config.User_id is not None: if self.config.User_id is not None:
logme.debug(__name__+':Twint:main:user_id') logme.debug(__name__+':Twint:main:user_id')
...@@ -186,9 +195,9 @@ class Twint: ...@@ -186,9 +195,9 @@ class Twint:
if self.config.Count: if self.config.Count:
verbose.Count(self.count, self.config) verbose.Count(self.count, self.config)
def run(config): def run(config, callback=None):
logme.debug(__name__+':run') logme.debug(__name__+':run')
get_event_loop().run_until_complete(Twint(config).main()) get_event_loop().run_until_complete(Twint(config).main(callback))
def Favorites(config): def Favorites(config):
logme.debug(__name__+':Favorites') logme.debug(__name__+':Favorites')
...@@ -234,11 +243,11 @@ def Profile(config): ...@@ -234,11 +243,11 @@ def Profile(config):
config.Profile = True config.Profile = True
run(config) run(config)
def Search(config): def Search(config, callback=None):
logme.debug(__name__+':Search') logme.debug(__name__+':Search')
config.TwitterSearch = True config.TwitterSearch = True
config.Following = False config.Following = False
config.Followers = False config.Followers = False
run(config) run(config, callback)
if config.Pandas_au: if config.Pandas_au:
storage.panda._autoget("tweet") storage.panda._autoget("tweet")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment