Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add preliminary support of libtorrent v1.2 #10373

Merged
merged 1 commit into from
Mar 19, 2019

Conversation

glassez
Copy link
Member

@glassez glassez commented Mar 12, 2019

With this PR I open a series of PRs that add support of libtorrent v1.2.
Why the series? IMO, it's obvious that a lot of work is often easier to do in parts (if you do not agree with me, you can try to make this job at once).
The main purpose of this PR is making qBittorrent compilable with libtorrent-1.2 that is built with deprecated features enabled so then you can easily proceed with adding more compatibilities doing the rest of jobs in libtorrent-1.2 environment. However, I made some additional corrections along the way.

I'm strongly asking reviewers not to pick on its details too much. Just make sure it doesn't break the current logic (health in the libtorrent-1.1 environment), and let's move on.

@glassez glassez added the Core label Mar 12, 2019
@glassez glassez added this to the 4.2.0 milestone Mar 12, 2019
@glassez glassez force-pushed the libtorrent-1.2 branch 2 times, most recently from 83214ed to 77252a5 Compare March 13, 2019 12:19
Copy link
Member

@Chocobo1 Chocobo1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, it looks good. 👍

src/base/bittorrent/infohash.h Outdated Show resolved Hide resolved
src/base/bittorrent/private/libtorrentfwd.h Outdated Show resolved Hide resolved
src/base/bittorrent/torrenthandle.cpp Show resolved Hide resolved
src/base/bittorrent/session.cpp Show resolved Hide resolved
src/base/bittorrent/trackerentry.cpp Show resolved Hide resolved
src/base/net/portforwarder.cpp Show resolved Hide resolved
src/base/bittorrent/session.cpp Show resolved Hide resolved
src/gui/properties/propertieswidget.cpp Outdated Show resolved Hide resolved
@ghost
Copy link

ghost commented Mar 17, 2019

Perhaps wait until libtorrent 1.2.1 comes out to merge into 4.2.0?

libtorrent v1.2 should be built with deprecated features enabled.
@glassez glassez merged commit 6de02b0 into qbittorrent:master Mar 19, 2019
@glassez glassez deleted the libtorrent-1.2 branch March 19, 2019 14:06
@sledgehammer999
Copy link
Member

Sorry for going offtopic: Are there any pending important PRs that are ready to merge? (so I can take a look the next weekend).

IMO, we should not mix adding compatibility with changing logic and adding new features.

I agree. Big changes are best done in logical increments(if possible). Even if that means more commits. The tradeoff (ie less strain on reviewers), is worth it, IMO.

@glassez
Copy link
Member Author

glassez commented Mar 19, 2019

Are there any pending important PRs that are ready to merge? (so I can take a look the next weekend).

#9591 is important for end-users, IIRC. I think it's time to end it. Even if there are still some shortcomings, it will be easier to fix them later. We have plenty of time before the 4.2 release.

@Chocobo1
Copy link
Member

#9591 is important for end-users,

@sledgehammer999
I find it easier to support it if it doesn't come with new custom widgets (from the new files) and I really doubt we really want to maintain them.

@ghost
Copy link

ghost commented Mar 20, 2019

@sledgehammer999 I think #10099 is the most important PR right now since it is the most drastic change from 4.1 to 4.2

libtorrent is being actively worked on and I'd bet that by the time qBittorrent 4.2.0 is ready to release, we will have libtorrent 1.2.1 come out.

@Ryrynz
Copy link

Ryrynz commented Mar 20, 2019

Yeah that's likely, wouldn't hurt to ask arvidn when it's likely due. It can't be far off as he releases generally within every four months and it's almost been three, so perhaps just days away?

@thalieht
Copy link
Contributor

Guys don't worry about libtorrent version. In qBt 4.2.0, the latest commit from libtorrent RC_1_2 branch will usually be used, just like the RC_1_1 branch was used up until now.

@FranciscoPombal
Copy link
Member

@sledgehammer999
Not ready, but important:
#10153
Relevant issue and comments:
#10162 (comment)

@xavier2k6
Copy link
Member

xavier2k6 commented Mar 25, 2019

@sledgehammer999
64bit cache limit to be lifted.
#10194
typo - BUGFIX: Impove DownloadManager code (glassez) Improve
#10386

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants