Code

Master#21

Code

Open

skywhat wants to merge 95 commits intoskywhatjnudeveloper/sync:skywhatfrom masterjnudeveloper/sync:masterCopy head branch name to clipboard

+2,784-208

Commits

Commits on Mar 11, 2017

• 1. hash文件名统一成 .synchash

  Show description for 872d0e9
  lgxbslgx

  committed
  872d0e9

  Copy full SHA for 872d0e9

• Merge branch 'master' of github.com:jnudeveloper/sync

  lgxbslgx

  committed
  a89126a

  Copy full SHA for a89126a

Commits on Mar 12, 2017

• Merge branch 'skywhat'

  skywhat

  committed
  a4c963a

  Copy full SHA for a4c963a

Commits on Mar 13, 2017

• 1.根据最新的“程序流程图_2.pdf”进行了修改，主要改动了proces.run()函数

  Show description for aaad44f
  

  Darkgel

  authored and

  michael.shi

  committed
  aaad44f

  Copy full SHA for aaad44f

Commits on Mar 14, 2017

• 1.根据流程图定义了需要的函数，大家一起逐步完善这些函数

  Show description for 2b6174f
  

  michael.shi

  committed
  2b6174f

  Copy full SHA for 2b6174f

• 1.主要修改了hash_algorithm.py,添加了一个计算文件名hash的函数，并在计算

  Show description for 32c3639
  

  Darkgel

  authored and

  michael.shi

  committed
  32c3639

  Copy full SHA for 32c3639

• fix a comment

  

  michael.shi

  committed
  3a55549

  Copy full SHA for 3a55549

Commits on Mar 15, 2017

• 完善哈希数组链表这个类

  Darkgel

  committed
  bc9fa8f

  Copy full SHA for bc9fa8f

Commits on Mar 18, 2017

• 规范化命名格式

  lgxbslgx

  committed
  d046182

  Copy full SHA for d046182

• 声明需要用到的各个函数，以便之后实现

  lgxbslgx

  committed
  8327b4e

  Copy full SHA for 8327b4e

Commits on Mar 19, 2017

• 确定分工

  lgxbslgx

  committed
  38e9209

  Copy full SHA for 38e9209

Commits on Mar 20, 2017

• 确定需求，重新分工

  lgxbslgx

  committed
  bea3ac1

  Copy full SHA for bea3ac1

Commits on Mar 21, 2017

• 程序开始时选项变化

  lgxbslgx

  committed
  d50d2c8

  Copy full SHA for d50d2c8

• 新建__init__文件

  lgxbslgx

  committed
  31bb840

  Copy full SHA for 31bb840

• 添加方法：delete_last_slash（去掉路径的最后的斜杠） 及其测试用例

  lgxbslgx

  committed
  7434667

  Copy full SHA for 7434667

• 添加方法：delete_last_slash（去掉路径的最后的斜杠） 及其测试用例

  lgxbslgx

  committed
  3255fa1

  Copy full SHA for 3255fa1

• 实现绝对路径和相对路径的转换，和对应的测试代码

  lgxbslgx

  committed
  363aa46

  Copy full SHA for 363aa46

• 1.完成增量pull，但没有测试，也没有封装

  

  Darkgel

  authored and

  michael.shi

  committed
  ff2741e

  Copy full SHA for ff2741e

• Merge remote-tracking branch 'origin/master'

  

  michael.shi

  committed
  13390f8

  Copy full SHA for 13390f8

• 1.完成sync.py中的move_one_file()方法，并给出相应的测试代码

  Show description for a05a898
  Darkgel

  committed
  a05a898

  Copy full SHA for a05a898

Commits on Mar 22, 2017

• 1.细化文件移动、删除函数的步骤

  

  Darkgel

  authored and

  michael.shi

  committed
  369300f

  Copy full SHA for 369300f

• 1.在path.py下封装了以下两个函数用于遍历目录，并在test/sync_test.py中给出了测试代码

  Show description for 51a3332
  

  Darkgel

  authored and

  michael.shi

  committed
  51a3332

  Copy full SHA for 51a3332

• 修改process.py下的一些注释

  Darkgel

  committed
  6a68749

  Copy full SHA for 6a68749

• 修改绝对路径和相对路径的转换

  lgxbslgx

  committed
  31a44c7

  Copy full SHA for 31a44c7

• 修改绝对路径和相对路径的转换的测试代码

  lgxbslgx

  committed
  8c31b03

  Copy full SHA for 8c31b03

• 序列化和反序列化函数，及其测试代码

  lgxbslgx

  committed
  7f216c7

  Copy full SHA for 7f216c7

• Merge branch 'master' of github.com:jnudeveloper/sync

  lgxbslgx

  committed
  923d8d1

  Copy full SHA for 923d8d1

Commits on Mar 23, 2017

• Delete path.pyc

  lgxbslgx

  authored
  a4f0df8

  Copy full SHA for a4f0df8

• Delete process.pyc

  lgxbslgx

  authored
  824b833

  Copy full SHA for 824b833

