Skip to content

feat: show file size in decimal and binary units #596

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

Merged
merged 1 commit into from
Aug 5, 2024
Merged

feat: show file size in decimal and binary units #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions components/torrent/TorrentActionCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
<span>File Size</span>
</div>
<div class="flex flex-row w-1/2">
<span>{{ fileSize(torrent.file_size) }}</span>
<span>{{ fileSizeDecimal(torrent.file_size) }}</span>/
<span>{{ fileSizeBinary(torrent.file_size) }}</span>
</div>
</div>
<div class="flex flex-row py-2 pb-0">
Expand Down Expand Up @@ -143,7 +144,8 @@ import type { PropType } from "vue";
import type { TorrentResponse } from "torrust-index-types-lib";
import { notify } from "notiwind-ts";
import {
fileSize,
fileSizeDecimal,
fileSizeBinary,
downloadTorrent,
useRestApi,
isUserLoggedIn,
Expand Down
4 changes: 2 additions & 2 deletions components/torrent/TorrentFilesTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<tr>
<th>{{ index + 1 }}</th>
<td>{{ file.name }}</td>
<td>{{ fileSize(file.size) }}</td>
<td>{{ fileSizeDecimal(file.size) }}/{{ fileSizeBinary(file.size) }}</td>
</tr>
</template>
</tbody>
Expand All @@ -42,7 +42,7 @@
import { ChevronDownIcon } from "@heroicons/vue/24/solid";
import type { PropType } from "vue";
import type { TorrentResponse } from "torrust-index-types-lib";
import { ref, fileSize } from "#imports";
import { ref, fileSizeDecimal, fileSizeBinary } from "#imports";

const collapsed = ref(false);

Expand Down
4 changes: 2 additions & 2 deletions components/torrent/TorrentList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</template>
</div>
<div class="flex flex-row items-start justify-start w-full mt-1 flex-nowrap">
<span class="text-xs whitespace-nowrap text-neutral-content/50">{{ fileSize(torrent.file_size) }}</span>
<span class="text-xs whitespace-nowrap text-neutral-content/50">{{ fileSizeDecimal(torrent.file_size) }}/{{ fileSizeBinary(torrent.file_size) }}</span>
<span class="ml-2 text-xs whitespace-nowrap text-neutral-content/50">{{ new Date(torrent.date_uploaded).toLocaleDateString(undefined, { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' }) }} ({{ timeSince(new Date(torrent.date_uploaded)) }} ago)</span>
<a class="ml-2 text-xs whitespace-nowrap text-neutral-content/50">u/{{ torrent.uploader }}</a>
</div>
Expand Down Expand Up @@ -58,7 +58,7 @@ import { ArrowDownTrayIcon, LinkIcon } from "@heroicons/vue/24/outline";
import { ChevronRightIcon, ChevronDownIcon } from "@heroicons/vue/20/solid";
import { type PropType, watch } from "vue";
import type { TorrentListing } from "torrust-index-types-lib";
import { fileSize, timeSince, ref, downloadTorrent } from "#imports";
import { fileSizeDecimal, fileSizeBinary, timeSince, ref, downloadTorrent } from "#imports";

const props = defineProps({
torrents: Array as PropType<Array<TorrentListing>>
Expand Down
4 changes: 2 additions & 2 deletions components/torrent/TorrentTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<span class="duration-200 cursor-pointer hover:text-amber-500" @click.stop="$router.push(`/torrent/${torrent.info_hash}`)">{{ torrent.title }}</span>
</td>
<td class="px-2">
{{ fileSize(torrent.file_size) }}
{{ fileSizeDecimal(torrent.file_size) }}/{{ fileSizeBinary(torrent.file_size) }}
</td>
<td>{{ timeSince(new Date(torrent.date_uploaded)) }} ago ({{ new Date(torrent.date_uploaded).toLocaleDateString(undefined, { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' }) }})</td>
<td>{{ torrent.uploader }}</td>
Expand Down Expand Up @@ -59,7 +59,7 @@
import { ArrowDownTrayIcon, LinkIcon, EyeIcon } from "@heroicons/vue/24/outline";
import { type PropType, watch } from "vue";
import type { TorrentListing } from "torrust-index-types-lib";
import { fileSize, timeSince, ref, downloadTorrent } from "#imports";
import { fileSizeDecimal, fileSizeBinary, timeSince, ref, downloadTorrent } from "#imports";

const props = defineProps({
torrents: Array as PropType<Array<TorrentListing>>
Expand Down
19 changes: 15 additions & 4 deletions composables/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,24 @@ export function downloadTorrent (infoHash: string, fileName?: string) {
});
}

export function fileSize (size: number): string {
export function fileSizeDecimal (size: number): string {
if (!size) { size = 0; }
let sizeString = `${(size).toFixed(2)} B`;

if (size / 1000000000 < 1000) { sizeString = `${(size / 1000000000).toFixed(2)} GB`; }
if (size / 1000000 < 1000) { sizeString = `${(size / 1000000).toFixed(2)} MB`; }
if (size / 1000 < 1000) { sizeString = `${(size / 1000).toFixed(2)} KB`; }
if (size / Math.pow(1000, 3) < 1000) { sizeString = `${(size / Math.pow(1000, 3)).toFixed(2)} GB`; }
if (size / Math.pow(1000, 2) < 1000) { sizeString = `${(size / Math.pow(1000, 2)).toFixed(2)} MB`; }
if (size / Math.pow(1000, 1) < 1000) { sizeString = `${(size / Math.pow(1000, 1)).toFixed(2)} KB`; }

return sizeString;
}

export function fileSizeBinary (size: number): string {
if (!size) { size = 0; }
let sizeString = `${(size).toFixed(2)} B`;

if (size / Math.pow(1024, 3) < 1024) { sizeString = `${(size / Math.pow(1024, 3)).toFixed(2)} GiB`; }
if (size / Math.pow(1024, 2) < 1024) { sizeString = `${(size / Math.pow(1024, 2)).toFixed(2)} MiB`; }
if (size / Math.pow(1024, 1) < 1024) { sizeString = `${(size / Math.pow(1024, 1)).toFixed(2)} KiB`; }

return sizeString;
}
Expand Down