Skip to content

Add Post Titles to Filenames #608

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.

Sign up for GitHub

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

Open
MetalNeo wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add Post Titles to Filenames #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6a127e
Post titles are now appended to the beginning of filenames and galler…
Dec 21, 2021
ffc9ac8
Fix intent string name
Dec 21, 2021
5b9c480
Rules are now correct for comments view
Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...src/main/java/ml/docilealligator/infinityforreddit/activities/ViewImageOrGifActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ public class ViewImageOrGifActivity extends AppCompatActivity implements SetAsWa
private RequestManager glide;
private String mImageUrl;
private String mImageFileName;
private String mPostTitle;
private String mSubredditName;
private boolean isGif = true;
private boolean isNsfw;
Expand Down Expand Up @@ -165,13 +166,13 @@ protected void onCreate(Bundle savedInstanceState) {
mImageUrl = intent.getStringExtra(EXTRA_IMAGE_URL_KEY);
}
mImageFileName = intent.getStringExtra(EXTRA_FILE_NAME_KEY);
String postTitle = intent.getStringExtra(EXTRA_POST_TITLE_KEY);
mPostTitle = intent.getStringExtra(EXTRA_POST_TITLE_KEY);
mSubredditName = intent.getStringExtra(EXTRA_SUBREDDIT_OR_USERNAME_KEY);
isNsfw = intent.getBooleanExtra(EXTRA_IS_NSFW, false);

