Commit graph

3344 commits

Author SHA1 Message Date
Vadim Ushakov
735061b79d Merge branch 'py3' into plugins 2019-07-12 01:28:32 +07:00
Vadim Ushakov
a2cb1615b3 Move the BitTorrent related code from SiteAnnouncer.py (#2078)
* Move the BitTorrent related code from SiteAnnouncer.py to a separate plugin

* AnnounceBitTorrentPlugin.py: add missing `from Debug import Debug`
2019-07-10 16:12:25 +02:00
ZeroNet
6b5fa140b9
Try use pypi gevent for py3.8 tests 2019-07-10 12:48:08 +02:00
shortcutme
356d0521e6
Rev4122 2019-07-10 03:15:56 +02:00
shortcutme
5a08ab93d3
Ignore file attribute changes when reloading source code 2019-07-10 03:15:46 +02:00
shortcutme
8185f4dfda
Test getFile inner_path security 2019-07-10 03:14:30 +02:00
shortcutme
f4f0e2afa8
Allow like parameters in database queries 2019-07-10 03:14:09 +02:00
shortcutme
67d6b1e724
Fix double logging when running tests 2019-07-10 03:12:56 +02:00
shortcutme
e34a9d452a
Allow filter optional files by inner path 2019-07-10 03:11:20 +02:00
ZeroNet
2819a36469
Merge pull request #2084 from tangdou1/patch-5
Update zh.json
2019-07-09 03:01:13 +02:00
tangdou1
8815b4e0c3
Update zh.json 2019-07-08 10:05:34 +08:00
ZeroNet
960635b993
Fix win download link 2019-07-08 02:51:16 +02:00
shortcutme
f9dcb29e92
Remove development test version warning, add windows instuctions, remove outdated instuctions 2019-07-08 02:41:30 +02:00
Vadim Ushakov
aa6d7a468d TrackerShare: store trackers in shared-trackers.json, since trackers.json is in use by AnnounceShare and may have an incompatible format in the future 2019-07-07 14:31:13 +07:00
ZeroNet
5a746769d0
Merge pull request #2073 from filips123/fix-infinite-reloading
Fix infinite reloading when system theme changes
2019-07-06 23:25:35 +02:00
Vadim Ushakov
f5b63a430c Merge branch 'py3' into plugins 2019-07-06 17:35:37 +07:00
Vadim Ushakov
6ee1db4197 TrackerList: fix a typo 2019-07-06 17:21:14 +07:00
Vadim Ushakov
37627822de TrackerList: make the plugin compatible with TrackerShare 2019-07-06 01:39:32 +07:00
Vadim Ushakov
d35a15d674 TrackerShare: don't delete "my" trackers on errors, but delete them on program restart; add "persistent" flag for manually added trackers 2019-07-06 01:15:37 +07:00
Filip Š
87b4500467 Fix infinite reloading when system theme changes 2019-07-05 18:43:54 +02:00
Vadim Ushakov
c8545ce054 TrackerShare: print the total number of discovered trackers at the end of discovery procedure 2019-07-05 23:41:23 +07:00
Vadim Ushakov
8f8e10a703 TrackerShare: Change the log level for several messages from debug to info
Increased the log level for messages that are not very annoying and help to keep the track of events.
2019-07-05 23:17:13 +07:00
ZeroNet
951e47469a
Merge pull request #2060 from imachug/default-subdir-clone
Fix siteCloning subdirectory with -default files
2019-07-05 17:13:29 +02:00
Vadim Ushakov
33c81a89e9 TrackerShare: rename the config arguments to avoid the name clash with AnnounceShare's arguments
--working_shared_trackers_limit -> --shared_trackers_limit
--working_shared_trackers_limit_per_protocol -> --shared_trackers_limit_per_protocol

Also modify the help messages so that they were more consistent with how the code really works.
2019-07-05 19:38:00 +07:00
Vadim Ushakov
84526a6657 TrackerShare: raise the default limit per protocol limit from 2 to 4 2019-07-05 19:28:03 +07:00
Vadim Ushakov
3910338b28 Import plugin: TrackerList 2019-07-05 19:16:25 +07:00
Vadim Ushakov
b2e92b1d10 Import the redesigned AnnounceShare under the new name TrackerShare 2019-07-05 19:14:23 +07:00
shortcutme
c1db963c76
Rev4112, Fix loading screen glitch, Change unstable trackers 2019-07-04 14:39:41 +02:00
ZeroNet
a252ec36f0
Merge pull request #2069 from imachug/patch-1
Guess content type correctly
2019-07-04 11:34:01 +02:00
Ivanq
33b478199a
Guess content type correctly
Fix e.g. vue.min.js being reported as text/plain instead of text/javascript.
2019-07-04 12:09:07 +03:00
shortcutme
21f285e099
Rev4111 2019-07-03 18:37:35 +02:00
shortcutme
fec312ed09
Better pytest atexit logging error workaround 2019-07-03 18:37:13 +02:00
shortcutme
eb2627721e
Fix pytest 5.x compatibility 2019-07-03 18:36:41 +02:00
shortcutme
ff32f822ba
Raise exception instead of using assert 2019-07-03 18:35:55 +02:00
ZeroNet
80bfccd9d3
Merge pull request #2066 from geekless/Dockerfile-fix-caching
Fix the order of commands in Dockerfile to make use of the caching
2019-07-03 16:22:03 +02:00
ZeroNet
eb5a24064a
Merge pull request #2067 from rllola/fix-travis
fix pytest version to 4.6.3 to avoid it to broke for python 3.8 dev
2019-07-03 16:21:23 +02:00
rllola
b971ccc673 fix pytest version to 4.6.3 to avoid it to broke for python 3.8 dev 2019-07-03 15:48:18 +02:00
Vadim Ushakov
945687bdad Fix the order of commands in Dockerfile to make use of the caching of intermediate Docker images.
In py2 version, `COPY . /root` was placed after `RUN apk ...`, so that the result of `RUN apk ...` can be cached by Docker.

In py3 version, the commands were reordered to make the file `/root/requirements.txt` available for `pip install`. That prevents caching, and the docker image every time is rebuild from scrach.

To enable the caching back again, we can `COPY` just the single file `requirements.txt` before running other commands. Since the file is unmodified most of the time, the resulting image can be effectively cached. The other ZeroNet files are copied after doing `RUN apk ...`, as in the previous version.
2019-07-03 19:18:54 +07:00
ZeroNet
6f56d0a944
Update .travis.yml 2019-07-03 11:44:12 +02:00
ZeroNet
66c48ba4ec
Update to latest packages before tests 2019-07-02 16:03:41 +02:00
ZeroNet
f83ade8d33
Merge pull request #2061 from imachug/dotdot
Allow some paths to contain .. but not ../
2019-07-01 17:56:27 +02:00
ZeroNet
eae0d1b2a6
Merge pull request #1959 from tangdou1/patch-1
Change default value to 10MB
2019-07-01 17:45:37 +02:00
Ivanq
743f92d15e Allow some paths to contain .. but not ../ 2019-07-01 18:17:42 +03:00
shortcutme
822dec5c03
Rev4110 2019-07-01 16:28:56 +02:00
shortcutme
40b84755de
Add some fixed content_type 2019-07-01 16:28:37 +02:00
shortcutme
1b307166ee
Formatting 2019-07-01 16:27:40 +02:00
shortcutme
7a483e7912
Add short address to site_info 2019-07-01 16:27:34 +02:00
shortcutme
841230fe80
Call onClosed function if websocket is disconneced 2019-07-01 16:27:20 +02:00
shortcutme
900ae4e1ea
Remove notification about port open status on startup 2019-07-01 16:26:57 +02:00
shortcutme
72b6d6c676
Make wrapper compatible with sidebar console function 2019-07-01 16:26:37 +02:00