• Delete prompt.pyc

  lgxbslgx

  authored
  cafbbea

  Copy full SHA for cafbbea

• Delete sync.pyc

  lgxbslgx

  authored
  96b0d7d

  Copy full SHA for 96b0d7d

• 1.完善sync.py中与文件操作相关的4个函数，还没测试

  

  Darkgel

  authored and

  michael.shi

  committed
  14477d2

  Copy full SHA for 14477d2

• 目录可写可读、是否存在项目、同名检测、空文件夹的函数

  lgxbslgx

  committed
  49504e7

  Copy full SHA for 49504e7

• Merge branch 'master' of github.com:jnudeveloper/sync

  lgxbslgx

  committed
  8f9e177

  Copy full SHA for 8f9e177

• 添加测试代码的注释

  lgxbslgx

  committed
  ca89427

  Copy full SHA for ca89427

• 路径复合判断的代码

  lgxbslgx

  committed
  8818fd9

  Copy full SHA for 8818fd9

• 修改README_CN文件

  lgxbslgx

  committed
  c7c5e5f

  Copy full SHA for c7c5e5f

• 1.测试sync.py中与文件操作相关的4个函数

  

  Darkgel

  authored and

  michael.shi

  committed
  4b40ea8

  Copy full SHA for 4b40ea8

• 列表初始化修改

  Show description for 3f26181
  skywhat

  committed
  3f26181

  Copy full SHA for 3f26181

• Merge remote-tracking branch 'origin/master'

  Show description for 4927d37
  skywhat

  committed
  4927d37

  Copy full SHA for 4927d37

• 获取各种路径

  lgxbslgx

  committed
  ae5e064

  Copy full SHA for ae5e064

• Merge branch 'master' of github.com:jnudeveloper/sync

  lgxbslgx

  committed
  30d1863

  Copy full SHA for 30d1863

• merge

  lgxbslgx

  committed
  0af6363

  Copy full SHA for 0af6363

• 1.在sync.py中封装了函数fully_pull，用于执行全量pull，并给出了相应的测试代码

  Show description for d80c6b6
  

  Darkgel

  authored and

  michael.shi

  committed
  d80c6b6

  Copy full SHA for d80c6b6

• Merge remote-tracking branch 'origin/master'

  Show description for 5387c9d
  

  Darkgel

  authored and

  michael.shi

  committed
  5387c9d

  Copy full SHA for 5387c9d

• add a tips

  

  michael.shi

  committed
  9137008

  Copy full SHA for 9137008

Commits on Mar 24, 2017

• 1.完成process中的流程“全量push”、"初始化本地已有的项目"。至此process中的所有流程都已经完成，但都没有测试

  Show description for 17043da
  

  Darkgel

  authored and

  michael.shi

  committed
  17043da

  Copy full SHA for 17043da

• 获取路径时，把路径最后的分隔符去掉

  lgxbslgx

  committed
  c20ec90

  Copy full SHA for c20ec90

• review主流程的代码，标注存疑点；修改路径校检的代码；删除一些无用代码

  lgxbslgx

  committed
  1787cf1

  Copy full SHA for 1787cf1

Commits on Mar 25, 2017

• 格式化代码

  lgxbslgx

  committed
  a64a6f7

  Copy full SHA for a64a6f7

• 封装初始化U盘的函数

  lgxbslgx

  committed
  de47f21

  Copy full SHA for de47f21

• 封装增量push和增量pull的函数

  lgxbslgx

  committed
  d9664e3

  Copy full SHA for d9664e3

• synchash complete

  Show description for 3877337
  skywhat

  committed
  3877337

  Copy full SHA for 3877337

• Merge remote-tracking branch 'origin/master'

  skywhat

  committed
  feaf3ce

  Copy full SHA for feaf3ce

• 回应国雄有疑问的地方，做相应的修改

  Darkgel

  committed
  aa3dfaf

  Copy full SHA for aa3dfaf

• 根据张刚提到的将 != None 改成 is not None

  Darkgel

  committed
  293b0f1

  Copy full SHA for 293b0f1

Commits on Mar 26, 2017

• 重看卫华的代码，回复卫华的信息

  lgxbslgx

  committed
  5dbd81f

  Copy full SHA for 5dbd81f

• review文件synchash.py的代码，给出建议；格式化代码；

  lgxbslgx

  committed
  d6ae7c1

  Copy full SHA for d6ae7c1

Commits on Mar 31, 2017

• 修复2个bug

  lgxbslgx

  committed
  f685830

  Copy full SHA for f685830

Commits on Apr 8, 2017

• 添加init_local的测试代码

  lgxbslgx

  committed
  d16e017

  Copy full SHA for d16e017

• 添加方法init_udisk的测试代码

  lgxbslgx

  committed
  810343a

  Copy full SHA for 810343a

Commits on Apr 9, 2017

• 添加方法incrementally_pull的测试代码

  lgxbslgx

  committed
  256bf6f

  Copy full SHA for 256bf6f

• 添加方法incrementally_push的测试代码，测试未通过，有待排错

  lgxbslgx

  committed
  a18c316

  Copy full SHA for a18c316

