Compare commits

..

No commits in common. "dca95f9d95f13621f7bafb8bf2712d15a8d6ccd9" and "19bb7e3b83826f3701837a954a83d10257e7d451" have entirely different histories.

6 changed files with 10 additions and 14 deletions

8
ctl
View file

@ -39,9 +39,7 @@ if [ "$action" = "init" ]; then
$SUDO git clone -b $branch https://git.0x2620.org/${package}.git src/${package} $SUDO git clone -b $branch https://git.0x2620.org/${package}.git src/${package}
fi fi
cd ${BASE}/src/${package} cd ${BASE}/src/${package}
$SUDO ${BASE}/bin/python setup.py develop
$SUDO ${BASE}/bin/pip install -e .
done done
cd ${BASE} cd ${BASE}
$SUDO ./bin/pip install -r requirements.txt $SUDO ./bin/pip install -r requirements.txt
@ -52,10 +50,6 @@ if [ "$action" = "init" ]; then
done done
exit 0 exit 0
fi fi
if [ "$action" = "version" ]; then
git rev-list HEAD --count
exit 0
fi
if [ "$action" = "manage" ]; then if [ "$action" = "manage" ]; then
cmd="pandora/manage.py" cmd="pandora/manage.py"

View file

@ -52,6 +52,7 @@ apt-get install -y \
python3-numpy \ python3-numpy \
python3-psycopg2 \ python3-psycopg2 \
python3-pyinotify \ python3-pyinotify \
python3-simplejson \
python3-lxml \ python3-lxml \
python3-cssselect \ python3-cssselect \
python3-html5lib \ python3-html5lib \

View file

@ -818,7 +818,6 @@ class Stream(models.Model):
self.file.save() self.file.save()
self.available = True self.available = True
self.save() self.save()
done = True
elif self.file.can_remux(): elif self.file.can_remux():
ok, error = extract.remux_stream(media, target) ok, error = extract.remux_stream(media, target)
done = True done = True

View file

@ -1,6 +1,7 @@
Django==4.2.7 Django==4.2.3
simplejson
chardet chardet
celery==5.3.5 celery==5.3.1
django-celery-results==2.5.1 django-celery-results==2.5.1
django-celery-beat==2.5.0 django-celery-beat==2.5.0
django-extensions==3.2.3 django-extensions==3.2.3
@ -11,9 +12,9 @@ gunicorn==20.0.4
html5lib html5lib
requests<3.0.0,>=2.24.0 requests<3.0.0,>=2.24.0
urllib3<2.0.0,>=1.25.2 urllib3<2.0.0,>=1.25.2
tornado==6.3.3 tornado==6.3.2
geoip2==4.7.0 geoip2==4.1.0
yt-dlp>=2023.11.16 yt-dlp>=2022.3.8.2
python-memcached python-memcached
elasticsearch<8 elasticsearch<8
future future

View file

@ -299,7 +299,7 @@ if __name__ == "__main__":
run(join(base, 'pandora/manage.py'), 'update_geoip') run(join(base, 'pandora/manage.py'), 'update_geoip')
if old < 6442: if old < 6442:
run('./bin/pip', 'install', 'yt-dlp>=2022.3.8.2') run('./bin/pip', 'install', 'yt-dlp>=2022.3.8.2')
if old <= 6581: if old <= 6517:
run('./bin/pip', 'install', '-U', 'pip') run('./bin/pip', 'install', '-U', 'pip')
run('./bin/pip', 'install', '-r', 'requirements.txt') run('./bin/pip', 'install', '-r', 'requirements.txt')
else: else:

View file

@ -111,6 +111,7 @@ apt-get install -y \
python3-numpy \ python3-numpy \
python3-psycopg2 \ python3-psycopg2 \
python3-pyinotify \ python3-pyinotify \
python3-simplejson \
python3-maxminddb \ python3-maxminddb \
libmaxminddb-dev \ libmaxminddb-dev \
python3-lxml \ python3-lxml \