Skip to content

Commit a730e96

Browse files
Final edits
1 parent 25b04f2 commit a730e96

5 files changed

Lines changed: 6 additions & 5 deletions

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/Extractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public LinkHandler getLinkHandler() {
5959
public void fetchPage() throws IOException, ExtractionException {
6060
ExtractorLogger.d(TAG, "base fetchPage called");
6161
if (pageFetched) {
62-
ExtractorLogger.d(TAG, "Page already fetched");
62+
ExtractorLogger.d(TAG, "Page already fetched; returning");
6363
return;
6464
}
6565
onFetchPage(downloader);

extractor/src/main/java/org/schabi/newpipe/extractor/Info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public Info(final int serviceId,
5454
this.url = url;
5555
this.originalUrl = originalUrl;
5656
this.name = name;
57-
ExtractorLogger.d(TAG, "Base Created " + this);
57+
ExtractorLogger.d(TAG, "Base Created {}", this);
5858
}
5959

6060
public Info(final int serviceId, final LinkHandler linkHandler, final String name) {

extractor/src/main/java/org/schabi/newpipe/extractor/NewPipe.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static void init(final Downloader d) {
4949
}
5050

5151
public static void init(final Downloader d, final Localization l) {
52-
ExtractorLogger.d(TAG, "Default init called with localization");
52+
ExtractorLogger.d(TAG, "Default init called with localization={}");
5353
init(d, l, l.getCountryCode().isEmpty()
5454
? ContentCountry.DEFAULT : new ContentCountry(l.getCountryCode()));
5555
}

extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public StreamInfo(final int serviceId,
6363
this.streamType = streamType;
6464
this.ageLimit = ageLimit;
6565
ExtractorLogger.d(TAG, "Created {}", this);
66-
6766
}
6867

6968
@Override

extractor/src/main/java/org/schabi/newpipe/extractor/utils/ExtractorLogger.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static void e(final String tag,
115115
}
116116

117117
/**
118-
* Simple string format method for easier logger in the form of
118+
* Simple string format method for easier logging in the form of
119119
* {@code ExtractorLogger.d("Hello my name {Name} {}", name, surname)}
120120
* @param template The template string to format
121121
* @param args Arguments to replace identifiers with in {@code template}
@@ -143,7 +143,9 @@ private static String format(final String template, final Object... args) {
143143
// If none found then there's no more arguments to replace
144144
out.append(template, cursorIndex, n); break;
145145
}
146+
// Append everything from cursor up to before the open brace
146147
out.append(template, cursorIndex, openBraceIndex);
148+
// Append arguments in the brace
147149
out.append(argIndex < args.length
148150
? String.valueOf(args[argIndex++])
149151
: template.substring(openBraceIndex, close + 1));

0 commit comments

Comments
 (0)