boolean useBottomAppBar = mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_BOTTOM_TOOLBAR_IN_MEDIA_VIEWER, false);
if (postTitle != null) {
Spanned title = Html.fromHtml(String.format("<font color=\"#FFFFFF\"><small>%s</small></font>", postTitle));
if (mPostTitle != null) {
Spanned title = Html.fromHtml(String.format("<font color=\"#FFFFFF\"><small>%s</small></font>", mPostTitle));
if (useBottomAppBar) {
titleTextView.setText(title);
} else {
Expand Down Expand Up @@ -369,7 +370,7 @@ private void download() {
Intent intent = new Intent(this, DownloadMediaService.class);
intent.putExtra(DownloadMediaService.EXTRA_URL, mImageUrl);
intent.putExtra(DownloadMediaService.EXTRA_MEDIA_TYPE, isGif ? DownloadMediaService.EXTRA_MEDIA_TYPE_GIF : DownloadMediaService.EXTRA_MEDIA_TYPE_IMAGE);
intent.putExtra(DownloadMediaService.EXTRA_FILE_NAME, mImageFileName);
intent.putExtra(DownloadMediaService.EXTRA_FILE_NAME, mPostTitle + "-" + mImageFileName);
intent.putExtra(DownloadMediaService.EXTRA_SUBREDDIT_NAME, mSubredditName);
intent.putExtra(DownloadMediaService.EXTRA_IS_NSFW, isNsfw);
ContextCompat.startForegroundService(this, intent);
Expand Down
5 changes: 5 additions & 0 deletions .../main/java/ml/docilealligator/infinityforreddit/activities/ViewRedditGalleryActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public class ViewRedditGalleryActivity extends AppCompatActivity implements SetA
public static final String EXTRA_REDDIT_GALLERY = "ERG";
public static final String EXTRA_SUBREDDIT_NAME = "ESN";
public static final String EXTRA_IS_NSFW = "EIN";
public static final String EXTRA_POST_TITLE = "EPT";

@BindView(R.id.hauler_view_view_reddit_gallery_activity)
HaulerView haulerView;
Expand All @@ -70,6 +71,7 @@ public class ViewRedditGalleryActivity extends AppCompatActivity implements SetA
Executor executor;
private SectionsPagerAdapter sectionsPagerAdapter;
private ArrayList<Post.Gallery> gallery;
private String postTitle;
private String subredditName;
private boolean isNsfw;
private boolean useBottomAppBar;
Expand Down Expand Up @@ -156,6 +158,7 @@ protected void onCreate(Bundle savedInstanceState) {
finish();
return;
}
postTitle = getIntent().getStringExtra(EXTRA_POST_TITLE);
subredditName = getIntent().getStringExtra(EXTRA_SUBREDDIT_NAME);
isNsfw = getIntent().getBooleanExtra(EXTRA_IS_NSFW, false);

Expand Down Expand Up @@ -290,6 +293,7 @@ public Fragment getItem(int position) {
ViewRedditGalleryVideoFragment fragment = new ViewRedditGalleryVideoFragment();
Bundle bundle = new Bundle();
bundle.putParcelable(ViewRedditGalleryVideoFragment.EXTRA_REDDIT_GALLERY_VIDEO, media);
bundle.putString(ViewRedditGalleryVideoFragment.EXTRA_POST_TITLE, postTitle);
bundle.putString(ViewRedditGalleryVideoFragment.EXTRA_SUBREDDIT_NAME, subredditName);
bundle.putInt(ViewRedditGalleryVideoFragment.EXTRA_INDEX, position);
bundle.putInt(ViewRedditGalleryVideoFragment.EXTRA_MEDIA_COUNT, gallery.size());
Expand All @@ -300,6 +304,7 @@ public Fragment getItem(int position) {
ViewRedditGalleryImageOrGifFragment fragment = new ViewRedditGalleryImageOrGifFragment();
Bundle bundle = new Bundle();
bundle.putParcelable(ViewRedditGalleryImageOrGifFragment.EXTRA_REDDIT_GALLERY_MEDIA, media);
bundle.putString(ViewRedditGalleryImageOrGifFragment.EXTRA_POST_TITLE, postTitle);
bundle.putString(ViewRedditGalleryImageOrGifFragment.EXTRA_SUBREDDIT_NAME, subredditName);
bundle.putInt(ViewRedditGalleryImageOrGifFragment.EXTRA_INDEX, position);
bundle.putInt(ViewRedditGalleryImageOrGifFragment.EXTRA_MEDIA_COUNT, gallery.size());
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ public class ViewVideoActivity extends AppCompatActivity {

private String videoDownloadUrl;
private String videoFileName;
private String postTitle;
private String subredditName;
private String id;
private boolean wasPlaying;
Expand Down Expand Up @@ -539,6 +540,7 @@ public void onIdle(@NonNull ZoomEngine zoomEngine) {
preparePlayer(savedInstanceState);
} else {
videoDownloadUrl = intent.getStringExtra(EXTRA_VIDEO_DOWNLOAD_URL);
postTitle = intent.getStringExtra(EXTRA_POST_TITLE);
subredditName = intent.getStringExtra(EXTRA_SUBREDDIT);
id = intent.getStringExtra(EXTRA_ID);
videoFileName = subredditName + "-" + id + ".mp4";
Expand Down Expand Up @@ -914,13 +916,14 @@ private void download() {
intent = new Intent(this, DownloadMediaService.class);
intent.putExtra(DownloadMediaService.EXTRA_URL, videoDownloadUrl);
intent.putExtra(DownloadMediaService.EXTRA_MEDIA_TYPE, DownloadMediaService.EXTRA_MEDIA_TYPE_VIDEO);
intent.putExtra(DownloadMediaService.EXTRA_FILE_NAME, videoFileName);
intent.putExtra(DownloadMediaService.EXTRA_FILE_NAME, postTitle + "-" + videoFileName);
intent.putExtra(DownloadMediaService.EXTRA_SUBREDDIT_NAME, subredditName);
intent.putExtra(DownloadMediaService.EXTRA_IS_NSFW, isNSFW);
} else {
intent = new Intent(this, DownloadRedditVideoService.class);
intent.putExtra(DownloadRedditVideoService.EXTRA_VIDEO_URL, videoDownloadUrl);
intent.putExtra(DownloadRedditVideoService.EXTRA_POST_ID, id);
intent.putExtra(DownloadRedditVideoService.EXTRA_POST_TITLE, postTitle);
intent.putExtra(DownloadRedditVideoService.EXTRA_SUBREDDIT, subredditName);
intent.putExtra(DownloadRedditVideoService.EXTRA_IS_NSFW, isNSFW);
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1991,6 +1991,7 @@ private void openMedia(Post post) {
} else if (post.getPostType() == Post.GALLERY_TYPE) {
Intent intent = new Intent(mActivity, ViewRedditGalleryActivity.class);
intent.putParcelableArrayListExtra(ViewRedditGalleryActivity.EXTRA_REDDIT_GALLERY, post.getGallery());
intent.putExtra(ViewRedditGalleryActivity.EXTRA_POST_TITLE, post.getTitle());
intent.putExtra(ViewRedditGalleryActivity.EXTRA_SUBREDDIT_NAME, post.getSubredditName());
intent.putExtra(ViewRedditGalleryActivity.EXTRA_IS_NSFW, post.isNSFW());
mActivity.startActivity(intent);
Expand Down
7 changes: 6 additions & 1 deletion ...a/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryImageOrGifFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
public class ViewRedditGalleryImageOrGifFragment extends Fragment {

public static final String EXTRA_REDDIT_GALLERY_MEDIA = "ERGM";
public static final String EXTRA_POST_TITLE = "EPT";
public static final String EXTRA_SUBREDDIT_NAME = "ESN";
public static final String EXTRA_INDEX = "EI";
public static final String EXTRA_MEDIA_COUNT = "EMC";
Expand Down Expand Up @@ -108,6 +109,8 @@ public class ViewRedditGalleryImageOrGifFragment extends Fragment {
private ViewRedditGalleryActivity activity;
private RequestManager glide;
private Post.Gallery media;
private String postTitle;
private int galleryIndex;
private String subredditName;
private boolean isNsfw;
private boolean isDownloading = false;
Expand All @@ -133,6 +136,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
setHasOptionsMenu(true);

media = getArguments().getParcelable(EXTRA_REDDIT_GALLERY_MEDIA);
postTitle = getArguments().getString(EXTRA_POST_TITLE);
galleryIndex = getArguments().getInt(EXTRA_INDEX) + 1;
subredditName = getArguments().getString(EXTRA_SUBREDDIT_NAME);
isNsfw = getArguments().getBoolean(EXTRA_IS_NSFW, false);
glide = Glide.with(activity);
Expand Down Expand Up @@ -399,7 +404,7 @@ private void download() {
Intent intent = new Intent(activity, DownloadMediaService.class);
intent.putExtra(DownloadMediaService.EXTRA_URL, media.hasFallback() ? media.fallbackUrl : media.url); // Retrieve original instead of the one additionally compressed by reddit
intent.putExtra(DownloadMediaService.EXTRA_MEDIA_TYPE, media.mediaType == Post.Gallery.TYPE_GIF ? DownloadMediaService.EXTRA_MEDIA_TYPE_GIF: DownloadMediaService.EXTRA_MEDIA_TYPE_IMAGE);
intent.putExtra(DownloadMediaService.EXTRA_FILE_NAME, media.fileName);
intent.putExtra(DownloadMediaService.EXTRA_FILE_NAME, postTitle + "-" + galleryIndex + "-" + media.fileName);
intent.putExtra(DownloadMediaService.EXTRA_SUBREDDIT_NAME, subredditName);
intent.putExtra(DownloadMediaService.EXTRA_IS_NSFW, isNsfw);
ContextCompat.startForegroundService(activity, intent);
Expand Down
7 changes: 6 additions & 1 deletion ...n/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryVideoFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
public class ViewRedditGalleryVideoFragment extends Fragment {

public static final String EXTRA_REDDIT_GALLERY_VIDEO = "EIV";
public static final String EXTRA_POST_TITLE = "EPT";
public static final String EXTRA_SUBREDDIT_NAME = "ESN";
public static final String EXTRA_INDEX = "EI";
public static final String EXTRA_MEDIA_COUNT = "EMC";
Expand All @@ -79,6 +80,8 @@ public class ViewRedditGalleryVideoFragment extends Fragment {
ImageView downloadImageView;
private ViewRedditGalleryActivity activity;
private Post.Gallery galleryVideo;
private String postTitle;
private int galleryIndex;
private String subredditName;
private boolean isNsfw;
private SimpleExoPlayer player;
Expand Down Expand Up @@ -110,6 +113,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
activity.setVolumeControlStream(AudioManager.STREAM_MUSIC);

galleryVideo = getArguments().getParcelable(EXTRA_REDDIT_GALLERY_VIDEO);
postTitle = getArguments().getString(EXTRA_POST_TITLE);
galleryIndex = getArguments().getInt(EXTRA_INDEX) + 1;
subredditName = getArguments().getString(EXTRA_SUBREDDIT_NAME);
isNsfw = getArguments().getBoolean(EXTRA_IS_NSFW, false);

Expand Down Expand Up @@ -243,7 +248,7 @@ private void download() {
Intent intent = new Intent(activity, DownloadMediaService.class);
intent.putExtra(DownloadMediaService.EXTRA_URL, galleryVideo.url);
intent.putExtra(DownloadMediaService.EXTRA_MEDIA_TYPE, DownloadMediaService.EXTRA_MEDIA_TYPE_VIDEO);
intent.putExtra(DownloadMediaService.EXTRA_FILE_NAME, galleryVideo.fileName);
intent.putExtra(DownloadMediaService.EXTRA_FILE_NAME, postTitle + "-" + galleryIndex + "-" + galleryVideo.fileName);
intent.putExtra(DownloadMediaService.EXTRA_SUBREDDIT_NAME, subredditName);
intent.putExtra(DownloadMediaService.EXTRA_IS_NSFW, isNsfw);
ContextCompat.startForegroundService(activity, intent);
Expand Down
4 changes: 3 additions & 1 deletion ...c/main/java/ml/docilealligator/infinityforreddit/services/DownloadRedditVideoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
public class DownloadRedditVideoService extends Service {

public static final String EXTRA_VIDEO_URL = "EVU";
public static final String EXTRA_POST_TITLE = "EPT";
public static final String EXTRA_SUBREDDIT = "ES";
public static final String EXTRA_POST_ID = "EPI";
public static final String EXTRA_IS_NSFW = "EIN";
Expand Down Expand Up @@ -98,8 +99,9 @@ public void handleMessage(Message msg) {
Bundle intent = msg.getData();
String videoUrl = intent.getString(EXTRA_VIDEO_URL);
String audioUrl = videoUrl.substring(0, videoUrl.lastIndexOf('/')) + "/DASH_audio.mp4";
String postTitle = intent.getString(EXTRA_POST_TITLE);
String subredditName = intent.getString(EXTRA_SUBREDDIT);
String fileNameWithoutExtension = subredditName + "-" + intent.getString(EXTRA_POST_ID);
String fileNameWithoutExtension = postTitle + "-" + subredditName + "-" + intent.getString(EXTRA_POST_ID);
boolean isNsfw = intent.getBoolean(EXTRA_IS_NSFW, false);
int randomNotificationIdOffset = msg.arg1;

Expand Down