Commits on Apr 10, 2017

• 1.添加测试代码测试incrementally_pull和incrementally_pull

  

  Darkgel

  authored and

  michael.shi

  committed
  a985271

  Copy full SHA for a985271

• 修复incrementally_push、incrementally_pull、synchash的bug

  lgxbslgx

  committed
  4a23244

  Copy full SHA for 4a23244

• 修改回哈希数组长度

  lgxbslgx

  committed
  817b0ec

  Copy full SHA for 817b0ec

Commits on Apr 14, 2017

• 修复push的bug

  lgxbslgx

  committed
  47a9fcf

  Copy full SHA for 47a9fcf

Commits on Apr 17, 2017

• 1.添加性能测试目录

  

  Darkgel

  authored and

  michael.shi

  committed
  cb2aab1

  Copy full SHA for cb2aab1

• 添加编写图形界面需要的文件

  lgxbslgx

  committed
  60cb44e

  Copy full SHA for 60cb44e

Commits on Apr 18, 2017

• 1.练习使用line-profiler

  

  Darkgel

  authored and

  michael.shi

  committed
  e8999b1

  Copy full SHA for e8999b1

Commits on Apr 19, 2017

• 性能测试：测试程序运行时间

  lgxbslgx

  committed
  50f3837

  Copy full SHA for 50f3837

• 修改删除文件的bug，增加注释

  lgxbslgx

  committed
  62ef359

  Copy full SHA for 62ef359

Commits on Apr 20, 2017

• 1.在/profile/src下添加脚本cpu_time0.py,cpu_time1.py,cpu_time0.py用于测试cpu运行时间

  Show description for 3f094bf
  

  Darkgel

  authored and

  michael.shi

  committed
  3f094bf

  Copy full SHA for 3f094bf

Commits on Apr 21, 2017

• 内存测试的代码

  lgxbslgx

  committed
  db9f90b

  Copy full SHA for db9f90b

Commits on Apr 22, 2017

• 再次封装fully_push和fully_pull方法

  lgxbslgx

  committed
  51e4dcb

  Copy full SHA for 51e4dcb

• 再次封装性能测试里面的fully_push和fully_pull函数

  lgxbslgx

  committed
  0ebfa8c

  Copy full SHA for 0ebfa8c

• 修改测试代码（因为fully_push和fully_pull改变了）

  lgxbslgx

  committed
  cf71b19

  Copy full SHA for cf71b19

• 添加注释、添加__init__.py文件

  lgxbslgx

  committed
  649d00b

  Copy full SHA for 649d00b

Commits on Apr 23, 2017

• 修复synchash.py的方法delete_by_name_hashcode

  lgxbslgx

  committed
  e30dc49

  Copy full SHA for e30dc49

• 把两份代码合成一份

  lgxbslgx

  committed
  69c2163

  Copy full SHA for 69c2163

• 把测试路径统一写在path.py文件中

  lgxbslgx

  committed
  8cb23d5

  Copy full SHA for 8cb23d5

Commits on Apr 26, 2017

• 修改内存测试的代码

  lgxbslgx

  committed
  daa4eb8

  Copy full SHA for daa4eb8

Commits on Apr 28, 2017

• GUI 设计代码

  skywhat

  committed
  12ebeb6

  Copy full SHA for 12ebeb6

• 完善ＧＵＩ代码

  skywhat

  committed
  fca2da1

  Copy full SHA for fca2da1

• Merge branch 'master' of https://github.com/jnudeveloper/sync

  skywhat

  committed
  e1ffad4

  Copy full SHA for e1ffad4

Commits on Apr 29, 2017

• 图形界面添加路径判断

  lgxbslgx

  committed
  695a1ee

  Copy full SHA for 695a1ee

• 修复图形界面路径判断的bug

  lgxbslgx

  committed
  4f47ca4

  Copy full SHA for 4f47ca4

• GUI完善，大功告成

  skywhat

  committed
  b396bdc

  Copy full SHA for b396bdc

Commits on May 3, 2017

• 添加GUI菜单功能

  skywhat

  committed
  d96b6df

  Copy full SHA for d96b6df

Commits on May 5, 2017

• fix a bug in test part

  skywhat

  committed
  b572a9f

  Copy full SHA for b572a9f

Commits on May 14, 2017

• 完善README文件，删除无用文件

  lgxbslgx

  committed
  fab0c51

  Copy full SHA for fab0c51

Commits on May 15, 2017

• add a file named setup.py. Now we can convert Python scripts into executable Windows programs, able to run without requiring a Python installation.

  skywhat

  committed
  3e1b64a

  Copy full SHA for 3e1b64a

• rename the file

  skywhat

  committed
  b5e1e96

  Copy full SHA for b5e1e96

• add a specific description for py2exe

  skywhat

  committed
  759d68f

  Copy full SHA for 759d68f

Commits on Jun 27, 2017

• 修改README文件

  lgxbslgx

  committed
  281188a

  Copy full SHA for 281188a