mirror of
https://github.com/instaloader/instaloader.git
synced 2026-10-24 01:19:38 -07:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
520b69d6ef | ||
|
|
25c4daa861 | ||
|
|
7d256c36c1 | ||
|
|
64908788d3 | ||
|
|
b7ef306374 | ||
|
|
813621026c | ||
|
|
44bd4d173b | ||
|
|
2393a1a7a4 | ||
|
|
5304e9794b | ||
|
|
ee3106814e | ||
|
|
4c6d6e50af | ||
|
|
af287c3fdd | ||
|
|
0bc9ab55dd | ||
|
|
e64394fd25 | ||
|
|
43cc15d1b3 | ||
|
|
a263ec85a6 | ||
|
|
487d2c366d | ||
|
|
e493fa9c2d | ||
|
|
2e482b063a | ||
|
|
0bc91b722e | ||
|
|
4264d40f19 | ||
|
|
b15a595083 | ||
|
|
71ae32c85e | ||
|
|
f5134ff95e | ||
|
|
347f01b7fc | ||
|
|
981eec9182 | ||
|
|
c54b61346e | ||
|
|
fe9c8e1604 | ||
|
|
524fb21b80 | ||
|
|
ed4add951f | ||
|
|
8e6b2d83d3 | ||
|
|
ba8faec6fe | ||
|
|
9a74d9e109 | ||
|
|
08f805482c | ||
|
|
308244b809 | ||
|
|
b0c42a2662 | ||
|
|
c5dacb5f6d | ||
|
|
3a314de191 | ||
|
|
3a95250265 | ||
|
|
2a3e5980ff | ||
|
|
8159229203 | ||
|
|
ae9a5efa85 | ||
|
|
e159065799 | ||
|
|
ed21752365 | ||
|
|
b0157d9bc1 | ||
|
|
eb2accc088 | ||
|
|
a0169b7094 | ||
|
|
0a9fccaf26 |
@@ -14,11 +14,11 @@ jobs:
|
|||||||
- name: "Setup Python"
|
- name: "Setup Python"
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: 3.12
|
python-version: 3.14
|
||||||
cache: 'pipenv'
|
cache: 'pipenv'
|
||||||
- name: "Install Dependencies"
|
- name: "Install Dependencies"
|
||||||
run: |
|
run: |
|
||||||
python -m pip install pipenv==2023.12.1
|
python -m pip install pipenv==2025.0.4
|
||||||
pipenv --python `python --version | grep -Eo '3\.[0-9]+'` sync --dev
|
pipenv --python `python --version | grep -Eo '3\.[0-9]+'` sync --dev
|
||||||
- name: "Build Documentation"
|
- name: "Build Documentation"
|
||||||
run: pipenv --python `python --version | grep -Eo '3\.[0-9]+'` run make -C docs html SPHINXOPTS="-W -n"
|
run: pipenv --python `python --version | grep -Eo '3\.[0-9]+'` run make -C docs html SPHINXOPTS="-W -n"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
|
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Instaloader Repository
|
- name: Checkout Instaloader Repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -20,9 +20,10 @@ jobs:
|
|||||||
cache: 'pipenv'
|
cache: 'pipenv'
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: |
|
run: |
|
||||||
python -m pip install pipenv==2023.12.1
|
python -m pip install pipenv==2025.0.4
|
||||||
pipenv --python `python --version | grep -Eo '3\.[0-9]+'` sync --dev
|
pipenv --python `python --version | grep -Eo '3\.[0-9]+'` sync --dev
|
||||||
- name: PyLint
|
- name: PyLint
|
||||||
|
if: matrix.python-version != '3.9'
|
||||||
run: pipenv --python `python --version | grep -Eo '3\.[0-9]+'` run pylint instaloader
|
run: pipenv --python `python --version | grep -Eo '3\.[0-9]+'` run pylint instaloader
|
||||||
- name: MyPy
|
- name: MyPy
|
||||||
run: pipenv --python `python --version | grep -Eo '3\.[0-9]+'` run mypy -m instaloader
|
run: pipenv --python `python --version | grep -Eo '3\.[0-9]+'` run mypy -m instaloader
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ jobs:
|
|||||||
- name: "Setup Python"
|
- name: "Setup Python"
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: 3.12
|
python-version: 3.14
|
||||||
- name: "Get the tagged version"
|
- name: "Get the tagged version"
|
||||||
id: get_version
|
id: get_version
|
||||||
env:
|
env:
|
||||||
@@ -23,11 +23,11 @@ jobs:
|
|||||||
run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_OUTPUT
|
run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_OUTPUT
|
||||||
shell: bash
|
shell: bash
|
||||||
- name: "Install Dependencies"
|
- name: "Install Dependencies"
|
||||||
run: python -m pip install setuptools
|
run: python -m pip install -U setuptools wheel build
|
||||||
- name: "Generate Python Package"
|
- name: "Generate Python Package"
|
||||||
run: python setup.py sdist
|
run: python -m build
|
||||||
- name: "Publish Distribution to PyPI"
|
- name: "Publish Distribution to PyPI"
|
||||||
uses: pypa/gh-action-pypi-publish@master
|
uses: pypa/gh-action-pypi-publish@release/v1
|
||||||
with:
|
with:
|
||||||
password: ${{ secrets.PYPI_PASSWORD }}
|
password: ${{ secrets.PYPI_PASSWORD }}
|
||||||
- name: "Publish Distribution to AUR"
|
- name: "Publish Distribution to AUR"
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ jobs:
|
|||||||
- name: Setup Python
|
- name: Setup Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: "3.12"
|
python-version: "3.14"
|
||||||
cache: 'pipenv'
|
cache: 'pipenv'
|
||||||
architecture: x64
|
architecture: x64
|
||||||
- name: Get the tagged version
|
- name: Get the tagged version
|
||||||
@@ -25,25 +25,15 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
VERSION_TAG: v${{ steps.get_version.outputs.VERSION }}
|
VERSION_TAG: v${{ steps.get_version.outputs.VERSION }}
|
||||||
run: python deploy/windows/create_exe.py
|
run: python deploy/windows/create_exe.py
|
||||||
- name: Create draft release
|
- name: Create draft release and upload EXE as release asset
|
||||||
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
|
||||||
id: create_release
|
id: create_release
|
||||||
uses: actions/create-release@v1
|
uses: softprops/action-gh-release@v2
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
tag_name: v${{ steps.get_version.outputs.VERSION }}
|
tag_name: v${{ steps.get_version.outputs.VERSION }}
|
||||||
release_name: Version ${{ steps.get_version.outputs.VERSION }}
|
name: Version ${{ steps.get_version.outputs.VERSION }}
|
||||||
draft: true
|
draft: true
|
||||||
prerelease: contains(steps.get_version.outputs.VERSION, 'a') || contains(steps.get_version.outputs.VERSION, 'b') || contains(steps.get_version.outputs.VERSION, 'c')
|
prerelease: contains(steps.get_version.outputs.VERSION, 'a') || contains(steps.get_version.outputs.VERSION, 'b') || contains(steps.get_version.outputs.VERSION, 'c')
|
||||||
- name: Upload EXE as release asset
|
files: ./instaloader-v${{ steps.get_version.outputs.VERSION }}-windows-standalone.zip
|
||||||
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
|
|
||||||
id: upload-release-asset
|
|
||||||
uses: actions/upload-release-asset@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
|
||||||
asset_path: ./instaloader-v${{ steps.get_version.outputs.VERSION }}-windows-standalone.zip
|
|
||||||
asset_name: instaloader-v${{ steps.get_version.outputs.VERSION }}-windows-standalone.zip
|
|
||||||
asset_content_type: application/zip
|
|
||||||
|
|||||||
@@ -433,6 +433,7 @@ disable=bad-inline-option,
|
|||||||
too-many-instance-attributes,
|
too-many-instance-attributes,
|
||||||
too-many-lines,
|
too-many-lines,
|
||||||
too-many-locals,
|
too-many-locals,
|
||||||
|
too-many-positional-arguments,
|
||||||
too-many-public-methods,
|
too-many-public-methods,
|
||||||
too-many-statements,
|
too-many-statements,
|
||||||
unnecessary-lambda-assignment,
|
unnecessary-lambda-assignment,
|
||||||
|
|||||||
Generated
+718
-542
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -53,7 +53,7 @@
|
|||||||
::
|
::
|
||||||
|
|
||||||
instaloader [--comments] [--geotags]
|
instaloader [--comments] [--geotags]
|
||||||
[--stories] [--highlights] [--tagged] [--igtv]
|
[--stories] [--highlights] [--tagged] [--reels] [--igtv]
|
||||||
[--login YOUR-USERNAME] [--fast-update]
|
[--login YOUR-USERNAME] [--fast-update]
|
||||||
profile | "#hashtag" | :stories | :feed | :saved
|
profile | "#hashtag" | :stories | :feed | :saved
|
||||||
|
|
||||||
|
|||||||
@@ -5,9 +5,13 @@ pkgbase = instaloader
|
|||||||
url = https://instaloader.github.io/
|
url = https://instaloader.github.io/
|
||||||
arch = any
|
arch = any
|
||||||
license = MIT
|
license = MIT
|
||||||
|
makedepends = python-build
|
||||||
|
makedepends = python-installer
|
||||||
makedepends = python-setuptools
|
makedepends = python-setuptools
|
||||||
depends = python>=3.8
|
makedepends = python-wheel
|
||||||
depends = python-requests>=2.4
|
depends = python
|
||||||
|
depends = python-requests
|
||||||
|
optdepends = python-browser-cookie3: Import session cookies from browser
|
||||||
options = !emptydirs
|
options = !emptydirs
|
||||||
source = instaloader-{{version}}.tar.gz::https://codeload.github.com/instaloader/instaloader/tar.gz/v{{version}}
|
source = instaloader-{{version}}.tar.gz::https://codeload.github.com/instaloader/instaloader/tar.gz/v{{version}}
|
||||||
sha512sums = {{hash}}
|
sha512sums = {{hash}}
|
||||||
|
|||||||
@@ -8,20 +8,30 @@ arch=('any')
|
|||||||
url="https://instaloader.github.io/"
|
url="https://instaloader.github.io/"
|
||||||
license=('MIT')
|
license=('MIT')
|
||||||
groups=()
|
groups=()
|
||||||
depends=('python>=3.8' 'python-requests>=2.4')
|
depends=(
|
||||||
makedepends=('python-setuptools')
|
python
|
||||||
|
python-requests
|
||||||
|
)
|
||||||
|
makedepends=(
|
||||||
|
python-build
|
||||||
|
python-installer
|
||||||
|
python-setuptools
|
||||||
|
python-wheel
|
||||||
|
)
|
||||||
|
optdepends=(
|
||||||
|
'python-browser-cookie3: Import session cookies from browser'
|
||||||
|
)
|
||||||
options=('!emptydirs')
|
options=('!emptydirs')
|
||||||
source=($pkgname-$pkgver.tar.gz::https://codeload.github.com/instaloader/instaloader/tar.gz/v$pkgver)
|
source=($pkgname-$pkgver.tar.gz::https://codeload.github.com/instaloader/instaloader/tar.gz/v$pkgver)
|
||||||
sha512sums=('{{hash}}')
|
sha512sums=('{{hash}}')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "$srcdir/$pkgname-$pkgver"
|
cd "$srcdir/$pkgname-$pkgver"
|
||||||
python setup.py clean --all
|
python -m build --wheel --no-isolation
|
||||||
python setup.py build
|
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
cd "$srcdir/$pkgname-$pkgver"
|
cd "$srcdir/$pkgname-$pkgver"
|
||||||
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
|
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
|
||||||
python setup.py install --root "$pkgdir/" --skip-build
|
python -m installer --destdir="$pkgdir" dist/*.whl
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ with open('__main__.py', 'w+') as f:
|
|||||||
f.writelines(lines)
|
f.writelines(lines)
|
||||||
|
|
||||||
# install dependencies and invoke PyInstaller
|
# install dependencies and invoke PyInstaller
|
||||||
commands = ["pip install pipenv==2023.12.1",
|
commands = ["pip install pipenv==2025.0.4",
|
||||||
f"pipenv --python {sys.version_info.major}.{sys.version_info.minor} sync --dev",
|
f"pipenv --python {sys.version_info.major}.{sys.version_info.minor} sync --dev",
|
||||||
"pipenv run pyinstaller --log-level=DEBUG instaloader.spec"]
|
"pipenv run pyinstaller --log-level=DEBUG instaloader.spec"]
|
||||||
|
|
||||||
|
|||||||
@@ -92,11 +92,14 @@ Instaloader supports the following targets:
|
|||||||
- :option:`--tagged`
|
- :option:`--tagged`
|
||||||
to **download posts where the user is tagged**, and
|
to **download posts where the user is tagged**, and
|
||||||
|
|
||||||
|
- :option:`--reels`
|
||||||
|
to **download Reels videos**.
|
||||||
|
|
||||||
- :option:`--igtv`
|
- :option:`--igtv`
|
||||||
to **download IGTV videos**.
|
to **download IGTV videos**.
|
||||||
|
|
||||||
- ``"#hashtag"``
|
- ``"#hashtag"``
|
||||||
Posts with a certain **hashtag** (the quotes are usually necessary).
|
Posts with a certain **hashtag** (the quotes are usually necessary). Requires :ref:`login<login>`.
|
||||||
|
|
||||||
- ``%location id``
|
- ``%location id``
|
||||||
Posts tagged with a given location; the location ID is the numerical ID
|
Posts tagged with a given location; the location ID is the numerical ID
|
||||||
@@ -122,7 +125,8 @@ Instaloader supports the following targets:
|
|||||||
|
|
||||||
- ``-post``
|
- ``-post``
|
||||||
Replace **post** with the post's shortcode to download single post. Must be preceded by ``--`` in
|
Replace **post** with the post's shortcode to download single post. Must be preceded by ``--`` in
|
||||||
the argument list to not be mistaken as an option flag::
|
the argument list to not be mistaken as an option flag. For example, to download the post
|
||||||
|
https://www.instagram.com/p/**B_K4CykAOtf**, run the command::
|
||||||
|
|
||||||
instaloader -- -B_K4CykAOtf
|
instaloader -- -B_K4CykAOtf
|
||||||
|
|
||||||
@@ -231,7 +235,7 @@ The filter string must be a
|
|||||||
where the attributes from :class:`Post` or
|
where the attributes from :class:`Post` or
|
||||||
:class:`StoryItem` respectively are defined.
|
:class:`StoryItem` respectively are defined.
|
||||||
|
|
||||||
Id est, the following attributes can be used with both
|
The following attributes can be used with both
|
||||||
:option:`--post-filter` and :option:`--storyitem-filter`:
|
:option:`--post-filter` and :option:`--storyitem-filter`:
|
||||||
|
|
||||||
- :attr:`~Post.owner_username` (str), :attr:`~Post.owner_id` (int)
|
- :attr:`~Post.owner_username` (str), :attr:`~Post.owner_id` (int)
|
||||||
|
|||||||
+18
-10
@@ -131,6 +131,12 @@ What to Download of each Profile
|
|||||||
|
|
||||||
.. versionadded:: 4.1
|
.. versionadded:: 4.1
|
||||||
|
|
||||||
|
.. option:: --reels
|
||||||
|
|
||||||
|
Also download Reels videos.
|
||||||
|
|
||||||
|
.. versionadded:: 4.14
|
||||||
|
|
||||||
.. option:: --igtv
|
.. option:: --igtv
|
||||||
|
|
||||||
Also download IGTV videos.
|
Also download IGTV videos.
|
||||||
@@ -202,22 +208,24 @@ Instead of :option:`--login`, it is possible to use
|
|||||||
|
|
||||||
.. option:: --load-cookies BROWSER-NAME, -b BROWSER-NAME
|
.. option:: --load-cookies BROWSER-NAME, -b BROWSER-NAME
|
||||||
|
|
||||||
Use Instagram cookie in your browser to login.
|
Load Instagram session cookies from a browser instead of using Instaloader's own login mechanism.
|
||||||
This feature requires the browser_cookie3 library.
|
This method requires the `browser_cookie3 <https://github.com/borisbabic/browser_cookie3>`__ library.
|
||||||
Compatible with :option:`--cookiefile` if you want to load cookies from browser profiles.
|
By default, cookies are loaded from the browser's main profile, but you can specify a custom cookie file using :option:`--cookiefile`.
|
||||||
Incompatible with :option:`--login` due to potential username mismatch between user input and browser login.
|
|
||||||
Supported browsers: Brave, Chrome, Chromium, Edge, Firefox, LibreWolf, Opera, Opera_GX, Safari and Vivaldi.
|
|
||||||
|
|
||||||
In subsequent runs, you can just use :option:`--login` to reuse the
|
Since :option:`--load-cookies` and :option:`--login` are alternative ways to acquire a session, they cannot be used together when initially acquiring a session.
|
||||||
same session, which is saved by Instaloader.
|
|
||||||
|
Supported browsers: Arc, Brave, Chrome, Chromium, Edge, Firefox, LibreWolf, Opera, Opera_GX, Safari, and Vivaldi.
|
||||||
|
|
||||||
|
Once logged in via browser cookies, Instaloader saves the session, allowing you to use :option:`--login` in subsequent runs.
|
||||||
|
|
||||||
.. versionadded:: 4.11
|
.. versionadded:: 4.11
|
||||||
|
|
||||||
.. option:: --cookiefile COOKIE-FILE, -B COOKIE-FILE
|
.. option:: --cookiefile COOKIE-FILE, -B COOKIE-FILE
|
||||||
|
|
||||||
Cookie file path of a browser profile to load cookies from.
|
Specifies a cookie file path for :option:`--load-cookies` to load cookies from a particular browser profile.
|
||||||
|
This option must be used together with :option:`--load-cookies` and does not work on its own.
|
||||||
|
|
||||||
.. versionadded:: 4.11
|
.. versionadded:: 4.11
|
||||||
|
|
||||||
.. option:: --sessionfile SESSIONFILE, -f SESSIONFILE
|
.. option:: --sessionfile SESSIONFILE, -f SESSIONFILE
|
||||||
|
|
||||||
@@ -304,7 +312,7 @@ How to Download
|
|||||||
.. option:: --user-agent USER_AGENT
|
.. option:: --user-agent USER_AGENT
|
||||||
|
|
||||||
User Agent to use for HTTP requests. Per default, Instaloader pretends being
|
User Agent to use for HTTP requests. Per default, Instaloader pretends being
|
||||||
Chrome/120 on Linux.
|
Chrome/142 on Linux.
|
||||||
|
|
||||||
.. option:: --max-connection-attempts N
|
.. option:: --max-connection-attempts N
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import instaloader
|
|||||||
|
|
||||||
L = instaloader.Instaloader()
|
L = instaloader.Instaloader()
|
||||||
|
|
||||||
posts = instaloader.Hashtag.from_name(L.context, 'urbanphotography').get_posts()
|
posts = instaloader.Hashtag.from_name(L.context, 'urbanphotography').get_posts_resumable()
|
||||||
|
|
||||||
users = set()
|
users = set()
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import instaloader
|
|||||||
|
|
||||||
L = instaloader.Instaloader()
|
L = instaloader.Instaloader()
|
||||||
|
|
||||||
posts = instaloader.Hashtag.from_name(L.context, "urbanphotography").get_posts()
|
posts = instaloader.Hashtag.from_name(L.context, "urbanphotography").get_posts_resumable()
|
||||||
|
|
||||||
SINCE = datetime(2020, 5, 10) # further from today, inclusive
|
SINCE = datetime(2020, 5, 10) # further from today, inclusive
|
||||||
UNTIL = datetime(2020, 5, 11) # closer to today, not inclusive
|
UNTIL = datetime(2020, 5, 11) # closer to today, not inclusive
|
||||||
|
|||||||
+1
-1
@@ -48,7 +48,7 @@ See :ref:`install` for more options on how to install Instaloader.
|
|||||||
::
|
::
|
||||||
|
|
||||||
instaloader [--comments] [--geotags]
|
instaloader [--comments] [--geotags]
|
||||||
[--stories] [--highlights] [--tagged] [--igtv]
|
[--stories] [--highlights] [--tagged] [--reels] [--igtv]
|
||||||
[--login YOUR-USERNAME] [--fast-update]
|
[--login YOUR-USERNAME] [--fast-update]
|
||||||
profile | "#hashtag" | %location_id |
|
profile | "#hashtag" | %location_id |
|
||||||
:stories | :feed | :saved
|
:stories | :feed | :saved
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ Exceptions
|
|||||||
^^^^^^^^^^
|
^^^^^^^^^^
|
||||||
|
|
||||||
.. module:: instaloader
|
.. module:: instaloader
|
||||||
:noindex:
|
:no-index:
|
||||||
|
|
||||||
.. highlight:: python
|
.. highlight:: python
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
.. module:: instaloader
|
.. module:: instaloader
|
||||||
:noindex:
|
:no-index:
|
||||||
|
|
||||||
.. highlight:: python
|
.. highlight:: python
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
.. module:: instaloader
|
.. module:: instaloader
|
||||||
:noindex:
|
:no-index:
|
||||||
|
|
||||||
.. highlight:: python
|
.. highlight:: python
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ Resumable Iterations
|
|||||||
^^^^^^^^^^^^^^^^^^^^
|
^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
.. module:: instaloader
|
.. module:: instaloader
|
||||||
:noindex:
|
:no-index:
|
||||||
|
|
||||||
.. highlight:: python
|
.. highlight:: python
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ Instagram Structures
|
|||||||
^^^^^^^^^^^^^^^^^^^^
|
^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
.. module:: instaloader
|
.. module:: instaloader
|
||||||
:noindex:
|
:no-index:
|
||||||
|
|
||||||
.. highlight:: python
|
.. highlight:: python
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
"""Download pictures (or videos) along with their captions and other metadata from Instagram."""
|
"""Download pictures (or videos) along with their captions and other metadata from Instagram."""
|
||||||
|
|
||||||
|
|
||||||
__version__ = '4.12.2'
|
__version__ = '4.15'
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|||||||
+36
-14
@@ -37,7 +37,7 @@ def usage_string():
|
|||||||
argv0 = "instaloader" if argv0 == "__main__.py" else argv0
|
argv0 = "instaloader" if argv0 == "__main__.py" else argv0
|
||||||
return """
|
return """
|
||||||
{0} [--comments] [--geotags]
|
{0} [--comments] [--geotags]
|
||||||
{2:{1}} [--stories] [--highlights] [--tagged] [--igtv]
|
{2:{1}} [--stories] [--highlights] [--tagged] [--reels] [--igtv]
|
||||||
{2:{1}} [--login YOUR-USERNAME] [--fast-update]
|
{2:{1}} [--login YOUR-USERNAME] [--fast-update]
|
||||||
{2:{1}} profile | "#hashtag" | %%location_id | :stories | :feed | :saved
|
{2:{1}} profile | "#hashtag" | %%location_id | :stories | :feed | :saved
|
||||||
{0} --help""".format(argv0, len(argv0), '')
|
{0} --help""".format(argv0, len(argv0), '')
|
||||||
@@ -112,7 +112,7 @@ def get_cookies_from_instagram(domain, browser, cookie_file='', cookie_name=''):
|
|||||||
print(f"Cookies loaded successfully from {browser}")
|
print(f"Cookies loaded successfully from {browser}")
|
||||||
else:
|
else:
|
||||||
raise LoginException(f"No cookies found for Instagram in {browser}, "
|
raise LoginException(f"No cookies found for Instagram in {browser}, "
|
||||||
f"Are you logged in succesfully in {browser}?")
|
f"Are you logged in successfully in {browser}?")
|
||||||
|
|
||||||
if cookie_name:
|
if cookie_name:
|
||||||
return cookies.get(cookie_name, {})
|
return cookies.get(cookie_name, {})
|
||||||
@@ -139,6 +139,7 @@ def _main(instaloader: Instaloader, targetlist: List[str],
|
|||||||
download_stories: bool = False,
|
download_stories: bool = False,
|
||||||
download_highlights: bool = False,
|
download_highlights: bool = False,
|
||||||
download_tagged: bool = False,
|
download_tagged: bool = False,
|
||||||
|
download_reels: bool = False,
|
||||||
download_igtv: bool = False,
|
download_igtv: bool = False,
|
||||||
fast_update: bool = False,
|
fast_update: bool = False,
|
||||||
latest_stamps_file: Optional[str] = None,
|
latest_stamps_file: Optional[str] = None,
|
||||||
@@ -258,11 +259,13 @@ def _main(instaloader: Instaloader, targetlist: List[str],
|
|||||||
instaloader.download_saved_posts(fast_update=fast_update, max_count=max_count,
|
instaloader.download_saved_posts(fast_update=fast_update, max_count=max_count,
|
||||||
post_filter=post_filter)
|
post_filter=post_filter)
|
||||||
elif re.match(r"^[A-Za-z0-9._]+$", target):
|
elif re.match(r"^[A-Za-z0-9._]+$", target):
|
||||||
|
download_profile_content = download_posts or download_tagged or download_reels or download_igtv
|
||||||
try:
|
try:
|
||||||
profile = instaloader.check_profile_id(target, latest_stamps)
|
profile = instaloader.check_profile_id(target, latest_stamps)
|
||||||
if instaloader.context.is_logged_in and profile.has_blocked_viewer:
|
if instaloader.context.is_logged_in and profile.has_blocked_viewer:
|
||||||
if download_profile_pic or ((download_posts or download_tagged or download_igtv)
|
if download_profile_pic or (
|
||||||
and not profile.is_private):
|
download_profile_content and not profile.is_private
|
||||||
|
):
|
||||||
raise ProfileNotExistsException("{} blocked you; But we download her anonymously."
|
raise ProfileNotExistsException("{} blocked you; But we download her anonymously."
|
||||||
.format(target))
|
.format(target))
|
||||||
else:
|
else:
|
||||||
@@ -272,8 +275,7 @@ def _main(instaloader: Instaloader, targetlist: List[str],
|
|||||||
except ProfileNotExistsException as err:
|
except ProfileNotExistsException as err:
|
||||||
# Not only our profile.has_blocked_viewer condition raises ProfileNotExistsException,
|
# Not only our profile.has_blocked_viewer condition raises ProfileNotExistsException,
|
||||||
# check_profile_id() also does, since access to blocked profile may be responded with 404.
|
# check_profile_id() also does, since access to blocked profile may be responded with 404.
|
||||||
if instaloader.context.is_logged_in and (download_profile_pic or download_posts or
|
if instaloader.context.is_logged_in and (download_profile_pic or download_profile_content):
|
||||||
download_tagged or download_igtv):
|
|
||||||
instaloader.context.log(err)
|
instaloader.context.log(err)
|
||||||
instaloader.context.log("Trying again anonymously, helps in case you are just blocked.")
|
instaloader.context.log("Trying again anonymously, helps in case you are just blocked.")
|
||||||
with instaloader.anonymous_copy() as anonymous_loader:
|
with instaloader.anonymous_copy() as anonymous_loader:
|
||||||
@@ -297,18 +299,35 @@ def _main(instaloader: Instaloader, targetlist: List[str],
|
|||||||
if instaloader.context.iphone_support and profiles and (download_profile_pic or download_posts) and \
|
if instaloader.context.iphone_support and profiles and (download_profile_pic or download_posts) and \
|
||||||
not instaloader.context.is_logged_in:
|
not instaloader.context.is_logged_in:
|
||||||
instaloader.context.log("Hint: Login to download higher-quality versions of pictures.")
|
instaloader.context.log("Hint: Login to download higher-quality versions of pictures.")
|
||||||
instaloader.download_profiles(profiles,
|
instaloader.download_profiles(
|
||||||
download_profile_pic, download_posts, download_tagged, download_igtv,
|
profiles,
|
||||||
download_highlights, download_stories,
|
download_profile_pic,
|
||||||
fast_update, post_filter, storyitem_filter, latest_stamps=latest_stamps)
|
download_posts,
|
||||||
|
download_tagged,
|
||||||
|
download_igtv,
|
||||||
|
download_highlights,
|
||||||
|
download_stories,
|
||||||
|
fast_update,
|
||||||
|
post_filter,
|
||||||
|
storyitem_filter,
|
||||||
|
latest_stamps=latest_stamps,
|
||||||
|
reels=download_reels,
|
||||||
|
)
|
||||||
if anonymous_retry_profiles:
|
if anonymous_retry_profiles:
|
||||||
instaloader.context.log("Downloading anonymously: {}"
|
instaloader.context.log("Downloading anonymously: {}"
|
||||||
.format(' '.join([p.username for p in anonymous_retry_profiles])))
|
.format(' '.join([p.username for p in anonymous_retry_profiles])))
|
||||||
with instaloader.anonymous_copy() as anonymous_loader:
|
with instaloader.anonymous_copy() as anonymous_loader:
|
||||||
anonymous_loader.download_profiles(anonymous_retry_profiles,
|
anonymous_loader.download_profiles(
|
||||||
download_profile_pic, download_posts, download_tagged, download_igtv,
|
anonymous_retry_profiles,
|
||||||
fast_update=fast_update, post_filter=post_filter,
|
download_profile_pic,
|
||||||
latest_stamps=latest_stamps)
|
download_posts,
|
||||||
|
download_tagged,
|
||||||
|
download_igtv,
|
||||||
|
fast_update=fast_update,
|
||||||
|
post_filter=post_filter,
|
||||||
|
latest_stamps=latest_stamps,
|
||||||
|
reels=download_reels
|
||||||
|
)
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
print("\nInterrupted by user.", file=sys.stderr)
|
print("\nInterrupted by user.", file=sys.stderr)
|
||||||
exit_code = ExitCode.USER_ABORTED
|
exit_code = ExitCode.USER_ABORTED
|
||||||
@@ -409,6 +428,8 @@ def main():
|
|||||||
help='Also download highlights of each profile that is downloaded. Requires login.')
|
help='Also download highlights of each profile that is downloaded. Requires login.')
|
||||||
g_prof.add_argument('--tagged', action='store_true',
|
g_prof.add_argument('--tagged', action='store_true',
|
||||||
help='Also download posts where each profile is tagged.')
|
help='Also download posts where each profile is tagged.')
|
||||||
|
g_prof.add_argument('--reels', action='store_true',
|
||||||
|
help='Also download Reels videos.')
|
||||||
g_prof.add_argument('--igtv', action='store_true',
|
g_prof.add_argument('--igtv', action='store_true',
|
||||||
help='Also download IGTV videos.')
|
help='Also download IGTV videos.')
|
||||||
|
|
||||||
@@ -570,6 +591,7 @@ def main():
|
|||||||
download_stories=download_stories,
|
download_stories=download_stories,
|
||||||
download_highlights=args.highlights,
|
download_highlights=args.highlights,
|
||||||
download_tagged=args.tagged,
|
download_tagged=args.tagged,
|
||||||
|
download_reels=args.reels,
|
||||||
download_igtv=args.igtv,
|
download_igtv=args.igtv,
|
||||||
fast_update=args.fast_update,
|
fast_update=args.fast_update,
|
||||||
latest_stamps_file=args.latest_stamps,
|
latest_stamps_file=args.latest_stamps,
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ def _requires_login(func: Callable) -> Callable:
|
|||||||
|
|
||||||
|
|
||||||
def _retry_on_connection_error(func: Callable) -> Callable:
|
def _retry_on_connection_error(func: Callable) -> Callable:
|
||||||
"""Decorator to retry the function max_connection_attemps number of times.
|
"""Decorator to retry the function max_connection_attempts number of times.
|
||||||
|
|
||||||
Herewith-decorated functions need an ``_attempt`` keyword argument.
|
Herewith-decorated functions need an ``_attempt`` keyword argument.
|
||||||
|
|
||||||
@@ -737,19 +737,20 @@ class Instaloader:
|
|||||||
suffix: Optional[str] = str(edge_number)
|
suffix: Optional[str] = str(edge_number)
|
||||||
if '{filename}' in self.filename_pattern:
|
if '{filename}' in self.filename_pattern:
|
||||||
suffix = None
|
suffix = None
|
||||||
if self.download_pictures and (not sidecar_node.is_video or self.download_video_thumbnails):
|
video_url = sidecar_node.video_url
|
||||||
|
if self.download_pictures and (video_url is None or self.download_video_thumbnails):
|
||||||
# pylint:disable=cell-var-from-loop
|
# pylint:disable=cell-var-from-loop
|
||||||
sidecar_filename = self.__prepare_filename(filename_template,
|
sidecar_filename = self.__prepare_filename(filename_template,
|
||||||
lambda: sidecar_node.display_url)
|
lambda: sidecar_node.display_url)
|
||||||
# Download sidecar picture or video thumbnail (--no-pictures implies --no-video-thumbnails)
|
# Download sidecar picture or video thumbnail (--no-pictures implies --no-video-thumbnails)
|
||||||
downloaded &= self.download_pic(filename=sidecar_filename, url=sidecar_node.display_url,
|
downloaded &= self.download_pic(filename=sidecar_filename, url=sidecar_node.display_url,
|
||||||
mtime=post.date_local, filename_suffix=suffix)
|
mtime=post.date_local, filename_suffix=suffix)
|
||||||
if sidecar_node.is_video and self.download_videos:
|
if video_url is not None and self.download_videos:
|
||||||
# pylint:disable=cell-var-from-loop
|
# pylint:disable=cell-var-from-loop
|
||||||
sidecar_filename = self.__prepare_filename(filename_template,
|
sidecar_filename = self.__prepare_filename(filename_template,
|
||||||
lambda: sidecar_node.video_url)
|
lambda: video_url)
|
||||||
# Download sidecar video if desired
|
# Download sidecar video if desired
|
||||||
downloaded &= self.download_pic(filename=sidecar_filename, url=sidecar_node.video_url,
|
downloaded &= self.download_pic(filename=sidecar_filename, url=video_url,
|
||||||
mtime=post.date_local, filename_suffix=suffix)
|
mtime=post.date_local, filename_suffix=suffix)
|
||||||
else:
|
else:
|
||||||
downloaded = False
|
downloaded = False
|
||||||
@@ -866,8 +867,9 @@ class Instaloader:
|
|||||||
last_scraped = latest_stamps.get_last_story_timestamp(name)
|
last_scraped = latest_stamps.get_last_story_timestamp(name)
|
||||||
scraped_timestamp = datetime.now().astimezone()
|
scraped_timestamp = datetime.now().astimezone()
|
||||||
for item in user_story.get_items():
|
for item in user_story.get_items():
|
||||||
if latest_stamps is not None and item.date_local <= last_scraped:
|
if latest_stamps is not None:
|
||||||
break
|
if item.date_local <= last_scraped:
|
||||||
|
break
|
||||||
if storyitem_filter is not None and not storyitem_filter(item):
|
if storyitem_filter is not None and not storyitem_filter(item):
|
||||||
self.context.log("<{} skipped>".format(item), flush=True)
|
self.context.log("<{} skipped>".format(item), flush=True)
|
||||||
continue
|
continue
|
||||||
@@ -1214,6 +1216,7 @@ class Instaloader:
|
|||||||
Use :meth:`Hashtag.get_posts_resumable`."""
|
Use :meth:`Hashtag.get_posts_resumable`."""
|
||||||
return Hashtag.from_name(self.context, hashtag).get_posts_resumable()
|
return Hashtag.from_name(self.context, hashtag).get_posts_resumable()
|
||||||
|
|
||||||
|
@_requires_login
|
||||||
def download_hashtag(self, hashtag: Union[Hashtag, str],
|
def download_hashtag(self, hashtag: Union[Hashtag, str],
|
||||||
max_count: Optional[int] = None,
|
max_count: Optional[int] = None,
|
||||||
post_filter: Optional[Callable[[Post], bool]] = None,
|
post_filter: Optional[Callable[[Post], bool]] = None,
|
||||||
@@ -1280,6 +1283,32 @@ class Instaloader:
|
|||||||
if latest_stamps is not None and tagged_posts.first_item is not None:
|
if latest_stamps is not None and tagged_posts.first_item is not None:
|
||||||
latest_stamps.set_last_tagged_timestamp(profile.username, tagged_posts.first_item.date_local)
|
latest_stamps.set_last_tagged_timestamp(profile.username, tagged_posts.first_item.date_local)
|
||||||
|
|
||||||
|
def download_reels(self, profile: Profile, fast_update: bool = False,
|
||||||
|
post_filter: Optional[Callable[[Post], bool]] = None,
|
||||||
|
latest_stamps: Optional[LatestStamps] = None) -> None:
|
||||||
|
"""Download reels videos of a profile.
|
||||||
|
|
||||||
|
.. versionadded:: 4.14.0
|
||||||
|
|
||||||
|
"""
|
||||||
|
self.context.log("Retrieving reels videos for profile {}.".format(profile.username))
|
||||||
|
posts_takewhile: Optional[Callable[[Post], bool]] = None
|
||||||
|
if latest_stamps is not None:
|
||||||
|
last_scraped = latest_stamps.get_last_reels_timestamp(profile.username)
|
||||||
|
posts_takewhile = lambda p: p.date_local > last_scraped
|
||||||
|
reels = profile.get_reels()
|
||||||
|
self.posts_download_loop(
|
||||||
|
reels,
|
||||||
|
profile.username,
|
||||||
|
fast_update,
|
||||||
|
post_filter,
|
||||||
|
owner_profile=profile,
|
||||||
|
takewhile=posts_takewhile,
|
||||||
|
possibly_pinned=3,
|
||||||
|
)
|
||||||
|
if latest_stamps is not None and reels.first_item is not None:
|
||||||
|
latest_stamps.set_last_reels_timestamp(profile.username, reels.first_item.date_local)
|
||||||
|
|
||||||
def download_igtv(self, profile: Profile, fast_update: bool = False,
|
def download_igtv(self, profile: Profile, fast_update: bool = False,
|
||||||
post_filter: Optional[Callable[[Post], bool]] = None,
|
post_filter: Optional[Callable[[Post], bool]] = None,
|
||||||
latest_stamps: Optional[LatestStamps] = None) -> None:
|
latest_stamps: Optional[LatestStamps] = None) -> None:
|
||||||
@@ -1409,7 +1438,9 @@ class Instaloader:
|
|||||||
post_filter: Optional[Callable[[Post], bool]] = None,
|
post_filter: Optional[Callable[[Post], bool]] = None,
|
||||||
storyitem_filter: Optional[Callable[[Post], bool]] = None,
|
storyitem_filter: Optional[Callable[[Post], bool]] = None,
|
||||||
raise_errors: bool = False,
|
raise_errors: bool = False,
|
||||||
latest_stamps: Optional[LatestStamps] = None):
|
latest_stamps: Optional[LatestStamps] = None,
|
||||||
|
max_count: Optional[int] = None,
|
||||||
|
reels: bool = False):
|
||||||
"""High-level method to download set of profiles.
|
"""High-level method to download set of profiles.
|
||||||
|
|
||||||
:param profiles: Set of profiles to download.
|
:param profiles: Set of profiles to download.
|
||||||
@@ -1426,6 +1457,8 @@ class Instaloader:
|
|||||||
Whether :exc:`LoginRequiredException` and :exc:`PrivateProfileNotFollowedException` should be raised or
|
Whether :exc:`LoginRequiredException` and :exc:`PrivateProfileNotFollowedException` should be raised or
|
||||||
catched and printed with :meth:`InstaloaderContext.error_catcher`.
|
catched and printed with :meth:`InstaloaderContext.error_catcher`.
|
||||||
:param latest_stamps: :option:`--latest-stamps`.
|
:param latest_stamps: :option:`--latest-stamps`.
|
||||||
|
:param max_count: Maximum count of posts to download.
|
||||||
|
:param reels: :option:`--reels`.
|
||||||
|
|
||||||
.. versionadded:: 4.1
|
.. versionadded:: 4.1
|
||||||
|
|
||||||
@@ -1434,6 +1467,12 @@ class Instaloader:
|
|||||||
|
|
||||||
.. versionchanged:: 4.8
|
.. versionchanged:: 4.8
|
||||||
Add `latest_stamps` parameter.
|
Add `latest_stamps` parameter.
|
||||||
|
|
||||||
|
.. versionchanged:: 4.13
|
||||||
|
Add `max_count` parameter.
|
||||||
|
|
||||||
|
.. versionchanged:: 4.14
|
||||||
|
Add `reels` parameter.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@contextmanager
|
@contextmanager
|
||||||
@@ -1477,6 +1516,12 @@ class Instaloader:
|
|||||||
self.download_tagged(profile, fast_update=fast_update, post_filter=post_filter,
|
self.download_tagged(profile, fast_update=fast_update, post_filter=post_filter,
|
||||||
latest_stamps=latest_stamps)
|
latest_stamps=latest_stamps)
|
||||||
|
|
||||||
|
# Download reels, if requested
|
||||||
|
if reels:
|
||||||
|
with self.context.error_catcher('Download reels of {}'.format(profile_name)):
|
||||||
|
self.download_reels(profile, fast_update=fast_update, post_filter=post_filter,
|
||||||
|
latest_stamps=latest_stamps)
|
||||||
|
|
||||||
# Download IGTV, if requested
|
# Download IGTV, if requested
|
||||||
if igtv:
|
if igtv:
|
||||||
with self.context.error_catcher('Download IGTV of {}'.format(profile_name)):
|
with self.context.error_catcher('Download IGTV of {}'.format(profile_name)):
|
||||||
@@ -1499,7 +1544,7 @@ class Instaloader:
|
|||||||
posts_to_download = profile.get_posts()
|
posts_to_download = profile.get_posts()
|
||||||
self.posts_download_loop(posts_to_download, profile_name, fast_update, post_filter,
|
self.posts_download_loop(posts_to_download, profile_name, fast_update, post_filter,
|
||||||
total_count=profile.mediacount, owner_profile=profile,
|
total_count=profile.mediacount, owner_profile=profile,
|
||||||
takewhile=posts_takewhile, possibly_pinned=3)
|
takewhile=posts_takewhile, possibly_pinned=3, max_count=max_count)
|
||||||
if latest_stamps is not None and posts_to_download.first_item is not None:
|
if latest_stamps is not None and posts_to_download.first_item is not None:
|
||||||
latest_stamps.set_last_post_timestamp(profile_name,
|
latest_stamps.set_last_post_timestamp(profile_name,
|
||||||
posts_to_download.first_item.date_local)
|
posts_to_download.first_item.date_local)
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import hashlib
|
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import pickle
|
import pickle
|
||||||
@@ -33,15 +32,15 @@ def copy_session(session: requests.Session, request_timeout: Optional[float] = N
|
|||||||
|
|
||||||
def default_user_agent() -> str:
|
def default_user_agent() -> str:
|
||||||
return ('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 '
|
return ('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 '
|
||||||
'(KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36')
|
'(KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36')
|
||||||
|
|
||||||
|
|
||||||
def default_iphone_headers() -> Dict[str, Any]:
|
def default_iphone_headers() -> Dict[str, Any]:
|
||||||
return {'User-Agent': 'Instagram 273.0.0.16.70 (iPad13,8; iOS 16_3; en_US; en-US; ' \
|
return {'User-Agent': 'Instagram 361.0.0.35.82 (iPad13,8; iOS 18_0; en_US; en-US; ' \
|
||||||
'scale=2.00; 2048x2732; 452417278) AppleWebKit/420+',
|
'scale=2.00; 2048x2732; 674117118) AppleWebKit/420+',
|
||||||
'x-ads-opt-out': '1',
|
'x-ads-opt-out': '1',
|
||||||
'x-bloks-is-panorama-enabled': 'true',
|
'x-bloks-is-panorama-enabled': 'true',
|
||||||
'x-bloks-version-id': '01507c21540f73e2216b6f62a11a5b5e51aa85491b72475c080da35b1228ddd6',
|
'x-bloks-version-id': '16b7bd25c6c06886d57c4d455265669345a2d96625385b8ee30026ac2dc5ed97',
|
||||||
'x-fb-client-ip': 'True',
|
'x-fb-client-ip': 'True',
|
||||||
'x-fb-connection-type': 'wifi',
|
'x-fb-connection-type': 'wifi',
|
||||||
'x-fb-http-engine': 'Liger',
|
'x-fb-http-engine': 'Liger',
|
||||||
@@ -94,7 +93,6 @@ class InstaloaderContext:
|
|||||||
self.quiet = quiet
|
self.quiet = quiet
|
||||||
self.max_connection_attempts = max_connection_attempts
|
self.max_connection_attempts = max_connection_attempts
|
||||||
self._graphql_page_length = 50
|
self._graphql_page_length = 50
|
||||||
self._root_rhx_gis = None
|
|
||||||
self.two_factor_auth_pending = None
|
self.two_factor_auth_pending = None
|
||||||
self.iphone_support = iphone_support
|
self.iphone_support = iphone_support
|
||||||
self.iphone_headers = default_iphone_headers()
|
self.iphone_headers = default_iphone_headers()
|
||||||
@@ -104,7 +102,7 @@ class InstaloaderContext:
|
|||||||
|
|
||||||
self._rate_controller = rate_controller(self) if rate_controller is not None else RateController(self)
|
self._rate_controller = rate_controller(self) if rate_controller is not None else RateController(self)
|
||||||
|
|
||||||
# Can be set to True for testing, disables supression of InstaloaderContext._error_catcher
|
# Can be set to True for testing, disables suppression of InstaloaderContext._error_catcher
|
||||||
self.raise_all_errors = False
|
self.raise_all_errors = False
|
||||||
|
|
||||||
# HTTP status codes that should cause an AbortDownloadException
|
# HTTP status codes that should cause an AbortDownloadException
|
||||||
@@ -387,31 +385,45 @@ class InstaloaderContext:
|
|||||||
|
|
||||||
def get_json(self, path: str, params: Dict[str, Any], host: str = 'www.instagram.com',
|
def get_json(self, path: str, params: Dict[str, Any], host: str = 'www.instagram.com',
|
||||||
session: Optional[requests.Session] = None, _attempt=1,
|
session: Optional[requests.Session] = None, _attempt=1,
|
||||||
response_headers: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
|
response_headers: Optional[Dict[str, Any]] = None,
|
||||||
|
use_post: bool = False) -> Dict[str, Any]:
|
||||||
"""JSON request to Instagram.
|
"""JSON request to Instagram.
|
||||||
|
|
||||||
:param path: URL, relative to the given domain which defaults to www.instagram.com/
|
:param path: URL, relative to the given domain which defaults to www.instagram.com/
|
||||||
:param params: GET parameters
|
:param params: request parameters
|
||||||
:param host: Domain part of the URL from where to download the requested JSON; defaults to www.instagram.com
|
:param host: Domain part of the URL from where to download the requested JSON; defaults to www.instagram.com
|
||||||
:param session: Session to use, or None to use self.session
|
:param session: Session to use, or None to use self.session
|
||||||
|
:param use_post: Use POST instead of GET to make the request
|
||||||
:return: Decoded response dictionary
|
:return: Decoded response dictionary
|
||||||
:raises QueryReturnedBadRequestException: When the server responds with a 400.
|
:raises AbortDownloadException: When the server responds with
|
||||||
|
'feedback_required'/'checkpoint_required'/'challenge_required'
|
||||||
|
:raises QueryReturnedBadRequestException: When the server responds with a 400 (and not
|
||||||
|
'feedback_required'/'checkpoint_required'/'challenge_required').
|
||||||
:raises QueryReturnedNotFoundException: When the server responds with a 404.
|
:raises QueryReturnedNotFoundException: When the server responds with a 404.
|
||||||
:raises ConnectionException: When query repeatedly failed.
|
:raises ConnectionException: When query repeatedly failed.
|
||||||
|
|
||||||
|
.. versionchanged:: 4.13
|
||||||
|
Added `use_post` parameter.
|
||||||
"""
|
"""
|
||||||
is_graphql_query = 'query_hash' in params and 'graphql/query' in path
|
is_graphql_query = 'query_hash' in params and 'graphql/query' in path
|
||||||
|
is_doc_id_query = 'doc_id' in params and 'graphql/query' in path
|
||||||
is_iphone_query = host == 'i.instagram.com'
|
is_iphone_query = host == 'i.instagram.com'
|
||||||
is_other_query = not is_graphql_query and host == "www.instagram.com"
|
is_other_query = not is_graphql_query and not is_doc_id_query and host == "www.instagram.com"
|
||||||
sess = session if session else self._session
|
sess = session if session else self._session
|
||||||
try:
|
try:
|
||||||
self.do_sleep()
|
self.do_sleep()
|
||||||
if is_graphql_query:
|
if is_graphql_query:
|
||||||
self._rate_controller.wait_before_query(params['query_hash'])
|
self._rate_controller.wait_before_query(params['query_hash'])
|
||||||
|
if is_doc_id_query:
|
||||||
|
self._rate_controller.wait_before_query(params['doc_id'])
|
||||||
if is_iphone_query:
|
if is_iphone_query:
|
||||||
self._rate_controller.wait_before_query('iphone')
|
self._rate_controller.wait_before_query('iphone')
|
||||||
if is_other_query:
|
if is_other_query:
|
||||||
self._rate_controller.wait_before_query('other')
|
self._rate_controller.wait_before_query('other')
|
||||||
resp = sess.get('https://{0}/{1}'.format(host, path), params=params, allow_redirects=False)
|
if use_post:
|
||||||
|
resp = sess.post('https://{0}/{1}'.format(host, path), data=params, allow_redirects=False)
|
||||||
|
else:
|
||||||
|
resp = sess.get('https://{0}/{1}'.format(host, path), params=params, allow_redirects=False)
|
||||||
if resp.status_code in self.fatal_status_codes:
|
if resp.status_code in self.fatal_status_codes:
|
||||||
redirect = " redirect to {}".format(resp.headers['location']) if 'location' in resp.headers else ""
|
redirect = " redirect to {}".format(resp.headers['location']) if 'location' in resp.headers else ""
|
||||||
body = ""
|
body = ""
|
||||||
@@ -438,6 +450,15 @@ class InstaloaderContext:
|
|||||||
response_headers.clear()
|
response_headers.clear()
|
||||||
response_headers.update(resp.headers)
|
response_headers.update(resp.headers)
|
||||||
if resp.status_code == 400:
|
if resp.status_code == 400:
|
||||||
|
with suppress(json.decoder.JSONDecodeError):
|
||||||
|
if resp.json().get("message") in [
|
||||||
|
"feedback_required",
|
||||||
|
"checkpoint_required",
|
||||||
|
"challenge_required",
|
||||||
|
]:
|
||||||
|
# Raise AbortDownloadException in case of substantial Instagram
|
||||||
|
# requirements to stop producing more requests
|
||||||
|
raise AbortDownloadException(self._response_error(resp))
|
||||||
raise QueryReturnedBadRequestException(self._response_error(resp))
|
raise QueryReturnedBadRequestException(self._response_error(resp))
|
||||||
if resp.status_code == 404:
|
if resp.status_code == 404:
|
||||||
raise QueryReturnedNotFoundException(self._response_error(resp))
|
raise QueryReturnedNotFoundException(self._response_error(resp))
|
||||||
@@ -462,6 +483,8 @@ class InstaloaderContext:
|
|||||||
if isinstance(err, TooManyRequestsException):
|
if isinstance(err, TooManyRequestsException):
|
||||||
if is_graphql_query:
|
if is_graphql_query:
|
||||||
self._rate_controller.handle_429(params['query_hash'])
|
self._rate_controller.handle_429(params['query_hash'])
|
||||||
|
if is_doc_id_query:
|
||||||
|
self._rate_controller.handle_429(params['doc_id'])
|
||||||
if is_iphone_query:
|
if is_iphone_query:
|
||||||
self._rate_controller.handle_429('iphone')
|
self._rate_controller.handle_429('iphone')
|
||||||
if is_other_query:
|
if is_other_query:
|
||||||
@@ -473,14 +496,48 @@ class InstaloaderContext:
|
|||||||
raise ConnectionException(error_string) from err
|
raise ConnectionException(error_string) from err
|
||||||
|
|
||||||
def graphql_query(self, query_hash: str, variables: Dict[str, Any],
|
def graphql_query(self, query_hash: str, variables: Dict[str, Any],
|
||||||
referer: Optional[str] = None, rhx_gis: Optional[str] = None) -> Dict[str, Any]:
|
referer: Optional[str] = None) -> Dict[str, Any]:
|
||||||
"""
|
"""
|
||||||
Do a GraphQL Query.
|
Do a GraphQL Query.
|
||||||
|
|
||||||
:param query_hash: Query identifying hash.
|
:param query_hash: Query identifying hash.
|
||||||
:param variables: Variables for the Query.
|
:param variables: Variables for the Query.
|
||||||
:param referer: HTTP Referer, or None.
|
:param referer: HTTP Referer, or None.
|
||||||
:param rhx_gis: 'rhx_gis' variable as somewhere returned by Instagram, needed to 'sign' request
|
:return: The server's response dictionary.
|
||||||
|
|
||||||
|
.. versionchanged:: 4.13.1
|
||||||
|
Removed the `rhx_gis` parameter.
|
||||||
|
"""
|
||||||
|
with copy_session(self._session, self.request_timeout) as tmpsession:
|
||||||
|
tmpsession.headers.update(self._default_http_header(empty_session_only=True))
|
||||||
|
del tmpsession.headers['Connection']
|
||||||
|
del tmpsession.headers['Content-Length']
|
||||||
|
tmpsession.headers['authority'] = 'www.instagram.com'
|
||||||
|
tmpsession.headers['scheme'] = 'https'
|
||||||
|
tmpsession.headers['accept'] = '*/*'
|
||||||
|
if referer is not None:
|
||||||
|
tmpsession.headers['referer'] = urllib.parse.quote(referer)
|
||||||
|
|
||||||
|
variables_json = json.dumps(variables, separators=(',', ':'))
|
||||||
|
|
||||||
|
resp_json = self.get_json('graphql/query',
|
||||||
|
params={'query_hash': query_hash,
|
||||||
|
'variables': variables_json},
|
||||||
|
session=tmpsession)
|
||||||
|
if 'status' not in resp_json:
|
||||||
|
self.error("GraphQL response did not contain a \"status\" field.")
|
||||||
|
return resp_json
|
||||||
|
|
||||||
|
def doc_id_graphql_query(self, doc_id: str, variables: Dict[str, Any],
|
||||||
|
referer: Optional[str] = None) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Do a doc_id-based GraphQL Query using method POST.
|
||||||
|
|
||||||
|
.. versionadded:: 4.13
|
||||||
|
|
||||||
|
:param doc_id: doc_id for the query.
|
||||||
|
:param variables: Variables for the Query.
|
||||||
|
:param referer: HTTP Referer, or None.
|
||||||
:return: The server's response dictionary.
|
:return: The server's response dictionary.
|
||||||
"""
|
"""
|
||||||
with copy_session(self._session, self.request_timeout) as tmpsession:
|
with copy_session(self._session, self.request_timeout) as tmpsession:
|
||||||
@@ -495,16 +552,12 @@ class InstaloaderContext:
|
|||||||
|
|
||||||
variables_json = json.dumps(variables, separators=(',', ':'))
|
variables_json = json.dumps(variables, separators=(',', ':'))
|
||||||
|
|
||||||
if rhx_gis:
|
|
||||||
#self.log("rhx_gis {} query_hash {}".format(rhx_gis, query_hash))
|
|
||||||
values = "{}:{}".format(rhx_gis, variables_json)
|
|
||||||
x_instagram_gis = hashlib.md5(values.encode()).hexdigest()
|
|
||||||
tmpsession.headers['x-instagram-gis'] = x_instagram_gis
|
|
||||||
|
|
||||||
resp_json = self.get_json('graphql/query',
|
resp_json = self.get_json('graphql/query',
|
||||||
params={'query_hash': query_hash,
|
params={'variables': variables_json,
|
||||||
'variables': variables_json},
|
'doc_id': doc_id,
|
||||||
session=tmpsession)
|
'server_timestamps': 'true'},
|
||||||
|
session=tmpsession,
|
||||||
|
use_post=True)
|
||||||
if 'status' not in resp_json:
|
if 'status' not in resp_json:
|
||||||
self.error("GraphQL response did not contain a \"status\" field.")
|
self.error("GraphQL response did not contain a \"status\" field.")
|
||||||
return resp_json
|
return resp_json
|
||||||
@@ -512,7 +565,7 @@ class InstaloaderContext:
|
|||||||
def graphql_node_list(self, query_hash: str, query_variables: Dict[str, Any],
|
def graphql_node_list(self, query_hash: str, query_variables: Dict[str, Any],
|
||||||
query_referer: Optional[str],
|
query_referer: Optional[str],
|
||||||
edge_extractor: Callable[[Dict[str, Any]], Dict[str, Any]],
|
edge_extractor: Callable[[Dict[str, Any]], Dict[str, Any]],
|
||||||
rhx_gis: Optional[str] = None,
|
_rhx_gis: Optional[str] = None,
|
||||||
first_data: Optional[Dict[str, Any]] = None) -> Iterator[Dict[str, Any]]:
|
first_data: Optional[Dict[str, Any]] = None) -> Iterator[Dict[str, Any]]:
|
||||||
"""
|
"""
|
||||||
Retrieve a list of GraphQL nodes.
|
Retrieve a list of GraphQL nodes.
|
||||||
@@ -524,7 +577,7 @@ class InstaloaderContext:
|
|||||||
def _query():
|
def _query():
|
||||||
query_variables['first'] = self._graphql_page_length
|
query_variables['first'] = self._graphql_page_length
|
||||||
try:
|
try:
|
||||||
return edge_extractor(self.graphql_query(query_hash, query_variables, query_referer, rhx_gis))
|
return edge_extractor(self.graphql_query(query_hash, query_variables, query_referer))
|
||||||
except QueryReturnedBadRequestException:
|
except QueryReturnedBadRequestException:
|
||||||
new_page_length = int(self._graphql_page_length / 2)
|
new_page_length = int(self._graphql_page_length / 2)
|
||||||
if new_page_length >= 12:
|
if new_page_length >= 12:
|
||||||
@@ -673,17 +726,6 @@ class InstaloaderContext:
|
|||||||
raise QueryReturnedNotFoundException(self._response_error(resp))
|
raise QueryReturnedNotFoundException(self._response_error(resp))
|
||||||
raise ConnectionException(self._response_error(resp))
|
raise ConnectionException(self._response_error(resp))
|
||||||
|
|
||||||
@property
|
|
||||||
def root_rhx_gis(self) -> Optional[str]:
|
|
||||||
"""rhx_gis string returned in the / query."""
|
|
||||||
if self.is_logged_in:
|
|
||||||
# At the moment, rhx_gis seems to be required for anonymous requests only. By returning None when logged
|
|
||||||
# in, we can save the root_rhx_gis lookup query.
|
|
||||||
return None
|
|
||||||
if self._root_rhx_gis is None:
|
|
||||||
self._root_rhx_gis = self.get_json('', {}).get('rhx_gis', '')
|
|
||||||
return self._root_rhx_gis or None
|
|
||||||
|
|
||||||
|
|
||||||
class RateController:
|
class RateController:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ class LatestStamps:
|
|||||||
POST_TIMESTAMP = 'post-timestamp'
|
POST_TIMESTAMP = 'post-timestamp'
|
||||||
TAGGED_TIMESTAMP = 'tagged-timestamp'
|
TAGGED_TIMESTAMP = 'tagged-timestamp'
|
||||||
IGTV_TIMESTAMP = 'igtv-timestamp'
|
IGTV_TIMESTAMP = 'igtv-timestamp'
|
||||||
|
REELS_TIMESTAMP = 'reels-timestamp'
|
||||||
STORY_TIMESTAMP = 'story-timestamp'
|
STORY_TIMESTAMP = 'story-timestamp'
|
||||||
ISO_FORMAT = '%Y-%m-%dT%H:%M:%S.%f%z'
|
ISO_FORMAT = '%Y-%m-%dT%H:%M:%S.%f%z'
|
||||||
|
|
||||||
@@ -87,6 +88,14 @@ class LatestStamps:
|
|||||||
"""Sets timestamp of last download of a profile's tagged posts."""
|
"""Sets timestamp of last download of a profile's tagged posts."""
|
||||||
self._set_timestamp(profile_name, self.TAGGED_TIMESTAMP, timestamp)
|
self._set_timestamp(profile_name, self.TAGGED_TIMESTAMP, timestamp)
|
||||||
|
|
||||||
|
def get_last_reels_timestamp(self, profile_name: str) -> datetime:
|
||||||
|
"""Returns timestamp of last download of a profile's reels posts."""
|
||||||
|
return self._get_timestamp(profile_name, self.REELS_TIMESTAMP)
|
||||||
|
|
||||||
|
def set_last_reels_timestamp(self, profile_name: str, timestamp: datetime):
|
||||||
|
"""Sets timestamp of last download of a profile's reels posts."""
|
||||||
|
self._set_timestamp(profile_name, self.REELS_TIMESTAMP, timestamp)
|
||||||
|
|
||||||
def get_last_igtv_timestamp(self, profile_name: str) -> datetime:
|
def get_last_igtv_timestamp(self, profile_name: str) -> datetime:
|
||||||
"""Returns timestamp of last download of a profile's igtv posts."""
|
"""Returns timestamp of last download of a profile's igtv posts."""
|
||||||
return self._get_timestamp(profile_name, self.IGTV_TIMESTAMP)
|
return self._get_timestamp(profile_name, self.IGTV_TIMESTAMP)
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ from .exceptions import AbortDownloadException, InvalidArgumentException
|
|||||||
from .instaloadercontext import InstaloaderContext
|
from .instaloadercontext import InstaloaderContext
|
||||||
|
|
||||||
class FrozenNodeIterator(NamedTuple):
|
class FrozenNodeIterator(NamedTuple):
|
||||||
query_hash: str
|
query_hash: Optional[str]
|
||||||
query_variables: Dict
|
query_variables: Dict
|
||||||
query_referer: Optional[str]
|
query_referer: Optional[str]
|
||||||
context_username: Optional[str]
|
context_username: Optional[str]
|
||||||
@@ -19,6 +19,7 @@ class FrozenNodeIterator(NamedTuple):
|
|||||||
best_before: Optional[float]
|
best_before: Optional[float]
|
||||||
remaining_data: Optional[Dict]
|
remaining_data: Optional[Dict]
|
||||||
first_node: Optional[Dict]
|
first_node: Optional[Dict]
|
||||||
|
doc_id: Optional[str]
|
||||||
FrozenNodeIterator.query_hash.__doc__ = """The GraphQL ``query_hash`` parameter."""
|
FrozenNodeIterator.query_hash.__doc__ = """The GraphQL ``query_hash`` parameter."""
|
||||||
FrozenNodeIterator.query_variables.__doc__ = """The GraphQL ``query_variables`` parameter."""
|
FrozenNodeIterator.query_variables.__doc__ = """The GraphQL ``query_variables`` parameter."""
|
||||||
FrozenNodeIterator.query_referer.__doc__ = """The HTTP referer used for the GraphQL query."""
|
FrozenNodeIterator.query_referer.__doc__ = """The HTTP referer used for the GraphQL query."""
|
||||||
@@ -28,6 +29,7 @@ FrozenNodeIterator.best_before.__doc__ = """Date when parts of the stored nodes
|
|||||||
FrozenNodeIterator.remaining_data.__doc__ = \
|
FrozenNodeIterator.remaining_data.__doc__ = \
|
||||||
"""The already-retrieved, yet-unprocessed ``edges`` and the ``page_info`` at time of freezing."""
|
"""The already-retrieved, yet-unprocessed ``edges`` and the ``page_info`` at time of freezing."""
|
||||||
FrozenNodeIterator.first_node.__doc__ = """Node data of the first item, if an item has been produced."""
|
FrozenNodeIterator.first_node.__doc__ = """Node data of the first item, if an item has been produced."""
|
||||||
|
FrozenNodeIterator.doc_id.__doc__ = """The GraphQL ``doc_id`` parameter."""
|
||||||
|
|
||||||
T = TypeVar('T')
|
T = TypeVar('T')
|
||||||
|
|
||||||
@@ -64,6 +66,9 @@ class NodeIterator(Iterator[T]):
|
|||||||
NodeIterators are matching if and only if they have the same magic.
|
NodeIterators are matching if and only if they have the same magic.
|
||||||
|
|
||||||
See also :func:`resumable_iteration` for a high-level context manager that handles a resumable iteration.
|
See also :func:`resumable_iteration` for a high-level context manager that handles a resumable iteration.
|
||||||
|
|
||||||
|
.. versionchanged: 4.13
|
||||||
|
Included support for `doc_id`-based queries (using POST method).
|
||||||
"""
|
"""
|
||||||
|
|
||||||
_graphql_page_length = 12
|
_graphql_page_length = 12
|
||||||
@@ -71,15 +76,17 @@ class NodeIterator(Iterator[T]):
|
|||||||
|
|
||||||
def __init__(self,
|
def __init__(self,
|
||||||
context: InstaloaderContext,
|
context: InstaloaderContext,
|
||||||
query_hash: str,
|
query_hash: Optional[str],
|
||||||
edge_extractor: Callable[[Dict[str, Any]], Dict[str, Any]],
|
edge_extractor: Callable[[Dict[str, Any]], Dict[str, Any]],
|
||||||
node_wrapper: Callable[[Dict], T],
|
node_wrapper: Callable[[Dict], T],
|
||||||
query_variables: Optional[Dict[str, Any]] = None,
|
query_variables: Optional[Dict[str, Any]] = None,
|
||||||
query_referer: Optional[str] = None,
|
query_referer: Optional[str] = None,
|
||||||
first_data: Optional[Dict[str, Any]] = None,
|
first_data: Optional[Dict[str, Any]] = None,
|
||||||
is_first: Optional[Callable[[T, Optional[T]], bool]] = None):
|
is_first: Optional[Callable[[T, Optional[T]], bool]] = None,
|
||||||
|
doc_id: Optional[str] = None):
|
||||||
self._context = context
|
self._context = context
|
||||||
self._query_hash = query_hash
|
self._query_hash = query_hash
|
||||||
|
self._doc_id = doc_id
|
||||||
self._edge_extractor = edge_extractor
|
self._edge_extractor = edge_extractor
|
||||||
self._node_wrapper = node_wrapper
|
self._node_wrapper = node_wrapper
|
||||||
self._query_variables = query_variables if query_variables is not None else {}
|
self._query_variables = query_variables if query_variables is not None else {}
|
||||||
@@ -95,12 +102,34 @@ class NodeIterator(Iterator[T]):
|
|||||||
self._is_first = is_first
|
self._is_first = is_first
|
||||||
|
|
||||||
def _query(self, after: Optional[str] = None) -> Dict:
|
def _query(self, after: Optional[str] = None) -> Dict:
|
||||||
|
if self._doc_id is not None:
|
||||||
|
return self._query_doc_id(self._doc_id, after)
|
||||||
|
else:
|
||||||
|
assert self._query_hash is not None
|
||||||
|
return self._query_query_hash(self._query_hash, after)
|
||||||
|
|
||||||
|
def _query_doc_id(self, doc_id: str, after: Optional[str] = None) -> Dict:
|
||||||
|
pagination_variables: Dict[str, Any] = {'__relay_internal__pv__PolarisFeedShareMenurelayprovider': False}
|
||||||
|
if after is not None:
|
||||||
|
pagination_variables['after'] = after
|
||||||
|
pagination_variables['before'] = None
|
||||||
|
pagination_variables['first'] = 12
|
||||||
|
pagination_variables['last'] = None
|
||||||
|
data = self._edge_extractor(
|
||||||
|
self._context.doc_id_graphql_query(
|
||||||
|
doc_id, {**self._query_variables, **pagination_variables}, self._query_referer
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self._best_before = datetime.now() + NodeIterator._shelf_life
|
||||||
|
return data
|
||||||
|
|
||||||
|
def _query_query_hash(self, query_hash: str, after: Optional[str] = None) -> Dict:
|
||||||
pagination_variables: Dict[str, Any] = {'first': NodeIterator._graphql_page_length}
|
pagination_variables: Dict[str, Any] = {'first': NodeIterator._graphql_page_length}
|
||||||
if after is not None:
|
if after is not None:
|
||||||
pagination_variables['after'] = after
|
pagination_variables['after'] = after
|
||||||
data = self._edge_extractor(
|
data = self._edge_extractor(
|
||||||
self._context.graphql_query(
|
self._context.graphql_query(
|
||||||
self._query_hash, {**self._query_variables, **pagination_variables}, self._query_referer
|
query_hash, {**self._query_variables, **pagination_variables}, self._query_referer
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
self._best_before = datetime.now() + NodeIterator._shelf_life
|
self._best_before = datetime.now() + NodeIterator._shelf_life
|
||||||
@@ -193,6 +222,7 @@ class NodeIterator(Iterator[T]):
|
|||||||
best_before=self._best_before.timestamp() if self._best_before else None,
|
best_before=self._best_before.timestamp() if self._best_before else None,
|
||||||
remaining_data=remaining_data,
|
remaining_data=remaining_data,
|
||||||
first_node=self._first_node,
|
first_node=self._first_node,
|
||||||
|
doc_id=self._doc_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
def thaw(self, frozen: FrozenNodeIterator) -> None:
|
def thaw(self, frozen: FrozenNodeIterator) -> None:
|
||||||
@@ -210,7 +240,8 @@ class NodeIterator(Iterator[T]):
|
|||||||
if (self._query_hash != frozen.query_hash or
|
if (self._query_hash != frozen.query_hash or
|
||||||
self._query_variables != frozen.query_variables or
|
self._query_variables != frozen.query_variables or
|
||||||
self._query_referer != frozen.query_referer or
|
self._query_referer != frozen.query_referer or
|
||||||
self._context.username != frozen.context_username):
|
self._context.username != frozen.context_username or
|
||||||
|
self._doc_id != frozen.doc_id):
|
||||||
raise InvalidArgumentException("Mismatching resume information.")
|
raise InvalidArgumentException("Mismatching resume information.")
|
||||||
if not frozen.best_before:
|
if not frozen.best_before:
|
||||||
raise InvalidArgumentException("\"best before\" date missing.")
|
raise InvalidArgumentException("\"best before\" date missing.")
|
||||||
|
|||||||
+114
-37
@@ -20,7 +20,7 @@ class PostSidecarNode(NamedTuple):
|
|||||||
"""Item of a Sidecar Post."""
|
"""Item of a Sidecar Post."""
|
||||||
is_video: bool
|
is_video: bool
|
||||||
display_url: str
|
display_url: str
|
||||||
video_url: str
|
video_url: Optional[str]
|
||||||
|
|
||||||
|
|
||||||
PostSidecarNode.is_video.__doc__ = "Whether this node is a video."
|
PostSidecarNode.is_video.__doc__ = "Whether this node is a video."
|
||||||
@@ -180,7 +180,7 @@ class Post:
|
|||||||
This class unifies access to the properties associated with a post. It implements == and is
|
This class unifies access to the properties associated with a post. It implements == and is
|
||||||
hashable.
|
hashable.
|
||||||
|
|
||||||
:param context: :attr:`Instaloader.context` used for additional queries if neccessary..
|
:param context: :attr:`Instaloader.context` used for additional queries if necessary..
|
||||||
:param node: Node structure, as returned by Instagram.
|
:param node: Node structure, as returned by Instagram.
|
||||||
:param owner_profile: The Profile of the owner, if already known at creation.
|
:param owner_profile: The Profile of the owner, if already known at creation.
|
||||||
"""
|
"""
|
||||||
@@ -232,21 +232,32 @@ class Post:
|
|||||||
"title": media.get("title"),
|
"title": media.get("title"),
|
||||||
"viewer_has_liked": media["has_liked"],
|
"viewer_has_liked": media["has_liked"],
|
||||||
"edge_media_preview_like": {"count": media["like_count"]},
|
"edge_media_preview_like": {"count": media["like_count"]},
|
||||||
|
"accessibility_caption": media.get("accessibility_caption"),
|
||||||
|
"comments": media.get("comment_count"),
|
||||||
"iphone_struct": media,
|
"iphone_struct": media,
|
||||||
}
|
}
|
||||||
with suppress(KeyError):
|
with suppress(KeyError):
|
||||||
fake_node["display_url"] = media['image_versions2']['candidates'][0]['url']
|
fake_node["display_url"] = media['image_versions2']['candidates'][0]['url']
|
||||||
with suppress(KeyError):
|
with suppress(KeyError, TypeError):
|
||||||
fake_node["video_url"] = media['video_versions'][-1]['url']
|
fake_node["video_url"] = media['video_versions'][-1]['url']
|
||||||
fake_node["video_duration"] = media["video_duration"]
|
fake_node["video_duration"] = media["video_duration"]
|
||||||
fake_node["video_view_count"] = media["view_count"]
|
fake_node["video_view_count"] = media["view_count"]
|
||||||
with suppress(KeyError):
|
with suppress(KeyError, TypeError):
|
||||||
fake_node["edge_sidecar_to_children"] = {"edges": [{"node": {
|
fake_node["edge_sidecar_to_children"] = {"edges": [{"node":
|
||||||
"display_url": node['image_versions2']['candidates'][0]['url'],
|
Post._convert_iphone_carousel(node, media_types)}
|
||||||
"is_video": media_types[node["media_type"]] == "GraphVideo",
|
for node in media["carousel_media"]]}
|
||||||
}} for node in media["carousel_media"]]}
|
|
||||||
return cls(context, fake_node, Profile.from_iphone_struct(context, media["user"]) if "user" in media else None)
|
return cls(context, fake_node, Profile.from_iphone_struct(context, media["user"]) if "user" in media else None)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _convert_iphone_carousel(iphone_node: Dict[str, Any], media_types: Dict[int, str]) -> Dict[str, Any]:
|
||||||
|
fake_node = {
|
||||||
|
"display_url": iphone_node["image_versions2"]["candidates"][0]["url"],
|
||||||
|
"is_video": media_types[iphone_node["media_type"]] == "GraphVideo",
|
||||||
|
}
|
||||||
|
if "video_versions" in iphone_node and iphone_node["video_versions"] is not None:
|
||||||
|
fake_node["video_url"] = iphone_node["video_versions"][0]["url"]
|
||||||
|
return fake_node
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def shortcode_to_mediaid(code: str) -> int:
|
def shortcode_to_mediaid(code: str) -> int:
|
||||||
if len(code) > 11:
|
if len(code) > 11:
|
||||||
@@ -308,13 +319,23 @@ class Post:
|
|||||||
|
|
||||||
def _obtain_metadata(self):
|
def _obtain_metadata(self):
|
||||||
if not self._full_metadata_dict:
|
if not self._full_metadata_dict:
|
||||||
pic_json = self._context.graphql_query(
|
pic_json = self._context.doc_id_graphql_query(
|
||||||
'2b0673e0dc4580674a88d426fe00ea90',
|
"8845758582119845", {"shortcode": self.shortcode}
|
||||||
{'shortcode': self.shortcode}
|
)["data"]["xdt_shortcode_media"]
|
||||||
)
|
if pic_json is None:
|
||||||
self._full_metadata_dict = pic_json['data']['shortcode_media']
|
|
||||||
if self._full_metadata_dict is None:
|
|
||||||
raise BadResponseException("Fetching Post metadata failed.")
|
raise BadResponseException("Fetching Post metadata failed.")
|
||||||
|
try:
|
||||||
|
xdt_types = {
|
||||||
|
"XDTGraphImage": "GraphImage",
|
||||||
|
"XDTGraphVideo": "GraphVideo",
|
||||||
|
"XDTGraphSidecar": "GraphSidecar",
|
||||||
|
}
|
||||||
|
pic_json["__typename"] = xdt_types[pic_json["__typename"]]
|
||||||
|
except KeyError as exc:
|
||||||
|
raise BadResponseException(
|
||||||
|
f"Unknown __typename in metadata: {pic_json['__typename']}."
|
||||||
|
) from exc
|
||||||
|
self._full_metadata_dict = pic_json
|
||||||
if self.shortcode != self._full_metadata_dict['shortcode']:
|
if self.shortcode != self._full_metadata_dict['shortcode']:
|
||||||
self._node.update(self._full_metadata_dict)
|
self._node.update(self._full_metadata_dict)
|
||||||
raise PostChangedException
|
raise PostChangedException
|
||||||
@@ -491,14 +512,14 @@ class Post:
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def caption_hashtags(self) -> List[str]:
|
def caption_hashtags(self) -> List[str]:
|
||||||
"""List of all lowercased hashtags (without preceeding #) that occur in the Post's caption."""
|
"""List of all lowercased hashtags (without preceding #) that occur in the Post's caption."""
|
||||||
if not self.caption:
|
if not self.caption:
|
||||||
return []
|
return []
|
||||||
return _hashtag_regex.findall(self.caption.lower())
|
return _hashtag_regex.findall(self.caption.lower())
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def caption_mentions(self) -> List[str]:
|
def caption_mentions(self) -> List[str]:
|
||||||
"""List of all lowercased profiles that are mentioned in the Post's caption, without preceeding @."""
|
"""List of all lowercased profiles that are mentioned in the Post's caption, without preceding @."""
|
||||||
if not self.caption:
|
if not self.caption:
|
||||||
return []
|
return []
|
||||||
return _mention_regex.findall(self.caption.lower())
|
return _mention_regex.findall(self.caption.lower())
|
||||||
@@ -581,6 +602,15 @@ class Post:
|
|||||||
return self._field('video_view_count')
|
return self._field('video_view_count')
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
@property
|
||||||
|
def video_play_count(self) -> Optional[int]:
|
||||||
|
"""Play count of the video, or None.
|
||||||
|
|
||||||
|
.. versionadded:: 4.14.3"""
|
||||||
|
if self.is_video:
|
||||||
|
return self._field('video_play_count')
|
||||||
|
return None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def video_duration(self) -> Optional[float]:
|
def video_duration(self) -> Optional[float]:
|
||||||
"""Duration of the video in seconds, or None.
|
"""Duration of the video in seconds, or None.
|
||||||
@@ -723,7 +753,11 @@ class Post:
|
|||||||
# Avoid doing additional requests if there are no comments
|
# Avoid doing additional requests if there are no comments
|
||||||
return []
|
return []
|
||||||
|
|
||||||
comment_edges = self._field('edge_media_to_comment', 'edges')
|
try:
|
||||||
|
comment_edges = self._field("edge_media_to_parent_comment", "edges")
|
||||||
|
except KeyError:
|
||||||
|
comment_edges = self._field("edge_media_to_comment", "edges")
|
||||||
|
|
||||||
answers_count = sum(edge['node'].get('edge_threaded_comments', {}).get('count', 0) for edge in comment_edges)
|
answers_count = sum(edge['node'].get('edge_threaded_comments', {}).get('count', 0) for edge in comment_edges)
|
||||||
|
|
||||||
if self.comments == len(comment_edges) + answers_count:
|
if self.comments == len(comment_edges) + answers_count:
|
||||||
@@ -897,8 +931,7 @@ class Profile:
|
|||||||
'include_reel': True,
|
'include_reel': True,
|
||||||
'include_suggested_users': False,
|
'include_suggested_users': False,
|
||||||
'include_logged_out_extras': False,
|
'include_logged_out_extras': False,
|
||||||
'include_highlight_reels': False},
|
'include_highlight_reels': False})['data']['user']
|
||||||
rhx_gis=context.root_rhx_gis)['data']['user']
|
|
||||||
if data:
|
if data:
|
||||||
profile = cls(context, data['reel']['owner'])
|
profile = cls(context, data['reel']['owner'])
|
||||||
else:
|
else:
|
||||||
@@ -1055,7 +1088,7 @@ class Profile:
|
|||||||
@property
|
@property
|
||||||
def biography_hashtags(self) -> List[str]:
|
def biography_hashtags(self) -> List[str]:
|
||||||
"""
|
"""
|
||||||
List of all lowercased hashtags (without preceeding #) that occur in the Profile's biography.
|
List of all lowercased hashtags (without preceding #) that occur in the Profile's biography.
|
||||||
|
|
||||||
.. versionadded:: 4.10
|
.. versionadded:: 4.10
|
||||||
"""
|
"""
|
||||||
@@ -1066,7 +1099,7 @@ class Profile:
|
|||||||
@property
|
@property
|
||||||
def biography_mentions(self) -> List[str]:
|
def biography_mentions(self) -> List[str]:
|
||||||
"""
|
"""
|
||||||
List of all lowercased profiles that are mentioned in the Profile's biography, without preceeding @.
|
List of all lowercased profiles that are mentioned in the Profile's biography, without preceding @.
|
||||||
|
|
||||||
.. versionadded:: 4.10
|
.. versionadded:: 4.10
|
||||||
"""
|
"""
|
||||||
@@ -1173,15 +1206,33 @@ class Profile:
|
|||||||
|
|
||||||
:rtype: NodeIterator[Post]"""
|
:rtype: NodeIterator[Post]"""
|
||||||
self._obtain_metadata()
|
self._obtain_metadata()
|
||||||
|
logged_in = self._context.is_logged_in
|
||||||
return NodeIterator(
|
return NodeIterator(
|
||||||
self._context,
|
context=self._context,
|
||||||
'003056d32c2554def87228bc3fd9668a',
|
edge_extractor=(
|
||||||
lambda d: d['data']['user']['edge_owner_to_timeline_media'],
|
(lambda d: d["data"]["xdt_api__v1__feed__user_timeline_graphql_connection"])
|
||||||
lambda n: Post(self._context, n, self),
|
if logged_in
|
||||||
{'id': self.userid},
|
else (lambda d: d["data"]["user"]["edge_owner_to_timeline_media"])
|
||||||
'https://www.instagram.com/{0}/'.format(self.username),
|
),
|
||||||
self._metadata('edge_owner_to_timeline_media'),
|
node_wrapper=(
|
||||||
Profile._make_is_newest_checker()
|
(lambda n: Post.from_iphone_struct(self._context, n))
|
||||||
|
if logged_in
|
||||||
|
else (lambda n: Post(self._context, n, self))
|
||||||
|
),
|
||||||
|
query_variables={
|
||||||
|
"data": {
|
||||||
|
"count": 12,
|
||||||
|
"include_relationship_info": True,
|
||||||
|
"latest_besties_reel_media": True,
|
||||||
|
"latest_reel_media": True,
|
||||||
|
},
|
||||||
|
**({"username": self.username} if logged_in else {"id": self.userid}),
|
||||||
|
},
|
||||||
|
query_referer="https://www.instagram.com/{0}/".format(self.username),
|
||||||
|
is_first=Profile._make_is_newest_checker(),
|
||||||
|
doc_id="7898261790222653" if logged_in else "7950326061742207",
|
||||||
|
query_hash=None,
|
||||||
|
first_data=(None if logged_in else self._metadata("edge_owner_to_timeline_media")),
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_saved_posts(self) -> NodeIterator[Post]:
|
def get_saved_posts(self) -> NodeIterator[Post]:
|
||||||
@@ -1218,6 +1269,30 @@ class Profile:
|
|||||||
is_first=Profile._make_is_newest_checker()
|
is_first=Profile._make_is_newest_checker()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def get_reels(self) -> NodeIterator[Post]:
|
||||||
|
"""Retrieve all reels from a profile.
|
||||||
|
|
||||||
|
:rtype: NodeIterator[Post]
|
||||||
|
|
||||||
|
.. versionadded:: 4.14.0
|
||||||
|
|
||||||
|
"""
|
||||||
|
self._obtain_metadata()
|
||||||
|
return NodeIterator(
|
||||||
|
context = self._context,
|
||||||
|
edge_extractor = lambda d: d['data']['xdt_api__v1__clips__user__connection_v2'],
|
||||||
|
# Reels post info is incomplete relative to regular posts so we create a Post from the shortcode
|
||||||
|
# and fetch the additional metadata with an additional API request per Reel
|
||||||
|
node_wrapper = lambda n: Post.from_shortcode(context=self._context, shortcode=n["media"]["code"]),
|
||||||
|
query_variables = {'data': {
|
||||||
|
'page_size': 12, 'include_feed_video': True, "target_user_id": str(self.userid)}},
|
||||||
|
query_referer = 'https://www.instagram.com/{0}/'.format(self.username),
|
||||||
|
is_first = Profile._make_is_newest_checker(),
|
||||||
|
# fb_api_req_friendly_name=PolarisProfileReelsTabContentQuery_connection
|
||||||
|
doc_id = '7845543455542541',
|
||||||
|
query_hash = None,
|
||||||
|
)
|
||||||
|
|
||||||
def get_igtv_posts(self) -> NodeIterator[Post]:
|
def get_igtv_posts(self) -> NodeIterator[Post]:
|
||||||
"""Retrieve all IGTV posts.
|
"""Retrieve all IGTV posts.
|
||||||
|
|
||||||
@@ -1483,7 +1558,7 @@ class StoryItem:
|
|||||||
@property
|
@property
|
||||||
def caption_hashtags(self) -> List[str]:
|
def caption_hashtags(self) -> List[str]:
|
||||||
"""
|
"""
|
||||||
List of all lowercased hashtags (without preceeding #) that occur in the StoryItem's caption.
|
List of all lowercased hashtags (without preceding #) that occur in the StoryItem's caption.
|
||||||
|
|
||||||
.. versionadded:: 4.10
|
.. versionadded:: 4.10
|
||||||
"""
|
"""
|
||||||
@@ -1494,7 +1569,7 @@ class StoryItem:
|
|||||||
@property
|
@property
|
||||||
def caption_mentions(self) -> List[str]:
|
def caption_mentions(self) -> List[str]:
|
||||||
"""
|
"""
|
||||||
List of all lowercased profiles that are mentioned in the StoryItem's caption, without preceeding @.
|
List of all lowercased profiles that are mentioned in the StoryItem's caption, without preceding @.
|
||||||
|
|
||||||
.. versionadded:: 4.10
|
.. versionadded:: 4.10
|
||||||
"""
|
"""
|
||||||
@@ -1793,11 +1868,11 @@ class Hashtag:
|
|||||||
@classmethod
|
@classmethod
|
||||||
def from_name(cls, context: InstaloaderContext, name: str):
|
def from_name(cls, context: InstaloaderContext, name: str):
|
||||||
"""
|
"""
|
||||||
Create a Hashtag instance from a given hashtag name, without preceeding '#'. Raises an Exception if there is no
|
Create a Hashtag instance from a given hashtag name, without preceding '#'. Raises an Exception if there is no
|
||||||
hashtag with the given name.
|
hashtag with the given name.
|
||||||
|
|
||||||
:param context: :attr:`Instaloader.context`
|
:param context: :attr:`Instaloader.context`
|
||||||
:param name: Hashtag, without preceeding '#'
|
:param name: Hashtag, without preceding '#'
|
||||||
:raises: :class:`QueryReturnedNotFoundException`
|
:raises: :class:`QueryReturnedNotFoundException`
|
||||||
"""
|
"""
|
||||||
# pylint:disable=protected-access
|
# pylint:disable=protected-access
|
||||||
@@ -1807,11 +1882,13 @@ class Hashtag:
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def name(self):
|
def name(self):
|
||||||
"""Hashtag name lowercased, without preceeding '#'"""
|
"""Hashtag name lowercased, without preceding '#'"""
|
||||||
return self._node["name"].lower()
|
return self._node["name"].lower()
|
||||||
|
|
||||||
def _query(self, params):
|
def _query(self, params):
|
||||||
json_response = self._context.get_json("explore/tags/{0}/".format(self.name), params)
|
json_response = self._context.get_iphone_json(
|
||||||
|
"api/v1/tags/web_info/", {**params, "tag_name": self.name}
|
||||||
|
)
|
||||||
return json_response["graphql"]["hashtag"] if "graphql" in json_response else json_response["data"]
|
return json_response["graphql"]["hashtag"] if "graphql" in json_response else json_response["data"]
|
||||||
|
|
||||||
def _obtain_metadata(self):
|
def _obtain_metadata(self):
|
||||||
@@ -2134,7 +2211,7 @@ def load_structure(context: InstaloaderContext, json_structure: dict) -> JsonExp
|
|||||||
"""Loads a :class:`Post`, :class:`Profile`, :class:`StoryItem`, :class:`Hashtag` or :class:`FrozenNodeIterator` from
|
"""Loads a :class:`Post`, :class:`Profile`, :class:`StoryItem`, :class:`Hashtag` or :class:`FrozenNodeIterator` from
|
||||||
a json structure.
|
a json structure.
|
||||||
|
|
||||||
:param context: :attr:`Instaloader.context` linked to the new object, used for additional queries if neccessary.
|
:param context: :attr:`Instaloader.context` linked to the new object, used for additional queries if necessary.
|
||||||
:param json_structure: Instaloader JSON structure
|
:param json_structure: Instaloader JSON structure
|
||||||
|
|
||||||
.. versionadded:: 4.8
|
.. versionadded:: 4.8
|
||||||
@@ -2164,7 +2241,7 @@ def load_structure_from_file(context: InstaloaderContext, filename: str) -> Json
|
|||||||
"""Loads a :class:`Post`, :class:`Profile`, :class:`StoryItem`, :class:`Hashtag` or :class:`FrozenNodeIterator` from
|
"""Loads a :class:`Post`, :class:`Profile`, :class:`StoryItem`, :class:`Hashtag` or :class:`FrozenNodeIterator` from
|
||||||
a '.json' or '.json.xz' file that has been saved by :func:`save_structure_to_file`.
|
a '.json' or '.json.xz' file that has been saved by :func:`save_structure_to_file`.
|
||||||
|
|
||||||
:param context: :attr:`Instaloader.context` linked to the new object, used for additional queries if neccessary.
|
:param context: :attr:`Instaloader.context` linked to the new object, used for additional queries if necessary.
|
||||||
:param filename: Filename, ends in '.json' or '.json.xz'
|
:param filename: Filename, ends in '.json' or '.json.xz'
|
||||||
"""
|
"""
|
||||||
compressed = filename.endswith('.xz')
|
compressed = filename.endswith('.xz')
|
||||||
|
|||||||
@@ -18,10 +18,10 @@ def get_version():
|
|||||||
raise SystemExit("Could not find version string.")
|
raise SystemExit("Could not find version string.")
|
||||||
|
|
||||||
|
|
||||||
if sys.version_info < (3, 8):
|
if sys.version_info < (3, 9):
|
||||||
sys.exit('Instaloader requires Python >= 3.8.')
|
sys.exit('Instaloader requires Python >= 3.9.')
|
||||||
|
|
||||||
requirements = ['requests>=2.4']
|
requirements = ['requests>=2.25']
|
||||||
optional_requirements = {
|
optional_requirements = {
|
||||||
'browser_cookie3': ['browser_cookie3>=0.19.1'],
|
'browser_cookie3': ['browser_cookie3>=0.19.1'],
|
||||||
}
|
}
|
||||||
@@ -46,7 +46,7 @@ setup(
|
|||||||
'from Instagram.',
|
'from Instagram.',
|
||||||
long_description=open(os.path.join(SRC, 'README.rst')).read(),
|
long_description=open(os.path.join(SRC, 'README.rst')).read(),
|
||||||
install_requires=requirements,
|
install_requires=requirements,
|
||||||
python_requires='>=3.8',
|
python_requires='>=3.9',
|
||||||
extras_require=optional_requirements,
|
extras_require=optional_requirements,
|
||||||
entry_points={'console_scripts': ['instaloader=instaloader.__main__:main']},
|
entry_points={'console_scripts': ['instaloader=instaloader.__main__:main']},
|
||||||
zip_safe=False,
|
zip_safe=False,
|
||||||
@@ -58,11 +58,12 @@ setup(
|
|||||||
'Intended Audience :: Developers',
|
'Intended Audience :: Developers',
|
||||||
'License :: OSI Approved :: MIT License',
|
'License :: OSI Approved :: MIT License',
|
||||||
'Operating System :: OS Independent',
|
'Operating System :: OS Independent',
|
||||||
'Programming Language :: Python :: 3.8',
|
|
||||||
'Programming Language :: Python :: 3.9',
|
'Programming Language :: Python :: 3.9',
|
||||||
'Programming Language :: Python :: 3.10',
|
'Programming Language :: Python :: 3.10',
|
||||||
'Programming Language :: Python :: 3.11',
|
'Programming Language :: Python :: 3.11',
|
||||||
'Programming Language :: Python :: 3.12',
|
'Programming Language :: Python :: 3.12',
|
||||||
|
'Programming Language :: Python :: 3.13',
|
||||||
|
'Programming Language :: Python :: 3.14',
|
||||||
'Programming Language :: Python :: 3 :: Only',
|
'Programming Language :: Python :: 3 :: Only',
|
||||||
'Topic :: Internet',
|
'Topic :: Internet',
|
||||||
'Topic :: Multimedia :: Graphics'
|
'Topic :: Multimedia :: Graphics'
|
||||||
|
|||||||
Reference in New Issue
Block a user