Peertube
/
TubeLab-App-Android
mirror of https://framagit.org/tom79/fedilab-tube
1
0
Fork 0
Code Issues Releases Wiki Activity

Some changes

This commit is contained in:
Thomas 2020-12-29 17:11:36 +01:00
parent 5c27292543
commit 8a8a433023
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
View File

@ -257,29 +257,30 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
for (int i = 0; i < torrent.getFileNames().length; i++) { for (int i = 0; i < torrent.getFileNames().length; i++) {
torrent.getTorrentHandle().renameFile(i, torrent.getFileNames()[0].replaceAll("[^a-zA-Z0-9/.-]", "_")); torrent.getTorrentHandle().renameFile(i, torrent.getFileNames()[0].replaceAll("[^a-zA-Z0-9/.-]", "_"));
} }
} startStream(peertube, torrent.getVideoFile().getAbsolutePath().replaceAll("[^a-zA-Z0-9/.-]", "_"), null, autoPlay, -1, null, null, true);
startStream(peertube, torrent.getVideoFile().getAbsolutePath().replaceAll("[^a-zA-Z0-9/.-]", "_"), null, autoPlay, -1, null, null, true); PlayerControlView controlView = binding.doubleTapPlayerView.findViewById(R.id.exo_controller);
PlayerControlView controlView = binding.doubleTapPlayerView.findViewById(R.id.exo_controller); ConstraintLayout torrent_info = controlView.findViewById(R.id.torrent_info);
ConstraintLayout torrent_info = controlView.findViewById(R.id.torrent_info); TextView dowload_rate = controlView.findViewById(R.id.dowload_rate);
TextView dowload_rate = controlView.findViewById(R.id.dowload_rate); TextView upload_rate = controlView.findViewById(R.id.upload_rate);
TextView upload_rate = controlView.findViewById(R.id.upload_rate); torrent_info.setVisibility(View.VISIBLE);
torrent_info.setVisibility(View.VISIBLE);
new Timer().scheduleAtFixedRate(new TimerTask() { new Timer().scheduleAtFixedRate(new TimerTask() {
@Override @Override
public void run() { public void run() {
SessionManager sessionManager = torrentStream.getSessionManager(); SessionManager sessionManager = torrentStream.getSessionManager();
if (sessionManager != null) { if (sessionManager != null) {
long upload = sessionManager.uploadRate(); long upload = sessionManager.uploadRate();
long download = sessionManager.downloadRate(); long download = sessionManager.downloadRate();
int seeds = sessionManager.maxActiveSeeds(); runOnUiThread(() -> {
runOnUiThread(() -> { dowload_rate.setText(String.format("▼ %s", Helper.rateSize(PeertubeActivity.this, download)));
dowload_rate.setText(String.format("▼ %s", Helper.rateSize(PeertubeActivity.this, download))); upload_rate.setText(String.format("▲ %s", Helper.rateSize(PeertubeActivity.this, upload)));
upload_rate.setText(String.format("▲ %s", Helper.rateSize(PeertubeActivity.this, upload))); });
}); }
} }
} }, 0, 1000);
}, 0, 1000); } else {
Toasty.error(PeertubeActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
}
} }
@ -1381,8 +1382,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
SingleSampleMediaSource subtitleSource = null; SingleSampleMediaSource subtitleSource = null;
DataSource.Factory dataSourceFactory = null; DataSource.Factory dataSourceFactory = null;
if (localTorrentUrl != null) { if (localTorrentUrl != null) {
java.io.File localFile = new java.io.File(localTorrentUrl);
DataSpec dataSpec = new DataSpec(Uri.fromFile(new java.io.File(localTorrentUrl))); DataSpec dataSpec = new DataSpec(Uri.fromFile(new java.io.File(localTorrentUrl)));
FileDataSource fileDataSource = new FileDataSource(); FileDataSource fileDataSource = new FileDataSource();
try { try {