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.

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

Python3 and other fixes #11

Merged
merged 21 commits into from
May 21, 2020
Merged

Python3 and other fixes #11

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4b46f3a
Fix noisy logs
JuiP Apr 3, 2020
8a37c39
Fix Gtk-WARNING: Can't set a target list till gtk_drag_set() is called
JuiP Apr 3, 2020
b501048
Run 2to3
JuiP Apr 3, 2020
00e5df3
update exec and replace statvfs with disk_usage as statvfs is removed…
JuiP Apr 3, 2020
97fdd0f
sugarpycha: change callable to isinstance and more changes
JuiP Apr 3, 2020
6dcec36
flake8 fix
JuiP Apr 3, 2020
c02848e
Fix traceback when no object is selected in _object_chooser
JuiP Apr 3, 2020
aa9065c
Fetch translations and delete empty translations
JuiP Apr 3, 2020
3699390
refresh pot file
JuiP Apr 3, 2020
12d739d
Add .flake8, not added in flake8 fix
JuiP Apr 3, 2020
fcd40b6
Added Screenshots
JuiP Apr 3, 2020
a428d4e
Rename screenshots
JuiP Apr 3, 2020
cfa54d5
Update README.md
JuiP Apr 3, 2020
c813d97
demote logging
JuiP Apr 3, 2020
1f1bb36
Update exec and use os.statvfs instead of shutil.disk_usage
JuiP Apr 3, 2020
4d4eb12
Added line chart
JuiP May 12, 2020
ef16be6
Added improvements:
JuiP May 13, 2020
8181469
Flake8 fix for E501: line too long
JuiP May 13, 2020
a7f1b91
Changes to ObjectChooser
JuiP May 15, 2020
14f0084
More Changes
JuiP May 18, 2020
137edbd
Added end of line marker
JuiP May 20, 2020
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
2 changes: 1 addition & 1 deletion activity/activity.info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = Analyze Journal
activity_version = 4
bundle_id = org.sugarlabs.AnalyzeJournal
exec = sugar-activity activity.AnalyzeJournal
exec = sugar-activity3 activity.AnalyzeJournal
icon = analyzejournal
license = GPLv3+
summary = chart of Sugar Journal activity
Expand Down
8 changes: 4 additions & 4 deletions readers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import os
import glob
import statvfs
import shutil
JuiP marked this conversation as resolved.
Show resolved Hide resolved

from gettext import gettext as _

Expand Down Expand Up @@ -63,9 +63,9 @@ def get_chart_data(self):
return chart_data

def _get_space(self):
stat = os.statvfs(env.get_profile_path())
free_space = stat[statvfs.F_BSIZE] * stat[statvfs.F_BAVAIL]
total_space = stat[statvfs.F_BSIZE] * stat[statvfs.F_BLOCKS]
total_space, used_space, free_space = shutil.disk_usage(env.get_profile_path())
#free_space = stat[statvfs.f_bsize] * stat[statvfs.f_bavail]
#total_space = stat[statvfs.F_BSIZE] * stat[statvfs.F_BLOCKS]

free_space = self._get_MBs(free_space)
total_space = self._get_MBs(total_space)
Expand Down